Search code examples
gitgit-configtfvcmergetool

git config mergetools - tfvc syntax documentation

My .gitconfig (I got this code from github and there the following questions are not documented/answered):

[merge]
    tool = vsdiffmerge
[mergetool]
    prompt = true
[mergetool "vsdiffmerge"]
    cmd = 'E:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe' $REMOTE $LOCAL $BASE $MERGED //m
    keepbackup = false
    trustexistcode = true

[diff]
    tool = vsdiffmerge
[difftool]
    prompt = true
[difftool "vsdiffmerge"]
    cmd = 'E:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe' $LOCAL $REMOTE //t
    keepbackup = false
    trustexistcode = true

1) What does //t mean? I cannot find a documentation about that.

2) //m is "documented" here. I would be also interested what the purpose //m is. Why do I need do specify //m when I already have specified four parameters? That does not make any syntactical sense to me.

Solution

  • I found an answer in the meantime:

    Use the /t switch to open the comparison in a “ProvisionalTab”