git 配置 mergetools - tfvc 语法文档
git config mergetools - tfvc syntax documentation
我的 .gitconfig(我从 github 得到这段代码,下面的问题不是 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) //t
是什么意思?我找不到相关文档。
2) //m 是 "documented" here。我也很想知道 //m
的目的是什么。为什么我已经指定了四个参数还需要指定 //m
?这对我来说没有任何语法意义。
我同时找到了答案:
Use the /t switch to open the comparison in a “ProvisionalTab”
我的 .gitconfig(我从 github 得到这段代码,下面的问题不是 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) //t
是什么意思?我找不到相关文档。
2) //m 是 "documented" here。我也很想知道 //m
的目的是什么。为什么我已经指定了四个参数还需要指定 //m
?这对我来说没有任何语法意义。
我同时找到了答案:
Use the /t switch to open the comparison in a “ProvisionalTab”