summaryrefslogtreecommitdiff
path: root/Documentation/git-cat-file.txt
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 /Documentation/git-cat-file.txt
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 'Documentation/git-cat-file.txt')
-rw-r--r--Documentation/git-cat-file.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 21cffe2..322f5ed 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -54,7 +54,7 @@ OPTIONS
--textconv::
Show the content as transformed by a textconv filter. In this case,
- <object> has be of the form <treeish>:<path>, or :<path> in order
+ <object> has be of the form <tree-ish>:<path>, or :<path> in order
to apply the filter to the content recorded in the index at <path>.
--batch::