From: Teemu Likonen <tlikonen@iki.fi>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Equivalent of "bzr diff -rancestor:"
Date: Mon, 17 Nov 2014 19:50:54 +0200 [thread overview]
Message-ID: <87h9xxpvgh.fsf@mithlond.arda> (raw)
In-Reply-To: <jwv8uj9risx.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 17 Nov 2014 09:45:58 -0500")
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 835 bytes --]
next prev parent reply other threads:[~2014-11-17 17:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 14:45 Equivalent of "bzr diff -rancestor:" Stefan Monnier
2014-11-17 14:58 ` Nicolas Richard
2014-11-17 17:24 ` Stefan Monnier
2014-11-17 18:59 ` Nicolas Richard
2014-11-17 15:29 ` Andreas Schwab
2014-11-17 17:40 ` Stefan Monnier
2014-11-17 17:50 ` Teemu Likonen [this message]
2014-11-17 18:59 ` Stefan Monnier
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h9xxpvgh.fsf@mithlond.arda \
--to=tlikonen@iki.fi \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).