use 'tree-ish' instead of 'treeish'
Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * "(also treeish)" in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Hansen committed
Sep 4, 2013 at 15:04 UTC
bb8040f9f9274d739b894230959134584b156ae5
6 files changed
+8
-8
Documentation/RelNotes/1.7.11.2.txt
+1
-1
@@ -31,7 +31,7 @@ Fixes since v1.7.11.1
31
* "git diff --no-index" did not work with pagers correctly.
32
33
* "git diff COPYING HEAD:COPYING" gave a nonsense error message that
34
- claimed that the treeish HEAD did not have COPYING in it.
34
+ claimed that the tree-ish HEAD did not have COPYING in it.
35
36
* When "git log" gets "--simplify-merges/by-decoration" together with
37
"--first-parent", the combination of these options makes the
Documentation/git-cat-file.txt
+1
-1
@@ -54,7 +54,7 @@ OPTIONS
54
55
--textconv::
56
Show the content as transformed by a textconv filter. In this case,
57
- <object> has be of the form <treeish>:<path>, or :<path> in order
57
+ <object> has be of the form <tree-ish>:<path>, or :<path> in order
58
to apply the filter to the content recorded in the index at <path>.
59
60
--batch::
Documentation/git-merge-tree.txt
+1
-1
@@ -13,7 +13,7 @@ SYNOPSIS
13
14
DESCRIPTION
15
-----------
16
-Reads three treeish, and output trivial merge results and
16
+Reads three tree-ish, and output trivial merge results and
17
conflicting stages to the standard output. This is similar to
18
what three-way 'git read-tree -m' does, but instead of storing the
19
results in the index, the command outputs the entries to the
fast-import.c
+2
-2
@@ -2957,7 +2957,7 @@ static struct object_entry *dereference(struct object_entry *oe,
2957
case OBJ_TAG:
2958
break;
2959
default:
2960
- die("Not a treeish: %s", command_buf.buf);
2960
+ die("Not a tree-ish: %s", command_buf.buf);
2961
}
2962
2963
if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
@@ -3041,7 +3041,7 @@ static void parse_ls(struct branch *b)
3041
struct tree_entry *root = NULL;
3042
struct tree_entry leaf = {NULL};
3043
3044
- /* ls SP (<treeish> SP)? <path> */
3044
+ /* ls SP (<tree-ish> SP)? <path> */
3045
p = command_buf.buf + strlen("ls ");
3046
if (*p == '"') {
3047
if (!b)
git-cvsserver.perl
+1
-1
@@ -4338,7 +4338,7 @@ sub getAnyHead
4338
=head2 getRevisionDirMap
4339
4340
A "revision dir map" contains all the plain-file filenames associated
4341
-with a particular revision (treeish), organized by directory:
4341
+with a particular revision (tree-ish), organized by directory:
4342
4343
$type = $out->{$dir}{$fullName}
4344
test-match-trees.c
+2
-2
@@ -12,10 +12,10 @@ int main(int ac, char **av)
12
die("cannot parse %s as an object name", av[2]);
13
one = parse_tree_indirect(hash1);
14
if (!one)
15
- die("not a treeish %s", av[1]);
15
+ die("not a tree-ish %s", av[1]);
16
two = parse_tree_indirect(hash2);
17
if (!two)
18
- die("not a treeish %s", av[2]);
18
+ die("not a tree-ish %s", av[2]);
19
20
shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
21
printf("shifted: %s\n", sha1_to_hex(shifted));