From: Andreas Politz <politza@fh-trier.de>
To: help-gnu-emacs@gnu.org
Subject: Re: How to configure git diff tool to use emacs diff tool
Date: Thu, 01 Oct 2009 04:23:31 +0200 [thread overview]
Message-ID: <87r5tnj1i4.fsf@fh-trier.de> (raw)
In-Reply-To: 5ff1d48c0909301638l2c239badq4a946e0a78e1499c@mail.gmail.com
hap 497 <hap497@gmail.com> 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
next prev parent reply other threads:[~2009-10-01 2:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-30 23:38 How to configure git diff tool to use emacs diff tool hap 497
2009-10-01 2:23 ` Andreas Politz [this message]
2009-10-01 5:14 ` n179911
2009-10-01 7:10 ` Andreas Politz
[not found] ` <mailman.7823.1254381039.2239.help-gnu-emacs@gnu.org>
2009-10-23 4:41 ` David Combs
2009-10-02 20:04 ` Andreas Politz
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=87r5tnj1i4.fsf@fh-trier.de \
--to=politza@fh-trier.de \
--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.