Merge branch 'nd/maint-remote-remove' into maint

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 0e6fd09852a73b50b179345aeacd79518f147bf8..15da926ce0d2cefc0620d4c5c4a761bceb2b911f 100755 (executable)
--- 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