git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nikodemus Siivola" <nikodemus@random-state.net>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Chris Shoemaker" <c.shoemaker@cox.net>,
	git@vger.kernel.org, "Alex Riesen" <raa.lkml@gmail.com>,
	"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: Re: merge-recursive: do not rudely die on binary merge
Date: Wed, 15 Aug 2007 14:19:16 +0300	[thread overview]
Message-ID: <6bcc356f0708150419h51546814x62ceb7c900293d58@mail.gmail.com> (raw)
In-Reply-To: <7vps1paceh.fsf@assigned-by-dhcp.cox.net>

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?

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

  reply	other threads:[~2007-08-15 11:19 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-14 22:33 merge-recursive: do not rudely die on binary merge Junio C Hamano
2007-08-14 23:14 ` Chris Shoemaker
2007-08-15  0:07   ` Junio C Hamano
2007-08-15 11:19     ` Nikodemus Siivola [this message]
2007-08-15 11:50       ` Junio C Hamano
2007-08-20  3:36     ` [PATCH] Document what the stage numbers in the :$n:path syntax mean Steven Grimm
2007-08-20  5:52       ` Jeff King
2007-08-20  6:05         ` Shawn O. Pearce
2007-08-20  6:13           ` Shawn O. Pearce
2007-08-20  7:15             ` Florian Weimer
2007-08-20  8:04               ` Jeff King
2007-08-20  6:30           ` Junio C Hamano
2007-08-20  6:44             ` Jeff King
2007-08-22  0:14             ` Jakub Narebski
2007-08-20  6:37           ` Jeff King
2007-08-20  9:55         ` [PATCH] Document what the stage numbers in the :$n:path syntaxmean Johannes Sixt
2007-08-20  6:20       ` [PATCH] Document what the stage numbers in the :$n:path syntax mean Junio C Hamano
2007-08-20 18:08         ` Jan Hudec
2007-08-20 19:55           ` Junio C Hamano
2007-08-15  0:09   ` merge-recursive: do not rudely die on binary merge Junio C Hamano
2007-08-15  0:18     ` Chris Larson
2007-08-15  1:16     ` Chris Shoemaker

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=6bcc356f0708150419h51546814x62ceb7c900293d58@mail.gmail.com \
    --to=nikodemus@random-state.net \
    --cc=c.shoemaker@cox.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=raa.lkml@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).