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 <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Ralf Thielow <ralf.thielow@gmail.com>
Subject: Re: [PATCH] rebase -i: improve advice on bad instruction lines
Date: Tue, 6 Sep 2016 20:50:10 +0200	[thread overview]
Message-ID: <CAN0XMOJofQwsPJvoHLZJ-fT6SudtquatYV=GwpGb6FkF4aXcxg@mail.gmail.com> (raw)
In-Reply-To: <20160906180838.865-1-ralf.thielow@gmail.com>

2016-09-06 20:08 GMT+02:00 Ralf Thielow <ralf.thielow@gmail.com>:
> -               warn "$(gettext "You can fix this with 'git rebase --edit-todo'.")"
> +               warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
>                 die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"

Please don't apply as is. There are some test failures due to the text change.
I'll send an updated version.

  reply	other threads:[~2016-09-06 18:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-06 18:08 [PATCH] rebase -i: improve advice on bad instruction lines Ralf Thielow
2016-09-06 18:50 ` Ralf Thielow [this message]
2016-09-06 18:59 ` [PATCH v2] " Ralf Thielow
2016-09-07  9:28   ` Dennis Kaarsemaker
2016-09-07 17:07     ` Ralf Thielow
2016-09-09 12:21       ` Johannes Schindelin
2016-09-07 18:58     ` Junio C Hamano

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='CAN0XMOJofQwsPJvoHLZJ-fT6SudtquatYV=GwpGb6FkF4aXcxg@mail.gmail.com' \
    --to=ralf.thielow@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).