Graft Update

This commit is contained in:
Kenneth Reitz 2010-08-28 13:39:45 -04:00 committed by Tj Holowaychuk
parent d978428973
commit 85c95d1002

View file

@ -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