summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-10 07:06:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-10 07:06:56 (GMT)
commitc35a7b8d806317dc1762e36561cbd31c2530dd9c (patch)
treeea631f59c9e9ef2fbe2b22e6f2b6495462bd915c
parent185612b8d3562c82975b017c0c6e1d47dd302897 (diff)
downloadgit-c35a7b8d806317dc1762e36561cbd31c2530dd9c.zip
git-c35a7b8d806317dc1762e36561cbd31c2530dd9c.tar.gz
git-c35a7b8d806317dc1762e36561cbd31c2530dd9c.tar.bz2
Skip merges in format-patch.
-rwxr-xr-xgit-format-patch-script3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-format-patch-script b/git-format-patch-script
index 003194c..c008169 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