projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit29a1f99b4b81cd28163de1275265234c5ab804b4
tree8179b07340733b5e447b81117a9d82e651d8315ctree | snapshot
parentc236bcd06138bcbc929b86ad1a513635bf4847b2commit | diff
parent38901a48375952ab6c02f22bddfa19ac2bec2c36commit | diff
Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'

* 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
Git—the stupid content tracker