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 /po/zh_CN.po | |
parent | bb8040f9f9274d739b894230959134584b156ae5 (diff) | |
download | git-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.gz git-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 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index b7b46f14f..1a042af11 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4562,7 +4562,7 @@ msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" #: builtin/describe.c:16 -msgid "git describe [options] <committish>*" +msgid "git describe [options] <commit-ish>*" msgstr "git describe [选项] <提交号>*" #: builtin/describe.c:17 @@ -4698,7 +4698,7 @@ msgid "No names found, cannot describe anything." msgstr "没有发现名称,无法描述任何东西。" #: builtin/describe.c:489 -msgid "--dirty is incompatible with committishes" +msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 不能与提交同时使用" #: builtin/diff.c:79 |