X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=9e574a04d3904228f835eca2ab698c66b92bf2a8;hb=724b511d4fb363ebee828ba3992c831ba006444c;hp=32005b03f3bee40413d7ff0d33e143de85b194c6;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 32005b03..9e574a04 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -13,6 +13,19 @@ --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. + +--abbrev[=]:: + Instead of showing the full 40-byte hexadecimal object + name in diff-raw format output and diff-tree header + lines, show only handful dhexigits prefix. This is + independent of --full-index option above, which controls + the diff-patch output format. Non default number of + digits can be specified with --abbrev=. + -B:: Break complete rewrite changes into pairs of delete and create. @@ -50,7 +63,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