summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63d34b0)
raw | patch | inline | side by side (parent: 63d34b0)
author | Junio C Hamano <junkio@cox.net> | |
Mon, 5 Dec 2005 08:22:01 +0000 (00:22 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 5 Dec 2005 08:22:01 +0000 (00:22 -0800) |
The table facility was nice in rendering HTML but was disastrous
for man page. Reword the text and do not use table for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
for man page. Reword the text and do not use table for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-diff.txt | patch | blob | history |
index cadaf59455c994c5c08fbdb84f9c0ed1bc974325..cf7527f5e9a4fe005b55f56e16a558454df9d6ba 100644 (file)
The combination of what is compared with what is determined by
the number of ents given to the command.
-`----------------`--------`-----------------------------`------------------
-Number of ents Options What's Compared Underlying command
----------------------------------------------------------------------------
-0 - index file and working tree git-diff-files
-1 --cached ent and index file git-diff-index
-1 - ent and working tree git-diff-index
-2 - two ents git-diff-tree
----------------------------------------------------------------------------
+* When no <ent> is given, the working tree and the index
+ file is compared, using `git-diff-files`.
+
+* When one <ent> is given, the working tree and the named
+ tree is compared, using `git-diff-index`. The option
+ `--cached` can be given to compare the index file and
+ the named tree.
+
+* When two <ent>s are given, these two trees are compared
+ using `git-diff-tree`.
OPTIONS
-------