summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-28 13:51:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-28 13:51:11 -0700
commit9abf65d23ce8700c290fa4f7d834a10ec5b3e327 (patch)
tree8a378ca3c195c00c4f43a30ea89f3c12d844bf38 /t/t3308-notes-merge.sh
parentMerge branch 'ah/doc-gitk-config' (diff)
parentrun-command: mark run_hook_with_custom_index as deprecated (diff)
downloadtgif-9abf65d23ce8700c290fa4f7d834a10ec5b3e327.tar.xz
Merge branch 'bp/commit-p-editor'
When it is not necessary to edit a commit log message (e.g. "git commit -m" is given a message without specifying "-e"), we used to disable the spawning of the editor by overriding GIT_EDITOR, but this means all the uses of the editor, other than to edit the commit log message, are also affected. * bp/commit-p-editor: run-command: mark run_hook_with_custom_index as deprecated merge hook tests: fix and update tests merge: fix GIT_EDITOR override for commit hook commit: fix patch hunk editing with "commit -p -m" test patch hunk editing with "commit -p -m" merge hook tests: use 'test_must_fail' instead of '!' merge hook tests: fix missing '&&' in test
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions