--- a/git/gitconfig	Thu Aug 30 10:05:43 2018 -0700
+++ b/git/gitconfig	Tue Nov 13 09:55:24 2018 -0800
@@ -1,26 +1,20 @@
-[user]
-	name = Ludovic Chabant
-	email = ludovic@chabant.com
-
-[push]
-default = simple
-
-[alias]
-lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
-lg = !"git lg1"
-
-[include]
-path = gitconfig-local
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
-[core]
-	excludesfile = /Users/abdul/.gitignore_global
-[commit]
-	template = /Users/abdul/.stCommitMsg
-
-# vim: ft=gitconfig
+[user]
+	name = Ludovic Chabant
+	email = ludovic@chabant.com
+
+[push]
+	default = simple
+
+[alias]
+	tags = tag -l
+	branches = branch -a
+	remotes = remote -v
+	lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
+	lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
+	lg = !"git lg1"
+
+[include]
+	path = gitconfig-${OS}
+	path = gitconfig-local
+
+# vim:ft=gitconfig:ts=2:sw=2