useful git combinators

gistfile1.txt

# rebase from master, deferring to master
git rebase master -s recursive -X theirs

# see diff between 2 branches
git diff --name.status master..branch

# .. or alternatively,
git diff --stat --color master..branch

# merge into a branch from another one, squashing all commits into one
git merge --squash branch