Hi, I'm trying to figure out the new Cogito syntax. What is the difference between cg-update and cg-pull? Here is my take so far, please correct me: 'cg-update branch-name' grabs any new changes from the upstream repository and merges them into my local repository. If I've been editing files in my local repository, the update attempts to merge the changes cleanly. Now, if the update is clean, a cg-commit is invoked automatically, and if the update is not clean, I then have to resolve any conflicts and give the cg-commit command by hand. But: what is the significance of either of these cg-commit commands? Why should I have to write a changelog entry recording this merge? All I'm doing is updating my tree to be current. Why should I have to 'commit' that update? Now I look at 'cg-pull'. What does this do? The readme says something about printing two ids, and being useful for diffs. But can't I do a diff after a cg-update and get the same result? I'm very confused about cg-pull right now. Also, the README says that cg-clone and cg-init are identical, except that cg-clone creates a new directory for the repository. Is that really the only difference? Why do we have cg-clone then? Be well, Zack -- Zack Brown - 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 Sat Apr 30 10:56:20 2005
This archive was generated by hypermail 2.1.8 : 2005-04-30 10:56:21 EST