Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Illustration: "Git Diff Types"
author
Junio C Hamano
<junkio@cox.net>
Thu, 3 Nov 2005 21:52:44 +0000
(13:52 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 3 Nov 2005 22:55:48 +0000
(14:55 -0800)
Jon Loeliger's ASCII art in the Tutorial.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/tutorial.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
66158e3
)
diff --git
a/Documentation/tutorial.txt
b/Documentation/tutorial.txt
index 20a4cb1df40004ce3f73e52bae5fc71522bacaf1..214673db06914c49c25038c4c70ac76c90dbeff5 100644
(file)
--- a/
Documentation/tutorial.txt
+++ b/
Documentation/tutorial.txt
@@
-455,6
+455,41
@@
the same diff that we've already seen several times, we can now do
(again, `-p` means to show the difference as a human-readable patch),
and it will show what the last commit (in `HEAD`) actually changed.
(again, `-p` means to show the difference as a human-readable patch),
and it will show what the last commit (in `HEAD`) actually changed.
+[NOTE]
+============
+Here is an ASCII art by Jon Loeliger that illustrates how
+various diff-\* commands compare things.
+
+ diff-tree
+ +----+
+ | |
+ | |
+ V V
+ +-----------+
+ | Object DB |
+ | Backing |
+ | Store |
+ +-----------+
+ ^ ^
+ | |
+ | | diff-index --cached
+ | |
+ diff-index | V
+ | +-----------+
+ | | Index |
+ | | "cache" |
+ | +-----------+
+ | ^
+ | |
+ | | diff-files
+ | |
+ V V
+ +-----------+
+ | Working |
+ | Directory |
+ +-----------+
+============
+
More interestingly, you can also give `git-diff-tree` the `-v` flag, which
tells it to also show the commit message and author and date of the
commit, and you can tell it to show a whole series of diffs.
More interestingly, you can also give `git-diff-tree` the `-v` flag, which
tells it to also show the commit message and author and date of the
commit, and you can tell it to show a whole series of diffs.