diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2020-11-26 15:35:30 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-11-26 15:35:30 +0100 |
commit | 861b9a0471ba38c2d3ec9ee793e88cd8d3f36bbe (patch) | |
tree | e5eaaf945dccb0eeb5f6085236a2476a32748b6e /gitconfig | |
parent | 9fb0576823d53bb967c70421e5572dc7dbb3af72 (diff) |
Use better diff, move Renviron to Rprofile
Diffstat (limited to 'gitconfig')
-rw-r--r-- | gitconfig | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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: |