barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Institude Filepath, veonim, and git-diff3-style

Browse source
This commit is contained in:
Barak Michener 2019-04-01 11:05:32 -07:00
parent 52f28e2d1b
commit 0b64b1cbe2
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitconfig
View file

@ -22,6 +22,9 @@
[diff]
renamelimit = 0
[merge]
conflictstyle = diff3
[color]
diff = auto
interactive = auto
@ -36,5 +39,6 @@
default = current
[rerere]
enabled = true
[url "git@github.com:"]
insteadOf = https://github.com/