Re: merge-recursive: do not rudely die on binary merge

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 15, 2007, 11:50 UTC
Message-ID: <7vbqd9rp7t.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <6bcc356f0708150419h51546814x62ceb7c900293d58@mail.gmail.com>

"Nikodemus Siivola" <nikodemus@random-state.net> writes:

Show 12 quoted lines

> On 8/15/07, Junio C Hamano <gitster@pobox.com> wrote:
>
>> People should learn this command.  Really.
>>
>>         $ git cat-file -p :$n:path
>>
>> where $n == 2 is ours, $n == 1 is common ancestor, and $n == 3
>> is theirs.
>
> A question related to this: as a user, how can I tell if a command
> is something I'm expected to use, or if thinking I need it is a
> sign that I'm doing something wrong?

Good question.

I guess "git show" instead of "git cat-file -p" is probably the recommended way these days. Mostly sticking to what the user manual demonstrates would be a safe thing to do, as J. Bruce Fields has really did a great job carefully picking the order of the commands to be presented in the manual.