git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Anderson <zelnaga@gmail.com>
To: git@vger.kernel.org
Subject: a few beginner git questions
Date: Sat, 6 Mar 2010 00:42:40 -0600	[thread overview]
Message-ID: <15b345f1003052242r7d812fe4q6ade253283696304@mail.gmail.com> (raw)

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?

             reply	other threads:[~2010-03-06  6:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-06  6:42 Thomas Anderson [this message]
2010-03-06  7:01 ` a few beginner git questions Allan Wind
2010-03-06  7:05 ` Tait
2010-03-07  2:23   ` Thomas Anderson
2010-03-07  9:08     ` Dmitry Potapov
2010-03-07  5:02   ` Thomas Anderson
2010-03-07  8:50     ` Dmitry Potapov
2010-03-08 18:55     ` Tait
2010-03-07  9:39 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=15b345f1003052242r7d812fe4q6ade253283696304@mail.gmail.com \
    --to=zelnaga@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).