From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Alex Riesen <raa.lkml@gmail.com>,
git@vger.kernel.org, Fredrik Kuivinen <freku045@student.liu.se>
Subject: Re: CFT: merge-recursive in C
Date: Tue, 27 Jun 2006 10:05:37 -0700 [thread overview]
Message-ID: <7vac7ya5r2.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0606271248270.29667@wbgn013.biozentrum.uni-wuerzburg.de> (Johannes Schindelin's message of "Tue, 27 Jun 2006 12:51:35 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> > - I always wondered why merge-recursive did not call merge-base, but did
>> > its own thing. Hmm?
>>
>> No idea yet.
A somewhat related issue is that when one head is given I'd
strongly prefer that merge-recursive did not call merge-base nor
did its own thing (that is, for the top-level). Otherwise we
cannot use it for historyless three tree merge that we need for
rebase/revert/cherry-pick.
next prev parent reply other threads:[~2006-06-27 17:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-26 23:38 CFT: merge-recursive in C Alex Riesen
2006-06-26 23:42 ` CFT: merge-recursive in C (test updates) Alex Riesen
2006-06-26 23:54 ` CFT: merge-recursive in C Linus Torvalds
2006-06-27 0:07 ` Linus Torvalds
2006-06-27 0:24 ` Alex Riesen
2006-06-27 0:27 ` Junio C Hamano
2006-06-27 0:17 ` Alex Riesen
2006-06-27 0:25 ` Junio C Hamano
2006-06-27 0:38 ` Alex Riesen
2006-06-27 7:28 ` Notes on diffcore API Junio C Hamano
2006-06-27 8:41 ` Alex Riesen
2006-06-27 23:33 ` Junio C Hamano
2006-06-28 7:36 ` Johannes Schindelin
2006-06-27 7:52 ` CFT: merge-recursive in C Johannes Schindelin
2006-06-27 8:58 ` Alex Riesen
2006-06-27 10:51 ` Johannes Schindelin
2006-06-27 11:53 ` Alex Riesen
2006-06-27 17:05 ` Junio C Hamano [this message]
2006-06-27 12:17 ` Alex Riesen
2006-06-27 12:43 ` Johannes Schindelin
2006-06-27 14:09 ` Alex Riesen
2006-06-28 6:37 ` Uwe Zeisberger
2006-06-28 7:32 ` Alex Riesen
2006-06-28 9:22 ` Junio C Hamano
2006-06-28 15:06 ` Christopher Faylor
2006-06-29 0:38 ` Alex Riesen
2006-06-29 0:49 ` Christopher Faylor
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=7vac7ya5r2.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=raa.lkml@gmail.com \
/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