diff --git a/.gitconfig b/.gitconfig
index a9ef2a1..150266c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,23 +1,8 @@
-[user]
-	name = binaryDiv
-	email = binarydiv@gmail.com
-	signingkey = F8D4956E224DA232
-[credentials]
-	name = binaryDiv
-[diff]
-	tool = vimdiff
-	guitool = gvimdiff
-[commit]
-	gpgsign = true
-[alias]
-	tree = log --all --graph --decorate --oneline
-[pager]
-	branch = false
-	config = false
-	stash = false
-[diff "ansible-vault"]
-	textconv = ansible-vault view
-[pull]
-	ff = only
-[init]
-	defaultBranch = main
+# Include common settings (default branch, diff tools, aliases...)
+[include]
+    path = ~/.gitconfig.inc/common.gitconfig
+
+# Include default user settings
+[include]
+    path = ~/.gitconfig.inc/user_binaryDiv.gitconfig
+
diff --git a/.gitconfig.inc/common.gitconfig b/.gitconfig.inc/common.gitconfig
new file mode 100644
index 0000000..ecdb74e
--- /dev/null
+++ b/.gitconfig.inc/common.gitconfig
@@ -0,0 +1,20 @@
+[init]
+	defaultBranch = main
+
+[pull]
+	ff = only
+
+[pager]
+	branch = false
+	config = false
+	stash = false
+
+[diff]
+	tool = vimdiff
+	guitool = gvimdiff
+
+[diff "ansible-vault"]
+	textconv = ansible-vault view
+
+[alias]
+	graph = log --all --graph --decorate --oneline
diff --git a/.gitconfig.inc/user_private.gitconfig b/.gitconfig.inc/user_private.gitconfig
new file mode 100644
index 0000000..857b171
--- /dev/null
+++ b/.gitconfig.inc/user_private.gitconfig
@@ -0,0 +1,8 @@
+[user]
+	name = binaryDiv
+	email = binarydiv@gmail.com
+	signingkey = F8D4956E224DA232
+[credentials]
+	name = binaryDiv
+[commit]
+	gpgsign = true