summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2012-08-01 19:09:09 +0200
committerJunio C Hamano <gitster@pobox.com>2012-08-01 13:58:47 -0700
commite39beac6731575bfff53bf1ef1256c89a6b94050 (patch)
tree1380cf73a148c4afb8669c89c573c24717ae659b /git-rebase.sh
parent97c793404910fbe8b51ec29661619ad0196ac1ae (diff)
downloadgit-e39beac6731575bfff53bf1ef1256c89a6b94050.tar.gz
git-rebase.sh: fix typo in an error message
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 0e6fd09852..15da926ce0 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