From 9010c70206129a3124364017e80e19ecdbe3a1f0 Mon Sep 17 00:00:00 2001
From: Jannik Zander <jannikz@gmail.com>
Date: Fri, 20 May 2016 22:42:54 +0200
Subject: [PATCH] Move git config to .config/git

---
 .gitconfig => .config/git/config                         | 7 +++----
 .config/git/templates/config                             | 9 +++++++++
 {.git_template => .config/git/templates}/hooks/cscope    | 0
 {.git_template => .config/git/templates}/hooks/ctags     | 0
 {.git_template => .config/git/templates}/hooks/gtags     | 0
 .../git/templates}/hooks/post-applypatch                 | 0
 .../git/templates}/hooks/post-checkout                   | 0
 .../git/templates}/hooks/post-commit                     | 0
 .../git/templates}/hooks/post-merge                      | 0
 .../git/templates}/hooks/post-rewrite                    | 0
 10 files changed, 12 insertions(+), 4 deletions(-)
 rename .gitconfig => .config/git/config (96%)
 create mode 100644 .config/git/templates/config
 rename {.git_template => .config/git/templates}/hooks/cscope (100%)
 rename {.git_template => .config/git/templates}/hooks/ctags (100%)
 rename {.git_template => .config/git/templates}/hooks/gtags (100%)
 rename {.git_template => .config/git/templates}/hooks/post-applypatch (100%)
 rename {.git_template => .config/git/templates}/hooks/post-checkout (100%)
 rename {.git_template => .config/git/templates}/hooks/post-commit (100%)
 rename {.git_template => .config/git/templates}/hooks/post-merge (100%)
 rename {.git_template => .config/git/templates}/hooks/post-rewrite (100%)

diff --git a/.gitconfig b/.config/git/config
similarity index 96%
rename from .gitconfig
rename to .config/git/config
index 4329c7e..5206648 100644
--- a/.gitconfig
+++ b/.config/git/config
@@ -1,4 +1,4 @@
-# ~/.gitconfig
+# ~/.config/git/config
 
 [github]
   user = jannikz
@@ -94,10 +94,9 @@
 [mergetool]
   prompt = false
 [init]
-  templatedir = ~/.git_template
+  templatedir = ~/.config/git/templates
 [core]
-  excludesfile = ~/.gitignore_global
   editor = vim
   autocrlf = false
 [include]
-  path = ~/.gitconfig_local
+  path = ~/.config/git/config_local
diff --git a/.config/git/templates/config b/.config/git/templates/config
new file mode 100644
index 0000000..f8767a9
--- /dev/null
+++ b/.config/git/templates/config
@@ -0,0 +1,9 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+	rebase = true
diff --git a/.git_template/hooks/cscope b/.config/git/templates/hooks/cscope
similarity index 100%
rename from .git_template/hooks/cscope
rename to .config/git/templates/hooks/cscope
diff --git a/.git_template/hooks/ctags b/.config/git/templates/hooks/ctags
similarity index 100%
rename from .git_template/hooks/ctags
rename to .config/git/templates/hooks/ctags
diff --git a/.git_template/hooks/gtags b/.config/git/templates/hooks/gtags
similarity index 100%
rename from .git_template/hooks/gtags
rename to .config/git/templates/hooks/gtags
diff --git a/.git_template/hooks/post-applypatch b/.config/git/templates/hooks/post-applypatch
similarity index 100%
rename from .git_template/hooks/post-applypatch
rename to .config/git/templates/hooks/post-applypatch
diff --git a/.git_template/hooks/post-checkout b/.config/git/templates/hooks/post-checkout
similarity index 100%
rename from .git_template/hooks/post-checkout
rename to .config/git/templates/hooks/post-checkout
diff --git a/.git_template/hooks/post-commit b/.config/git/templates/hooks/post-commit
similarity index 100%
rename from .git_template/hooks/post-commit
rename to .config/git/templates/hooks/post-commit
diff --git a/.git_template/hooks/post-merge b/.config/git/templates/hooks/post-merge
similarity index 100%
rename from .git_template/hooks/post-merge
rename to .config/git/templates/hooks/post-merge
diff --git a/.git_template/hooks/post-rewrite b/.config/git/templates/hooks/post-rewrite
similarity index 100%
rename from .git_template/hooks/post-rewrite
rename to .config/git/templates/hooks/post-rewrite
-- 
2.43.0