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

From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Aug 15, 2007, 11:19 UTC
Message-ID: <6bcc356f0708150419h51546814x62ceb7c900293d58@mail.gmail.com>
In-Reply-To: <7vps1paceh.fsf@assigned-by-dhcp.cox.net>

On 8/15/07, Junio C Hamano <gitster@pobox.com> wrote:

Show 6 quoted lines

> 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?

Git has many commands, and telling the business-as-usual apart from the deviant ones is not always easy. It may be that it's just a question of knowing what is plumbing and what is a porcelain, but I'm not sure.

Cheers,

 -- Nikodemus