![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sat, 21 Aug 2010 06:48:44 +0000 (08:48 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:45:31 +0000 (23:45 -0700) | ||
| commit | 01bfbdca60577271c86addb86ff3f2701eef1882 | |
| tree | 65310dbe7858c76eabcd9232a8b04acb62584a06 | tree | snapshot |
| parent | f9c33605700e37b75279ed6ce4bffaad3eb0cf10 | commit | diff |
checkout/merge: optionally fail operation when ignored files need to be overwritten
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/config.txt | diff | blob | history | |
| builtin/checkout.c | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| cache.h | diff | blob | history | |
| config.c | diff | blob | history | |
| environment.c | diff | blob | history |