From: Johannes Sixt <j.sixt@viscovery.net>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 5/4] rebase -i: suggest using --edit-todo to fix an unknown instruction
Date: Wed, 19 Sep 2012 08:43:54 +0200 [thread overview]
Message-ID: <505969AA.1070509@viscovery.net> (raw)
In-Reply-To: <1347931690-20625-1-git-send-email-andrew.kw.w@gmail.com>
From: Johannes Sixt <j6t@kdbg.org>
We have now an explicit UI to edit the todo sheet and need not disclose
the name of the file.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
git-rebase--interactive.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 2b8f2a9..4b2ef11 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -575,11 +575,12 @@ do_next () {
;;
*)
warn "Unknown command: $command $sha1 $rest"
+ fixtodo="Please fix this using 'git rebase --edit-todo'."
if git rev-parse --verify -q "$sha1" >/dev/null
then
- die_with_patch $sha1 "Please fix this in the file $todo."
+ die_with_patch $sha1 "$fixtodo"
else
- die "Please fix this in the file $todo."
+ die "$fixtodo"
fi
;;
esac
--
1.7.12.1721.gd1d8b74
next prev parent reply other threads:[~2012-09-19 6:44 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 16:14 [RFC] Add "edit" action for interactive rebase? Andrew Wong
2012-09-10 16:14 ` [PATCH] rebase -i: Teach "--edit" action Andrew Wong
2012-09-10 16:25 ` Matthieu Moy
2012-09-10 16:46 ` Andrew Wong
2012-09-10 16:54 ` Jeff King
2012-09-10 18:36 ` Johannes Sixt
2012-09-10 18:46 ` Jeff King
2012-09-10 19:33 ` Andrew Wong
2012-09-10 19:57 ` Junio C Hamano
2012-09-10 21:17 ` Andrew Wong
2012-09-15 20:08 ` [PATCH 0/3] rebase -i: Teach "--edit-todo" Andrew Wong
2012-09-15 20:08 ` [PATCH 1/3] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-15 20:08 ` [PATCH 2/3] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-16 6:54 ` Junio C Hamano
2012-09-16 15:49 ` Andrew Wong
2012-09-18 6:56 ` Junio C Hamano
2012-09-15 20:08 ` [PATCH 3/3] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-16 6:58 ` Junio C Hamano
2012-09-16 15:17 ` [PATCH v2 1/3] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-16 15:17 ` [PATCH v2 2/3] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-17 6:11 ` Martin von Zweigbergk
2012-09-18 1:28 ` [PATCH v3 0/4] " Andrew Wong
2012-09-18 1:28 ` [PATCH 1/4] rebase usage: subcommands can not be combined with -i Andrew Wong
2012-09-18 1:28 ` [PATCH 2/4] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-18 1:28 ` [PATCH 3/4] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-18 1:28 ` [PATCH 4/4] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-18 4:58 ` Martin von Zweigbergk
2012-09-18 5:23 ` Andrew Wong
2012-09-18 5:37 ` Martin von Zweigbergk
2012-09-19 6:43 ` Johannes Sixt [this message]
2012-09-19 19:52 ` [PATCH 5/4] rebase -i: suggest using --edit-todo to fix an unknown instruction Junio C Hamano
2012-09-16 15:17 ` [PATCH v2 3/3] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-10 18:28 ` [RFC] Add "edit" action for interactive rebase? Johannes Sixt
2012-09-10 20:13 ` Andrew Wong
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=505969AA.1070509@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=andrew.kw.w@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 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).