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 /git-cvsserver.perl | |
parent | cd8c891b7403754cc7f4b5ace0f799adb83d3218 (diff) | |
parent | 4b6acde54364d9350779eb470a1677aa78ed5bf4 (diff) | |
download | git-89dde7882f71f846ccd0359756d27bebc31108de.tar.gz |
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 'git-cvsserver.perl')
-rwxr-xr-x | git-cvsserver.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl index a0d796e570..a9f6f8ebd4 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -4338,7 +4338,7 @@ sub getAnyHead =head2 getRevisionDirMap A "revision dir map" contains all the plain-file filenames associated -with a particular revision (treeish), organized by directory: +with a particular revision (tree-ish), organized by directory: $type = $out->{$dir}{$fullName} |