summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-11-03 13:52:44 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-03 14:55:48 -0800
commit66158e331b385a81ac825c208c6160a0cdd2324c (patch)
treee7616c3aabc690b9c9b24a6cc7ef9d266f57c367
parentgit-merge-ours: make sure our index matches HEAD (diff)
downloadtgif-66158e331b385a81ac825c208c6160a0cdd2324c.tar.xz
Illustration: "Fundamental Git Index Operations"
Jon Loeliger's ASCII art in the Discussion section. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--README40
1 files changed, 40 insertions, 0 deletions
diff --git a/README b/README
index 0ee49d4898..4a2616ba57 100644
--- a/README
+++ b/README
@@ -399,6 +399,46 @@ save the note about that state, in practice we tend to just write the
result to the file `.git/HEAD`, so that we can always see what the
last committed state was.
+Here is an ASCII art by Jon Loeliger that illustrates how
+various pieces fit together.
+
+------------
+
+ commit-tree
+ commit obj
+ +----+
+ | |
+ | |
+ V V
+ +-----------+
+ | Object DB |
+ | Backing |
+ | Store |
+ +-----------+
+ ^
+ write-tree | |
+ tree obj | |
+ | | read-tree
+ | | tree obj
+ V
+ +-----------+
+ | Index |
+ | "cache" |
+ +-----------+
+ update-index ^
+ blob obj | |
+ | |
+ checkout-index -u | | checkout-index
+ stat | | blob obj
+ V
+ +-----------+
+ | Working |
+ | Directory |
+ +-----------+
+
+------------
+
+
6) Examining the data
~~~~~~~~~~~~~~~~~~~~~