From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Mar 2011 20:21:21 GMT
Subject: Re: cherry-pick applies some other changes than the specified one?
Message-ID: <7v62rcp6m6.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D87B00D.2010905@gmail.com>

Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:

>> Sure.  The index contains multiple competing versions, which you can
>> see with "git ls-files -u".  To compare the working tree and one of
>> those use "git diff --base / --ours / --theirs" (or -1 / -2 / -3).
>
> Thanks, didn't know about that (and it's not documented in diff man page).

These "compare a particular stage against working tree file" modes
only make sense when you are comparing the index and the working tree, so
the description is in "git diff-files" manpage but hasn't been ported to
the documentation of generic "git diff" frontend.

Perhaps we should.