path: root/Documentation/git-commit.txt
diff options
authorJunio C Hamano <>2020-10-20 01:03:52 (GMT)
committerJunio C Hamano <>2020-10-20 18:57:35 (GMT)
commitae2e0ab6c544675256091a6bde5975407b0fab05 (patch)
tree5424981a2bd5f8a02f47a46147221b799f3711a1 /Documentation/git-commit.txt
parenta5fa49ff0a8f3252c6bff49f92b85e7683868f8a (diff)
doc: preparatory clean-up of description on the sign-off option
Almost identical text on the signed-off-by trailer appears in the documentation for "git commit" and "git merge" and its friends. Introduce a new signoff-option.txt file to be shared. A couple of things of note are: - The short-form "-s" is available only in "git commit", but not in commands that are friends of "git merge", as it is used as a short-hand for "--strategy". - The original lacks description on the negated "--no-signoff" form on "git commit" side, but it equally is applicable. It however was unclear in the original text that not adding a Signed-off-by trailer is the default, so rephrase to explain it as a way to countermand a --signoff option that appeared earlier on the same command line. This is in preparation to apply a further clarification on what exactly the Signed-off-by trailer means. Suggested-by: Philippe Blain <> Signed-off-by: Junio C Hamano <> Reviewed-by: Taylor Blau <> Reviewed-by: Bradley M. Kuhn <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-commit.txt')
1 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index a3baea3..17150fa 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -59,6 +59,7 @@ commit by giving the same set of parameters (options and paths).
If you make a commit and then find a mistake immediately after
that, you can recover from it with 'git reset'.
+:git-commit: 1
@@ -163,14 +164,7 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
message, the commit is aborted. This has no effect when a message
is given by other means, e.g. with the `-m` or `-F` options.
- 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 for more information).