Dan Kohn [off-list ref] writes:
This alternative workflow works, but is obviously tedious:
# First 3 steps are the same
(feature-branch)$ git merge origin/master
# Save default commit message
(feature-branch)$ git commit --amend -s
# Commit message now has signoff line
(feature-branch)$ git push
# This now passes the DCObot check.
Or, I could manually add the Signoff line to the proposed git merge
commit message, which would allow me to skip the `--amend` step.
Could you please add a `--signoff` option to `git merge`?
The reason why we changed the default for "git merge" to start an
editor at around v1.7.10 was because we wanted to encourage people
to write log message that more meaningfully documents the change,
and adding sign-off is probably in line with that.
I've done that "commit --amend" on a merge to tweak its message
myself number of times, but I have to admit that I never did so for
sign-off, but why not? ;-)
On Sat, Jul 1, 2017 at 1:45 PM, Junio C Hamano [off-list ref] wrote:
Dan Kohn [off-list ref] writes:
quoted
Could you please add a `--signoff` option to `git merge`?
The reason why we changed the default for "git merge" to start an
editor at around v1.7.10 was because we wanted to encourage people
to write log message that more meaningfully documents the change,
and adding sign-off is probably in line with that.
I've done that "commit --amend" on a merge to tweak its message
myself number of times, but I have to admit that I never did so for
sign-off, but why not? ;-)
I'm not opposed to starting the editor, although in the case of our
workflow there's not much more to say beyond "Merged in master". I
would just like the Sign-Off line to appear by default in the commit
message if I do `git merge origin/master --signoff`. I know it seems
trivial, but many GitHub users aren't familiar with the exact header
syntax to use, as they're used to just doing `git commit -sam 'New
Feature'`.
Separately, I just came back from Beijing where Linus spoke at LC3
<https://www.lfasiallc.com/linuxcon-containercon-cloudopen-china>. He
was asked about git and explained that he had largely bowed out of any
development after the first few months and credited your stewardship.
Even if you turn down my request for a new flag here, thanks for the
amazing project!
--
Dan Kohn <mailto:dan@linuxfoundation.org>
Executive Director, Cloud Native Computing Foundation <https://cncf.io/>
tel:+1-415-233-1000