From ad43d821e540097cfa9a76fcd6e21b45593998c4 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 24 Jan 2007 13:09:48 +0000
Subject: [PATCH] gitconfig: New global GIT configuration.

---
 gitconfig | 10 ++++++++++
 setup     |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 gitconfig

diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..7442bb1
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,10 @@
+[user]
+	name = Mark Wooding
+	email = <mdw@distorted.org.uk>
+
+[merge]
+	summary = true
+
+[diff]
+	color = true
+	renames = copies
diff --git a/setup b/setup
index f5427b3..2be9065 100755
--- a/setup
+++ b/setup
@@ -145,6 +145,7 @@ dotfiles="
   bash_profile bash_logout bashrc inputrc
   emacs emacs-calc 
   vm mailrc signature
+  gitconfig
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
-- 
2.11.0