diff --git a/git/aliases b/git/aliases
new file mode 100644
index 0000000..79ebe84
--- /dev/null
+++ b/git/aliases
@@ -0,0 +1,6 @@
+[alias]
+    d = difftool
+    co = checkout
+    st = status
+    ci = commit
+    hist = log --pretty=format:'%C(yellow)[%ad]%C(reset) %C(green)[%h]%C(reset) | %C(bold blue){{%an}}%C(reset) %C(white)%s %C(red)%d%C(reset)' --graph --date=short
diff --git a/git/config b/git/config
new file mode 100644
index 0000000..c12d7ca
--- /dev/null
+++ b/git/config
@@ -0,0 +1,16 @@
+[credential]
+    helper = cache
+[push]
+    default = simple
+[diff]
+    tool = vimdiff
+[difftool]
+    prompt = false
+[log]
+    date = local
+[core]
+    quotepath = false
+[merge]
+    tool=meld
+[commit]
+    gpgsign = true
diff --git a/git/gitconfig b/git/gitconfig
deleted file mode 100644
index 8e7aae0..0000000
--- a/git/gitconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-[credential]
-    helper = cache
-[push]
-    default = simple
-[diff]
-    tool = vimdiff
-[difftool]
-    prompt = false
-[alias]
-    d = difftool
-    co = checkout
-    st = status
-    ci = commit
-	hist = log --pretty=format:'%C(yellow)[%ad]%C(reset) %C(green)[%h]%C(reset) | %C(white)%s %C(bold blue){{%an}}%C(reset) %C(red)%d%C(reset)' --graph --date=short
-[log]
-    date = local
-[core]
-    quotepath = false
-[merge]
-    tool=meld
-[commit]
-    gpgsign = true