From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Richard Newsgroups: gmane.emacs.devel Subject: Re: Equivalent of "bzr diff -rancestor:" Date: Mon, 17 Nov 2014 19:59:43 +0100 Message-ID: <87vbmdk600.fsf@yahoo.fr> References: <87h9xxan7d.fsf@yahoo.fr> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416250821 11575 80.91.229.3 (17 Nov 2014 19:00:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 19:00:21 +0000 (UTC) Cc: Nicolas Richard , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 20:00:14 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqRX4-0001kn-EY for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 20:00:14 +0100 Original-Received: from localhost ([::1]:49742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqRX3-0007Fi-Vh for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 14:00:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqRWi-00077e-8d for emacs-devel@gnu.org; Mon, 17 Nov 2014 13:59:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqRWb-0003hO-VU for emacs-devel@gnu.org; Mon, 17 Nov 2014 13:59:52 -0500 Original-Received: from mailrelay007.isp.belgacom.be ([195.238.6.173]:1666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqRWb-0003h3-Q0 for emacs-devel@gnu.org; Mon, 17 Nov 2014 13:59:45 -0500 X-Belgacom-Dynamic: yes Original-Received: from 55.229-240-81.adsl-dyn.isp.belgacom.be (HELO LDLC-portable) ([81.240.229.55]) by relay.skynet.be with ESMTP; 17 Nov 2014 19:59:44 +0100 In-Reply-To: (Stefan Monnier's message of "Mon, 17 Nov 2014 12:24:58 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.238.6.173 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177477 Archived-At: Stefan Monnier writes: >>> In Bazaar, I'd do something like "bzr diff -r ancestor:" > >> Perhaps you want: >> git diff origin/foo master > > This just shows the diff between the head of both branches. > Whereas I want the diff between the head of "foo" and the common ancestor > between "foo" and "master". Ah, sorry. That is "git diff ...foo" Quoting "git help diff" : > git diff [--options] ... [--] [...] > This form is to view the changes on the branch containing and > up to the second , starting at a common ancestor of > both . "git diff A...B" is equivalent to "git diff > $(git-merge-base A B) B". You can omit any one of , > which has the same effect as using HEAD instead. -- Nicolas Richard