From: "Peter Eriksen" <s022018@student.dtu.dk>
To: Git Mailing List <git@vger.kernel.org>
Subject: Bottlenecks in git merge
Date: Tue, 31 Jan 2006 22:33:14 +0100 [thread overview]
Message-ID: <20060131213314.GA32131@ebar091.ebar.dtu.dk> (raw)
Hello,
In connection with Ian Molton's question about merge have I played a
little with 'git merge' on the kernel sources. What I find is that a
merge can take quite some time, but I'm not sure where that time exactly
goes to. Here are the times I got:
Recursive (default): 4m22.282s
Resolve (-s resolve): 3m23.548s
What is taking so long?
Regards,
Peter
==============================>8==================
#!/bin/sh
# Run from linux-2.6
change_readme() {
sed -i "s/are much better/are better/" README
}
git checkout -f master
git branch -d test
git checkout -b test v2.6.12
change_readme
git commit -a -m "Work, work, work"
time git merge $STRATEGY "Merging happily." HEAD v2.6.15
next reply other threads:[~2006-01-31 21:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-31 21:33 Peter Eriksen [this message]
2006-01-31 23:06 ` Bottlenecks in git merge Junio C Hamano
2006-01-31 23:35 ` Petr Baudis
2006-02-01 0:43 ` Junio C Hamano
2006-01-31 23:45 ` Linus Torvalds
2006-02-01 0:50 ` Petr Baudis
2006-02-01 1:04 ` Linus Torvalds
2006-01-31 23:27 ` Petr Baudis
2006-02-04 7:31 ` [PATCH] read-tree --aggressive Junio C Hamano
2006-02-04 11:52 ` Peter Eriksen
2006-02-04 12:56 ` Junio C Hamano
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=20060131213314.GA32131@ebar091.ebar.dtu.dk \
--to=s022018@student.dtu.dk \
--cc=git@vger.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;
as well as URLs for NNTP newsgroup(s).