tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
refuse to merge during a merge
[git.git]
/
builtin-checkout.c
2009-05-26
Junio C Hamano
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
commitdiff
|
raw
2009-05-26
Junio C Hamano
Merge branch 'jm/format-patch-no-auto-n-when-k-is-given...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'np/push-delta' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'ar/merge-one-file-diag' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'ar/unlink-err' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-26
Junio C Hamano
Merge branch 'jk/maint-add-empty' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-24
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-24
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-05-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-05-16
Daniel Cordero
builtin-checkout: Don't tell user that HEAD has moved...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-16
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-14
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-05-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-05-12
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-12
Junio C Hamano
Merge branch 'jc/maint-read-tree-multi' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-12
Junio C Hamano
Revert "checkout branch: prime cache-tree fully"
blob
|
commitdiff
|
raw
|
diff to current
2009-05-10
Linus Torvalds
Teach 'git checkout' to preload the index contents
blob
|
commitdiff
|
raw
|
diff to current
2009-05-09
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-05-09
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-05-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-05-06
Junio C Hamano
Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-06
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Sync with GIT 1.6.2.5
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'np/maint-no-ofs-delta' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-read-tree-multi' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'lt/pack-object-memuse' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-05-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-04-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-29
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-29
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-25
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-23
Junio C Hamano
Merge branch 'jc/maint-read-tree-multi'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-23
Mike Ralphson
Fix typos / spelling in comments
blob
|
commitdiff
|
raw
|
diff to current
2009-04-21
Junio C Hamano
Merge branch 'mk/maint-apply-swap'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Junio C Hamano
checkout branch: prime cache-tree fully
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Junio C Hamano
Move prime_cache_tree() to cache-tree.c
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Junio C Hamano
Merge branch 'mm/maint-add-p-quit'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Junio C Hamano
Sync with 1.6.2.4
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'ef/maint-fast-export' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'lt/maint-reflog-expire' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-19
Junio C Hamano
Merge branch 'jc/maint-shared-literally' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'lt/pack-object-memuse'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'js/maint-submodule-checkout' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-submodule-fix...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'da/difftool'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-13
Junio C Hamano
Mark t1301 permission test to depend on POSIXPERM
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'sb/doc-upstream-branch'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'jk/show-upstream'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'fg/remote-prune'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'cc/sha1-bsearch'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'cc/bisect-filter'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-12
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/shared-literally' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'js/maint-1.6.0-exec-path-env' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Jari Aalto
Change double quotes to single quotes in message
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'lt/reflog-expire'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'ms/http-auth'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'js/maint-submodule-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-submodule-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-08
Junio C Hamano
Merge branch 'mh/html-path'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-06
Junio C Hamano
Merge branch 'jc/name-branch'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-06
Junio C Hamano
Merge branch 'jc/shared-literally'
blob
|
commitdiff
|
raw
|
diff to current
2009-04-06
Junio C Hamano
Merge branch 'sb/format-patch-patchname'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
