summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 21:47:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 21:47:08 -0800
commit3b425656a469722d9c45b7c88e0e01a9cd8c0fd3 (patch)
tree189b98866ea410ba2a94a578b4c7261b4f52e434 /contrib/emacs
parentMerge branch 'maint-1.7.6' into maint-1.7.7 (diff)
parentcheckout,merge: loosen overwriting untracked file check based on info/exclude (diff)
downloadtgif-3b425656a469722d9c45b7c88e0e01a9cd8c0fd3.tar.xz
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 'contrib/emacs')
0 files changed, 0 insertions, 0 deletions