From 861b9a0471ba38c2d3ec9ee793e88cd8d3f36bbe Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 26 Nov 2020 15:35:30 +0100 Subject: Use better diff, move Renviron to Rprofile --- gitconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gitconfig') diff --git a/gitconfig b/gitconfig index cd68b80..103b345 100644 --- a/gitconfig +++ b/gitconfig @@ -1,16 +1,16 @@ # vim: ft=gitconfig [user] - name = Johannes Ranke - email = jranke@uni-bremen.de + name = Johannes Ranke + email = jranke@uni-bremen.de signingkey = E19F 5F87 1288 99B1 92B1 A2C2 AD5F 960A 256A 04AF [push] - default = simple + default = simple [core] - excludesfile = ~/.gitignore - autocrlf = input - pager = less -S + excludesfile = ~/.gitignore + autocrlf = input + pager = /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less --tabs=4 -RFX [merge] - tool = vimdiff + tool = vimdiff [url "git@salsa.debian.org:"] - pushInsteadOf = https://salsa.debian.org/ - insteadOf = salsa: + pushInsteadOf = https://salsa.debian.org/ + insteadOf = salsa: -- cgit v1.2.1