Skip to content

Commit c35a7b8

Browse files
author
Junio C Hamano
committed
Skip merges in format-patch.
1 parent 185612b commit c35a7b8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-format-patch-script

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
117117
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
118118
stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'
119119

120-
git-rev-list --merge-order $(git-rev-parse --revs-only "$revpair") >$series
120+
git-rev-list --no-merges --merge-order \
121+
$(git-rev-parse --revs-only "$revpair") >$series
121122
total=`wc -l <$series | tr -dc "[0-9]"`
122123
i=$total
123124
while read commit

0 commit comments

Comments
 (0)