Here are some handy git shortcuts I use with oh-my-zsh to both speed up and protect my workflow.
All merges are handled without a fast-forward. All merges use the default messaging. Whenever possible, autocompletion is provided.
Merges the current branch into another branch and prompts you to automatically push changes.
gmto [branch]
Merges another branch into the current branch and prompts you to automatically push changes.
gmfr [branch]
Archives the current branch and prompts you to automatically push changes.
gar
Rebases the svn branch, prompts you to merge it into master, and then prompts you to automatically push changes.
gsre