.gitconfig

[alias]
  # View the SHA, description, and history graph of the latest 20 commits
  l = log --pretty=oneline -n 20 --graph
  # View the current working tree status using the short format
  s = status -s
  # Diff
  d = diff --patch-with-stat
  # Pull in remote changes for the current repository and all its submodules
  p = !"git pull; git submodule foreach git pull origin master"
  # Clone a repository including all submodules
  c = clone --recursive
  # Commit all changes
  ca = !git add . && git add -u && git commit -a
  # Switch to a branch, creating it if necessary
  go = checkout -B
  # Undo a `git push`
  undopush = push -f origin HEAD^:master
  # Git pull for non-master branches
  mom = !"git fetch; git merge origin/master"
  rom = !"git fetch; git rebase origin/master"
  # Git merge the upstream master
  mum = !"git fetch upstream; git merge upstream/master"
  rum = !"git fetch upstream; git rebase upstream/master"

[core]
  # Use custom `.gitignore` and `.gitattributes`
  excludesfile = ~/.gitignore
  attributesfile = ~/.gitattributes
  # Tell me about trailing spaces
  whitespace = trailing-space


[color]
  # Use colors in Git commands that are capable of colored output when outputting to the terminal
  ui = auto
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
[color "status"]
  added = yellow
  changed = green
  untracked = cyan
[merge]
  # Include summaries of merged commits in newly created merge commit messages
  log = true
  summary = true
[branch]
  autosetupmerge = true
# Use `origin` as the default remote on the `master` branch in all cases
[branch "master"]
  remote = origin
  merge = refs/heads/master

# URL shorthands
[url "git@github.com:"]
  insteadOf = "gh:"
  pushInsteadOf = "github:"
  pushInsteadOf = "git://github.com/"
  name = Grier Johnson
  email = grierj@gmail.com
[url "git://github.com/"]
  insteadOf = "github:"
  name = Grier Johnson
  email = grierj@gmail.com
[url "git@gist.github.com:"]
  insteadOf = "gst:"
  pushInsteadOf = "gist:"
  pushInsteadOf = "git://gist.github.com/"
  name = Grier Johnson
  email = grierj@gmail.com
[url "git://gist.github.com/"]
  insteadOf = "gist:"[user]
  name = Grier Johnson
  email = grierj@gmail.com
[push]
  config = default
  default = tracking
[diff]
  renames = true
[status]
  showUntrackedFiles = all
[rebase]
  autosquash = true