summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-26 16:08:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-26 16:08:08 -0700
commited36a48e6d246f4f60d44b27e8c1e660151cd0b4 (patch)
treee0b4b25edee7aec9592650055c3659a659d1d9ac /t/t3032-merge-recursive-options.sh
parentcompletion: replace core.abbrevguard to core.abbrev (diff)
parentMerge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3 (diff)
downloadtgif-ed36a48e6d246f4f60d44b27e8c1e660151cd0b4.tar.xz
Merge branch 'maint-1.7.3' into maint-1.7.4
* maint-1.7.3: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files'
Diffstat (limited to 't/t3032-merge-recursive-options.sh')
0 files changed, 0 insertions, 0 deletions