Merge branch 'master' of gitlab.com:pad92/dotfiles

* 'master' of gitlab.com:pad92/dotfiles:
  cleanup git config
  add gitconfig
  add gitconfig

.gitconfig

@@ -1,44 +1,42 @@
-[user]
-	name = Pascal Armand
-	email = pascalito@gmail.com
-	signingkey = 54F5F5D31C432E0F
+[include]
+  path = ~/.gitconfig.local
 
 [core]
-    editor = vim
-    excludesfile = ~/.gitignore
-    whitespace = space-before-tab,trailing-space
+  editor = vim
+  excludesfile = ~/.gitignore
+  whitespace = space-before-tab,trailing-space
 
 [apply]
-    # Detect whitespace errors when applying a patch
-    whitespace = fix
+  # Detect whitespace errors when applying a patch
+  whitespace = fix
 
 [color]
-    # Use colors in Git commands that are capable of colored output when
-    # outputting to the terminal. (This is the default setting in Git > 1.8.4.)
-    ui = auto
+  # Use colors in Git commands that are capable of colored output when
+  # outputting to the terminal. (This is the default setting in Git > 1.8.4.)
+  ui = auto
 
 [color "branch"]
-    current = yellow reverse
-    local = yellow
-    remote = green
+  current = yellow reverse
+  local = yellow
+  remote = green
 
 [color "diff"]
-    meta = yellow
-    frag = magenta
-    old = red
-    new = green
+  meta = yellow
+  frag = magenta
+  old = red
+  new = green
 
 [color "status"]
-    added = green
-    changed = cyan
-    untracked = red
+  added = green
+  changed = cyan
+  untracked = red
 
 [merge]
-    # Include summaries of merged commits in newly created merge commit messages
-    log = true
+  # Include summaries of merged commits in newly created merge commit messages
+  log = true
 
 [push]
-    default = matching
+  default = matching
 
 [filter "lfs"]
 	clean = git-lfs clean -- %f
@@ -49,10 +47,10 @@
 	gpgsign = true
 
 [alias]
-    # git change-commits GIT_COMMITTER_NAME "old name" "new name"
-    change-commits = "!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; git filter-branch --env-filter \"if [[ \\\"$`echo $VAR`\\\" = '$OLD' ]]; then export $VAR='$NEW'; fi\" $@; }; f "
-    # from https://help.github.com/articles/remove-sensitive-data
-    remove-file = "!f() { git filter-branch -f --index-filter \"git rm --cached --ignore-unmatch $1\" --prune-empty --tag-name-filter cat -- --all; }; f"
+  # git change-commits GIT_COMMITTER_NAME "old name" "new name"
+  change-commits = "!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; git filter-branch --env-filter \"if [[ \\\"$`echo $VAR`\\\" = '$OLD' ]]; then export $VAR='$NEW'; fi\" $@; }; f "
+  # from https://help.github.com/articles/remove-sensitive-data
+  remove-file = "!f() { git filter-branch -f --index-filter \"git rm --cached --ignore-unmatch $1\" --prune-empty --tag-name-filter cat -- --all; }; f"
 [gc]
 	auto = 1
 [gpg]