From: Fredrik Kuivinen <freku045@student.liu.se>
To: git@vger.kernel.org
Cc: junkio@cox.net
Subject: [PATCH 0/2] Make merge recursive faster in some cases
Date: Thu, 2 Feb 2006 12:38:48 +0100 [thread overview]
Message-ID: <20060202113848.GA8103@c165.ib.student.liu.se> (raw)
The first patch teaches git-merge-recursive how to use the bases that
are supplied by the merge driver program in some cases. To be more
precise: if git-merge-recursive is supplied with a single base then
that one will be used, otherwise git-merge-recursive will compute the
bases on its own.
The second patch makes the commit graph construction more efficient.
- Fredrik
next reply other threads:[~2006-02-02 11:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-02 11:38 Fredrik Kuivinen [this message]
2006-02-02 11:43 ` [PATCH 1/2] merge-recursive: Make use of provided bases Fredrik Kuivinen
2006-02-02 11:43 ` [PATCH 2/2] merge-recursive: Speed up commit graph construction Fredrik Kuivinen
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=20060202113848.GA8103@c165.ib.student.liu.se \
--to=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).