.gitconfig

[user]
  name = Arnaud Didry
  email = arnaud.didry@gmail.com

[color]
  ui = auto
  diff = auto

[alias]
  st = status
  ci = commit -v
  br = branch
  co = checkout
  df = diff
  lg = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  ls = ls-files

[core]
  # Global exclude file
  excludesfile = ~/.gitignore_global

  # Tell Git which whitespace problems it should recognize, namely any whitespace at the end of a line, as well as mixed spaces and tabs
  whitespace = trailing-space,space-before-tab
	editor = vi

[branch]
  # When branching off a remote branch, automatically let the local branch track the remote branch
  autosetupmerge = true

[push]
  # When pushing without giving a refspec, push the current branch to its upstream branch
  default = simple 
  autoSetupRemote = true

[rerere]
  # Enable the recording of resolved conflicts, so that identical hunks can be resolved automatically later on.
  enabled = true
[merge]
	tool = meld
[mergetool "meld"]
	cmd = meld
	trustExitCode = false
[diff]
	tool = meld
[difftool "meld"]
	cmd = meld