From: Miklos Vajna <vmiklos@frugalware.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 00/11] Build in merge
Date: Sat, 21 Jun 2008 02:32:43 +0200 [thread overview]
Message-ID: <20080621003243.GF29404@genesis.frugalware.org> (raw)
In-Reply-To: <7v4p7oq029.fsf@gitster.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 997 bytes --]
On Thu, Jun 19, 2008 at 08:04:14PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> > As usual, comments are welcome. :-)
>
> Thanks.
>
> I take that last line of comment to mean "this is still RFC and not for
> inclusion yet" ;-) I think the series is fine up to eighth patch (get
> octopus merge base).
In fact only the version that had "WIP" in the subject was sent not for
inclusion. ;-)
> I'll queue the whole thing (still strictly as "test merge" basis) to 'pu';
> I've fixed 3 "old-style C function definition" issues you have in the
> tenth patch (build in merge), and I have some other issues with the ninth
> one (filter independent).
Thanks. I'm using the kernel's scripts/checkpatch.pl, but it does not
have such a check, and I missed it.
Currently I have 12 patches in my branch; if there will be no objections
to the new "filter independent" one, then I will resend the series
excluding the first 8 to avoid unnecessary traffic, if that is OK to
you.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
prev parent reply other threads:[~2008-06-21 0:33 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-19 23:22 [PATCH 00/11] Build in merge Miklos Vajna
2008-06-19 23:22 ` [PATCH 01/11] Move split_cmdline() to alias.c Miklos Vajna
2008-06-19 23:22 ` [PATCH 02/11] Move commit_list_count() to commit.c Miklos Vajna
2008-06-19 23:22 ` [PATCH 03/11] Move parse-options's skip_prefix() to git-compat-util.h Miklos Vajna
2008-06-19 23:22 ` [PATCH 04/11] Add new test to ensure git-merge handles pull.twohead and pull.octopus Miklos Vajna
2008-06-19 23:22 ` [PATCH 05/11] parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option Miklos Vajna
2008-06-19 23:22 ` [PATCH 06/11] Move read_cache_unmerged() to read-cache.c Miklos Vajna
2008-06-19 23:22 ` [PATCH 07/11] git-fmt-merge-msg: make it usable from other builtins Miklos Vajna
2008-06-19 23:22 ` [PATCH 08/11] Introduce get_octopus_merge_bases() in commit.c Miklos Vajna
2008-06-19 23:22 ` [PATCH 09/11] Introduce filter_independent() " Miklos Vajna
2008-06-19 23:22 ` [PATCH 10/11] Build in merge Miklos Vajna
2008-06-19 23:22 ` [PATCH 11/11] Add new test to ensure git-merge handles more than 25 refs Miklos Vajna
2008-06-20 3:03 ` [PATCH 09/11] Introduce filter_independent() in commit.c Junio C Hamano
2008-06-20 11:53 ` Johannes Schindelin
2008-06-20 12:06 ` Miklos Vajna
2008-06-20 12:37 ` Johannes Schindelin
2008-06-20 13:25 ` Miklos Vajna
2008-06-21 0:23 ` [PATCH] " Miklos Vajna
2008-06-21 9:45 ` Junio C Hamano
2008-06-21 17:00 ` [PATCH 00/13] Build in merge Miklos Vajna
2008-06-21 17:00 ` [PATCH 09/13] Add new test to ensure git-merge handles more than 25 refs Miklos Vajna
2008-06-21 17:00 ` [PATCH 10/13] Introduce get_merge_bases_many() Miklos Vajna
2008-06-21 17:00 ` [PATCH 11/13] Introduce reduce_heads() Miklos Vajna
2008-06-21 17:00 ` [PATCH 12/13] Build in merge Miklos Vajna
2008-06-21 17:00 ` [PATCH 13/13] Add new test case to ensure git-merge filters for independent parents Miklos Vajna
2008-06-21 17:15 ` [PATCH 13/13] Add new test case to ensure git-merge reduces octopus parents when possible Miklos Vajna
2008-06-25 16:22 ` [PATCH 12/13] Build in merge Olivier Marin
2008-06-27 1:06 ` Miklos Vajna
2008-06-27 11:03 ` Olivier Marin
2008-06-27 12:54 ` Miklos Vajna
2008-06-27 13:04 ` Olivier Marin
2008-06-27 13:17 ` Miklos Vajna
2008-06-27 11:56 ` Johannes Schindelin
2008-06-27 13:01 ` Miklos Vajna
2008-06-21 9:45 ` [PATCH 1/2] Introduce get_merge_bases_many() Junio C Hamano
2008-06-21 9:45 ` [PATCH 2/2] Introduce reduce_heads() Junio C Hamano
2008-06-20 3:04 ` [PATCH 00/11] Build in merge Junio C Hamano
2008-06-21 0:32 ` Miklos Vajna [this message]
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=20080621003243.GF29404@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).