Search code examples
gitbeyondcompare4

Is "git config --global mergetool.bc3 trustExitCode true" a correct usage of git-config?

Using Beyond Compare with Version Control Systems under OS X uses:

git config --global mergetool.bc3 trustExitCode true

But Using Beyond Compare with Version Control Systems uses:

 git config --global mergetool.bc3.trustExitCode true

I think that the first usage of git config is incorrect since I can't find a description about it in git-config. Is my understanding correct?

Solution

  • By reading the Git doc, I think your understanding is correct.

    In the Git configuration chapter of the official doc, there is a section named External Merge and Diff Tools.

    In it, you can find the following lines of configuration:

    git config --global merge.tool extMerge
git config --global mergetool.extMerge.trustExitCode false

    extMerge refers to a wrapper script but the syntax is the same for any supported tools (gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge).