From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Politz Newsgroups: gmane.emacs.help Subject: Re: How to configure git diff tool to use emacs diff tool Date: Thu, 01 Oct 2009 04:23:31 +0200 Message-ID: <87r5tnj1i4.fsf@fh-trier.de> References: <5ff1d48c0909301638l2c239badq4a946e0a78e1499c@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1254364381 22017 80.91.229.12 (1 Oct 2009 02:33:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Oct 2009 02:33:01 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu Oct 01 04:32:54 2009 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.50) id 1MtBTR-00013H-N9 for geh-help-gnu-emacs@m.gmane.org; Thu, 01 Oct 2009 04:32:53 +0200 Original-Received: from localhost ([127.0.0.1]:52865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtBTR-0002HO-AE for geh-help-gnu-emacs@m.gmane.org; Wed, 30 Sep 2009 22:32:53 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtBKv-0004mn-9b for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 22:24:05 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtBKq-0004jh-IP for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 22:24:04 -0400 Original-Received: from [199.232.76.173] (port=60393 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtBKq-0004jb-BG for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 22:24:00 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:50942) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MtBKq-0004Jl-0Z for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 22:24:00 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1MtBKk-0006r8-2d for help-gnu-emacs@gnu.org; Thu, 01 Oct 2009 04:23:54 +0200 Original-Received: from dslb-084-059-096-149.pools.arcor-ip.net ([84.59.96.149]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 01 Oct 2009 04:23:54 +0200 Original-Received: from politza by dslb-084-059-096-149.pools.arcor-ip.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 01 Oct 2009 04:23:54 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: dslb-084-059-096-149.pools.arcor-ip.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) Cancel-Lock: sha1:9Fv7bs7uEmGCn37V+xzmy+LsgR0= X-detected-operating-system: by monty-python.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:68586 Archived-At: hap 497 writes: > Hi, > > One can configure git merge tool to use vimdiff > > $git config --global merge.tool vimdiff > > How can I change it to use emacs diff? And is it possible to use > emacsclient for diff? > http://www.emacswiki.org/emacs/EmacsClient#toc1 (so that I can speed > things up by not launching a new emacs every time). > > Thank you. It seems obvious, how to do this. The emacs function is `ediff-files' and it takes 2 arguments, namely the files to run diff on. Combine this with the --eval option of emacs(client) in a shell. $ cat ~/bin/ediff #!/bin/sh emacsclient --eval "(ediff-files \"$1\" \"$2\")" -ap