Update gitconfig
parent
832620344f
commit
24952a74fd
|
@ -63,3 +63,7 @@
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
[pull]
|
||||||
|
rebase = true
|
||||||
|
[diff]
|
||||||
|
colorMoved = zebra
|
||||||
|
|
Loading…
Reference in New Issue