![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:25:12 +0000 (15:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:25:12 +0000 (15:25 -0800) | ||
| commit | 9ef569791f967c1559b498d8f77a2c42a14be2ed | |
| tree | afd2b29be852150fd4f74d57e257ab47729ca86c | tree | snapshot |
| parent | ce8781e8ab66fb90fb7baf8d953a4582a06571a7 | commit | diff |
| parent | fc001b526c42e5fb776340136a2fb247e391a61b | commit | diff |
Merge branch 'nd/maint-ignore-exclude'
* 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 |