From: Chris Packham <judge.packham@gmail.com>
To: "J.V." <jvsrvcs@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git: Unexpected behaviour?
Date: Sat, 12 Nov 2011 21:25:49 +1300 [thread overview]
Message-ID: <4EBE2D8D.1090206@gmail.com> (raw)
In-Reply-To: <4EBDBCA2.7070603@gmail.com>
On 12/11/11 13:24, J.V. wrote:
> OK so "work tree" is a new term for me. I thought we were in isolated
> sandboxes called "branches" and changes made in a branch would stay in
> that branch regardless.
>
> so anything in the "work tree" is over layed on top of my branch if
> there are no conflicts?
Kind of. I'd say that your work tree is updated to match a branch when
you run git checkout initially. The branch is updated when you run git
commit (after staging changes in the index with git add or using -a).
next prev parent reply other threads:[~2011-11-12 8:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 20:55 Git: Unexpected behaviour? Jvsrvcs
2011-11-11 21:03 ` Carlos Martín Nieto
[not found] ` <CAPZPVFb-VbTfkuyg4KtTsaWiNvd37GHeH7crPtqv1fKRbwuyfQ@mail.gmail.com>
2011-11-11 21:04 ` Eugene Sajine
2011-11-11 21:09 ` Jvsrvcs
2011-11-11 21:14 ` Taylor Hedberg
2011-11-11 21:25 ` Gelonida N
2011-11-11 21:31 ` Chris Packham
2011-11-12 0:24 ` J.V.
2011-11-12 8:25 ` Chris Packham [this message]
2011-11-12 19:37 ` Junio C Hamano
2011-11-14 17:20 ` Martin von Zweigbergk
2011-11-14 20:55 ` Junio C Hamano
2011-11-14 21:33 ` Jakub Narebski
2011-11-12 8:32 ` Alexey Shumkin
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=4EBE2D8D.1090206@gmail.com \
--to=judge.packham@gmail.com \
--cc=git@vger.kernel.org \
--cc=jvsrvcs@gmail.com \
/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).