git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: ib@wupperonline.de (Ingo Brueckl)
To: Avery Pennarun <apenwarr@gmail.com>
Cc: git@vger.kernel.org
Subject: question concerning branches
Date: Wed, 19 Aug 2009 20:31:00 +0200	[thread overview]
Message-ID: <4a8c4425@wupperonline.de> (raw)
In-Reply-To: <32541b130908191107v2ab6752awb43f521f805b5f1a@mail.gmail.com>

Avery Pennarun <apenwarr@gmail.com> writes:

> You seem to have forgotten the "git commit" step before switching back
> to master.

No, I passed over the commit in my example. I know that after the commit the
things are as they ought to be, but what if I can't do a commit because I am
in the middle of coding and have to have a break?

> You have a modified file in your repository; what did you *want* to happen
> when you switched branches?

I want an unchanged file in master if I switch there (because I worked in a
different branch) and a changed version in the test branch.

Why is the *master* different depending on whether my work in test in still
going on or committed?!

Actually, I cannot image how branches are practicable if I always have to
have in mind possibly still uncommitted work. Shouldn't it be git's work
to ensure that master will remain it was when branching?

Without git I'd make a copy for testing new features. With git, it seems that
I have to do the same (a clone). This is what I don't understand.

> (Many people find the current behaviour very convenient.)

I find it highly confusing. I understood a branch as something I can do in
whatever I want without affecting master. But now a learn that everything I
do in the branch will happen in master, too, until I commit. Strange. Very
strange.

> You might also want to look at the "git stash" command.

Yes, but isn't it annoying to leave the test branch always either with stash
or commit in order to have an unchanged master?!

Ingo

  reply	other threads:[~2009-08-19 18:50 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-19 17:33 question concerning branches Ingo Brueckl
2009-08-19 18:07 ` Bruce Stephens
2009-08-19 18:07 ` Avery Pennarun
2009-08-19 18:31   ` Ingo Brueckl [this message]
2009-08-19 19:08     ` Jakub Narebski
2009-08-19 19:45       ` Ingo Brueckl
2009-08-19 19:50         ` Avery Pennarun
2009-08-20  7:57           ` Matthieu Moy
2009-08-19 19:53         ` Jacob Helwig
2009-08-19 20:01         ` Jakub Narebski
2009-08-19 20:39         ` Theodore Tso
2009-08-19 20:57           ` Jakub Narebski
2009-08-20 17:37             ` Theodore Tso
2009-08-19 21:51         ` Linus Torvalds
2009-08-20  3:01           ` Randal L. Schwartz
2009-08-20 12:46           ` Ingo Brueckl
2009-08-20 13:47             ` Johannes Sixt
2009-08-20 14:59               ` Jakub Narebski
2009-08-19 18:35 ` Junio C Hamano
2009-08-19 19:21   ` Ingo Brueckl
2009-08-20  7:33     ` Andreas Ericsson

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=4a8c4425@wupperonline.de \
    --to=ib@wupperonline.de \
    --cc=apenwarr@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).