git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Björn Steinbrink" <B.Steinbrink@gmx.de>,
	"Tom Lambda" <tom.lambda@gmail.com>,
	git@vger.kernel.org
Subject: Re: Question regarding git fetch
Date: Thu, 27 Aug 2009 18:16:31 -0400	[thread overview]
Message-ID: <20090827221631.GA7058@coredump.intra.peff.net> (raw)
In-Reply-To: <32541b130908271512h255834adl5a606054f6ab20e4@mail.gmail.com>

On Thu, Aug 27, 2009 at 10:12:50PM +0000, Avery Pennarun wrote:

> > I'm still screwed. The issue is that you consider your configured
> > refspec destinations to be precious, and not merely a cache for what's
> > happening on the remote side.
> 
> Is the "precious remote ref" concept perhaps an imaginary one?

Maybe. I certainly don't use it. But I am trying to consider corner
cases where somebody who _isn't_ me is going to get screwed by a
change we make.

> After all, if I *really* care about the prior state of the remote, I
> can just make it a remote branch.  And if (as often happens) I just

Do you mean "local branch" here?

> want to know what's new in that ref since last time I merged, it's
> simply
> 
>    git log master..origin/master
> 
> This works even if master has extra commits vs. origin/master, since
> the double-dot invokes git-merge-base.

Well, ".." doesn't use git-merge-base. But yes, I actually do this,
except I do:

  gitk master...origin/master

-Peff

  reply	other threads:[~2009-08-27 22:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-27 15:30 Question regarding git fetch Tom Lambda
2009-08-27 15:36 ` Avery Pennarun
2009-08-27 16:21   ` Eric Raible
2009-08-27 16:28     ` Avery Pennarun
2009-08-27 16:46   ` Björn Steinbrink
2009-08-27 17:22     ` Avery Pennarun
2009-08-27 20:48       ` Jeff King
2009-08-27 21:34         ` Jeff King
2009-08-27 21:44           ` Junio C Hamano
2009-08-27 21:50             ` Jeff King
2009-08-27 21:53               ` Jeff King
2009-08-27 22:12               ` Avery Pennarun
2009-08-27 22:16                 ` Jeff King [this message]
2009-08-27 22:24                   ` Avery Pennarun
2009-08-27 21:20   ` Junio C Hamano
2009-08-27 21:39     ` Jeff King
2009-08-28 13:24 ` Tom Lambda

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=20090827221631.GA7058@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=B.Steinbrink@gmx.de \
    --cc=apenwarr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tom.lambda@gmail.com \
    /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.
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 NNTP newsgroup(s).