git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Diogo de Campos <campos@esss.com.br>
To: git@vger.kernel.org
Subject: git rebase --interactive "forgets" strategies after --continue
Date: Fri, 9 Aug 2013 16:29:37 -0300	[thread overview]
Message-ID: <CAMebvcQ4mzHOnQNPZ-Qpgn4JkxXMBH+ys9PLcJgZ6aL7Xei7jQ@mail.gmail.com> (raw)

I had some problems rebasing a repository that had empty commits,
which caused the rebase to stop. After continuing it with git rebase
--continue, it seems that the strategies I originally gave were
forgotten.

I quickly glanced at the code, and it seems that a lot of rebase
options are stored in in a $state_dir, but $strategy_args is not one
of them.


Since git rebase --interactive not ignoring strategies
(https://github.com/git/git/commit/db2b3b820e2b28da268cc88adff076b396392dfe)
is a recent change to Git (only available in 1.8.4-rc+), I believe
that this was overlooked.

-- 
Diogo Campos

                 reply	other threads:[~2013-08-09 19:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=CAMebvcQ4mzHOnQNPZ-Qpgn4JkxXMBH+ys9PLcJgZ6aL7Xei7jQ@mail.gmail.com \
    --to=campos@esss.com.br \
    --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 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).