Documentation: git-diff asciidoc table workaround.
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>
Junio C Hamano committed
Dec 5, 2005 at 00:22 UTC
dfa2f22f942ffc96105e667024b516e6f4fa07d1
1 file changed
+10
-8
Documentation/git-diff.txt
+10
-8
@@ -17,14 +17,16 @@ ent and the index file, or the index file and the working tree.
17
The combination of what is compared with what is determined by
18
the number of ents given to the command.
19
20
-`----------------`--------`-----------------------------`------------------
21
-Number of ents Options What's Compared Underlying command
22
----------------------------------------------------------------------------
23
-0 - index file and working tree git-diff-files
24
-1 --cached ent and index file git-diff-index
25
-1 - ent and working tree git-diff-index
26
-2 - two ents git-diff-tree
27
----------------------------------------------------------------------------
20
+* When no <ent> is given, the working tree and the index
21
+ file is compared, using `git-diff-files`.
22
+
23
+* When one <ent> is given, the working tree and the named
24
+ tree is compared, using `git-diff-index`. The option
25
+ `--cached` can be given to compare the index file and
26
+ the named tree.
27
+
28
+* When two <ent>s are given, these two trees are compared
29
+ using `git-diff-tree`.
30
31
OPTIONS
32
-------