From 27fda278eff1a279da3dc31a496c9393d1b7ee36 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 9 Oct 2013 12:21:14 +0200
Subject: [PATCH] gitconfig split for mac

---
 .gitconfig.mac                                           | 4 ++++
 .gitconfig_includes.common                               | 7 +++++++
 gitconfig_mac => .gitconfig_includes.mac                 | 9 +--------
 .../Solarized Dark.itermcolors                           | 0
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 .gitconfig.mac
 create mode 100644 .gitconfig_includes.common
 rename gitconfig_mac => .gitconfig_includes.mac (88%)
 rename Solarized Dark.itermcolors => mac/Solarized Dark.itermcolors (100%)

diff --git a/.gitconfig.mac b/.gitconfig.mac
new file mode 100644
index 00000000..93bd2ab4
--- /dev/null
+++ b/.gitconfig.mac
@@ -0,0 +1,4 @@
+[include]
+	path = dev/dotfiles/.gitconfig_includes.common
+	path = dev/dotfiles/.gitconfig_includes.mac
+
diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
new file mode 100644
index 00000000..997bc3e9
--- /dev/null
+++ b/.gitconfig_includes.common
@@ -0,0 +1,7 @@
+[user]
+	name = Cyryl Plotnicki-Chudyk
+	email = cyplo@cyplo.net
+[color]
+	ui = true
+[help]
+	autocorrect = 1
diff --git a/gitconfig_mac b/.gitconfig_includes.mac
similarity index 88%
rename from gitconfig_mac
rename to .gitconfig_includes.mac
index 780138d1..8a493398 100644
--- a/gitconfig_mac
+++ b/.gitconfig_includes.mac
@@ -1,5 +1,3 @@
-[user]
-	name = Cyryl Plotnicki-Chudyk
 
 [mergetool "filemerge"]
 	cmd = /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -merge $MERGED -left $LOCAL -ancestor $BASE -right $REMOTE
@@ -25,9 +23,4 @@
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
-[push]
-	default = simple
-[color]
-	ui = true
-[help]
-	autocorrect = 1
+
diff --git a/Solarized Dark.itermcolors b/mac/Solarized Dark.itermcolors
similarity index 100%
rename from Solarized Dark.itermcolors
rename to mac/Solarized Dark.itermcolors