Skip to contentSkip to conversation

GIT tree usage.

DISCUSSION Rene Herman 2 participants 3 messages Jun 10, 2008 – Jun 11, 2008

lore
Share & tools
lore
#0 lore raw

Good day.

I have been using Takashi's "sound-2.6" GIT repo:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

for pulling current ALSA (branch master) into the stock kernel tree and while rebuilding stuff thought I'd try switching to the official ALSA GIT repo(s). I'd like to make sure that I am now using the right trees and branches...

I start out locally with a fresh linus clone:

$ git clone 
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 local

and then want to pull latest ALSA into it:

$ git remote add alsa git://git.alsa-project.org/alsa-kernel.git
$ git remote show alsa
* remote alsa
   URL: git://git.alsa-project.org/alsa-kernel.git
   Tracked remote branches
     for-linus linux-2.6 master
$ git checkout -b current
$ git merge alsa/master

Am I using the right tree and branch for this? And is this branch being rebased?

Rene.

#1 lore raw
Quoted 16 lines · Rene Herman

I have been using Takashi's "sound-2.6" GIT repo:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

for pulling current ALSA (branch master) into the stock kernel tree and while rebuilding stuff thought I'd try switching to the official ALSA GIT repo(s). I'd like to make sure that I am now using the right trees and branches...

I start out locally with a fresh linus clone:

$ git clone 
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 local

and then want to pull latest ALSA into it:

Quoted 7 lines
$ git remote add alsa git://git.alsa-project.org/alsa-kernel.git
$ git remote show alsa
* remote alsa
  URL: git://git.alsa-project.org/alsa-kernel.git
  Tracked remote branches
    for-linus linux-2.6 master
$ git checkout -b current

missing here: $ git fetch alsa

Quoted 4 lines
$ git merge alsa/master

Am I using the right tree and branch for this? And is this branch being rebased?

Rene.

#2 lore raw
In reply to Rene Herman

At Tue, 10 Jun 2008 23:19:12 +0200,

Quoted 8 lines · Rene Herman

Good day.

I have been using Takashi's "sound-2.6" GIT repo:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

for pulling current ALSA (branch master)

FYI, I created devel branch on the above git tree for less-frequent rebase.

The master is basically for the next kernel, and it's been sometime rebased so that it's clean enough to be pull-able without confliction on the latest Linus kernel.

OTOH, devel branch is based on a certain stable point and has incremental changesets. In the next release cycle, devel branch will be rebased, too, but during the rc phase, it should be rarely rebased (unless really necessary).

But, if you'd like to work on the latest Linus tree and avoid merge conflicts, master branch is fine.

Takashi