diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-21 13:28:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 13:28:37 -0700 |
| commit | e96e98b3399ae4c638466f84068fe94d4712c5a3 (patch) | |
| tree | 55cee4b82db5239c5f1b2070509c261b378f55f3 /t/Makefile | |
| parent | Merge branch 'da/mergetool-temporary-filename' (diff) | |
| parent | difftool: don't assume that default sh is sane (diff) | |
| download | tgif-e96e98b3399ae4c638466f84068fe94d4712c5a3.tar.xz | |
Merge branch 'da/mergetool-tool-help'
Allow "git mergetool --help" to run outside a Git repository.
* da/mergetool-tool-help:
difftool: don't assume that default sh is sane
mergetool: don't require a work tree for --tool-help
git-sh-setup: move GIT_DIR initialization into a function
mergetool: use more conservative temporary filenames
test-lib-functions: adjust style to match CodingGuidelines
t7610-mergetool: prefer test_config over git config
Diffstat (limited to 't/Makefile')
0 files changed, 0 insertions, 0 deletions