| commit | 2c642ed8668745271a714f0a672dbfcd6b0a6fa8 | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Fri, 27 Aug 2010 20:28:16 +0000 (28 01:58 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Aug 2010 23:47:45 +0000 (27 16:47 -0700) | ||
| tree | fa9ad23593a89c3cd89ec8ebd04535a94acb1345 | treesnapshot (tar.gz zip) |
| parent | 6426f2d2afb42e51dac901ff666c3296424c6f5c | commitdiff |
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>
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>
| Documentation/git-format-patch.txt | diffblobblamehistory | |
| builtin/log.c | diffblobblamehistory | |
| t/t4014-format-patch.sh | diffblobblamehistory |