threads / patch / 34556

patchgit-rebase: fix typo

Subject: [PATCH] git-rebase: fix typo

## tl;dr

3 messages between Jul 29, 2013 and Jul 29, 2013. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Ralf Thielow· Jul 29, 2013, 04:24 UTC · lore

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
 git-rebase.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-rebase.sh +1 −1

diff --git a/git-rebase.sh b/git-rebase.sh
index 0039ecf..8d7659a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -159,7 +159,7 @@ finish_rebase () {
 			die "$(eval_gettext "Cannot store \$stash_sha1")"
 			gettext 'Applying autostash resulted in conflicts.
 Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" it at any time.
+You can run "git stash pop" or "git stash drop" at any time.
 '
 		fi
 	fi

-- 
1.8.2.1873.gfc589a4

Ramkumar Ramachandra· Jul 29, 2013, 10:28 UTC · re: Ralf Thielow · lore

Re: [PATCH] git-rebase: fix typo

Ralf Thielow wrote:

Show 10 quoted lines

> diff --git a/git-rebase.sh b/git-rebase.sh
> index 0039ecf..8d7659a 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -159,7 +159,7 @@ finish_rebase () {
>                         die "$(eval_gettext "Cannot store \$stash_sha1")"
>                         gettext 'Applying autostash resulted in conflicts.
>  Your changes are safe in the stash.
> -You can run "git stash pop" or "git stash drop" it at any time.
> +You can run "git stash pop" or "git stash drop" at any time.

Good eyes, thanks.

Junio C Hamano· Jul 29, 2013, 17:32 UTC · re: Ramkumar Ramachandra · lore

Re: [PATCH] git-rebase: fix typo

Ramkumar Ramachandra <artagnon@gmail.com> writes:

Show 13 quoted lines

> Ralf Thielow wrote:
>> diff --git a/git-rebase.sh b/git-rebase.sh
>> index 0039ecf..8d7659a 100755
>> --- a/git-rebase.sh
>> +++ b/git-rebase.sh
>> @@ -159,7 +159,7 @@ finish_rebase () {
>>                         die "$(eval_gettext "Cannot store \$stash_sha1")"
>>                         gettext 'Applying autostash resulted in conflicts.
>>  Your changes are safe in the stash.
>> -You can run "git stash pop" or "git stash drop" it at any time.
>> +You can run "git stash pop" or "git stash drop" at any time.
>
> Good eyes, thanks.

Thanks.