mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 15:36:21 -04:00
b9478d64b7
If branch creation in feature|bug|refactor returns a non-zero value then simply try to switch to branch
16 lines
498 B
Bash
Executable file
16 lines
498 B
Bash
Executable file
#!/bin/sh
|
|
|
|
if test "$1" = "finish"; then
|
|
test -z $2 && echo "feature <name> required." 1>&2 && exit 1
|
|
branch=feature/$2
|
|
git merge --no-ff $branch && git delete-branch $branch
|
|
else
|
|
test -z $1 && echo "feature <name> required." 1>&2 && exit 1
|
|
if test -n "$2"; then
|
|
echo "too many arguments; if not finishing a feature, only <name> of new feature is expected" && exit 1
|
|
fi
|
|
branch=feature/$1
|
|
git checkout -b $branch &> /dev/null
|
|
test -n $? && git checkout $branch &> /dev/null
|
|
fi
|