fixed git-squash

This commit is contained in:
TJ Holowaychuk 2012-02-04 13:59:07 -08:00
parent 1c62e436b7
commit 07d5ee82ff

View file

@ -5,8 +5,8 @@ msg=$2
test -z $src && echo "source branch required." && exit 1
git merge --squash $src && git branch -d $src
git merge --squash $src
if test -n $msg
git commit -a -m "$msg"
fi
if test -n "$msg"; then
git commit -a -m "$msg" && git branch -D $src
fi