projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c236bcd 38901a4)
Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
authorJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:44:17 +0000 (19:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:44:26 +0000 (19:44 -0700)
* jc/maint-checkout-fix:
  checkout --ours/--theirs: allow checking out one side of a conflicting merge
  checkout -f: allow ignoring unmerged paths when checking out of the index
  checkout: do not check out unmerged higher stages randomly


Trivial merge
Git—the stupid content tracker