X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-format-patch.txt;h=41e487ae1d0189b906f9b06624d0d23f9aa4652f;hb=877276d4d3018d2810be990c39fa7f59678e960d;hp=c60ce123ec745e1903da0b5ab50e4efabeeb5dc3;hpb=c74815261225e5068490583b08303d158837ab9e;p=git.git
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c60ce123e..41e487ae1 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -9,7 +9,7 @@ git-format-patch - Prepare patches for e-mail submission
SYNOPSIS
--------
[verse]
-'git-format-patch' [-k] [-o
| --stdout] [--thread]
+'git format-patch' [-k] [-o | --stdout] [--thread]
[--attach[=] | --inline[=]]
[-s | --signoff] []
[-n | --numbered | -N | --no-numbered]
@@ -27,7 +27,7 @@ DESCRIPTION
Prepare each commit with its patch in
one file per commit, formatted to resemble UNIX mailbox format.
The output of this command is convenient for e-mail submission or
-for use with linkgit:git-am[1].
+for use with `git-am`.
There are two ways to specify which commits to operate on.
@@ -61,7 +61,7 @@ they are created in the current working directory.
If -n is specified, instead of "[PATCH] Subject", the first line
is formatted as "[PATCH n/m] Subject".
-If given --thread, git-format-patch will generate In-Reply-To and
+If given --thread, `git-format-patch` will generate In-Reply-To and
References headers to make the second and subsequent patch mails appear
as replies to the first mail; this also generates a Message-Id header to
reference.
@@ -74,14 +74,17 @@ include::diff-options.txt[]
-::
Limits the number of patches to prepare.
--o|--output-directory ::
+-o ::
+--output-directory ::
Use to store the resulting files, instead of the
current working directory.
--n|--numbered::
+-n::
+--numbered::
Name output in '[PATCH n/m]' format.
--N|--no-numbered::
+-N::
+--no-numbered::
Name output in '[PATCH]' format.
--start-number ::
@@ -92,11 +95,13 @@ include::diff-options.txt[]
without the default first line of the commit appended.
Mutually exclusive with the --stdout option.
--k|--keep-subject::
+-k::
+--keep-subject::
Do not strip/add '[PATCH]' from the first line of the
commit log message.
--s|--signoff::
+-s::
+--signoff::
Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
@@ -170,10 +175,10 @@ and file suffix, and number patches when outputting more than one.
------------
[format]
- headers = "Organization: git-foo\n"
- subjectprefix = CHANGE
- suffix = .txt
- numbered = auto
+ headers = "Organization: git-foo\n"
+ subjectprefix = CHANGE
+ suffix = .txt
+ numbered = auto
cc =
------------
@@ -185,7 +190,7 @@ EXAMPLES
the current branch using `git-am` to cherry-pick them:
+
------------
-$ git format-patch -k --stdout R1..R2 | git-am -3 -k
+$ git format-patch -k --stdout R1..R2 | git am -3 -k
------------
* Extract all commits which are in the current branch but not in the
@@ -201,7 +206,7 @@ For each commit a separate file is created in the current directory.
project:
+
------------
-$ git format-patch \--root origin
+$ git format-patch --root origin
------------
* The same as the previous one:
@@ -223,7 +228,7 @@ as e-mailable patches:
$ git format-patch -3
------------
-See Also
+SEE ALSO
--------
linkgit:git-am[1], linkgit:git-send-email[1]
@@ -238,4 +243,4 @@ Documentation by Junio C Hamano and the git-list .
GIT
---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite