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>
This commit is contained in:
parent
63d34b0b13
commit
dfa2f22f94
@ -17,14 +17,16 @@ ent and the index file, or the index file and the working tree.
|
|||||||
The combination of what is compared with what is determined by
|
The combination of what is compared with what is determined by
|
||||||
the number of ents given to the command.
|
the number of ents given to the command.
|
||||||
|
|
||||||
`----------------`--------`-----------------------------`------------------
|
* When no <ent> is given, the working tree and the index
|
||||||
Number of ents Options What's Compared Underlying command
|
file is compared, using `git-diff-files`.
|
||||||
---------------------------------------------------------------------------
|
|
||||||
0 - index file and working tree git-diff-files
|
* When one <ent> is given, the working tree and the named
|
||||||
1 --cached ent and index file git-diff-index
|
tree is compared, using `git-diff-index`. The option
|
||||||
1 - ent and working tree git-diff-index
|
`--cached` can be given to compare the index file and
|
||||||
2 - two ents git-diff-tree
|
the named tree.
|
||||||
---------------------------------------------------------------------------
|
|
||||||
|
* When two <ent>s are given, these two trees are compared
|
||||||
|
using `git-diff-tree`.
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user