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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"Nikodemus Siivola" <nikodemus@xxxxxxxxxxxxxxxx> writes:

> On 8/15/07, Junio C Hamano <gitster@xxxxxxxxx> 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.

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux