summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorŁukasz Gryglicki <lukaszgryglicki@o2.pl>2017-07-04 09:33:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-25 19:11:47 (GMT)
commit14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900 (patch)
treee2b9c9e3f148e33c07b78eec61b1ef8ee130d235 /Documentation/git-merge.txt
parent5800c63717ae35286a1441f14ffff753e01f7e2b (diff)
downloadgit-14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900.zip
git-14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900.tar.gz
git-14d01b4f07a08ee55bffc74f2d6e1b0a4e8ce900.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 04fdd8c..6b308ab 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -64,6 +64,14 @@ OPTIONS
-------
include::merge-options.txt[]
+--signoff::
+ Add Signed-off-by line by the committer at the end of the commit
+ log message. The meaning of a signoff depends on the project,
+ but it typically certifies that committer has
+ the rights to submit this work under the same license and
+ agrees to a Developer Certificate of Origin
+ (see http://developercertificate.org/ for more information).
+
-S[<keyid>]::
--gpg-sign[=<keyid>]::
GPG-sign the resulting merge commit. The `keyid` argument is