Git Mergetool and difftool with Beyond Compare 4 · GitHub
Posted by jpluimers on 2020/11/26
For my archive: [WayBack] Git Mergetool and difftool with Beyond Compare 4 · GitHub
I stuck to this as I:
- do not run
git bash- have Beyond Compared installed in the default directory (not the
x86one)- do not want a new UI instance, so use the recommended
BComp.exegit config --global merge.tool bc4 git config --global mergetool.bc4.cmd "'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" git config --global mergetool.bc4.trustExitCode trueThis works splendid with
git mergetool: it starts a merge in the already openBCompare.exeinstance.I only do merge from Beyond Compare, so no need for me to do a similar Beyond Compare setup for
diff.tool, but if anyone wants it, it would be this:git config --global diff.tool bc4 git config --global difftool.bc4.cmd "'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"" git config --global difftool.bc4.prompt false
This works fine for any git versoin > 2.2.0.
Related:
- [WayBack] Beyond Compare Technical Support: git for Linux
- [WayBack] Integrate beyond compare 4 with git · GitHub
- [WayBack] Beyond Compare Technical Support: git for Windows
- [WayBack] Git – git-merge Documentation
- [WayBack] Git – git-mergetool Documentation
- [WayBack] How the git mergetool solved my anxiety, fears, and most importantly, my merge conflicts | Knight Lab
What I need to find out is if it is possible to open all merges at once in Beyond Compare. Maybe these help:
- [WayBack] How do I make gvimdiff opened by git mergetool open all files at once in tabs? – Stack Overflow
- [WayBack] git difftool, open all diff files immediately, not in serial – Stack Overflow
This did help getting rid of .orig files: [WayBack] version control – Git mergetool generates unwanted .orig files – Stack Overflow
–jeroen
jpluimers commented