Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Raw File
Tip revision: 32e49d5d1ccbc4833b0c6f30d6dfc0f0936cc3f3 authored by Junio C Hamano on 10 October 2005, 02:19:36 UTC
GIT 0.99.8c
Tip revision: 32e49d5
diff-options.txt
-p::
	Generate patch (see section on generating patches)

-u::
	Synonym for "-p".

-r::
	Look recursively in subdirectories; only used by "git-diff-tree";
	other diff commands always work recursively.

-z::
	\0 line termination on output

--name-only::
	Show only names of changed files.

--name-status::
	Show only names and status of changed files.

-B::
	Break complete rewrite changes into pairs of delete and create.

-M::
	Detect renames.

-C::
	Detect copies as well as renames.

--find-copies-harder::
	For performance reasons, by default, -C option finds copies only 
	if the original file of the copy was modified in the same 
	changeset.  This flag makes the command
	inspect unmodified files as candidates for the source of
	copy.  This is a very expensive operation for large
	projects, so use it with caution.

-l<num>::
	-M and -C options require O(n^2) processing time where n
	is the number of potential rename/copy targets.  This
	option prevents rename/copy detection from running if
	the number of rename/copy targets exceeds the specified
	number.

-S<string>::
	Look for differences that contain the change in <string>.

--pickaxe-all::
	When -S finds a change, show all the changes in that
	changeset, not just the files that contain 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::
	Swap two inputs; that is, show differences from cache or
	on-disk file to tree contents.

For more detailed explanation on these common options, see also
link:diffcore.html[diffcore documentation].
back to top