diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-24 10:20:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-24 10:20:02 -0700 |
| commit | bdfc15fb21328a1461191863777583d32c034077 (patch) | |
| tree | 7443285d2b5a32d810f2e94aa68e1cd73572f8e1 /Documentation/git-merge.txt | |
| parent | Sync with maint (diff) | |
| parent | merge: add a --signoff flag (diff) | |
| download | tgif-bdfc15fb21328a1461191863777583d32c034077.tar.xz | |
Merge branch 'lg/merge-signoff'
"git merge" learned a "--signoff" option to add the Signed-off-by:
trailer with the committer's name.
* lg/merge-signoff:
merge: add a --signoff flag
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 04fdd8cf08..6b308ab6d0 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 |