From: Junio C Hamano <gitster@pobox.com>
To: wmpalmer@gmail.com
Cc: git@vger.kernel.org
Subject: Re: [PATCHv2 1/2] add basic tests for merge-tree
Date: Wed, 14 Jul 2010 09:26:46 -0700 [thread overview]
Message-ID: <7vwrsyxc55.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1279090893.2789.21.camel@dreddbeard> (Will Palmer's message of "Wed\, 14 Jul 2010 08\:01\:33 +0100")
Will Palmer <wmpalmer@gmail.com> writes:
> However, merge-tree has a function similar to diff (it shows differences
> between trees) and apply (it creates the "result" object when there are
> no conflicts), and its purpose seems to be more of a "shower" than a
> "do-er" (contrasted with something like git-merge, which actually
> creates a commit object, for example), so I thought that diff-commands
> would be a good classification.
Ok, that makes sense (I haven't heard anybody use merge-tree in real life,
though). Let's keep the numbering as-is.
next prev parent reply other threads:[~2010-07-14 16:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-11 13:16 [PATCHv2 0/2] merge-tree: fix (merge-base a b) b a Will Palmer
2010-07-11 13:16 ` [PATCHv2 1/2] add basic tests for merge-tree Will Palmer
2010-07-13 23:31 ` Junio C Hamano
2010-07-14 7:01 ` Will Palmer
2010-07-14 16:26 ` Junio C Hamano [this message]
2010-07-11 13:16 ` [PATCHv2 2/2] fix merge-tree where two branches share no changes Will Palmer
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=7vwrsyxc55.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=wmpalmer@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.