* [PATCH] git-rebase.sh: fix typo
@ 2012-08-01 17:09 Ralf Thielow
2012-08-01 23:28 ` Jiang Xin
2012-08-02 17:41 ` Ralf Thielow
0 siblings, 2 replies; 3+ messages in thread
From: Ralf Thielow @ 2012-08-01 17:09 UTC (permalink / raw)
To: git; +Cc: gitster, worldhello.net, Ralf Thielow
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-rebase.sh: fix typo
2012-08-01 17:09 [PATCH] git-rebase.sh: fix typo Ralf Thielow
@ 2012-08-01 23:28 ` Jiang Xin
2012-08-02 17:41 ` Ralf Thielow
1 sibling, 0 replies; 3+ messages in thread
From: Jiang Xin @ 2012-08-01 23:28 UTC (permalink / raw)
To: Ralf Thielow; +Cc: git, gitster
2012/8/2 Ralf Thielow <ralf.thielow@gmail.com>:
> $(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
It's my fault in commit c7108b. I am curious how this happened, and find out
that it comes from my copy/paste from code review this post:
http://thread.gmane.org/gmane.comp.version-control.git/202010/focus=202048
If I did a more careful diff, especially word-diff, might find it earlier.
$ git show --word-diff c7108b | head -122 | tail -1
I wonder if you [-are-]{+ware+} in the middle of another rebase.
If that is the
--
Jiang Xin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-rebase.sh: fix typo
2012-08-01 17:09 [PATCH] git-rebase.sh: fix typo Ralf Thielow
2012-08-01 23:28 ` Jiang Xin
@ 2012-08-02 17:41 ` Ralf Thielow
1 sibling, 0 replies; 3+ messages in thread
From: Ralf Thielow @ 2012-08-02 17:41 UTC (permalink / raw)
To: git; +Cc: gitster, worldhello.net, Ralf Thielow
On Wed, Aug 1, 2012 at 7:09 PM, Ralf Thielow <ralf.thielow@gmail.com> wrote:
> $(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
After looked at it again, I've noticed that there are also two whitespace
characters after the sentence (same on another sentence in this message).
I don't think that we need another patch for that, though, but it should be
fixed when the message gets changed.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-02 17:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-01 17:09 [PATCH] git-rebase.sh: fix typo Ralf Thielow
2012-08-01 23:28 ` Jiang Xin
2012-08-02 17:41 ` Ralf Thielow
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).