From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Aug 2005 07:06:16 +0000 (-0700)
Subject: Skip merges in format-patch.
X-Git-Tag: v0.99.4~3^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c35a7b8d806317dc1762e36561cbd31c2530dd9c;p=git.git

Skip merges in format-patch.
---

diff --git a/git-format-patch-script b/git-format-patch-script
index 003194cdd..c0081697d 100755
--- a/git-format-patch-script
+++ b/git-format-patch-script
@@ -117,7 +117,8 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'
 
-git-rev-list --merge-order $(git-rev-parse --revs-only "$revpair") >$series
+git-rev-list --no-merges --merge-order \
+	$(git-rev-parse --revs-only "$revpair") >$series
 total=`wc -l <$series | tr -dc "[0-9]"`
 i=$total
 while read commit