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: Re: git mergetool again Date: Fri, 13 Aug 2010 21:43:12 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1281730280 12184 80.91.229.12 (13 Aug 2010 20:11:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 13 Aug 2010 20:11:20 +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 22:11:18 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 1Ok0av-0001A2-Jd for geh-help-gnu-emacs@m.gmane.org; Fri, 13 Aug 2010 22:11:14 +0200 Original-Received: from localhost ([127.0.0.1]:50045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ok0au-0006qE-6S for geh-help-gnu-emacs@m.gmane.org; Fri, 13 Aug 2010 16:11:12 -0400 Original-Received: from [140.186.70.92] (port=50304 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ok0OO-0000Yu-WA for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 15:58:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ok0A5-0000jn-Fr for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 15:43:30 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:41252) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ok0A5-0000jW-4K for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 15:43:29 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ok0A0-0004uv-Ib for help-gnu-emacs@gnu.org; Fri, 13 Aug 2010 21:43:24 +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:43:24 +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:43:24 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 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:5Gl413pkhmt7WJkfSE8TkLuHfMc= 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:74626 Archived-At: Andrea Crotti writes: > 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 > [mergetool "mymerge"] > cmd = 'exec /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -e \"(ediff-files (getenv \"LOCAL\") (getenv \"MERGED\") (getenv \"REMOTE\"))\"' > [merge] > tool = mymerge > > 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 I didn't in the easiest place, what process is started by git, and here the command (I added the -Q) --8<---------------cut here---------------start------------->8--- cmd =Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $MERGED $REMOTE --8<---------------cut here---------------end--------------->8--- it's already much better, but I would like to use emacsclient instead, still not working there though :(