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>

diff --git a/git-p4.py b/git-p4.py
index 647f11020257598a8245eb1e84f64b80a2c55aca..4092c55f80b00695b77e1d2b4dd7be2b913d1079 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -3153,7 +3153,7 @@ def rebase(self):
         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:
         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:
 
         [upstream, settings] = findUpstreamBranchPoint()
         if len(upstream) == 0:

diff --git a/git-svn.perl b/git-svn.perl
index 6c7bd95032b890d2f79cff0d18ac6aa688a74757..7fbc53e3f9c45ca1378d9150b59c97186d57ca9a 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1220,7 +1220,7 @@ sub cmd_rebase {
                return;
        }
        if (command(qw/diff-index HEAD --/)) {
                return;
        }
        if (command(qw/diff-index HEAD --/)) {

-               print STDERR "Cannot rebase with uncommited changes:\n";
+               print STDERR "Cannot rebase with uncommitted changes:\n";

                command_noisy('status');
                exit 1;
        }
                command_noisy('status');
                exit 1;
        }

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5e19598fe72787e17d521980a3edfacb1dfa2024..37cc095d86263f7f871c7711a3c0f309bbff8151 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
 
 test_debug 'git log --graph --decorate --oneline --all'
 
 
 test_debug 'git log --graph --decorate --oneline --all'
 

-test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
+test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '

        git reset --hard c1 &&
        test_must_fail git merge --squash --ff-only c2
 '
        git reset --hard c1 &&
        test_must_fail git merge --squash --ff-only c2
 '