summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.7.11.2.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/RelNotes/1.7.11.2.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/RelNotes/1.7.11.2.txt')
-rw-r--r--Documentation/RelNotes/1.7.11.2.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.11.2.txt b/Documentation/RelNotes/1.7.11.2.txt
index a0d24d1..f0cfd02 100644
--- a/Documentation/RelNotes/1.7.11.2.txt
+++ b/Documentation/RelNotes/1.7.11.2.txt
@@ -31,7 +31,7 @@ Fixes since v1.7.11.1
* "git diff --no-index" did not work with pagers correctly.
* "git diff COPYING HEAD:COPYING" gave a nonsense error message that
- claimed that the treeish HEAD did not have COPYING in it.
+ claimed that the tree-ish HEAD did not have COPYING in it.
* When "git log" gets "--simplify-merges/by-decoration" together with
"--first-parent", the combination of these options makes the