summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 18:42:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-17 18:42:51 (GMT)
commit89dde7882f71f846ccd0359756d27bebc31108de (patch)
tree84e3b55dae79ab5a867983229f33dcb2964dea68 /builtin
parentcd8c891b7403754cc7f4b5ace0f799adb83d3218 (diff)
parent4b6acde54364d9350779eb470a1677aa78ed5bf4 (diff)
downloadgit-89dde7882f71f846ccd0359756d27bebc31108de.zip
git-89dde7882f71f846ccd0359756d27bebc31108de.tar.gz
git-89dde7882f71f846ccd0359756d27bebc31108de.tar.bz2
Merge branch 'rh/ishes-doc'
We liberally use "committish" and "commit-ish" (and "treeish" and "tree-ish"); as these are non-words, let's unify these terms to their dashed form. More importantly, clarify the documentation on object peeling using these terms. * rh/ishes-doc: glossary: fix and clarify the definition of 'ref' revisions.txt: fix and clarify <rev>^{<type>} glossary: more precise definition of tree-ish (a.k.a. treeish) use 'commit-ish' instead of 'committish' use 'tree-ish' instead of 'treeish' glossary: define commit-ish (a.k.a. committish) glossary: mention 'treeish' as an alternative to 'tree-ish'
Diffstat (limited to 'builtin')
-rw-r--r--builtin/describe.c4
-rw-r--r--builtin/merge.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index c94e5c3..b9d3603 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 a8cf4a2..02a69c1 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.
*/