On Tue, 2008-09-02 at 20:20 -0400, Celejar wrote: > [This is off topic, but my entire reason for struggling with git is to > help test patches to b43, so I beg the list's pardon for asking here.] > > I'm trying to maintain a git repository of wireless-testing, to test > Michael's patches to b43. The initial git-clone went fine, and I > tested several patches successfully. I'm currently having a great deal > of trouble trying to update my local repository via git-pull. I've > spent a while with the various git manpages (git-pull, git-clean, > git-checkout, git-reset, git-tutorial, etc.), as well as with the > wireless.kernel.org git-guide and with google, but I just can't seem to > grok basic git operation. > > All I want to do is dump any changes I've made to the code, and then > pull in an updated version, but I just can't make git do that. I am > getting all kinds of errors; google turns up other instances of them, > but no straightforward solution.
You may be better off writing to linux-wireless about it. As far as I know, there was some botched update made to the tree made in the recent days, but it have been fixed. Anyway, many trees are updated in a non-linear way. This means that you may need to reset the tree to the remote tip: git-reset --hard wireless-testing/master This will lose your uncommitted changes. If you have your changes in a separate branch, you should be able to rebase your branch on top on the newly updated version. I recommend that you use StGIT for local patches. While not strictly required, it's a tool that is primarily designed to working with patchsets. It will pop all patches before updates, so that you should be able to do any dangerous git commands and then push your patches on top of the result. If you have any advanced questions about git, please ask them in the git list. -- Regards, Pavel Roskin _______________________________________________ Bcm43xx-dev mailing list [email protected] https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
