Skip to content

Commit f7e604e

Browse files
vlajosgitster
authored andcommitted
random typofixes (committed missing a 't', successful missing an 's')
Signed-off-by: Veres Lajos <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b3b8ceb commit f7e604e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3153,7 +3153,7 @@ def rebase(self):
31533153
if os.system("git update-index --refresh") != 0:
31543154
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.");
31553155
if len(read_pipe("git diff-index HEAD --")) > 0:
3156-
die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");
3156+
die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
31573157

31583158
[upstream, settings] = findUpstreamBranchPoint()
31593159
if len(upstream) == 0:

git-svn.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ sub cmd_rebase {
12201220
return;
12211221
}
12221222
if (command(qw/diff-index HEAD --/)) {
1223-
print STDERR "Cannot rebase with uncommited changes:\n";
1223+
print STDERR "Cannot rebase with uncommitted changes:\n";
12241224
command_noisy('status');
12251225
exit 1;
12261226
}

t/t7600-merge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
316316

317317
test_debug 'git log --graph --decorate --oneline --all'
318318

319-
test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
319+
test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '
320320
git reset --hard c1 &&
321321
test_must_fail git merge --squash --ff-only c2
322322
'

0 commit comments

Comments
 (0)