utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

git-squash: add --me flag to flatten the current branch

Browse source
This commit is contained in:
TJ Holowaychuk 2013-06-18 13:44:55 -07:00
parent ed24416bf7
commit c136afba67
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
bin/git-squash
View file

@ -3,7 +3,33 @@
src=$1
msg=$2
test -z $src && echo "source branch required." && exit 1
test -z $src && echo "source branch required, or use --me." && exit 1
# squash current branch
# TODO: do this in a less hacky way
# TODO: less sketchy arguments
if [[ $1 == "--me" ]]; then
msg=$3
branch=`git rev-parse --abbrev-ref HEAD`
# merge against target branch or master
git checkout ${2-master}
git checkout -B squash-tmp
git squash $branch
git branch -D $branch
git checkout -B $branch
git branch -D squash-tmp
if test -n "$msg"; then
git commit -a -m "$msg"
fi
exit
fi
# squash $src
git merge --squash $src