summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-25 13:13:43 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-25 13:13:43 -0700
commitd0b16c8f878bef5c1268e033a3d1f427498c7008 (patch)
tree23b896e51418ea182bf6335020b5b53138398df9 /t
parent770c54170a43ffb3810088a85f25c59c0cbf7b38 (diff)
parente498257d650529812ffe1872b3cd62e2bd604287 (diff)
downloadgit-d0b16c8f878bef5c1268e033a3d1f427498c7008.tar.gz
Merge branch 'maint'
* maint: Documentation/SubmittingPatches: clarify GMail section and SMTP show-branch: use DEFAULT_ABBREV instead of 7 t7502-commit: fix spelling test get_git_work_tree() return value for NULL
Diffstat (limited to 't')
-rwxr-xr-xt/t7502-commit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 844fb43c6d..95044668ee 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -35,7 +35,7 @@ test_expect_success 'partial' '
'
-test_expect_success 'partial modification in a subdirecotry' '
+test_expect_success 'partial modification in a subdirectory' '
test_tick &&
git commit -m "partial commit to subdirectory" not &&