summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-06 05:24:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-06 05:24:24 (GMT)
commitfb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2 (patch)
tree4233d3847c9dfec1cebbed8f354741431fdfc57a /Documentation/git-merge.txt
parenta1bf46ed9dfe67ce07f351e0fd9b9cfe68740d6c (diff)
parent3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a (diff)
downloadgit-fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2.zip
git-fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2.tar.gz
git-fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2.tar.bz2
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/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3c6927b..d5dfd84 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).