summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--git/.config/git/attributes4
-rw-r--r--git/.config/git/config (renamed from git/.gitconfig)5
-rw-r--r--git/.config/git/ignore1
3 files changed, 10 insertions, 0 deletions
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
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*