Re: Struggling with tangled

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 22, 2006, 13:30 UTC
Message-ID: <Pine.LNX.4.63.0611221429470.30004@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vu00rsnho.fsf@assigned-by-dhcp.cox.net>

Hi,

On Wed, 22 Nov 2006, Junio C Hamano wrote:

Show 11 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > 	git diff --ours <file> | git apply -R
> >
> > This also updates the index.
> 
> Good suggestion, but apply does not update the index without
> being told to do so with --index, so I think the commandline
> should be:
> 
> 	git diff --ours <path> | git apply -R --index

Oops. Thanks! Dscho