![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 06:55:07 +0000 (22:55 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 06:55:07 +0000 (22:55 -0800) |
* nd/ignore-might-be-precious:
checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/checkout.c | patch | | diff1 | | diff2 | | blob | history |
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/checkout.c
Simple merge
diff --cc builtin/merge.c
Simple merge