5c97558c9a
This rips out the rename detection engine from diff-helper and moves it to the diff core, and updates the internal calling convention used by diff-tree family into the diff core. In order to give the same option name to diff-tree family as well as to diff-helper, I've changed the earlier diff-helper '-r' option to '-M' (stands for Move; sorry but the natural abbreviation 'r' for 'rename' is already taken for 'recursive'). Although I did a fair amount of test with the git-diff-tree with existing rename commits in the core GIT repository, this should still be considered beta (preview) release. This patch depends on the diff-delta infrastructure just committed. This implements almost everything I wanted to see in this series of patch, except a few minor cleanups in the calling convention into diff core, but that will be a separate cleanup patch. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
55 lines
1.0 KiB
Plaintext
55 lines
1.0 KiB
Plaintext
git-diff-files(1)
|
|
=================
|
|
v0.1, May 2005
|
|
|
|
NAME
|
|
----
|
|
git-diff-files - Compares files in the working tree and the cache
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-diff-files' [-p] [-q] [-r] [-z] [-M] [<pattern>...]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Compares the files in the working tree and the cache. When paths
|
|
are specified, compares only those named paths. Otherwise all
|
|
entries in the cache are compared. The output format is the
|
|
same as "git-diff-cache" and "git-diff-tree".
|
|
|
|
OPTIONS
|
|
-------
|
|
-p::
|
|
generate patch (see section on generating patches).
|
|
|
|
-q::
|
|
Remain silent even on nonexisting files
|
|
|
|
-M::
|
|
Detect renames; implies -p.
|
|
|
|
-r::
|
|
This flag does not mean anything. It is there only to match
|
|
git-diff-tree. Unlike git-diff-tree, git-diff-files always looks
|
|
at all the subdirectories.
|
|
|
|
|
|
Output format
|
|
-------------
|
|
include::diff-format.txt[]
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the link:git.html[git] suite
|
|
|