On Tue, 2005-05-03 at 11:47 +0200, Petr Baudis wrote: > Dear diary, on Tue, May 03, 2005 at 09:13:28AM CEST, I got a letter > where Benjamin Herrenschmidt <benh@kernel.crashing.org> told me that... > > > when accessing the remote repository, Cogito always looks for remote > > > refs/heads/master first - if that one isn't there, it takes HEAD, but > > > there is no correlation between the local and remote branch name. If you > > > want to fetch a different branch from the remote repository, use the > > > fragment identifier (see cg-help cg-branch-add). > > > > Ok, that I'm getting. So then, what happen of my local > > refs/heads/<branchname> and refs/heads/master/ ? I'm still a bit > > confused by the whole branch mecanism... It's my understanding than when > > I cg-init, it creates both "master" (a head without matching branch) > > and "origin" (a branch + a head) both having the same sha1. It also > > checks out the tree. > > > > Now, when I cg-update origin, what happens exactly ? I mean, I know it's > > pulls all objects, then get the master from the remote pointed by the > > origin branch, but then, I suppose it updates both my local "origin" and > > my local "master" pointer, right ? I mean, they are always in sync ? Or > > is this related to what branch my current checkout is tracking ? > > They are in sync as long as you update only from that given branch. > At the moment you do a local commit, they get out of sync, at least > until your master branch is merged to the origin branch on the other > side. Every cg-update will then generate a merging commit, so it will > look like this: > > .../... Thanks for that detailed explanation ! Ben. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Wed May 04 09:51:46 2005
This archive was generated by hypermail 2.1.8 : 2005-05-04 09:51:47 EST