Using emerge as git mergetool

Using emerge as git mergetool

[Andrea Crotti]

I think I want a very simple thing, being able to use emerge as merge
tool.
It works already but:
1. while in the shell it loads a terminal emacs instead of using EmacsClient
2. it loads my full configuration

So I would just like to change the "emacs" call to "Emacs -Q" (which is
an alias to my GUI version).

It should not be so hard but I don't find how the heck I should
configure it...
Until writing maybe I found:
 git config --global mergetool.emerge.cmd "Emacs -Q"

and it could be useful for someone else, but I don't know if it works
until the next conflict to solve...

Re: Using emerge as git mergetool

[Andrea Crotti]

Andrea Crotti <andrea.crotti.0@gmail.com> writes:
>
> and it could be useful for someone else, but I don't know if it works
> until the next conflict to solve...

Ok I found a nice way to test and no, it doesn't work...still using the
same one.

I would just like to know what command I should give to get the same
thing as git mergetool -t emerge

Should be something like
--8<---------------cut here---------------start------------->8---
 cmd = git-merge-diffmerge-wrapper.sh "$PWD/$LOCAL" "$PWD/$BASE"
 "$PWD/$REMOTE" "$PWD/$MERGED" 
--8<---------------cut here---------------end--------------->8---