diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2010-08-28 01:58:16 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-27 16:47:45 -0700 |
| commit | 2c642ed8668745271a714f0a672dbfcd6b0a6fa8 (patch) | |
| tree | fa9ad23593a89c3cd89ec8ebd04535a94acb1345 /Documentation/git-format-patch.txt | |
| parent | 6426f2d2afb42e51dac901ff666c3296424c6f5c (diff) | |
| download | git-2c642ed8668745271a714f0a672dbfcd6b0a6fa8.tar.gz | |
format-patch: Don't go over merge commits
If the topmost three commits in a branch were merge commits, 'git
format-patch -3' used to output nothing. Since Git can't prepare
patches out of merge commits anyway, don't go over them in the first
place. 'git format-patch -3' now prepares three patches from the
topmost three commits without counting merge commits. Also add a
corresponding test in t4014-format-patch and update documentation.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 835fb7135b..95b8bcc49e 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -73,7 +73,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>:: |