From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: hap 497 Newsgroups: gmane.emacs.help Subject: How to configure git diff tool to use emacs diff tool Date: Wed, 30 Sep 2009 16:38:11 -0700 Message-ID: <5ff1d48c0909301638l2c239badq4a946e0a78e1499c@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 X-Trace: ger.gmane.org 1254353934 31786 80.91.229.12 (30 Sep 2009 23:38:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Sep 2009 23:38:54 +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 01:38:47 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 1Mt8kw-0006Jb-SO for geh-help-gnu-emacs@m.gmane.org; Thu, 01 Oct 2009 01:38:47 +0200 Original-Received: from localhost ([127.0.0.1]:32800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mt8kw-0000mA-8F for geh-help-gnu-emacs@m.gmane.org; Wed, 30 Sep 2009 19:38:46 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mt8kV-0000kT-DO for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 19:38:19 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mt8kP-0000ck-W9 for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 19:38:18 -0400 Original-Received: from [199.232.76.173] (port=48266 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mt8kP-0000cD-QJ for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 19:38:13 -0400 Original-Received: from mail-bw0-f220.google.com ([209.85.218.220]:55318) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mt8kP-0003W2-AN for help-gnu-emacs@gnu.org; Wed, 30 Sep 2009 19:38:13 -0400 Original-Received: by bwz20 with SMTP id 20so5673225bwz.42 for ; Wed, 30 Sep 2009 16:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=RuqgBLuIqOMK9tt+XIQQs5ze81pJH1QXGjhXoA55+58=; b=E+hR0J8xnDqtpbdBj7/nKUGi6Ht2m4lAwCSHfOgLfQbOWdGqiEpdXPpri+H9tUORD2 /G3pKP3AH2u0TjFxHpqX3LbvRJ8ZxKHOGzhf20gk70puuNHUj5zTQdZ7oOLCij54ic1T BVPeMu4twueLsyOSkHBfZojH/w5BZ4yqcBOiI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=Lgm5eE2y2QUS+SH2OjqZdDXOWMNdHfVQRWLYcs5GjYOrW+8Tq6umB/119/f/QHs2dU VDIJ9JsuWUNgjS632PF13ha9EWkSZFpnqtcIBQnDOjatUhm2FjNuXDE3ey0vAgErHz9i DNddfEZS5SCt/5pPlSR1DgSGbCcuhMwGiUqk0= Original-Received: by 10.204.161.197 with SMTP id s5mr381087bkx.8.1254353891327; Wed, 30 Sep 2009 16:38:11 -0700 (PDT) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:68577 Archived-At: 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.