diff options
| author | Richard Hansen <rhansen@bbn.com> | 2013-09-04 19:04:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 22:02:56 (GMT) |
| commit | bb8040f9f9274d739b894230959134584b156ae5 (patch) | |
| tree | f7684c21fbba555276e9069662f4c887fbe67910 /Documentation/git-merge-tree.txt | |
| parent | 406fde17da450036acc35316c085e32bbd73ebc1 (diff) | |
| download | git-bb8040f9f9274d739b894230959134584b156ae5.zip git-bb8040f9f9274d739b894230959134584b156ae5.tar.gz git-bb8040f9f9274d739b894230959134584b156ae5.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index c5f84b6..58731c1 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads three treeish, and output trivial merge results and +Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the |