From: Ingo Molnar <mingo@elte.hu>
To: Sergey Vlasov <vsu@altlinux.ru>
Cc: git@vger.kernel.org
Subject: Re: q: faster way to integrate/merge lots of topic branches?
Date: Wed, 23 Jul 2008 16:14:56 +0200 [thread overview]
Message-ID: <20080723141456.GA13556@elte.hu> (raw)
In-Reply-To: <20080723140959.GB9537@elte.hu>
* Ingo Molnar <mingo@elte.hu> wrote:
> Even assuming that the filesystem is sane, is my merge-cache
> implementation semantically equivalent to a git-merge? One detail is
> that i suspect it is not equivalent in the git-merge --no-ff case.
> (but that is a not too interesting non-default case anyway)
actually, since --no-ff creates a merge commit and thus propagates the
head sha1, this should work fine as well.
(besides the small detail that my script has $1 hardcoded so parameters
are not properly passed onto.)
Ingo
next prev parent reply other threads:[~2008-07-23 14:16 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 13:05 q: faster way to integrate/merge lots of topic branches? Ingo Molnar
2008-07-23 13:17 ` Ingo Molnar
2008-07-23 13:49 ` Ingo Molnar
2008-07-23 14:47 ` Jay Soffian
2008-07-23 14:56 ` Ingo Molnar
2008-07-23 15:06 ` Ingo Molnar
2008-07-23 13:40 ` Andreas Ericsson
2008-07-23 14:02 ` Ingo Molnar
2008-07-23 14:57 ` Miklos Vajna
2008-07-23 13:41 ` Sergey Vlasov
2008-07-23 14:09 ` Ingo Molnar
2008-07-23 14:14 ` Ingo Molnar [this message]
2008-07-23 13:56 ` SZEDER Gábor
2008-07-23 14:04 ` Ingo Molnar
2008-07-23 17:59 ` Junio C Hamano
2008-07-23 22:09 ` [PATCH 1/2] builtin-branch.c: remove unused code in append_ref() callback function Junio C Hamano
2008-07-23 22:15 ` [PATCH] builtin-branch.c: optimize --merged and --no-merged Junio C Hamano
2008-07-24 7:16 ` Lars Hjemli
2008-07-24 8:29 ` Nanako Shiraishi
2008-07-24 10:03 ` Lars Hjemli
2008-07-24 15:29 ` q: faster way to integrate/merge lots of topic branches? Ingo Molnar
2008-07-23 18:04 ` Linus Torvalds
2008-07-23 18:12 ` Linus Torvalds
2008-07-23 20:01 ` Junio C Hamano
2008-07-24 15:27 ` Ingo Molnar
2008-07-25 8:46 ` Junio C Hamano
2008-07-23 14:06 ` Björn Steinbrink
2008-07-23 14:06 ` Santi Béjar
2008-07-23 17:59 ` Linus Torvalds
2008-07-23 19:09 ` Pierre Habouzit
2008-07-23 20:27 ` Pierre Habouzit
2008-07-23 20:40 ` Pierre Habouzit
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=20080723141456.GA13556@elte.hu \
--to=mingo@elte.hu \
--cc=git@vger.kernel.org \
--cc=vsu@altlinux.ru \
/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).