summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-04-27 22:48:28 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-02 07:47:47 +0900
commitdc4b5bc3534bf4d8f362173d905d294048c48f79 (patch)
tree3c14aca218525455bf72a68aa67add273f28c2a5 /contrib/examples/git-merge.sh
parentrebase -i: Handle "combination of <n> commits" with GETTEXT_POISON (diff)
downloadtgif-dc4b5bc3534bf4d8f362173d905d294048c48f79.tar.xz
sequencer: always commit without editing when asked for
Previously, we only called run_git_commit() without EDIT_MSG when we also passed in a default message. However, an upcoming caller will want to commit without EDIT_MSG and *without* a default message: to clean up fixup/squash comments in HEAD's commit message. Let's prepare for that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions