From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:09 +0000 (-0800)
Subject: Merge branch 'dw/signoff-doc' into maint
X-Git-Tag: v2.7.1~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7aae9ba6613c38d9f275955af80881fb67ddbd8a?hp=-c

Merge branch 'dw/signoff-doc' into maint

The documentation has been updated to hint the connection between
the '--signoff' option and DCO.

* dw/signoff-doc:
Expand documentation describing --signoff
---

7aae9ba6613c38d9f275955af80881fb67ddbd8a
diff --combined Documentation/git-format-patch.txt
index e3cdaeb958,96b52bde91..b149e09065
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@@ -109,6 -109,7 +109,7 @@@ include::diff-options.txt[
  --signoff::
  	Add `Signed-off-by:` line to the commit message, using
  	the committer identity of yourself.
+ 	See the signoff option in linkgit:git-commit[1] for more information.
  
  --stdout::
  	Print all commits to the standard output in mbox format,
@@@ -256,10 -257,6 +257,10 @@@ you can use `--suffix=-patch` to get `0
  	using this option cannot be applied properly, but they are
  	still useful for code review.
  
 +--zero-commit::
 +  Output an all-zero hash in each patch's From header instead
 +  of the hash of the commit.
 +
  --root::
  	Treat the revision argument as a <revision range>, even if it
  	is just a single commit (that would normally be treated as a