ce24067549
This patch updates diff documentation and usage strings: - clarify the semantics of -R. It is not "output in reverse"; rather, it is "I will feed diff backwards". Semantically they are different when -C is involved. - describe -O in usage strings of diff-* brothers. It was implemented, documented but not described in usage text. Also it adds -O to diff-helper. Like -S (and unlike -M/-C/-B), this option can work on sanitized diff-raw output produced by the diff-* brothers. While we are at it, the call it makes to diffcore is cleaned up to use the diffcore_std() like everybody else, and the declaration for the low level diffcore routines are moved from diff.h (public) to diffcore.h (private between diff.c and diffcore backends). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
77 lines
1.6 KiB
Plaintext
77 lines
1.6 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] [-B] [-M] [-C] [-R] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<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
|
|
|
|
-R::
|
|
Swap two inputs; that is, show differences from on-disk files
|
|
to cache contents.
|
|
|
|
-B::
|
|
Break complete rewrite changes into pairs of delete and create.
|
|
|
|
-M::
|
|
Detect renames.
|
|
|
|
-C::
|
|
Detect copies as well as renames.
|
|
|
|
-S<string>::
|
|
Look for differences that contains the change in <string>.
|
|
|
|
--pickaxe-all::
|
|
When -S finds a change, show all the changes in that
|
|
changeset, not just the files that contains the change
|
|
in <string>.
|
|
|
|
-O<orderfile>::
|
|
Output the patch in the order specified in the
|
|
<orderfile>, which has one shell glob pattern per line.
|
|
|
|
-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
|
|
|