diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-10 00:06:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-10 00:06:56 -0700 |
| commit | c35a7b8d806317dc1762e36561cbd31c2530dd9c (patch) | |
| tree | ea631f59c9e9ef2fbe2b22e6f2b6495462bd915c | |
| parent | 185612b8d3562c82975b017c0c6e1d47dd302897 (diff) | |
| download | git-c35a7b8d806317dc1762e36561cbd31c2530dd9c.tar.gz git-c35a7b8d806317dc1762e36561cbd31c2530dd9c.tar.xz | |
Skip merges in format-patch.
| -rwxr-xr-x | git-format-patch-script | 3 |
1 files changed, 2 insertions, 1 deletions
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 |