gitconfig

[pull]
  rebase = true
[user]
  name = Maciej Wilk
  email = [email protected]

[alias]
  aa = add --all
  di = diff
  dc = diff --cached
  amend = commit --amend
  ci = commit
  co = checkout
  st = status
  ff = merge --ff-only
  pullff = pull --ff-only
  noff = merge --no-ff
  b = branch

  l = "!. ~/.githelpers && pretty_git_log"
  la = !git l --all
  r = !git l -30
  ra = !git r --all

[core]
  excludesfile = ~/.gitignore

[diff "ansible-vault"]
  textconv = ansible-vault view
  cachetextconv = false

[merge "ansible-vault"]
  name = ansible-vault merge driver
  driver = /usr/local/bin/ansible-vault-merge -- %O %A %B %P