diff options
| author |  Richard Hansen <rhansen@bbn.com> | 2013-09-04 15:04:31 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-09-04 15:03:03 -0700 |
| commit | a8a5406ab32fccabf8ed08001d50b5373e18ff1a (patch) | |
| tree | 82ec0a98750812e269b935eb369671ad84be8b45 /t | |
| parent | use 'tree-ish' instead of 'treeish' (diff) | |
| download | tgif-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.xz | |
use 'commit-ish' instead of 'committish'
Replace 'committish' in documentation and comments with 'commit-ish'
to match gitglossary(7) and to be consistent with 'tree-ish'.
The only remaining instances of 'committish' are:
* variable, function, and macro names
* "(also committish)" in the definition of commit-ish in
gitglossary[7]
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9300-fast-import.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index ac6f3b6af2..a74b9cf4d3 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2815,14 +2815,14 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' ' ' # -# notemodify, mark in committish +# notemodify, mark in commit-ish # -test_expect_success 'S: notemodify with garbarge after mark committish must fail' ' +test_expect_success 'S: notemodify with garbarge after mark commit-ish must fail' ' test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && commit refs/heads/Snotes committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT - commit S note committish + commit S note commit-ish COMMIT N :202 :302x EOF |