diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-05-25 13:13:43 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-25 13:13:43 -0700 |
commit | d0b16c8f878bef5c1268e033a3d1f427498c7008 (patch) | |
tree | 23b896e51418ea182bf6335020b5b53138398df9 /t | |
parent | 770c54170a43ffb3810088a85f25c59c0cbf7b38 (diff) | |
parent | e498257d650529812ffe1872b3cd62e2bd604287 (diff) | |
download | git-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-x | t/t7502-commit.sh | 2 |
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 && |