git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ralf Thielow <ralf.thielow@gmail.com>
To: git@vger.kernel.org
Cc: bafain@gmail.com, gitster@pobox.com, mhagger@alum.mit.edu,
	Ralf Thielow <ralf.thielow@gmail.com>
Subject: Re: [PATCH] rebase -i: Remember merge options beyond continue actions
Date: Fri, 18 Jul 2014 19:03:37 +0200	[thread overview]
Message-ID: <1405703017-15934-1-git-send-email-ralf.thielow@gmail.com> (raw)
In-Reply-To: <53965334.3030206@gmail.com>

Hi,

Thanks for the patch. I've had this issue today
and the patch has fixed it. I hope the patch makes
its way to Git.

Ralf

> Hi Eric,
> 
> thanks a lot for the reference.
> 
> I added the Reported-by: and Signed-off-by: lines to the commit message.
> 
>    Fabian
> 
> -- >8 --
> Subject: rebase -i: Remember merge options beyond continue actions
> 
> If the user explicitly specified a merge strategy or strategy options,
> "rebase --interactive" started using the default merge strategy again
> after "rebase --continue".
> 
> This problem gets fixed by this commit. Add test.
> 
> Since the "rebase" options "-s" and "-X" imply "--merge", we can simply
> remove the "do_merge" guard in the interactive mode and always compile
> the "cherry-pick" arguments from the "rebase" state variables "strategy"
> and "strategy_opts".
...

  parent reply	other threads:[~2014-07-18 17:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-10  0:02 [PATCH] rebase -i: Remember merge options beyond continue actions Fabian Ruch
2014-06-10  0:17 ` Eric Sunshine
2014-06-10  0:37   ` Fabian Ruch
2014-06-11 21:13     ` Michael Haggerty
2014-07-18 17:03     ` Ralf Thielow [this message]
2015-12-11 19:54     ` [PATCH] rebase -i: remember " Ralf Thielow
2015-12-11 20:07       ` Junio C Hamano
2015-12-11 20:30         ` [PATCH v2] " Ralf Thielow

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=1405703017-15934-1-git-send-email-ralf.thielow@gmail.com \
    --to=ralf.thielow@gmail.com \
    --cc=bafain@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    /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).