mirror of
https://github.com/hcartiaux/dotfiles.git
synced 2024-10-18 09:15:24 +02:00
[git] Cosmetic changes
This commit is contained in:
parent
44488c558d
commit
7144d0ee56
1 changed files with 5 additions and 3 deletions
|
@ -72,7 +72,7 @@
|
|||
mergeoptions = --no-edit
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
|
||||
[mergetool]
|
||||
|
@ -85,6 +85,8 @@
|
|||
default = matching
|
||||
|
||||
[filter "lfs"]
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
required = true
|
||||
process = git-lfs filter-process
|
||||
|
||||
|
|
Loading…
Reference in a new issue