projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d3a035 335c6e4)
Merge branch 'jc/checkout-m-twoway'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:06:22 +0000 (16:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:06:22 +0000 (16:06 -0800)
commit7f1068e21e5840fca0787f0925e62148b2f873ed
treefc50947d7f1b4ac6816168596d0ab75c2a24ba21tree | snapshot
parent1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1ccommit | diff
parent335c6e403d862913846661638af6e184055f6db5commit | diff
Merge branch 'jc/checkout-m-twoway'

* jc/checkout-m-twoway:
  checkout_merged(): squelch false warning from some gcc
  Test 'checkout -m -- path'
  checkout -m: no need to insist on having all 3 stages
builtin/checkout.c diff1 | diff2 | blob | history
Git—the stupid content tracker