diff options
| -rw-r--r-- | config/git/attributes | 1 | ||||
| -rw-r--r-- | git/global-gitconfig | 4 |
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] |