.gitconfig

[user]
  email = hi@gomah.fr
  name = Gomah

[alias]
  loggy = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
  prune = fetch --prune
  stash-all = stash save --include-untracked
  undo = reset --soft HEAD^

[merge]
  conflictstyle = diff3
  ff = only

[commit]
  gpgSign = true

[push]
  default = simple
  followTags = true

[status]
  showUntrackedFiles = all

[transfer]
  fsckobjects = true

[diff]
  tool = icdiff

[difftool]
  prompt = false
  
[difftool "icdiff"]
  cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE