From: "Shawn O. Pearce" <spearce@spearce.org>
To: "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
Cc: git@vger.kernel.org
Subject: Re: 1.5.0.rc1.gb60d: fetch in another branch works strangely
Date: Sat, 13 Jan 2007 16:14:28 -0500 [thread overview]
Message-ID: <20070113211428.GA17749@spearce.org> (raw)
In-Reply-To: <200701132106.l0DL6BPH008314@laptop13.inf.utfsm.cl>
"Horst H. von Brand" <vonbrand@inf.utfsm.cl> wrote:
> I created a new branch in the kernel to carry a not yet official patch, to
> keep this up to date I do:
>
> $ git fetch git://git2.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
That's only writing into FETCH_HEAD whatever branch is marked as
HEAD in Linus' repository. No local refs are being updated.
> $ git pull . origin
So this won't merge in the changes fetched above.
Why not setup that URL as a remote (git remote add linus ....)
Then you can do:
$ git fetch linus
$ git merge linus/master
or
$ git fetch linus
$ git pull . linus/master
or
$ git pull linus master
--
Shawn.
next prev parent reply other threads:[~2007-01-13 21:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-13 21:06 1.5.0.rc1.gb60d: fetch in another branch works strangely Horst H. von Brand
2007-01-13 21:14 ` Shawn O. Pearce [this message]
2007-01-13 21:46 ` 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=20070113211428.GA17749@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=vonbrand@inf.utfsm.cl \
/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).