X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-format-patch.txt;h=d7ca2dbb22994a31ded56f6060c25acc69e4dab7;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=1788a97b702a195ca58b7fb76453135f1a209c47;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 1788a97b..d7ca2dbb 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -3,25 +3,100 @@ git-format-patch(1)
 
 NAME
 ----
-git-format-patch - Some git command not yet documented.
+git-format-patch - Prepare patches for e-mail submission.
 
 
 SYNOPSIS
 --------
-'git-format-patch' [ --option ] <args>...
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] [--diff-options] <his> [<mine>]
 
 DESCRIPTION
 -----------
-Does something not yet documented.
+Prepare each commit with its patch since <mine> head forked from
+<his> head, one file per patch, for e-mail submission.  Each
+output file is numbered sequentially from 1, and uses the first
+line of the commit message (massaged for pathname safety) as the
+filename.
+
+When -o is specified, output files are created in that
+directory; otherwise in the current working directory.
+
+When -n is specified, instead of "[PATCH] Subject", the first
+line is formatted as "[PATCH N/M] Subject", unless you have only
+one patch.
+
+When --mbox is specified, the output is formatted to resemble
+UNIX mailbox format, and can be concatenated together for
+processing with applymbox.
 
 
 OPTIONS
 -------
---option::
-	Some option not yet documented.
+-o|--output-directory <dir>::
+	Use <dir> to store the resulting files, instead of the
+	current working directory.
+
+-n|--numbered::
+	Name output in '[PATCH n/m]' format.
+
+-k|--keep-subject::
+	Do not strip/add '[PATCH]' from the first line of the
+	commit log message.
+
+-a|--author, -d|--date::
+	Output From: and Date: headers for commits made by
+	yourself as well.  Usually these are output only for
+	commits made by people other than yourself.
+
+-s|--signoff::
+	Add `Signed-off-by:` line to the commit message, using
+	the committer identity of yourself.
+
+-c|--check::
+        Display suspicious lines in the patch.  The definition
+        of 'suspicious lines' is currently the lines that has
+        trailing whitespaces, and the lines whose indentation
+        has a SP character immediately followed by a TAB
+        character.
+
+-m|--mbox::
+	Format the output files for closer to mbox format by
+	adding a phony Unix "From " line, so they can be
+	concatenated together and fed to `git-applymbox`.
+	Implies --author and --date.
 
-<args>...::
-	Some argument not yet documented.
+--stdout::
+	This flag generates the mbox formatted output to the
+	standard output, instead of saving them into a file per
+	patch and implies --mbox.
+
+
+EXAMPLES
+--------
+
+git-format-patch -k --stdout R1..R2 | git-am -3 -k::
+	Extract commits between revisions R1 and R2, and apply
+	them on top of the current branch using `git-am` to
+	cherry-pick them.
+
+git-format-patch origin::
+	Extract commits the current branch accumulated since it
+	pulled from origin the last time in a patch form for
+	e-mail submission.
+
+git-format-patch -M -B origin::
+	The same as the previous one, except detect and handle
+	renames and complete rewrites intelligently to produce
+	renaming patch.  A renaming patch reduces the amount of
+	text output, and generally makes it easier to review
+	it.  Note that the "patch" program does not understand
+	renaming patch well, so use it only when you know the
+	recipient uses git to apply your patch.
+
+
+See Also
+--------
+gitlink:git-am[1], gitlink:git-send-email
 
 
 Author
@@ -34,5 +109,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite