projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d3a035
335c6e4
)
Merge branch 'jc/checkout-m-twoway'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 20 Dec 2011 00:06:22 +0000
(16:06 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 20 Dec 2011 00:06:22 +0000
(16:06 -0800)
* 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
1
2
builtin/checkout.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
builtin/checkout.c
Simple merge