On 4 September 2013 01:20, John McKown <john.archie.mck...@gmail.com> wrote:
> If you don't want to do a commit, then do a stash. It puts the current
> working directory "off to the side". Like a temporary branch. When you want
> to come back, then you do a git stash pop.
> I think I understand how you're working. You likely only do a "commit" when
> you think something is "finished". I, on the other hand, think of "commit"
> as "take a checkpoint". And I use the commit comment to tell me where I am
> and what I'm thinking about. I have a bare repository to which I do a "git
> push" when I think that something is finished. Well, to the extent that
> anything that _I_ do is ever finished <grin/>.
The following additional comments are directed to maya melnick, based
on John's above:
I agree. At this state I'd encourage you more toward getting more
comfortable with commits rather than stashing, although both are fine.
Like John wrote, I think of commits as snapshots. The less sure I am
of how todays code is going to develop, the more interim commits I
make, in case I go in a direction that doesn't work out, or might not.
I make lots of commits and little branches. Then when the final design
becomes clearer, I remove the unwanted stuff, usually by rebasing or
amending commits. I find the graphical tools gitk and git-gui help
This is different to thinking of commits as "finished milestones",
although you can of course have other commits and/or branches that
have that role.
It takes a while to become that comfortable with git, but when you do,
it is great.
It is very important (and took me too long) to realise that branches
are just pointers, and so this: when you want to do anything in git
that you are unsure about (like rebasing or tidying up a branch), just
create another temporary branch that points to the exactly same place
and modify it. So if you mess it up, the original branch will still be
there unchanged, as a fallback. Repeat until happy with results.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.