是否有一个等同于git mergetool的命令行.-- keepBackup global config

Question

而不是必须在全局配置中设置它（这是开发人员共享存储库时的问题），在我们的脚本中自动执行此操作会很好，但是git mergetool --help没有提供任何东西。

Answer 1

You can pass any configuration variable to git using the -c option , eg:

git -c mergetool.keepBackup=false mergetool

should run git mergetool with mergetool.keepBackup set to false .

That's a bit long, so you may want to alias this, eg

alias.mt '!git -c mergetool.keepBackup=false mergetool'
alias.mtk '!git -c mergetool.keepBackup=true mergetool'

in the appropriate config file. Then git mt and git mtk should run git mergetool with keepBackup set to false and true respectively.