path: root/Documentation/merge-options.txt
diff options
authorW. Trevor King <>2017-10-12 18:35:42 (GMT)
committerJunio C Hamano <>2017-10-13 01:47:36 (GMT)
commit3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a (patch)
tree4d8e47aca3cbe09b993d6013a8f2dac41be8f512 /Documentation/merge-options.txt
parent111ef79afe185f8731920569450f6a65320f5d5f (diff)
pull: pass --signoff/--no-signoff to "git merge"
merge can take --signoff, but without pull passing --signoff down, it is inconvenient to use; allow 'pull' to take the option and pass it through. The order of options in merge-options.txt is mostly alphabetical by long option since 7c85d274 (Documentation/merge-options.txt: order options in alphabetical groups, 2009-10-22). The long-option bit didn't make it into the commit message, but it's under the fold in [1]. I've put --signoff between --log and --stat to preserve the alphabetical order. [1]: Signed-off-by: W. Trevor King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/merge-options.txt')
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 4e32304..f394622 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -51,6 +51,16 @@ set to `no` at the beginning of them.
With --no-log do not list one-line descriptions from the
actual commits being merged.
+ 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 for more information).
+With --no-signoff do not add a Signed-off-by line.