From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: linux@horizon.com, git@vger.kernel.org
Subject: Re: git-fetch will leave a ref pointing to a tag
Date: Tue, 3 Jul 2007 13:01:49 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707031257590.4071@racer.site> (raw)
In-Reply-To: <20070703041859.GB4007@coredump.intra.peff.net>
Hi,
On Tue, 3 Jul 2007, Jeff King wrote:
> On Mon, Jul 02, 2007 at 11:23:15PM -0400, linux@horizon.com wrote:
>
> > And until git-merge-ff is available, what's the recommended way to
> > "advance master to tag <foo>, but only if that wouldn't lose anything?"
>
> You can ask "do I have anything that foo doesn't?":
>
> test "`git-rev-list foo.. | wc -l`" -gt 0
If it is only the test, you can do that by
test $(git merge-base foo bar) = $(git rev-parse foo)
(which tests if foo is a stricth ancestor of bar). Although in your
(linux@horizon.com's) place I would really look at "git log foo.." myself,
as peff almost suggested.
For if you (linux@horizon.com) _have_ changes, you want to know which
changes they are, right?
Of course, it seems to me that what you (linux@horizon.com; do you really
have no proper name?) _really_ wanted to do is "git rebase v2.6.22-rc7".
Ciao,
Dscho
next prev parent reply other threads:[~2007-07-03 12:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-02 19:44 git-fetch will leave a ref pointing to a tag linux
2007-07-02 21:14 ` Johannes Schindelin
2007-07-02 23:11 ` Junio C Hamano
2007-07-02 23:29 ` Johannes Schindelin
2007-07-03 3:23 ` linux
2007-07-03 4:18 ` Jeff King
2007-07-03 12:01 ` Johannes Schindelin [this message]
2007-07-03 13:59 ` Jeff King
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=Pine.LNX.4.64.0707031257590.4071@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=linux@horizon.com \
--cc=peff@peff.net \
/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).