Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: clarify "working tree" definition
author
Jonathan Nieder
<jrnieder@gmail.com>
Fri, 9 Oct 2009 10:20:19 +0000
(
05:20
-0500)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 9 Oct 2009 21:54:55 +0000
(14:54 -0700)
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>
Documentation/glossary-content.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
bb35f35
)
diff --git
a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 572374f7a6ff17dd40ad687a2fda24d53f7d730b..43d84d15e921435ba4629a7d8c18021d16f89223 100644
(file)
--- 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.