]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00754b2 5cd7fad)
Merge branch 'jc/checkout-m-twoway' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:44:54 +0000 (11:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:44:54 +0000 (11:44 -0800)
* jc/checkout-m-twoway:
  t/t2023-checkout-m.sh: fix use of test_must_fail
  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
Unnamed repository; edit this file 'description' to name the repository.