gitconfig: New global GIT configuration.

diff --git a/gitconfig b/gitconfig
new file mode 100644 (file)
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 (executable)
--- 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