From 36f05ef485d023eda3bf750e7b207d07d5feb39d Mon Sep 17 00:00:00 2001 From: Junio C Hamano <junkio@cox.net> Date: Thu, 3 Nov 2005 13:52:44 -0800 Subject: [PATCH] Illustration: "Git Diff Types" Jon Loeliger's ASCII art in the Tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net> --- Documentation/tutorial.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 20a4cb1df40..214673db069 100644 --- 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. +[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.