mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip merges in format-patch.

Browse Source
This commit is contained in:
Junio C Hamano
2005-08-10 00:06:16 -07:00
parent 185612b8d3
commit c35a7b8d80
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-format-patch-script
View File

@ -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" _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d' 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]"` total=`wc -l <$series | tr -dc "[0-9]"`
i=$total i=$total
while read commit while read commit