diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-28 10:41:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-28 10:41:43 -0800 |
| commit | f44054c82f4199ccff14f472e4fd7904b0db8ff5 (patch) | |
| tree | a34aedc1fb8a8f919bb7ce86a91ed9f0b6d43848 /gitweb/static/js/lib | |
| parent | 017d1e134545db0d162908f3538077eaa1f34fb6 (diff) | |
| parent | fc001b526c42e5fb776340136a2fb247e391a61b (diff) | |
Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude
Diffstat (limited to 'gitweb/static/js/lib')
0 files changed, 0 insertions, 0 deletions