hcartiaux/dotfiles
1
0
Fork 0
mirror of https://github.com/hcartiaux/dotfiles.git synced 2024-10-18 17:25:23 +02:00
Code Activity

[git] Updated gitconfig

Browse source
This commit is contained in:
Hyacinthe Cartiaux 2016-01-06 15:01:42 +01:00
parent ebd95d3842
commit c8ae1160f1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git/gitconfig
View file

@ -72,6 +72,10 @@
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
[http]
sslverify = false