How can I see the list of available merge tools for git on the command line?
Asked Answered
F

2

7

I am using git on a virtual machine Ubuntu server running command-line only and I don't know vim (and frankly I don't really want to learn it right now) so I don't want to use vimdiff. How can I get the list of available merge tools for git?

Bonus points for a list of merge tools usable from the command line that don't have too much of a steep learning curve!

Finned answered 19/8, 2013 at 19:58 Comment(3)
Doesn't your host OS permit you to read the documentation?Aniline
programmers.stackexchange.com/questions/147681/…Jarid
@devnull: you're right, I have updated my question accordingly.Finned
T
2

Just run it without a tool value:

$ git mergetool --tool=
merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse ecmerge p4merge araxis bc3 vimdiff emerge

I'll leave the bonus points for the documentation :/

Tripp answered 19/8, 2013 at 20:4 Comment(2)
Running this command also starts the merge. Is there no way to see the available list without merging? Not that it's a big bother.Finned
git help config and search for mergetool - the same list is in the manual page. That won't start the merge...Kinkajou
G
33

This gives you the list without actually starting the merge :

git mergetool --tool-help
Gaza answered 31/7, 2014 at 17:18 Comment(0)
T
2

Just run it without a tool value:

$ git mergetool --tool=
merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse ecmerge p4merge araxis bc3 vimdiff emerge

I'll leave the bonus points for the documentation :/

Tripp answered 19/8, 2013 at 20:4 Comment(2)
Running this command also starts the merge. Is there no way to see the available list without merging? Not that it's a big bother.Finned
git help config and search for mergetool - the same list is in the manual page. That won't start the merge...Kinkajou

© 2022 - 2024 — McMap. All rights reserved.