From: Alex Riesen <raa.lkml@gmail.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: 'upstream' branches.
Date: Sun, 6 May 2007 00:52:49 +0200 [thread overview]
Message-ID: <20070505225249.GE2898@steel.home> (raw)
In-Reply-To: <1178387429.17680.35.camel@shinybook.infradead.org>
David Woodhouse, Sat, May 05, 2007 19:50:28 +0200:
> > >
> > > Is there a better way?
> >
> > I would just remove the pluses. git-fetch will say that the branch is
> > already up-to-date, if the local branch already has everything the
> > remote has.
>
> Then after I pull from Linus' tree, I can't pull from the mtd tree -- it
> complains that the 'linus' branch there can't be fast-forwarded, and
> refuses to pull the 'master' branch.
Which got me by surprise (just tried). I though it'd notice that all
the commits are already present...
Experts, is it really supposed to be that way?
next prev parent reply other threads:[~2007-05-05 22:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-05 12:29 'upstream' branches David Woodhouse
2007-05-05 17:44 ` Alex Riesen
2007-05-05 17:50 ` David Woodhouse
2007-05-05 22:52 ` Alex Riesen [this message]
2007-05-06 6:36 ` Junio C Hamano
2007-05-06 7:35 ` David Woodhouse
2007-05-06 8:00 ` Junio C Hamano
2007-05-06 8:39 ` David Woodhouse
2007-05-07 1:20 ` Junio C Hamano
2007-05-07 8:51 ` David Woodhouse
2007-05-06 9:21 ` Alex Riesen
2007-05-07 7:40 ` Junio C Hamano
2007-05-07 8:39 ` Alex Riesen
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=20070505225249.GE2898@steel.home \
--to=raa.lkml@gmail.com \
--cc=dwmw2@infradead.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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).