aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÓscar Nájera <hi@oscarnajera.com>2021-03-18 16:43:31 +0100
committerÓscar Nájera <hi@oscarnajera.com>2021-03-18 16:43:31 +0100
commit2f26abdd32dfc92d5313e0f1ae7db75df2f638ec (patch)
tree397e6f7e3948c0278d2cf754b9afc89c4e5ef37d
parentc8cddda732a15750d1efc76c3314e5717a5997f4 (diff)
downloaddotfiles-2f26abdd32dfc92d5313e0f1ae7db75df2f638ec.tar.gz
dotfiles-2f26abdd32dfc92d5313e0f1ae7db75df2f638ec.tar.bz2
dotfiles-2f26abdd32dfc92d5313e0f1ae7db75df2f638ec.zip
Orgmode git diff headings
-rw-r--r--config/git/attributes1
-rw-r--r--git/global-gitconfig4
2 files changed, 3 insertions, 2 deletions
diff --git a/config/git/attributes b/config/git/attributes
new file mode 100644
index 0000000..01e819b
--- /dev/null
+++ b/config/git/attributes
@@ -0,0 +1 @@
+*.org diff=org \ No newline at end of file
diff --git a/git/global-gitconfig b/git/global-gitconfig
index 89270c5..0131ef1 100644
--- a/git/global-gitconfig
+++ b/git/global-gitconfig
@@ -5,12 +5,12 @@
rebase = true
[push]
default = simple
-[core]
- attributesfile = ~/.gitattributes
[diff "gpg"]
textconv = gpg --no-tty --decrypt
[diff "pdf"]
textconv = pdfinfo
+[diff "org"]
+ xfuncname = "^(\\*+ +.*)$"
[difftool "image_diff"]
cmd = compare $REMOTE $LOCAL png:- | montage -font Liberation-Sans -tile 3x -geometry 400x -label "reference" $LOCAL -label "diff" - -label "current--%f" $REMOTE x:
[diff]