http://book.git-scm.com/3_basic_branching_and_merging.html
you can also do
1 git branch playing
2 git checkout playing
3 -- perform changes
4 git checkout master
-- you're back to level 2, but 3 is avail
How is 3 available? Is it version separately from the master you just
restored on top of it?
Right now I need to recover from a "fetch origin". I'm not sure how to
restore integrity to the repo. I'm not even sure what state the repo is in.
It seems unchanged. When I say "repo" I mean the set of directories and
their contents and nothing else. Git GUI must be maintaining lots of state,
and this too must be part of my repo, but I don't see a way to get a look
inside Git's view of the directory it maintains and monitors. For example,
I don't see the change in Git's state from my last fetch origin action.
Chris has an extra step in-between your 2 and 4. I'm supposed to "add" (not
sure what that means) and "commit". I have GUI panes for Unstaged Changes
and for Staged Changes (Will Commit). Again, the language is close but not
spot on. I suppose from the evidence that Unstaged Changes are changes in
any file in the repo resulting from user edits, include whole depositions of
files into the repo directory. The Staged Changes (Will Commit) pane seems
to be an intermediate area where you place your changed files, and then as a
final step do a commit (-m and comment) on each. Haven't tried it yet.
Anyway, you left out this step in your list above, where you just checkout
the master. Is
master == my original clone
?
If so then how does Git take care of changes that I have not committed to my
own clone. They could easily be destroyed. Looks like the commit is first
necessary, unless I'm missing something.
Shaping
5 rebuild as above
6 git checkout playing
-- you're back to your playing
git is really cool and probably a new paradigm for source control depending
on where you're coming from
Store.
Shaping
On Sat, Nov 13, 2010 at 11:53 PM, Chris Double <chris.dou...@double.co.nz>
wrote:
On Sun, Nov 14, 2010 at 8:52 PM, Chris Double <chris.dou...@double.co.nz>
wrote:
> 2) In this repository you make your own changes, including adding
> stuff to the work directory, editing files, etc. Now you want to save
> those in git so you can update safely.
>
> git add work/my-new-vocab/*
> git add any-other-new-files
> got commit -m "This is a message describing my changes"
That last line should be:
git commit -a -m "This is a message describing my changes"
Note that '-a' switch.
Chris.
--
http://www.bluishcoder.co.nz
----------------------------------------------------------------------------
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
--
Jim
"I'm for extending the working Medicare program for our seniors all the way
back to contraception, so Americans can concentrate on living their lives
without fear of changing a job, going bankrupt from deductibles or fighting
HMO bureaucracy."
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
