From: "J. Bruce Fields" <bfields@fieldses.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: rebasing trouble
Date: Thu, 29 Jun 2006 16:22:34 -0400 [thread overview]
Message-ID: <20060629202234.GE14287@fieldses.org> (raw)
In-Reply-To: <7vd5crranq.fsf@assigned-by-dhcp.cox.net>
On Thu, Jun 29, 2006 at 01:04:25PM -0700, Junio C Hamano wrote:
> "J. Bruce Fields" <bfields@fieldses.org> writes:
>
> > I must be missing something obvious:
> >
> > bfields@puzzle:linux-2.6$ git checkout -b TMP nfs-client-stable^^^
> > bfields@puzzle:linux-2.6$ git-describe
> > v2.6.17-rc6-g28df955
> > bfields@puzzle:linux-2.6$ git-rebase --onto v2.6.17 origin
> > Nothing to do.
> > bfields@puzzle:linux-2.6$ git-describe
> > v2.6.17
> >
> > So the git-rebase just reset TMP to v2.6.17. But I know that nfs-client-stable
> > isn't a subset of origin, so this doesn't make sense to me.
> >
> > The tree in question is actually at git://linux-nfs.org/~bfields/linux.git, if
> > it matters.
>
> It matters of course. Where is the "origin"?
I realized after I sent that that "origin" in that public repository actually
isn't the same as "origin" in the local repo that I'm working on. So I just
ran a GIT_DIR=. git-fetch there, and now both branches agree.
--b.
next prev parent reply other threads:[~2006-06-29 20:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-29 19:47 rebasing trouble J. Bruce Fields
2006-06-29 20:04 ` Junio C Hamano
2006-06-29 20:22 ` J. Bruce Fields [this message]
2006-06-29 20:38 ` J. Bruce Fields
2006-06-29 21:57 ` J. Bruce Fields
2006-06-29 22:34 ` Junio C Hamano
2006-06-29 23:45 ` J. Bruce Fields
2006-06-30 1:12 ` Junio C Hamano
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=20060629202234.GE14287@fieldses.org \
--to=bfields@fieldses.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).