summaryrefslogtreecommitdiff
path: root/Documentation/glossary-content.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-10-09 05:20:19 -0500
committerJunio C Hamano <gitster@pobox.com>2009-10-09 14:54:55 -0700
commit580cbb58a29ee3ebc3714f4792d34f958fd86165 (patch)
tree81de2d45438b182e9a83b17d9ceba1f2898828cf /Documentation/glossary-content.txt
parentbb35f35e67ed2fdfce1892cc9d55827b90fcb775 (diff)
downloadgit-580cbb58a29ee3ebc3714f4792d34f958fd86165.tar.gz
Documentation: clarify "working tree" definition
It is not necessarily obvious to a git novice what it means for a filesystem tree to be equal to the HEAD. Spell it out. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/glossary-content.txt')
-rw-r--r--Documentation/glossary-content.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 572374f7a6..43d84d15e9 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 <<def_HEAD,HEAD>> 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 <<def_HEAD,HEAD>> commit's tree,
+ plus any local changes that you have made but not yet committed.