mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
fixed git-squash
This commit is contained in:
parent
1c62e436b7
commit
07d5ee82ff
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue