kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Illustration: "Git Diff Types" 

Jon Loeliger's ASCII art in the Tutorial.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2005-11-03 13:52:44 -08:00
parent 66158e331b
commit 36f05ef485
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Documentation/tutorial.txt
View File

@ -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), (again, `-p` means to show the difference as a human-readable patch),
and it will show what the last commit (in `HEAD`) actually changed. 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 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 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. commit, and you can tell it to show a whole series of diffs.