From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 04 Dec 2006 10:52:36 GMT
Subject: Re: [PATCH] [checkout-index] Give names to stages
Message-ID: <Pine.LNX.4.63.0612041149410.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <505428.75434.qm@web31808.mail.mud.yahoo.com>

Hi,

On Sun, 3 Dec 2006, Luben Tuikov wrote:

> This patch merely allows the user to say
>    git-checkout-index --stage=ours their_broken_file.c
> instead of
>    git-checkout-index --stage=2 their_broken_file.c
> and similarly for "theirs", etc.

Dunno. When this problem hits me, I usually do

	git diff --theirs their_broken_file.c

anyway, to see what it is doing (colour and all). When I am satisfied, 
that "theirs" is really what I want, I just go back one in history, and 
append a call to git-apply like this:

	git diff --theirs their_broken_file.c | git apply --index

Ciao,
Dscho