Update .gitconfig
This commit is contained in:
parent
5f94d7dd45
commit
8bde03cf3b
|
@ -48,12 +48,3 @@
|
||||||
editor = nvim
|
editor = nvim
|
||||||
excludesfile = /Users/felix.delattre/.gitignore_global
|
excludesfile = /Users/felix.delattre/.gitignore_global
|
||||||
|
|
||||||
[user]
|
|
||||||
name = Felix Delattre
|
|
||||||
email = felix.delattre@up42.com
|
|
||||||
[difftool "sourcetree"]
|
|
||||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
||||||
path =
|
|
||||||
[mergetool "sourcetree"]
|
|
||||||
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
||||||
trustExitCode = true
|
|
||||||
|
|
Loading…
Reference in New Issue