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>
Veres Lajos committed
Jun 19, 2013 at 07:37 UTC
f7e604ed390cec7b20471f9c03bbc507ebfe41c0
3 files changed
+3
-3
git-p4.py
+1
-1
@@ -3153,7 +3153,7 @@ class P4Rebase(Command):
3153
if os.system("git update-index --refresh") != 0:
3154
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.");
3155
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.");
3157
3158
[upstream, settings] = findUpstreamBranchPoint()
3159
if len(upstream) == 0:
git-svn.perl
+1
-1
@@ -1220,7 +1220,7 @@ sub cmd_rebase {
1220
return;
1221
}
1222
if (command(qw/diff-index HEAD --/)) {
1223
- print STDERR "Cannot rebase with uncommited changes:\n";
1223
+ print STDERR "Cannot rebase with uncommitted changes:\n";
1224
command_noisy('status');
1225
exit 1;
1226
}
t/t7600-merge.sh
+1
-1
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
316
317
test_debug 'git log --graph --decorate --oneline --all'
318
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)' '
320
git reset --hard c1 &&
321
test_must_fail git merge --squash --ff-only c2
322
'