From: stonekyx@gmail.com (Stone Kang)
To: kernelnewbies@lists.kernelnewbies.org
Subject: Problems with Linux next tree
Date: Tue, 15 Jul 2014 13:37:42 +0800 [thread overview]
Message-ID: <20140715053742.GA22732@stone-arch> (raw)
In-Reply-To: <CAD9xVF_U6PpvD4wLR3x3wZpvVMo9wLcxf1jK89NsZMhruwpW_A@mail.gmail.com>
On Tue, Jul 15, 2014 at 12:52:07PM +0800, ??? wrote:
> > Due to the way the linux-next tree is built, 'git pull' won't work.
> >
> > You want to 'git clone' Linus's master tree, then 'git remote add'
> > the Linux-next tree. Then use 'git remote update' instead of 'git pull'
> > when you want to refresh the tree.
>
> I use 'git remote update', and then try 'git checkout master', it
> tells that my branch has diverged.
> But I do not have modifies on that branch. So I have to try 'git reset
> 20140707', and then checkout successed. I don't know why, any help?
>
There might have been an upstream rebase since your last pull (or
clone). Check out `git help rebase` for more about this.
After running `git reset 20140707`, HEAD points to a position after
rebase, so checkout is possible now.
next prev parent reply other threads:[~2014-07-15 5:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 4:52 Problems with Linux next tree 黄钦佳
2014-07-15 5:37 ` Stone Kang [this message]
2014-07-15 7:47 ` Prabhakar Lad
2014-07-15 14:52 ` Kinka Huang
-- strict thread matches above, loose matches on Subject: below --
2014-07-14 20:07 Lucas Tanure
2014-07-14 20:26 ` Prabhakar Lad
2014-07-14 20:57 ` Lucas Tanure
2014-07-14 21:54 ` Valdis.Kletnieks at vt.edu
2014-07-15 7:45 ` Prabhakar Lad
2014-07-14 20:57 ` Benedict Börger
2014-07-14 21:04 ` Lucas Tanure
2014-07-14 21:18 ` Peter Senna Tschudin
2014-07-14 21:29 ` Lucas Tanure
2014-07-15 6:46 ` Alexey Tulia
2014-07-14 19:58 Lucas Tanure
2014-07-15 13:16 ` Varka Bhadram
2014-07-15 13:32 ` Lucas Tanure
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=20140715053742.GA22732@stone-arch \
--to=stonekyx@gmail.com \
--cc=kernelnewbies@lists.kernelnewbies.org \
/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).