mirror of
https://github.com/git/git.git
synced 2024-12-01 14:03:34 +08:00
Skip merges in format-patch.
This commit is contained in:
parent
185612b8d3
commit
c35a7b8d80
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user