| commit | ad241d9861131ab47620955bfb9292c4d4f71f3c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jul 2012 23:06:27 +0000 (16 16:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jul 2012 23:06:27 +0000 (16 16:06 -0700) | ||
| tree | 5112f4917df4dac6ab3d20ef1e47a66d9784a3a0 | treesnapshot (tar.gz zip) |
| parent | 0b30d5504a602ef409b9bf3873acba8abb24cf9c | commitdiff |
Meta/Reintegrate: force invoking the editor when merging
As "git merge" is clever not to default to --edit behaviour when its
standard input and output streams are not connected to the same
terminal (i.e. indicating an interactive tty session), we would need
to explicitly ask for "--edit" while exporting "EDITOR=:" one-shot,
so that commit log cleaner still is triggered.
In the longer term, the interactions among pull, fmt-merge-msg,
merge and the editor need to be redesigned, but it is a large task,
so for now this workaround should suffice.
As "git merge" is clever not to default to --edit behaviour when its
standard input and output streams are not connected to the same
terminal (i.e. indicating an interactive tty session), we would need
to explicitly ask for "--edit" while exporting "EDITOR=:" one-shot,
so that commit log cleaner still is triggered.
In the longer term, the interactions among pull, fmt-merge-msg,
merge and the editor need to be redesigned, but it is a large task,
so for now this workaround should suffice.
| Reintegrate | diffblobblamehistory |