From: Anatoly Borodin <anatoly.borodin@gmail.com>
To: git@vger.kernel.org
Subject: Re: Limitiations of git rebase --preserve-merges --interactive
Date: Thu, 22 Sep 2016 21:01:24 +0000 (UTC) [thread overview]
Message-ID: <ns1gr4$pjs$1@blaine.gmane.org> (raw)
In-Reply-To: 1mtveu4.19lvgi1c0hmhaM%lists@haller-berlin.de
Hi Stefan,
I've also done some archaeology and found that the original version of
the merge preserving code was written by Johannes Schindelin
<Johannes.Schindelin@gmx.de>, see e.g.
f09c9b8c5ff9d8a15499b09ccd6c3e7b3c76af77
There were also some big discussion threads in 2007-2008 regarding a
better mechanism to "mark" or "tag" the heads of rebased branches, but I
haven't seen consensus and development in that direction after that.
PS There are also some pieces of "what should work" in these tests:
t/t3409-rebase-preserve-merges.sh*
t/t3410-rebase-preserve-dropped-merges.sh*
t/t3411-rebase-preserve-around-merges.sh*
t/t3414-rebase-preserve-onto.sh*
--
Mit freundlichen Grüßen,
Anatoly Borodin
next prev parent reply other threads:[~2016-09-22 21:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 8:46 Limitiations of git rebase --preserve-merges --interactive Stefan Haller
2016-09-22 19:33 ` Anatoly Borodin
2016-09-22 19:48 ` Kevin Daudt
2016-09-22 20:54 ` Stefan Beller
2016-09-23 10:40 ` Stefan Haller
2016-09-23 21:13 ` Johannes Schindelin
2016-09-23 22:26 ` Stefan Beller
2016-09-22 21:04 ` Anatoly Borodin
2016-09-22 21:01 ` Anatoly Borodin [this message]
2016-09-22 21:08 ` Stefan Beller
2016-09-23 21:04 ` Johannes Schindelin
2016-09-23 10:40 ` Stefan Haller
2016-09-23 15:37 ` Junio C Hamano
2016-09-23 15:50 ` Stefan Haller
2016-09-23 19:24 ` Johannes Sixt
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='ns1gr4$pjs$1@blaine.gmane.org' \
--to=anatoly.borodin@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.