32 lines
983 B
Plaintext
32 lines
983 B
Plaintext
|
[core]
|
||
|
|
repositoryformatversion = 0
|
||
|
|
filemode = false
|
||
|
|
bare = false
|
||
|
|
logallrefupdates = true
|
||
|
|
symlinks = false
|
||
|
|
ignorecase = true
|
||
|
|
[user]
|
||
|
|
[diff]
|
||
|
|
tool = vsdiffmerge
|
||
|
|
[difftool]
|
||
|
|
prompt = true
|
||
|
|
[difftool "vsdiffmerge"]
|
||
|
|
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
|
||
|
|
keepBackup = false
|
||
|
|
[merge]
|
||
|
|
tool = vsdiffmerge
|
||
|
|
[mergetool]
|
||
|
|
prompt = true
|
||
|
|
[mergetool "vsdiffmerge"]
|
||
|
|
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
|
||
|
|
keepBackup = false
|
||
|
|
trustExitCode = true
|
||
|
|
[credential]
|
||
|
|
helper = store
|
||
|
|
[remote "origin"]
|
||
|
|
url = https://git.adriy.be/iset3/projetthealone.git
|
||
|
|
fetch = +refs/heads/*:refs/remotes/origin/*
|
||
|
|
[branch "master"]
|
||
|
|
remote = origin
|
||
|
|
merge = refs/heads/master
|