diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 14:24:24 +0900 |
| commit | fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2 (patch) | |
| tree | 4233d3847c9dfec1cebbed8f354741431fdfc57a /Documentation/merge-options.txt | |
| parent | a1bf46ed9dfe67ce07f351e0fd9b9cfe68740d6c (diff) | |
| parent | 3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a (diff) | |
| download | git-fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2.tar.gz | |
Merge branch 'wk/pull-signoff'
"git pull" has been taught to accept "--[no-]signoff" option and
pass it down to "git merge".
* wk/pull-signoff:
pull: pass --signoff/--no-signoff to "git merge"
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 2552ab8e8d..3888c3ff85 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -57,6 +57,16 @@ set to `no` at the beginning of them. With --no-log do not list one-line descriptions from the actual commits being merged. +--signoff:: +--no-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). ++ +With --no-signoff do not add a Signed-off-by line. --stat:: -n:: |