merge: add a --signoff flag
authorŁukasz Gryglicki <lukaszgryglicki@o2.pl>
Tue, 4 Jul 2017 09:33:06 +0000 (09:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Jul 2017 19:11:47 +0000 (12:11 -0700)
commit14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900
treee2b9c9e3f148e33c07b78eec61b1ef8ee130d235
parent5800c63717ae35286a1441f14ffff753e01f7e2b
merge: add a --signoff flag

Some projects require every commit, even merges, to be signed off
[*1*].  Because "git merge" does not have a "--signoff" option like
"git commit" does, the user needs to add one manually when the
command presents an editor to describe the merge, or later use "git
commit --amend --signoff".

Help developers of these projects by teaching "--signoff" option to
"git merge".

*1* https://public-inbox.org/git/CAHv71zK5SqbwrBFX=a8-DY9H3KT4FEyMgv__p2gZzNr0WUAPUw@mail.gmail.com/T/#u

Requested-by: Dan Kohn <dan@linuxfoundation.org>
Signed-off-by: Łukasz Gryglicki <lukaszgryglicki@o2.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt
builtin/merge.c
t/t7614-merge-signoff.sh [new file with mode: 0755]