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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <jrnieder@xxxxxxxxx> wrote:

>> +++ b/contrib/examples/git-merge.sh
[...]
>> -               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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]