git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: "Jörg Sommer" <joerg@alea.gnuu.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] rebase with preserve merges should not show merged commits
Date: Sat, 22 Mar 2008 02:52:52 +0100	[thread overview]
Message-ID: <20080322015252.GA7570@atjola.homenet> (raw)
In-Reply-To: <1206148785-29466-1-git-send-email-joerg@alea.gnuu.de>

On 2008.03.22 02:19:42 +0100, 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.

Uhm, why do you completely remove the possibility to edit A instead of
fixing the code so that the editing actually works?

Björn

  parent reply	other threads:[~2008-03-22  1:53 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-22  1:19 [PATCH] rebase with preserve merges should not show merged commits Jörg Sommer
2008-03-22  1:19 ` [PATCH] Check for non‐foreign commits in rebase-interactive test Jörg Sommer
2008-03-22  1:19   ` [PATCH] Handle fast forward correctly in rebase with preserve merges Jörg Sommer
2008-03-22  1:19     ` [PATCH] New tests to check " Jörg Sommer
2008-03-22  1:33 ` [PATCH] rebase with preserve merges should not show merged commits Johannes Schindelin
2008-03-22  9:43   ` Jörg Sommer
2008-03-22 11:22     ` Johannes Schindelin
2008-03-22  1:52 ` Björn Steinbrink [this message]
2008-03-22  9:40   ` Jörg Sommer
2008-03-22 12:37     ` Björn Steinbrink
2008-03-22 14:06   ` Jörg Sommer
2008-03-22 15:12     ` Björn Steinbrink
2008-03-22 15:37       ` Jörg Sommer
2008-03-22 14:08 ` [PATCH v2 1/5] " Jörg Sommer
2008-03-22 14:08   ` [PATCH v2 2/5] New test: no merges without preserve merges Jörg Sommer
2008-03-22 14:08     ` [PATCH v2 3/5] Check for non‐foreign commits in rebase-interactive test Jörg Sommer
2008-03-22 14:08       ` [PATCH v2 4/5] Handle fast forward correctly in rebase with preserve merges Jörg Sommer
2008-03-22 14:08         ` [PATCH v2 5/5] New tests to check " Jörg Sommer
2008-03-22 14:46   ` [PATCH v2 1/5] rebase with preserve merges should not show merged commits Johannes Schindelin

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=20080322015252.GA7570@atjola.homenet \
    --to=b.steinbrink@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=joerg@alea.gnuu.de \
    /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).