Skip to content

Commit 6f85537

Browse files
Nikolai WeibullJunio C Hamano
authored andcommitted
Documentation/git-format-patch.txt: Add --signoff, --check, and long option-names.
The documentation was lacking descriptions for the --signoff and --check options to git-format-patch. It was also missing the following long option-names: --output-directory (-o), --numbered (-n), --keep-subject (-k), --author (-a), --date (-d), and --mbox (-m). Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent d4ce5f7 commit 6f85537

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

Documentation/git-format-patch.txt

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-format-patch - Prepare patches for e-mail submission.
88

99
SYNOPSIS
1010
--------
11-
'git-format-patch' [-n][-o <dir>|--stdout][-k][--mbox][--diff-options] <his> [<mine>]
11+
'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] [--diff-options] <his> [<mine>]
1212

1313
DESCRIPTION
1414
-----------
@@ -32,23 +32,34 @@ processing with applymbox.
3232

3333
OPTIONS
3434
-------
35-
-o <dir>::
35+
-o|--output-directory <dir>::
3636
Use <dir> to store the resulting files, instead of the
3737
current working directory.
3838

39-
-n::
39+
-n|--numbered::
4040
Name output in '[PATCH n/m]' format.
4141

42-
-k::
42+
-k|--keep-subject::
4343
Do not strip/add '[PATCH]' from the first line of the
4444
commit log message.
4545

46-
--author, --date::
46+
-a|--author, -d|--date::
4747
Output From: and Date: headers for commits made by
4848
yourself as well. Usually these are output only for
4949
commits made by people other than yourself.
5050

51-
--mbox::
51+
-s|--signoff::
52+
Add `Signed-off-by:` line to the commit message, using
53+
the committer identity of yourself.
54+
55+
-c|--check::
56+
Display suspicious lines in the patch. The definition
57+
of 'suspicious lines' is currently the lines that has
58+
trailing whitespaces, and the lines whose indentation
59+
has a SP character immediately followed by a TAB
60+
character.
61+
62+
-m|--mbox::
5263
Format the output files for closer to mbox format by
5364
adding a phony Unix "From " line, so they can be
5465
concatenated together and fed to `git-applymbox`.

0 commit comments

Comments
 (0)