diff --git a/vscode/rootfs/etc/cont-init.d/51-git-config.sh b/vscode/rootfs/etc/cont-init.d/51-git-config.sh
new file mode 100644
index 0000000..33b88af
--- /dev/null
+++ b/vscode/rootfs/etc/cont-init.d/51-git-config.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: Visual Studio Code
+# Sets up the users git global config to be persistent
+# ==============================================================================
+readonly GIT_USER_PATH=/data/git
+
+if ! bashio::fs.directory_exists "${GIT_USER_PATH}"; then
+    mkdir -p "${GIT_USER_PATH}" \
+        || bashio::exit.nok 'Failed to create a persistent git folder'
+
+    chmod 700 "${GIT_USER_PATH}" \
+        || bashio::exit.nok \
+            'Failed setting permissions on persistent git folder'
+fi
+
+ln -s "${GIT_USER_PATH}/.gitconfig" ~/.gitconfig