From: Avery Pennarun <apenwarr@gmail.com>
To: Ingo Brueckl <ib@wupperonline.de>
Cc: git@vger.kernel.org
Subject: Re: question concerning branches
Date: Wed, 19 Aug 2009 18:07:14 +0000 [thread overview]
Message-ID: <32541b130908191107v2ab6752awb43f521f805b5f1a@mail.gmail.com> (raw)
In-Reply-To: <4a8c373f@wupperonline.de>
On Wed, Aug 19, 2009 at 5:33 PM, Ingo Brueckl<ib@wupperonline.de> wrote:
> Within a git repository, I do:
>
> git branch test
> git checkout test
> # edit foo.bar
> git checkout master
>
> I'd expect that master is in the exactly same unchanged state it was at
> branching time, but what a surprise, foo.bar is modified here, too!
You seem to have forgotten the "git commit" step before switching back
to master. You have a modified file in your repository; what did you
*want* to happen when you switched branches? (Many people find the
current behaviour very convenient.)
You might also want to look at the "git stash" command.
Avery
next prev parent reply other threads:[~2009-08-19 18:07 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 [this message]
2009-08-19 18:31 ` Ingo Brueckl
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=32541b130908191107v2ab6752awb43f521f805b5f1a@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=ib@wupperonline.de \
/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).