summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-09 06:00:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-09 06:00:21 (GMT)
commit5b841d61c428bc8dbb9e3b5afd12781aff51eb2a (patch)
tree19774eec3062cb055c5c035ee169297aea82f3d9
parentaa41cf8f43687579363a2360795cac621d5254ed (diff)
parent2d266f9d623625e0a28fbe3c3615707500e9448f (diff)
downloadgit-5b841d61c428bc8dbb9e3b5afd12781aff51eb2a.zip
git-5b841d61c428bc8dbb9e3b5afd12781aff51eb2a.tar.gz
git-5b841d61c428bc8dbb9e3b5afd12781aff51eb2a.tar.bz2
Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1
* tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications
-rw-r--r--Documentation/git-format-patch.txt21
1 files changed, 12 insertions, 9 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 11a7d77..1f577b8 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -39,15 +39,11 @@ There are two ways to specify which commits to operate on.
REVISIONS" section in linkgit:git-rev-parse[1]) means the
commits in the specified range.
-A single commit, when interpreted as a <revision range>
-expression, means "everything that leads to that commit", but
-if you write 'git format-patch <commit>', the previous rule
-applies to that command line and you do not get "everything
-since the beginning of the time". If you want to format
-everything since project inception to one commit, say "git
-format-patch \--root <commit>" to make it clear that it is the
-latter case. If you want to format a single commit, you can do
-this with "git format-patch -1 <commit>".
+The first rule takes precedence in the case of a single <commit>. To
+apply the second rule, i.e., format everything since the beginning of
+history up until <commit>, use the '\--root' option: "git format-patch
+\--root <commit>". If you want to format only <commit> itself, you
+can do this with "git format-patch -1 <commit>".
By default, each output file is numbered sequentially from 1, and uses the
first line of the commit message (massaged for pathname safety) as
@@ -170,6 +166,13 @@ not add any suffix.
applied. By default the contents of changes in those files are
encoded in the patch.
+--root::
+ Treat the revision argument as a <revision range>, even if it
+ is just a single commit (that would normally be treated as a
+ <since>). Note that root commits included in the specified
+ range are always formatted as creation patches, independently
+ of this flag.
+
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each message