git/list[1] front-page[2] threads[3] people[4] search[5] about
 

questions about cg-update, cg-pull, and cg-clone.

From
ZBZack Brown <zbrown@tumblerings.org>
Date
Apr 30, 2005, 00:53 UTC
Message-ID
<20050430005322.GA5408@tumblerings.org>
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
Next: David A. Wheeler
Message 1 of 8 in “questions about cg-update, cg-pull, and cg-clone.”
  1. Zack BrownApr 30, 2005
  2. David A. WheelerApr 30, 2005
  3. Zack BrownApr 30, 2005
  4. Petr BaudisMay 2, 2005
  5. Zack BrownMay 3, 2005
  6. Joel BeckerMay 3, 2005
  7. Joel BeckerMay 3, 2005
  8. Daniel BarkalowMay 3, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.