diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-05 00:22:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-05 00:22:01 -0800 |
| commit | dfa2f22f942ffc96105e667024b516e6f4fa07d1 (patch) | |
| tree | 7baeaf7f57f7e60ed7742d7572f09f260c6bb0c9 /Documentation/git-diff.txt | |
| parent | 63d34b0b13b3527eb63dce5e37098e200f6a0717 (diff) | |
| download | git-dfa2f22f942ffc96105e667024b516e6f4fa07d1.tar.gz git-dfa2f22f942ffc96105e667024b516e6f4fa07d1.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index cadaf5945..cf7527f5e 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -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 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 ------- |