vtwmrc: Introduce ${vtwmpager}

[ian-dotfiles.git] / templates / gitconfig.in

diff --git a/templates/gitconfig.in b/templates/gitconfig.in
index 6aacb67d6cbd24cf6777ea9b405ce2224f3156ed..f645c590c070564a092d82acb4b1f09f1dbebc41 100755 (executable)
--- a/templates/gitconfig.in
+++ b/templates/gitconfig.in
@@ -32,6 +32,9 @@ zealot)
 [dgit-distro "debian"]
        username = iwj
        keyid = 0x48B50D39
+[gui]
+       fontui = -family \"DejaVu Sans\" -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+       fontdiff = -family \"DejaVu Sans Mono\" -size 11 -weight normal -slant roman -underline 0 -overstrike 0
 [url "git://git.kernel.org/"]
        insteadOf = git://git.kernel.org/
 [url "git://xenbits.xen.org/linux-pvops.git"]
@@ -53,4 +56,11 @@ cat <<END
 [color]
        diff = false
        ui = false
+[merge]
+       conflictStyle = diff3
+[branch]
+       autoSetupMerge = false
+[dgit "default"]
+       clean-mode = git
+       build-products-dir = ../bpd
 END