From: Andrea Crotti <andrea.crotti.0@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: git mergetool again
Date: Fri, 13 Aug 2010 21:24:01 +0200 [thread overview]
Message-ID: <m1pqxm8gfi.fsf@gmail.com> (raw)
I really have to solve this before I go completely insane :D
It's more a problem of git but could make life easier to many emacs
user, so I think it's not offtopic.
Anyway I like emerge and it would be nice to use it to solve conflicts
with git.
Now the default configuration for me is really bad, because it opens a
new emacs, loads the WHOLE configuration and in short doesn't work at
all!
So I read again the doc and ended up with something like
--8<---------------cut here---------------start------------->8---
[mergetool "mymerge"]
cmd = 'exec /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -e \"(ediff-files (getenv \"LOCAL\") (getenv \"MERGED\") (getenv \"REMOTE\"))\"'
[merge]
tool = mymerge
--8<---------------cut here---------------end--------------->8---
after trying all possible easier solutions.
but now way it doesn't work.
I just need to fire up the editor with ediff-files on those three files,
which at the call moment are part of the environment (I think).
Not sure I need the getenv but the thing is that I have no way to get
the f***** actual command used by git for emerge.
I tried all possible magic combinations with git config, but no way it
doesn't spit it out..
Any help is welcome :)
Thanks
next reply other threads:[~2010-08-13 19:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 19:24 Andrea Crotti [this message]
2010-08-13 19:43 ` git mergetool again Andrea Crotti
2010-08-13 20:47 ` Andrea Crotti
2010-08-17 14:10 ` Andrea Crotti
[not found] ` <mailman.7.1282054253.30498.help-gnu-emacs@gnu.org>
2010-08-17 15:11 ` David Kastrup
2010-08-17 21:26 ` jpkotta
[not found] <mailman.13.1281727462.3281.help-gnu-emacs@gnu.org>
2010-08-13 20:00 ` David Kastrup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1pqxm8gfi.fsf@gmail.com \
--to=andrea.crotti.0@gmail.com \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.