X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary-content.txt;h=43d84d15e921435ba4629a7d8c18021d16f89223;hb=1b52ac5935c3773596fa41f6cf83578ab86b6b83;hp=572374f7a6ff17dd40ad687a2fda24d53f7d730b;hpb=bb35fefbc952d5661d8b675aa5e0c1c49c515487;p=git.git diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 572374f7a..43d84d15e 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -456,6 +456,6 @@ This commit is referred to as a "merge commit", or sometimes just a of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'". [[def_working_tree]]working tree:: - The tree of actual checked out files. The working tree is - normally equal to the <> plus any local changes - that you have made but not yet committed. + The tree of actual checked out files. The working tree normally + contains the contents of the <> commit's tree, + plus any local changes that you have made but not yet committed.