summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-28 10:41:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-28 10:41:43 -0800
commitf44054c82f4199ccff14f472e4fd7904b0db8ff5 (patch)
treea34aedc1fb8a8f919bb7ce86a91ed9f0b6d43848 /t
parentUpdate 1.7.8 draft release notes in preparation for rc4 (diff)
parentcheckout,merge: loosen overwriting untracked file check based on info/exclude (diff)
downloadtgif-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 't')
0 files changed, 0 insertions, 0 deletions