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 | |
| parent | Merge branch 'pc/submodule-helper' (diff) | |
| parent | pull: pass --signoff/--no-signoff to "git merge" (diff) | |
| download | tgif-fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-merge.txt | 8 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 3c6927b1fb..d5dfd8430f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -64,14 +64,6 @@ 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). - -m <msg>:: Set the commit message to be used for the merge commit (in case one is created). 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:: |