diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 22:42:51 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 22:42:51 +0400 |
commit | 89dde7882f71f846ccd0359756d27bebc31108de (patch) | |
tree | 84e3b55dae79ab5a867983229f33dcb2964dea68 /builtin/merge.c | |
parent | cd8c891b7403754cc7f4b5ace0f799adb83d3218 (diff) | |
parent | 4b6acde54364d9350779eb470a1677aa78ed5bf4 (diff) |
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/merge.c')
-rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a8cf4a2484..02a69c14e6 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. */ |