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.