From: Steffen Prohaska <prohaska@zib.de>
To: git@vger.kernel.org
Cc: Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error
Date: Sun, 6 Jan 2008 16:46:25 +0100 [thread overview]
Message-ID: <1199634385511-git-send-email-prohaska@zib.de> (raw)
rebase interactive asks the user to fix unknown commands but it did not
tell how to continue.
This commits adds a hint how to continue.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
git-rebase--interactive.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index acdcc54..d4bd811 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -310,7 +310,7 @@ do_next () {
;;
*)
warn "Unknown command: $command $sha1 $rest"
- die_with_patch $sha1 "Please fix this in the file $TODO."
+ die_with_patch $sha1 "Please fix this in the file $TODO. And run 'git rebase --continue'."
;;
esac
test -s "$TODO" && return
--
1.5.4.rc2.26.g1deb
next reply other threads:[~2008-01-06 15:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-06 15:46 Steffen Prohaska [this message]
2008-01-06 17:33 ` [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error Wincent Colaiuta
2008-01-06 19:50 ` David Brown
2008-01-06 20:14 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1199634385511-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--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).