Always use prefixes, patches may become weird
Add summary to git merges
Use -p (preserve) on git pull --rebase