merge diff3

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

diff --git a/templates/gitconfig.in b/templates/gitconfig.in
index 7e874d2f2ec960ad416c5d3446b9ca85cc39b0d3..fffd447bc41cb1e2596282d6fb5cdee64716d84f 100755 (executable)
--- a/templates/gitconfig.in
+++ b/templates/gitconfig.in
@@ -8,25 +8,51 @@ 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)" in
+zealot)
+    cat <<END
+       smtpdomain = zealot.relativity.greenend.org.uk
+       smtpserver = tunnel.chiark.greenend.org.uk
+       smtpserverport = 25
+       envelopesender = $email
+       bcc = $email
+[dgit-distro "debian"]
+       username = iwj
+       keyid = 0x48B50D39
+[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
+
 if [ "$cache" ]; then
     cat <<END
 [url "$cache/git://"]
         insteadOf = git://
 [url "$cache/git://"]
         insteadOf = $cache/git://
-[color]
-        diff = false
-        ui = false
 END
 fi
+
+cat <<END
+[color]
+       diff = false
+       ui = false
+[merge]
+       conflictStyle = diff3
+END