From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Sep 2013 18:42:51 +0000 (-0700)
Subject: Merge branch 'rh/ishes-doc'
X-Git-Tag: v1.8.5-rc0~123
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89dde7882f71f846ccd0359756d27bebc31108de?hp=89dde7882f71f846ccd0359756d27bebc31108de

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'
---