Hi, On Wed, 22 Nov 2006, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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 - To unsubscribe from this list: 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