From 1a924d91905a22dcbab136d622cf5f0c6b1f845e Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sun, 3 Nov 2013 21:56:00 +0100 Subject: [PATCH] Update git config --- git/.config/git/attributes | 4 ++++ git/{.gitconfig => .config/git/config} | 5 +++++ git/.config/git/ignore | 1 + 3 files changed, 10 insertions(+) create mode 100644 git/.config/git/attributes rename git/{.gitconfig => .config/git/config} (83%) create mode 100644 git/.config/git/ignore 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/.gitconfig b/git/.config/git/config similarity index 83% rename from git/.gitconfig rename to git/.config/git/config index d55f3be..bfea8b7 100644 --- a/git/.gitconfig +++ b/git/.config/git/config @@ -8,6 +8,7 @@ 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 @@ -20,3 +21,7 @@ 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*