diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-24 11:09:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-24 11:09:35 -0700 |
| commit | 7526f0aeb1f0a4fa2a4a6fc213db28d5a1b8d418 (patch) | |
| tree | 462fc178bdbda7070e3af57df4ff9594cfb1ef06 /git-merge.txt | |
| parent | a4ff729866ec6f1eb3dc876e34a797b3b686dc5b (diff) | |
| download | git-htmldocs-7526f0aeb1f0a4fa2a4a6fc213db28d5a1b8d418.tar.gz | |
Autogenerated HTML docs for v2.14.1-326-g3dc57
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-merge.txt b/git-merge.txt index 04fdd8cf0..6b308ab6d 100644 --- a/git-merge.txt +++ b/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 |