Migrate from .stow-rename to --dotfiles
This commit is contained in:
parent
de371ed2b9
commit
c1686f9118
10 changed files with 0 additions and 3 deletions
|
@ -1,26 +0,0 @@
|
|||
#!/bin/zsh
|
||||
branch=$1
|
||||
branchParts=( ${(s:/:)branch} )
|
||||
kind=$branchParts[1]
|
||||
name=$branchParts[2]
|
||||
|
||||
pullreq=$2
|
||||
[[ -n pullreq ]] && pullreq=" (pull request #$pullreq)"
|
||||
|
||||
echo "Finishing $kind '$name'$pullreq..." >&2
|
||||
|
||||
git checkout $branch || exit $?
|
||||
|
||||
merge-into() {
|
||||
echo "Merging $branch into $1..." >&2
|
||||
git checkout $1 || exit $?
|
||||
git merge --ff-only || exit $?
|
||||
git merge --no-ff $branch --message "Merge $kind '$name'$pullreq into $1" || exit $?
|
||||
}
|
||||
|
||||
[[ $kind = feature ]] || merge-into master
|
||||
merge-into develop
|
||||
|
||||
echo "Merge successful, deleting $branch..." >&2
|
||||
git push origin --delete $branch || exit $?
|
||||
git branch --delete $branch
|
Loading…
Add table
Add a link
Reference in a new issue