diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:09 -0700 |
commit | 7fd739cd5720fbd1d170584baff7e4f706df641c (patch) | |
tree | a7f00c907b31236eba887075542d83410d08782e /Documentation/git-format-patch.txt | |
parent | b3c16ee454effda5ec8033ab665249710f622699 (diff) | |
parent | 2c642ed8668745271a714f0a672dbfcd6b0a6fa8 (diff) | |
download | git-7fd739cd5720fbd1d170584baff7e4f706df641c.tar.gz git-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/git-format-patch.txt')
-rw-r--r-- | Documentation/git-format-patch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 4b3f5ba53..df77474c2 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>:: |