From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] [checkout-index] Give names to stages
Date: Mon, 04 Dec 2006 12:36:24 +0100 [thread overview]
Message-ID: <el113s$25v$1@sea.gmane.org> (raw)
In-Reply-To: Pine.LNX.4.63.0612041149410.28348@wbgn013.biozentrum.uni-wuerzburg.de
Johannes Schindelin wrote:
> 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
Then
git checkout --theirs their_broken_file.c
is obvious simplification.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-04 11:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-03 9:49 [PATCH] [checkout-index] Give names to stages Luben Tuikov
2006-12-04 2:00 ` Junio C Hamano
2006-12-04 5:18 ` Luben Tuikov
2006-12-04 6:32 ` Junio C Hamano
2006-12-04 6:59 ` Luben Tuikov
2006-12-04 10:52 ` Johannes Schindelin
2006-12-04 11:36 ` Jakub Narebski [this message]
2006-12-04 11:39 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='el113s$25v$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.