diff --git a/runtime/indent/gitconfig.vim b/runtime/indent/gitconfig.vim
new file mode 100644
index 0000000..7ce0c71
--- /dev/null
+++ b/runtime/indent/gitconfig.vim
@@ -0,0 +1,35 @@
+" Vim indent file
+" Language:	git config file
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
+" Last Change:	2008 Jun 04
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=GetGitconfigIndent()
+setlocal indentkeys=o,O,*<Return>,0[,],0;,0#,=,!^F
+
+" Only define the function once.
+if exists("*GetGitconfigIndent")
+  finish
+endif
+
+function! GetGitconfigIndent()
+    let line  = getline(prevnonblank(v:lnum-1))
+    let cline = getline(v:lnum)
+    if line =~  '\\\@<!\%(\\\\\)*\\$'
+        " odd number of slashes, in a line continuation
+        return 2 * &sw
+    elseif cline =~ '^\s*\['
+        return 0
+    elseif cline =~ '^\s*\a'
+        return &sw
+    elseif cline == ''       && line =~ '^\['
+        return &sw
+    else
+        return -1
+    endif
+endfunction