Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15
DORMANTno replies

[PATCH] git-rebase.sh: fix typo

From: Ralf Thielow <hidden>
Date: 2016-06-15 22:54:24
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help