Merge branch 'rr/rebase-autostash'

gitster · gitster · commit c8686e510fa5 · 2013-07-31T12:38:29.000-07:00
* rr/rebase-autostash:
  git-rebase: fix typo
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ finish_rebase () {`
`159`	`159`	`die "$(eval_gettext "Cannot store \$stash_sha1")"`
`160`	`160`	`gettext 'Applying autostash resulted in conflicts.`
`161`	`161`	`Your changes are safe in the stash.`
`162`		`-You can run "git stash pop" or "git stash drop" it at any time.`
	`162`	`+You can run "git stash pop" or "git stash drop" at any time.`
`163`	`163`	`'`
`164`	`164`	`fi`
`165`	`165`	`fi`