diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/global-gitconfig | 19 | ||||
| -rw-r--r-- | git/tribe29 (renamed from git/.gitconfig) | 0 |
2 files changed, 19 insertions, 0 deletions
diff --git a/git/global-gitconfig b/git/global-gitconfig new file mode 100644 index 0000000..89270c5 --- /dev/null +++ b/git/global-gitconfig @@ -0,0 +1,19 @@ +[user] + name = Óscar Nájera + email = hi@oscarnajera.com +[pull] + rebase = true +[push] + default = simple +[core] + attributesfile = ~/.gitattributes +[diff "gpg"] + textconv = gpg --no-tty --decrypt +[diff "pdf"] + textconv = pdfinfo +[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 diff --git a/git/.gitconfig b/git/tribe29 index 4e47e4b..4e47e4b 100644 --- a/git/.gitconfig +++ b/git/tribe29 |