From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andrea Crotti Newsgroups: gmane.emacs.help Subject: git mergetool again Date: Fri, 13 Aug 2010 21:24:01 +0200 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1281728142 3960 80.91.229.12 (13 Aug 2010 19:35:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 13 Aug 2010 19:35:42 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Aug 13 21:35:37 2010 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ok02O-0001ND-7O for geh-help-gnu-emacs@m.gmane.org; Fri, 13 Aug 2010 21:35:36 +0200 Original-Received: from localhost ([127.0.0.1]:43184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ok02M-0005Jj-9r for geh-help-gnu-emacs@m.gmane.org; Fri, 13 Aug 2010 15:35:30 -0400 Original-Received: from [140.186.70.92] (port=44551 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjzrW-0000e4-GE for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 15:24:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OjzrT-0006Vd-Vu for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 15:24:17 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:50022) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OjzrT-0006VT-PH for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 15:24:15 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OjzrP-0004Xj-4l for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 21:24:11 +0200 Original-Received: from xdsl-89-0-44-64.netcologne.de ([89.0.44.64]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Aug 2010 21:24:11 +0200 Original-Received: from andrea.crotti.0 by xdsl-89-0-44-64.netcologne.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Aug 2010 21:24:11 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 31 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: xdsl-89-0-44-64.netcologne.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (darwin) Cancel-Lock: sha1:IV6RaRfSuwdJoaOlKvZnAfuDoy4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:74625 Archived-At: 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