Re: Problems with Linux next tree
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?
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.
Hi, On Tue, Jul 15, 2014 at 5:52 AM, 黄钦佳 <kinkabrain@gmail.com> 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?
You should always create your own local branch and never work on master branch! Thanks, --Prabhakar Lad
ok, got it. Thanks! 2014-7-15 下午3:48于 "Prabhakar Lad" <prabhakar.csengg@gmail.com>写道：
Hi,
On Tue, Jul 15, 2014 at 5:52 AM, 黄钦佳 <kinkabrain@gmail.com> 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?
You should always create your own local branch and never work on master branch!
Thanks, --Prabhakar Lad
participants (4)
-
Kinka Huang -
Prabhakar Lad -
Stone Kang -
黄钦佳