From: Jan Harkes <jaharkes@cs.cmu.edu>
To: git <git@vger.kernel.org>
Subject: Re: Using local trees and cogito
Date: Thu, 16 Jun 2005 12:39:07 -0400 [thread overview]
Message-ID: <20050616163907.GA26037@delft.aura.cs.cmu.edu> (raw)
In-Reply-To: <9e473391050615193719d81951@mail.gmail.com>
On Wed, Jun 15, 2005 at 10:37:59PM -0400, Jon Smirl wrote:
> One problem I did notice is that if you add file in a fork and jump to
> a fork without the file, it doesn't get removed. That's not a big
> problem but it can be confusing.
I noticed the same thing and 'solved' it the following way,
After pointing the head at the new branch, instead of using,
git-read-tree -m HEAD && checkout-cache -q -f -u -a
I use,
git-diff-cache -R -p HEAD | git-apply --index
This simple reverse applies the differences between the previously
checked out tree and the branch we just switched to. Ofcourse the
cache/index has to be up to date before we switch between branches.
Jan
next prev parent reply other threads:[~2005-06-16 16:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-16 2:37 Using local trees and cogito Jon Smirl
2005-06-16 16:39 ` Jan Harkes [this message]
2005-06-17 11:57 ` Matthias Urlichs
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=20050616163907.GA26037@delft.aura.cs.cmu.edu \
--to=jaharkes@cs.cmu.edu \
--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).