![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800) | ||
| commit | 3b425656a469722d9c45b7c88e0e01a9cd8c0fd3 | |
| tree | 189b98866ea410ba2a94a578b4c7261b4f52e434 | tree | snapshot |
| parent | 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b | commit | diff |
| parent | fc001b526c42e5fb776340136a2fb247e391a61b | commit | diff |
Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude
* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude
| builtin/checkout.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |