How can i update kernel source from git with my own changes in another branch
I clone my kernel source several days ago, and created a branch for me to do some test and play.
Now I want to update my kernel from upstream. While I still want to keep my changes in another branch. So: git pull could be used? Does this command merge my changes? |
You need to explain the steps that you took after the initial clone.
Did you create a new branch? When a local branch is started off a remote branch, git sets up the branch so that git pull will appropriately merge from the remote branch. |
After git clone, I didn't change any code in master branch.
And then I create a branch with git branch new_branch. Now I want to update my code with the upstream. Should I first git branch master? Then git pull? $git branch master * pci-nic |
I think that you would want to
Code:
git checkout master |
Thanks
Then after this, master would be the latest code right? And pci-nic would be the original version. If one day, I want to make this branch also the latest code, I should Quote:
|
Quote:
Quote:
|
$git pull
git.kernel.org[0: 180.168.41.175]: errno=Connection refused fatal: unable to connect a socket (Connection refused) ---------- Post added 09-24-11 at 10:25 PM ---------- Quote:
|
You can't use git from kernel.org anymore.
It is on github now. https://github.com/mirrors/linux https://github.com/mirrors/linux.git Read Linus' message https://lkml.org/lkml/2011/9/4/92 and substitute the above for the replaced: https://github.com/torvalds/linux.git |
Anymore? Never?
Then how to config my git to pull from this site? |
Quote:
https://lkml.org/lkml/2011/9/4/92 |
Thanks a lot.
BTW, does git pull get the tags? I see some doc on internet mentions git pull will not get tags. While in the mail from Linus, sees git pull could retrieve tags if it is a origin branch. |
BTW, what are the so long list of those people and title.
Those a patches? ---------- Post added 09-24-11 at 10:51 PM ---------- Hmm.... $git pull https://github.com/torvalds/linux.git fatal: https://github.com/torvalds/linux.git/info/refs download error - The requested URL returned error: 403 |
$git pull https://github.com/mirrors/linux.git
fatal: https://github.com/mirrors/linux.git/info/refs download error - The requested URL returned error: 403 |
I think that he means for you to:
Code:
git fetch --tags https://github.com/mirrors/linux.git |
Quote:
|
All times are GMT -5. The time now is 07:42 PM. |