On Mon, 19 Feb 2007 16:40:15 -0800 (PST), Alex Davis wrote: > I appreciate all the help, but now I'm confused. I got these instructions from Larry Finger: > git branch michael > git checkout michael > git pull http://bu3sch.de/git/wireless-dev.git master This is easier for one-time pull. > And these instructions from Pavel Roskin: > git-remote add bcm43xx http://bu3sch.de/git/wireless-dev.git > git-branch bcm43xx > git-config branch.bcm43xx.remote bcm43xx > git-config branch.bcm43xx.merge refs/heads/master > git-checkout bcm43xx > git-pull This is useful if you want to pull regularly. But Larry's way can be used even in that case - I'm pulling regularly from wireless-dev and never used git-config :-) Also, Larry's advice about getting back to the original wireless-dev tree could be useful for you. It applies to both Larry's and Pavel's instructions. > Which set of instructions do I use? Are either of these still applicable, seeing as I was asked > to pull from Jiri Benc's tree? If you pull from my tree, you won't be able to compile any d80211 driver. The wireless statistics fixes need to be committed by John first. Jiri -- Jiri Benc SUSE Labs - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
