Merge branch 'rh/ishes-doc'
commit89dde7882f71f846ccd0359756d27bebc31108de
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:42:51 +0000 (17 11:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:42:51 +0000 (17 11:42 -0700)
tree84e3b55dae79ab5a867983229f33dcb2964dea68
parentcd8c891b7403754cc7f4b5ace0f799adb83d3218
parent4b6acde54364d9350779eb470a1677aa78ed5bf4
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'
Documentation/config.txt
Documentation/git-cat-file.txt
Documentation/git-fast-import.txt
Documentation/git-push.txt
Documentation/glossary-content.txt
builtin/describe.c
builtin/merge.c
fast-import.c
po/de.po
po/fr.po
t/t9300-fast-import.sh