diff --git a/.gitconfig.d/.gitignore b/.gitconfig.d/.gitignore
index 1fc3f8d..913c1f5 100644
--- a/.gitconfig.d/.gitignore
+++ b/.gitconfig.d/.gitignore
@@ -1,3 +1,5 @@
 /*
 !.gitignore
-!example.gitconfig
\ No newline at end of file
+!example.gitconfig
+!base.gitconfig
+!var
\ No newline at end of file
diff --git a/.gitconfig.d/base.gitconfig b/.gitconfig.d/base.gitconfig
new file mode 100644
index 0000000..cd595d0
--- /dev/null
+++ b/.gitconfig.d/base.gitconfig
@@ -0,0 +1,8 @@
+[credential]
+	helper = store
+[push]
+	autoSetupRemote = true
+[core]
+	autocrlf = false
+[pull]
+	rebase = true
diff --git a/.gitconfig.d/example.gitconfig b/.gitconfig.d/var/example.gitconfig
similarity index 100%
rename from .gitconfig.d/example.gitconfig
rename to .gitconfig.d/var/example.gitconfig
diff --git a/scripts/gitconfig b/scripts/gitconfig
index 22f0c0f..ed0d4c3 100755
--- a/scripts/gitconfig
+++ b/scripts/gitconfig
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-CONFIG_DIR="$DOTFILES_INSTALL_DIR/.gitconfig.d"
+CONFIG_DIR="$DOTFILES_INSTALL_DIR/.gitconfig.d/var"
 
 echo
 echo "[+] Generating Gitconfig"
@@ -8,6 +8,8 @@ echo
 
 rm -f "$HOME/.gitconfig"
 
+cp "$DOTFILES_INSTALL_DIR/.gitconfig.d/base.gitconfig" "$HOME/.gitconfig"
+
 for config in "$CONFIG_DIR"/*.gitconfig; do
     [ -e "$config" ] || continue
 
@@ -23,7 +25,6 @@ for config in "$CONFIG_DIR"/*.gitconfig; do
     echo "Create config for $domain"
 
     cat <<EOF >> "$HOME/.gitconfig"
-
 [includeIf "hasconfig:remote.*.url:https://**$domain/**"]
     path = $config
 EOF