![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | 7f1068e21e5840fca0787f0925e62148b2f873ed | |
| tree | fc50947d7f1b4ac6816168596d0ab75c2a24ba21 | tree | snapshot |
| parent | 1d3a035d6d48bfa870b6ebe7c59f12b66e3a1b1c | commit | diff |
| parent | 335c6e403d862913846661638af6e184055f6db5 | commit | 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
* 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 |