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 /diff.h | |
parent | Update 1.7.8 draft release notes in preparation for rc4 (diff) | |
parent | checkout,merge: loosen overwriting untracked file check based on info/exclude (diff) | |
download | tgif-f44054c82f4199ccff14f472e4fd7904b0db8ff5.tar.xz |
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 'diff.h')
0 files changed, 0 insertions, 0 deletions