From: Thomas Rast <trast@inf.ethz.ch>
To: <git@vger.kernel.org>
Cc: Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 0/3] merge -Xindex-only
Date: Sun, 7 Jul 2013 20:02:37 +0200 [thread overview]
Message-ID: <cover.1373219466.git.trast@inf.ethz.ch> (raw)
[Michael, sorry for the double mail -- I typoed the list address on
the first round.]
I recently looked into making merge-recursive more useful as a modular
piece in various tasks, e.g. Michael's git-imerge and the experiments
I made in showing evil merges.
This miniseries is the extremely low-hanging fruit. If it makes a
good first step for git-imerge, perhaps it can go in like this. It's
not a big speedup (about 2.2s vs 2.4s in a sample conflicting merge in
git.git), but it does feel much cleaner to avoid touching the worktree
unless actually necessary.
Otherwise it's probably not worth it just yet; for what I want to do
with it, we need some more reshuffling of things.
Thomas Rast (3):
merge-recursive: remove dead conditional in update_stages()
merge-recursive: untangle double meaning of o->call_depth
merge-recursive: -Xindex-only to leave worktree unchanged
Documentation/merge-strategies.txt | 4 ++++
merge-recursive.c | 46 +++++++++++++++++++++-----------------
merge-recursive.h | 1 +
t/t3030-merge-recursive.sh | 13 +++++++++++
4 files changed, 43 insertions(+), 21 deletions(-)
--
1.8.3.2.908.gbd0dbd0
next reply other threads:[~2013-07-07 18:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-07 18:02 Thomas Rast [this message]
2013-07-07 18:02 ` [PATCH 1/3] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2013-07-07 18:02 ` [PATCH 2/3] merge-recursive: untangle double meaning of o->call_depth Thomas Rast
2013-07-07 18:37 ` Junio C Hamano
2013-07-07 18:02 ` [PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
2013-07-08 15:21 ` [PATCH 0/3] merge -Xindex-only Michael Haggerty
2013-07-08 15:44 ` Thomas Rast
2013-07-09 9:44 ` Michael Haggerty
2013-07-09 12:08 ` Thomas Rast
2013-07-09 19:38 ` Michael Haggerty
2013-07-09 20:01 ` Thomas Rast
2013-10-26 14:40 ` Thomas Rast
2013-10-26 14:43 ` [PATCH 1/3] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2013-10-26 14:43 ` [PATCH 2/3] merge-recursive: internal flag to avoid touching the worktree Thomas Rast
2013-10-26 14:43 ` [PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1373219466.git.trast@inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).