diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:47:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:47:08 -0800 |
| commit | 3b425656a469722d9c45b7c88e0e01a9cd8c0fd3 (patch) | |
| tree | 189b98866ea410ba2a94a578b4c7261b4f52e434 /.gitattributes | |
| parent | 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b (diff) | |
| parent | fc001b526c42e5fb776340136a2fb247e391a61b (diff) | |
| download | git-3b425656a469722d9c45b7c88e0e01a9cd8c0fd3.tar.gz | |
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
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions