From 1a924d91905a22dcbab136d622cf5f0c6b1f845e Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 3 Nov 2013 21:56:00 +0100
Subject: Update git config

---
 git/.config/git/attributes |  4 ++++
 git/.config/git/config     | 27 +++++++++++++++++++++++++++
 git/.config/git/ignore     |  1 +
 git/.gitconfig             | 22 ----------------------
 4 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 git/.config/git/attributes
 create mode 100644 git/.config/git/config
 create mode 100644 git/.config/git/ignore
 delete mode 100644 git/.gitconfig

diff --git a/git/.config/git/attributes b/git/.config/git/attributes
new file mode 100644
index 0000000..c66eb71
--- /dev/null
+++ b/git/.config/git/attributes
@@ -0,0 +1,4 @@
+*.lisp   diff=lisp
+*.el     diff=lisp
+*.org    diff=org
+*.hy     diff=lisp
\ No newline at end of file
diff --git a/git/.config/git/config b/git/.config/git/config
new file mode 100644
index 0000000..bfea8b7
--- /dev/null
+++ b/git/.config/git/config
@@ -0,0 +1,27 @@
+[user]
+	name = Tom Willemse
+	email = tom@ryuslash.org
+[core]
+	editor = emacs -nw
+	whitespace = trailing-space,tab-in-indent,space-before-tab
+[color]
+	ui = auto
+[alias]
+	st = status -s
+    su = status -suno
+	unadd = reset HEAD
+	lschanged = diff --name-only
+	history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+[sendemail]
+	smtpencryption = tls
+	smtpserver = smtp.gmail.com
+	smtpuser = ryuslash@gmail.com
+	smtpserverport = 587
+[merge]
+	tool = emerge
+[push]
+	default = simple
+[diff "lisp"]
+    xfuncname = "^\\([^ ]+ [^ ]+"
+[diff "org"]
+    xfuncname = "^\\*+.*"
diff --git a/git/.config/git/ignore b/git/.config/git/ignore
new file mode 100644
index 0000000..ed4e90b
--- /dev/null
+++ b/git/.config/git/ignore
@@ -0,0 +1 @@
+.emacs.desktop*
diff --git a/git/.gitconfig b/git/.gitconfig
deleted file mode 100644
index d55f3be..0000000
--- a/git/.gitconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-[user]
-	name = Tom Willemse
-	email = tom@ryuslash.org
-[core]
-	editor = emacs -nw
-	whitespace = trailing-space,tab-in-indent,space-before-tab
-[color]
-	ui = auto
-[alias]
-	st = status -s
-	unadd = reset HEAD
-	lschanged = diff --name-only
-	history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
-[sendemail]
-	smtpencryption = tls
-	smtpserver = smtp.gmail.com
-	smtpuser = ryuslash@gmail.com
-	smtpserverport = 587
-[merge]
-	tool = emerge
-[push]
-	default = simple
-- 
cgit v1.2.3-54-g00ecf