aboutsummaryrefslogtreecommitdiffstats
path: root/git/global-gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'git/global-gitconfig')
-rw-r--r--git/global-gitconfig4
1 files changed, 2 insertions, 2 deletions
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]