From: "David J. Neu" <davidjneu@gmail.com>
To: Steffen Prohaska <prohaska@zib.de>
Cc: git@vger.kernel.org
Subject: Re: git-checkout question
Date: Sun, 13 Jan 2008 10:12:02 -0500 [thread overview]
Message-ID: <20080113151202.GC10426@bach.davidneu.local> (raw)
In-Reply-To: <AF05EA04-C41A-4964-B225-E3A427D32E33@zib.de>
On Sun, Jan 13, 2008 at 03:31:19PM +0100, Steffen Prohaska wrote:
>
> On Jan 13, 2008, at 3:21 PM, David J. Neu wrote:
>
> >I was wondering if someone could explain the following behavior.
> >
> >1. create and switch to branch off master
> >2. edit a file in the branch
> >3. checkout master without committing changes in the branch
> >4. the changes in the branch are automatically applied in working tree
> > in master
> >
> >I wasn't expecting the changes in the branch to be automatically
> >moved to master. Had I committed while in the branch this doesn't
> >happen.
>
> This already is the explanation. You did not commit. Therefore,
> the changes are not in the branch but still in your work tree.
> They are on neither branch; they are _only_ in your work tree.
> If you switch the branch the changes will stay in the work tree.
> They always stayed in the same place: your work tree.
>
> Steffen
>
Ahh, got it - thanks!
prev parent reply other threads:[~2008-01-13 15:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-13 14:21 git-checkout question David J. Neu
2008-01-13 14:31 ` Steffen Prohaska
2008-01-13 15:12 ` David J. Neu [this message]
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=20080113151202.GC10426@bach.davidneu.local \
--to=davidjneu@gmail.com \
--cc=djneu@acm.org \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.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).