diff options
| author | Richard Hansen <rhansen@bbn.com> | 2013-09-04 19:04:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 22:03:03 (GMT) |
| commit | a8a5406ab32fccabf8ed08001d50b5373e18ff1a (patch) | |
| tree | 82ec0a98750812e269b935eb369671ad84be8b45 /builtin | |
| parent | bb8040f9f9274d739b894230959134584b156ae5 (diff) | |
| download | git-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.zip git-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.gz git-a8a5406ab32fccabf8ed08001d50b5373e18ff1a.tar.bz2 | |
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 'builtin')
| -rw-r--r-- | builtin/describe.c | 4 | ||||
| -rw-r--r-- | builtin/merge.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 7d73722..121a535 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -13,7 +13,7 @@ #define MAX_TAGS (FLAG_BITS - 1) static const char * const describe_usage[] = { - N_("git describe [options] <committish>*"), + N_("git describe [options] <commit-ish>*"), N_("git describe [options] --dirty"), NULL }; @@ -486,7 +486,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) } describe("HEAD", 1); } else if (dirty) { - die(_("--dirty is incompatible with committishes")); + die(_("--dirty is incompatible with commit-ishes")); } else { while (argc-- > 0) { describe(*argv++, argc == 0); diff --git a/builtin/merge.c b/builtin/merge.c index 34a6166..9a2c58a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1193,7 +1193,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * This could be traditional "merge <msg> HEAD <commit>..." and * the way we can tell it is to see if the second token is HEAD, * but some people might have misused the interface and used a - * committish that is the same as HEAD there instead. + * commit-ish that is the same as HEAD there instead. * Traditional format never would have "-m" so it is an * additional safety measure to check for it. */ |