![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Jan 2011 03:03:19 +0000 (19:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 31 Jan 2011 03:03:19 +0000 (19:03 -0800) | ||
| commit | ce30a02f5b414741d19c9b7680671feba1c94a73 | |
| tree | 199417467daf0fcc9bc121c71fb5e4eb59ca5123 | tree | snapshot |
| parent | 4642416efda4b0ac642f68c06577872ea66682e6 | commit | diff |
| parent | 01bfbdca60577271c86addb86ff3f2701eef1882 | commit | diff |
Merge branch 'cb/ignored-paths-are-precious' into pu
* cb/ignored-paths-are-precious:
checkout/merge: optionally fail operation when ignored files need to be overwritten
Conflicts:
Documentation/config.txt
builtin/checkout.c
* cb/ignored-paths-are-precious:
checkout/merge: optionally fail operation when ignored files need to be overwritten
Conflicts:
Documentation/config.txt
builtin/checkout.c
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| builtin/checkout.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| config.c | diff1 | | diff2 | | blob | history |
| environment.c | diff1 | | diff2 | | blob | history |