From: Ralf Thielow <ralf.thielow@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, worldhello.net@gmail.com,
Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH] git-rebase.sh: fix typo
Date: Wed, 1 Aug 2012 19:09:09 +0200 [thread overview]
Message-ID: <1343840949-3122-1-git-send-email-ralf.thielow@gmail.com> (raw)
Fix a typo in the error messages which is
shown if it seems that a rebase is already
in progress.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 0e6fd09..15da926 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -348,7 +348,7 @@ then
cmd_clear_stale_rebase="rm -fr \"$state_dir\""
die "
$(eval_gettext 'It seems that there is already a $state_dir_base directory, and
-I wonder if you ware in the middle of another rebase. If that is the
+I wonder if you are in the middle of another rebase. If that is the
case, please try
$cmd_live_rebase
If that is not the case, please
--
1.7.12.rc1
next reply other threads:[~2012-08-01 17:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-01 17:09 Ralf Thielow [this message]
2012-08-01 23:28 ` [PATCH] git-rebase.sh: fix typo Jiang Xin
2012-08-02 17:41 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343840949-3122-1-git-send-email-ralf.thielow@gmail.com \
--to=ralf.thielow@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=worldhello.net@gmail.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.
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).