summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 13:49:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 13:49:09 -0700
commit7fd739cd5720fbd1d170584baff7e4f706df641c (patch)
treea7f00c907b31236eba887075542d83410d08782e /Documentation
parentMerge branch 'jc/pickaxe-grep' (diff)
parentformat-patch: Don't go over merge commits (diff)
downloadtgif-7fd739cd5720fbd1d170584baff7e4f706df641c.tar.xz
Merge branch 'rr/format-patch-count-without-merges'
* rr/format-patch-count-without-merges: format-patch: Don't go over merge commits t4014-format-patch: Call test_tick before committing
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-format-patch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 4b3f5ba535..df77474c29 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -74,7 +74,7 @@ OPTIONS
include::diff-options.txt[]
-<n>::
- Limits the number of patches to prepare.
+ Prepare patches from the topmost <n> commits.
-o <dir>::
--output-directory <dir>::