From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Teemu Likonen Newsgroups: gmane.emacs.devel Subject: Re: Equivalent of "bzr diff -rancestor:" Date: Mon, 17 Nov 2014 19:50:54 +0200 Message-ID: <87h9xxpvgh.fsf@mithlond.arda> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1416246700 6247 80.91.229.3 (17 Nov 2014 17:51:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 17:51:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 18:51:33 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 1XqQSb-0001Ho-1c for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 18:51:33 +0100 Original-Received: from localhost ([::1]:49500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqQSa-0003kK-JS for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 12:51:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqQSG-0003jA-Ld for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:51:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqQS9-0004mK-6H for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:51:12 -0500 Original-Received: from mta-out1.inet.fi ([62.71.2.227]:54849 helo=jenni1.inet.fi) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqQS8-0004kB-Sh for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:51:05 -0500 Original-Received: from mithlond.arda (84.251.132.236) by jenni1.inet.fi (8.5.142.08) id 5462934400A20B69; Mon, 17 Nov 2014 19:51:00 +0200 Original-Received: from dtw by mithlond.arda with local (Exim 4.80) (envelope-from ) id 1XqQS1-0001Qj-Cc; Mon, 17 Nov 2014 19:50:57 +0200 In-Reply-To: (Stefan Monnier's message of "Mon, 17 Nov 2014 09:45:58 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 62.71.2.227 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:177463 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier [2014-11-17 09:45:58 -05:00] wrote: > Say, I'm on local branch "foo" which tracks a remote branch "foo", and > I'd like to see what are the changes on this branch foo compared to > "master". Don't know Bazaar very well so here is my guess about what you may want. A diff between master's and foo's common ancestor and the tip of foo: git diff master...foo # Three dots. In other words, it's is a diff between A and B in the graph below. o---o---A---o---o----o master \ \--o---o---B foo --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJUajV+AAoJEHGdadMkU5RQME8QAIBTk4rzHz3pdCYkIFBm5VSa ZYQVl6F6k0113XCoZIL5GPtD44rHQFGplh+dW4sx0PtFKVV+ix0cXQwIxteyfPSl 7kZPAXCZZK/U9LwxNHP/yAppgylAdbgyk8lRhCEXtRaG3xaIAiPsfoX4IAWzSHcV HQ4Yl1dgzM0jA0a4h5TdhYBAXzWBJdoR9WWvSUvecZkvvO2TNFWhlkwNtI83z0Y5 g1V+viuD662X5VmOj1WrGbJ8owMxya8nOkq8ziwFA9tUAcXb92qfZKJT+C/KeSgm po7+r7Dm5Cp+y20UnbdUjdJ7M3kZMOXsYAkEdpUwLNxt7x9WywhV2HKFp5xQsssM 1rNozKZttcQEUas20cwz4N+z0RHqwLuJaoKm0lYpGXgDso9z2V0BjK0GdzVuv5A4 18N2k7O+1VzKPvvTBtjxOiJpraw4U+IovNz+6ouPWI9nuyVN0mfXWZjyIWFCS0gB MH+x27j2AdloG930rraC1/AFgzuGRjat05orhV1hOPYsUStJ1IogRLqZw42ojq1Q tD0wnmb2ZGIj0rCyAJ58qbEsehIOz+O6FYI49H8nnb+BnJ8SmTIuLefoHgiYNY5h ffUn1nYU5yF5CFF/u3pgC/KSPCxuwOTCLuyBg/0/x/VN4cCsCTMjC27l1/koQIZD LwQfhaqovH9m2JRZaj9w =BdBx -----END PGP SIGNATURE----- --=-=-=--