summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Veres Lajos <vlajos@gmail.com>2013-06-19 07:37:24 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-19 11:31:33 -0700
commitf7e604ed390cec7b20471f9c03bbc507ebfe41c0 (patch)
treef5bcf2eeb9d9248b307b40e5c067c33c6628a5ef
parentt0070 "mktemp to unwritable directory" needs SANITY (diff)
downloadtgif-f7e604ed390cec7b20471f9c03bbc507ebfe41c0.tar.xz
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>
-rwxr-xr-xgit-p4.py2
-rwxr-xr-xgit-svn.perl2
-rwxr-xr-xt/t7600-merge.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/git-p4.py b/git-p4.py
index 647f110202..4092c55f80 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -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:
diff --git a/git-svn.perl b/git-svn.perl
index 6c7bd95032..7fbc53e3f9 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1220,7 +1220,7 @@ sub cmd_rebase {
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;
}
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5e19598fe7..37cc095d86 100755
--- 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_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
'