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

a few beginner git questions

From
TAThomas Anderson <zelnaga@gmail.com>
Date
Mar 6, 2010, 06:42 UTC
Message-ID
<15b345f1003052242r7d812fe4q6ade253283696304@mail.gmail.com>
A few questions.
1. When do you commit changes and when do you stage changes?  Or maybe
more to the point, what's the difference between doing "stage, commit,
stage, commit" and "stage, stage, commit"?
2. What's the difference between merging and pushing?  In CVS, you
merge code by manually adding changes.  ie. the CVS client doesn't do
the merging - you do.  Yet in Git Gui, there's a Merge menu button, as
if it's now supposed to be somehow automated?
3. Creating branches in Git Gui is easy enough but it's unclear to me
how to switch back to the trunk once you've created a branch.
4. I clone git://github.com/symfony/symfony.git to c:\git\test\root
and clone that to c:\git\test\clone.  I then blank
c:\git\test\clone\README, stage it, commit it and push it and the
change does not appear in c:\git\test\root\README.  I then reopen Git
Gui and open root and there I see the blanked README as an uncommited
state change.  I commit it and the change still does not appear in
c:\git\test\root\README.  Is this what Git should be doing?
Next: Allan Wind
Message 1 of 9 in “a few beginner git questions”
  1. Thomas AndersonMar 6, 2010
  2. Allan WindMar 6, 2010
  3. TaitMar 6, 2010
  4. Thomas AndersonMar 7, 2010
  5. Dmitry PotapovMar 7, 2010
  6. Thomas AndersonMar 7, 2010
  7. Dmitry PotapovMar 7, 2010
  8. TaitMar 8, 2010
  9. Junio C HamanoMar 7, 2010

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.