Useful git tips, aliases and configs

index.txt

# Set upstream automatically on `git push`
`git config --global push.default current`

## The reference to the last branch is saved into `-` in git.

# Checkout to the previous branch
`git checkout -`

# Merge into the last branch
`git merge -`

# See the diff of two branches
  ## Diff against their heads
  `git diff branch_1..branch_2`
  ## Diff against their common ancestor
  `git diff branch_1...branch_2`
  
# See contents of a stash without applying it
`git stash show -p stash@{1}`