From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Len Brown <lenb@kernel.org>
Cc: git@vger.kernel.org
Subject: Re: octopus limit
Date: Fri, 27 Jun 2008 13:00:56 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806271259440.9925@racer> (raw)
In-Reply-To: <alpine.LFD.1.10.0806262243130.2988@localhost.localdomain>
Hi,
On Thu, 26 Jun 2008, Len Brown wrote:
> it would be nice if a merge of more than 16 branches failed right at the
> start, rather than chunking along doing merges and then giving up,
> leaving my repo in an intermediate state.
FWIW I think the rewrite of git-merge as a builtin, which is currently in
the works, lifts the limit. However, this is only true if you do not use
a custom script which calls commit-tree.
Ciao,
Dscho
next prev parent reply other threads:[~2008-06-27 12:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-27 2:44 octopus limit Len Brown
2008-06-27 6:33 ` Matthieu Moy
2008-06-27 13:04 ` Miklos Vajna
2008-06-27 12:00 ` Johannes Schindelin [this message]
2008-06-27 12:24 ` [PATCH] commit-tree: lift completely arbitrary limit of 16 parents Johannes Schindelin
2008-06-27 13:00 ` Johannes Sixt
2008-06-27 13:02 ` Johannes Schindelin
2008-06-27 17:16 ` Junio C Hamano
2008-06-27 17:46 ` Johannes Schindelin
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=alpine.DEB.1.00.0806271259440.9925@racer \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=lenb@kernel.org \
/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