X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=6b496ede2550cf573a3a7ce37db908e6b3ab631e;hb=8bf14d6ef9245f3b81d24cb7725a868f62343277;hp=06500d04b7f56507cd8bc379cb34b91b7056bf18;hpb=f73ae1fc5d5308fecf0a4bdbd7312f7f5b00df55;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 06500d04..6b496ede 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -4,10 +4,6 @@ -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 @@ -17,6 +13,11 @@ --name-status:: Show only names and status of changed files. +--full-index:: + Instead of the first handful characters, show full + object name of pre- and post-image blob on the "index" + line when generating a patch format output. + -B:: Break complete rewrite changes into pairs of delete and create. @@ -54,7 +55,7 @@ , which has one shell glob pattern per line. -R:: - Swap two inputs; that is, show differences from cache or + Swap two inputs; that is, show differences from index or on-disk file to tree contents. For more detailed explanation on these common options, see also