git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: lists@haller-berlin.de (Stefan Haller)
To: anatoly.borodin@gmail.com (Anatoly Borodin), git@vger.kernel.org
Subject: Re: Limitiations of git rebase --preserve-merges --interactive
Date: Fri, 23 Sep 2016 12:40:29 +0200	[thread overview]
Message-ID: <1mu13z0.1hye7bq1uqj26sM%lists@haller-berlin.de> (raw)
In-Reply-To: <ns1gr4$pjs$1@blaine.gmane.org>

Anatoly Borodin <anatoly.borodin@gmail.com> wrote:

> 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*

Thanks, this is interesting; I'm having trouble understanding the tests
though. Some of them use rebase -p -i, but I don't understand why they
use -i, or why that even works in a test (i.e. why it doesn't open an
editor).

In one test I saw "GIT_EDITOR=: git rebase -i -p", which I guess means
"use the initially given todo sheet unchanged". I don't see any tests
that do an interactive rebase and actually change the todo list.


-- 
Stefan Haller
Berlin, Germany
http://www.haller-berlin.de/

  parent reply	other threads:[~2016-09-23 10:40 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
2016-09-22 21:08   ` Stefan Beller
2016-09-23 21:04     ` Johannes Schindelin
2016-09-23 10:40   ` Stefan Haller [this message]
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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1mu13z0.1hye7bq1uqj26sM%lists@haller-berlin.de \
    --to=lists@haller-berlin.de \
    --cc=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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).