all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Equivalent of "bzr diff -rancestor:"
Date: Mon, 17 Nov 2014 15:58:14 +0100	[thread overview]
Message-ID: <87h9xxan7d.fsf@yahoo.fr> (raw)
In-Reply-To: <jwv8uj9risx.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 17 Nov 2014 09:45:58 -0500")

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> I can't seem to figure out how to do the above.
>
> 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".
>
> In Bazaar, I'd do something like "bzr diff -r ancestor:<master>"
> but I can't find any equivalent in "man gitrevisions".
>
> The best I can come up with is to arrange for "foo" to be uptodate with
> respect to "master", and then I can just do "git diff <master>", but
> sometimes it's inconvenient/impractical to be "uptodate".

Perhaps you want:
git diff origin/foo master

You need to "git fetch" first, so that origin/foo is uptodate.

-- 
Nicolas Richard



  reply	other threads:[~2014-11-17 14:58 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 [this message]
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
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87h9xxan7d.fsf@yahoo.fr \
    --to=theonewiththeevillook@yahoo.fr \
    --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 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.