random typofixes (committed missing a 't', successful missing an 's')
Signed-off-by: Veres Lajos <vlajos@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
b3b8ceb48b
commit
f7e604ed39
@ -3153,7 +3153,7 @@ class P4Rebase(Command):
|
||||
if os.system("git update-index --refresh") != 0:
|
||||
die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash.");
|
||||
if len(read_pipe("git diff-index HEAD --")) > 0:
|
||||
die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");
|
||||
die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
|
||||
|
||||
[upstream, settings] = findUpstreamBranchPoint()
|
||||
if len(upstream) == 0:
|
||||
|
Reference in New Issue
Block a user