mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
Misc refactoring
This commit is contained in:
parent
85c95d1002
commit
4b6d4ff743
|
|
@ -3,6 +3,6 @@
|
|||
test -z $1 && echo "foreign branch required." && exit 1
|
||||
test -z $2 && echo "merge branch required." && exit 1
|
||||
|
||||
git checkout $2 &&
|
||||
git merge --no-ff $1 &&
|
||||
git delete-branch $1
|
||||
git checkout $2 \
|
||||
&& git merge --no-ff $1 \
|
||||
&& git delete-branch $1
|
||||
Loading…
Reference in a new issue