On Tue, 21 Mar 2006, Junio C Hamano wrote: > merlyn@xxxxxxxxxxxxxx (Randal L. Schwartz) writes: > > >>>>>> "Junio" == Junio C Hamano <junkio@xxxxxxx> 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 - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html