[PATCH] diff overhaul

This cleans up the way calls are made into the diff core from diff-tree
family and diff-helper.  Earlier, these programs had "if
(generating_patch)" sprinkled all over the place, but those ugliness are
gone and handled uniformly from the diff core, even when not generating
patch format.

This also allowed diff-cache and diff-files to acquire -R
(reverse) option to generate diff in reverse.  Users of
diff-tree can swap two trees easily so I did not add -R there.

[ Linus' note: I'll add -R to "diff-tree" too, since a "commit
  diff" doesn't have another tree to switch around: the other
  tree is always the parent(s) of the commit ]

Also -M<digits-as-mantissa> suggestion made by Linus has been
implemented.

Documentation updates are also included.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-05-19 19:00:36 -07:00
committed by Linus Torvalds
parent dc26bd890d
commit 57fe64a40d
11 changed files with 192 additions and 125 deletions

View File

@ -9,7 +9,7 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi
SYNOPSIS
--------
'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [--cached] <tree-ish>
'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [--cached] <tree-ish>
DESCRIPTION
-----------
@ -36,6 +36,9 @@ OPTIONS
-M::
Detect renames; implies -p.
-R::
Output diff in reverse.
--cached::
do not consider the on-disk file at all

View File

@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the cache
SYNOPSIS
--------
'git-diff-files' [-p] [-q] [-r] [-z] [-M] [<pattern>...]
'git-diff-files' [-p] [-q] [-r] [-z] [-M] [-R] [<pattern>...]
DESCRIPTION
-----------
@ -26,6 +26,9 @@ OPTIONS
-q::
Remain silent even on nonexisting files
-R::
Output diff in reverse.
-M::
Detect renames; implies -p.