Re: What's in git.git

From: Linus Torvalds <torvalds@osdl.org>
Date: Mar 22, 2006, 16:21 UTC
Message-ID: <Pine.LNX.4.64.0603220820090.26286@g5.osdl.org>
In-Reply-To: <7v64m7av6o.fsf@assigned-by-dhcp.cox.net>

On Tue, 21 Mar 2006, Junio C Hamano wrote:

Show 14 quoted lines

> merlyn@stonehenge.com (Randal L. Schwartz) writes:
> 
> >>>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes:
> >
> >>> But this wastes a commit.  Is there any way to get an index that simply
> >>> includes the file from that other branch?
> >
> > Junio>         $ git checkout master
> > Junio>         $ git checkout next git-cvsimport.perl
> >
> > Yow.  How simple is *that*?  Thanks.
> 
> There is one thing you would want to be careful about.
> This updates the index.

Yes. Btw, I've been bitten by that. I think it might be better to _not_ update the index when we check out a file from another branch than the one we're on (or rather, we should perhaps update the index with the value from the current branch every time, even though the _working_tree_ is updated from another branch)

		Linus