diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:42:51 -0700 |
| commit | 89dde7882f71f846ccd0359756d27bebc31108de (patch) | |
| tree | 84e3b55dae79ab5a867983229f33dcb2964dea68 /Documentation/gitcli.txt | |
| parent | cd8c891b7403754cc7f4b5ace0f799adb83d3218 (diff) | |
| parent | 4b6acde54364d9350779eb470a1677aa78ed5bf4 (diff) | |
| download | git-89dde7882f71f846ccd0359756d27bebc31108de.tar.xz | |
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 'Documentation/gitcli.txt')
| -rw-r--r-- | Documentation/gitcli.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 9ac5088acd..7d54b77f3c 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -106,7 +106,7 @@ couple of magic command line options: + --------------------------------------------- $ git describe -h -usage: git describe [options] <committish>* +usage: git describe [options] <commit-ish>* or: git describe [options] --dirty --contains find the tag that comes after the commit |