vtwmrc: Introduce ${vtwmpager}

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

diff --git a/templates/gitconfig.in b/templates/gitconfig.in
index 78dee9960bf86b2edb8b189bc42525d06af7b6ae..f645c590c070564a092d82acb4b1f09f1dbebc41 100755 (executable)
--- a/templates/gitconfig.in
+++ b/templates/gitconfig.in
@@ -8,18 +8,20 @@ case "$(hostname -f)" in
     cache=git://git-cache.xs.citrite.net:9419
     ;;
 *)
+    cache=git://localhost:9419
     email=ijackson@chiark.greenend.org.uk
     ;;
 esac
 
 cat <<END
 [user]
-       email="$email"
+       name = Ian Jackson
+       email = $email
 [sendemail]
-        bcc = $email
+       bcc = $email
 END
 
-case "$(hostname -f)" in
+case "$(hostname)" in
 zealot)
     cat <<END
        smtpdomain = zealot.relativity.greenend.org.uk
@@ -30,6 +32,13 @@ 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"]
+       insteadOf = git://xenbits.xen.org/linux-pvops.git
 END
     ;;
 esac
@@ -40,8 +49,18 @@ if [ "$cache" ]; then
         insteadOf = git://
 [url "$cache/git://"]
         insteadOf = $cache/git://
+END
+fi
+
+cat <<END
 [color]
        diff = false
        ui = false
+[merge]
+       conflictStyle = diff3
+[branch]
+       autoSetupMerge = false
+[dgit "default"]
+       clean-mode = git
+       build-products-dir = ../bpd
 END
-fi