git-finish: fast-forward destination branches before merging into them
This commit is contained in:
parent
ea343dbfa0
commit
a91decbc47
1 changed files with 1 additions and 0 deletions
|
@ -14,6 +14,7 @@ git checkout $branch || exit $?
|
|||
merge-into() {
|
||||
echo "Merging $branch into $1..." >&2
|
||||
git checkout $1 || exit $?
|
||||
git merge --ff-only || exit $?
|
||||
git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $?
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue