fmt-merge-msg -m to override merge title
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 23:00:34 +0000 (18:00 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commit2102440c17f990fcb5c9269459c39c6312e80d1c
tree45f16b2b4e9ed80d31806f4a9acb4eb322172383
parenta1e0ad78b784fd7c47c7bc2847f4813aca4cebaf
fmt-merge-msg -m to override merge title

Since v1.7.1.1~23^2 (merge: --log appends shortlog to message if
specified, 2010-05-11), the fmt-merge-msg backend supports custom text
to override the merge title "Merge <foo> into <bar>".

Expose this functionality for scripted callers.  Example:

 git fmt-merge-msg --log -m \
"$(printf '%s\n' \
    "Merge branch 'api-cleanup' into feature" \
    '' \
    'This is to use a few functions refactored for this purpose.'
)" <.git/FETCH_HEAD

Cc: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-fmt-merge-msg.txt
builtin/fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh