aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/global-gitconfig21
1 files changed, 0 insertions, 21 deletions
diff --git a/git/global-gitconfig b/git/global-gitconfig
deleted file mode 100644
index 460a2b9..0000000
--- a/git/global-gitconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-[user]
- name = Óscar Nájera
- email = hi@oscarnajera.com
-[pull]
- rebase = true
-[push]
- default = simple
-[diff "gpg"]
- textconv = gpg --no-tty --decrypt
-[diff "pdf"]
- textconv = pdfinfo
-[diff "org"]
- xfuncname = "^(\\*+ +.*)$"
-[diff "lisp"]
- xfuncname = "^[ \t]*(((;+ )|\\((cl-|el-patch-)?def(un|var|macro|method|custom|ine)).*)$"
-[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]
- algorithm = histogram
-[includeIf "gitdir:~/git/"]
- path = ~/git/.gitconfig