Julian Phillips <julian@xxxxxxxxxxxxxxxxx> writes: > On Sat, 4 Aug 2007, David Kastrup wrote: > >> "Lars Hjemli" <lh@xxxxxxxxxxxxxxxxx> writes: >> >>> The magic setup that makes this happen is the following lines in .git/config: >> It would be helpful. Except that nothing whatsoever can be found in >> .git/config concerning my local and my remote tracking branches. So >> where is that information _really_ hidden away? > >> What gives? > > It would appear that your repo was created with an old version of > git. Which also explains why you were talking about origin as a > branch - which it used to be (a real local branch too ...), rather > than as a remote - which it is now. > > The whole remotes/tracking mechanism changed in 1.5.0 - now it's > much more flexible (and probably more complicated too). I think I am going to cry. So I need to rebase my branches, pull out the resulting patch sets, scrap my repository, clone it new from upstream, reapply my branches, in order to have a system where the documentation is somewhat in synch with the actual behavior? [...] No, it would seem that I can just git-clone -l my repository and be set up in the new order of things. Nice. However, it would appear from my experiments up to now that the --track option _can't_ be made to work with a 1.4 repository. I think that is worth mentioning in the docs. -- David Kastrup, Kriemhildstr. 15, 44793 Bochum - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html