I updated my gist of git flow helpers with this change.
After this:
- Commands use the -F option to fetch
- Master and developer are
pull --rebase. - Commands use option --showcommands so that one can see what git-flow is doing
gup_develop() {
current_branch="$(git_current_branch)"
echo current_branch is $current_branch
gco develop && gup && gco "$current_branch"
}
gup_master() {
current_branch="$(git_current_branch)"
echo current_branch is $current_branch
gco master && gup && gco "$current_branch"
}
gup_develop_master() {
gup_develop && gup_master
}
gffs() {
feature=`sanitize $1`
gup_develop_master && echoRun "git flow feature start -F --showcommands $feature"
}
gffp() {
feature=`sanitize $1`
gup_develop_master && echoRun "git flow feature publish --showcommands $feature"
}
gfff() {
gup_develop_master && echoRun "git flow feature finish -F --showcommands $(gitFlowNameForCurrentBranch)" &&
echo "Confirm merge and then push develop" || echo "Examine error messages!"
}
gfrs() {
release=`sanitize $1`
gup_develop_master && echoRun "git flow release start -F --showcommands $release"
}
gfrp() {
release=`sanitize $1`
gup_develop_master && echoRun "git flow release publish -F --showcommands $release"
}
# Changed to
# 1. Be sure to sync up remotes and pull --rebase
# 2. Not push
gfrf() {
gup_develop_master && echoRun "git flow release finish -Fn --showcommands $(gitFlowNameForCurrentBranch)" &&
echo "Confirm merge and then push master" || echo "Examine error messages!"
}
gfhs() {
release=`sanitize $1`
gup_develop_master && echoRun "git flow hotfix start -F --showcommands $release"
}
gfhp() {
release=`sanitize $1`
gup_develop_master && echoRun "git flow hotfix publish --showcommands $release"
}
# Changed to
# 1. Be sure to sync up remotes and pull --rebase
# 2. Not push
gfhf() {
gup_develop_master && echoRun "git flow hotfix finish -Fn --showcommands $(gitFlowNameForCurrentBranch)" &&
echo "Confirm merge and then push master and develop" || echo "Examine error messages!"
}