Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-rebase.sh: fix typo in an error message
author
Ralf Thielow
<ralf.thielow@gmail.com>
Wed, 1 Aug 2012 17:09:09 +0000
(19:09 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 1 Aug 2012 20:58:47 +0000
(13:58 -0700)
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>
git-rebase.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
97c7934
)
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
w
are 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