From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [PATCH] rebase with preserve merges should not show merged commits Date: Sat, 22 Mar 2008 12:22:57 +0100 (CET) Message-ID: References: <1206148785-29466-1-git-send-email-joerg@alea.gnuu.de> <20080322094331.GB30074@alea.gnuu.de> Mime-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323584-1302288836-1206184978=:4124" Cc: git@vger.kernel.org, gitster@pobox.com To: =?ISO-8859-15?Q?J=F6rg_Sommer?= X-From: git-owner@vger.kernel.org Sat Mar 22 12:23:44 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jd1pA-0001aI-EX for gcvg-git-2@gmane.org; Sat, 22 Mar 2008 12:23:44 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756164AbYCVLW6 (ORCPT ); Sat, 22 Mar 2008 07:22:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755271AbYCVLW6 (ORCPT ); Sat, 22 Mar 2008 07:22:58 -0400 Received: from mail.gmx.net ([213.165.64.20]:42825 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755256AbYCVLW5 (ORCPT ); Sat, 22 Mar 2008 07:22:57 -0400 Received: (qmail invoked by alias); 22 Mar 2008 11:22:55 -0000 Received: from host86-148-26-43.range86-148.btcentralplus.com (EHLO racer.home) [86.148.26.43] by mail.gmx.net (mp011) with SMTP; 22 Mar 2008 12:22:55 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1+N/PhvehKNXB2ci3odsg9leSW+zUOZwvYJ54eTZO WKNMMDQAHMue5V X-X-Sender: gene099@racer.site In-Reply-To: <20080322094331.GB30074@alea.gnuu.de> User-Agent: Alpine 1.00 (LSU 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323584-1302288836-1206184978=:4124 Content-Type: TEXT/PLAIN; charset=UTF-8 Content-Transfer-Encoding: 8BIT Hi, On Sat, 22 Mar 2008, Jörg Sommer wrote: > Johannes Schindelin schrieb am Sat 22. Mar, 02:33 (+0100): > > On Sat, 22 Mar 2008, Jörg Sommer wrote: > > > > > The current version of git-rebase--interactive shows the user the > > > commits coming from a merge. > > > > > > M---A---B > > > \ \ > > > o---o---+---o branch > > > > > > Rebasing branch on M with preserve merges gives the commits A and B. But > > > if you mark them for editing or remove them the rebase fails. You must > > > keep them as they are. It's useless to bother the user with these > > > commits and might lead to mistakes. > > > > I don't understand. Rebasing with "rebase --onto M" > > _should_ show A and B. > > But IMO not “rebase --onto --preserve-merges -i M”. Umm, yes it should. You are asking to transplant everything up to and including M onto something else. Ciao, Dscho --8323584-1302288836-1206184978=:4124--