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] Cosmetic changes

Browse source
This commit is contained in:
Hyacinthe Cartiaux 2017-03-14 10:52:49 +01:00
parent 44488c558d
commit 7144d0ee56
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git/gitconfig
View file

@ -72,7 +72,7 @@
mergeoptions = --no-edit mergeoptions = --no-edit
[merge] [merge]
tool = vimdiff tool = vimdiff
conflictstyle = diff3 conflictstyle = diff3
[mergetool] [mergetool]
@ -85,6 +85,8 @@
default = matching default = matching
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
required = true required = true
process = git-lfs filter-process