Re: [PATCH 19/24] merge script: handle -m --log correctly

Tay Ray Chuan wrote:

Thanks for the heads up.

Thanks for adding the feature in the first place. :)

On Tue, Aug 17, 2010 at 3:06 PM, Jonathan Nieder [off-list ref] wrote:

quoted

+++ b/contrib/examples/git-merge.sh

[...]

quoted

-               done | git fmt-merge-msg $log_arg
-       )
-       merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"
+               done |
+               if test "$have_message" = t
+               then
+                       git fmt-merge-msg -m "$merge_msg" $log_arg

hmm, when did git-fmt-merge-msg learn -m? Mine (1.7.2.1.219.gf2a27) doesn't.

Patch 11 from this series ("fmt-merge-msg -m to override subject line")
should do it, assuming it works correctly.