| commit | e96e98b3399ae4c638466f84068fe94d4712c5a3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:37 +0000 (21 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:37 +0000 (21 13:28 -0700) | ||
| tree | 55cee4b82db5239c5f1b2070509c261b378f55f3 | treesnapshot (tar.gz zip) |
| parent | 02f4db83bd979fe33f18006fa612d7d5ab1d2470 | commitdiff |
| parent | 4fb4b02d98310f4f859f7d52f57f36d49198be5c | commitdiff |
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
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
| git-mergetool.sh | diff1 | diff2 | blobhistory |
| git-sh-setup.sh | diff1 | diff2 | blobhistory |