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-show.txt | |
parent | t4014-format-patch: Call test_tick before committing (diff) | |
download | tgif-2c642ed8668745271a714f0a672dbfcd6b0a6fa8.tar.xz |
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-show.txt')
0 files changed, 0 insertions, 0 deletions