Documentation/diff-options.txt

   1 -p::
   2         Generate patch (see section on generating patches)
   3
   4 -u::
   5         Synonym for "-p".
   6
   7 -z::
   8         \0 line termination on output
   9
  10 --name-only::
  11         Show only names of changed files.
  12
  13 --name-status::
  14         Show only names and status of changed files.
  15
  16 --full-index::
  17         Instead of the first handful characters, show full
  18         object name of pre- and post-image blob on the "index"
  19         line when generating a patch format output.
  20
  21 --abbrev[=<n>]::
  22         Instead of showing the full 40-byte hexadecimal object
  23         name in diff-raw format output and diff-tree header
  24         lines, show only handful hexdigits prefix.  This is
  25         independent of --full-index option above, which controls
  26         the diff-patch output format.  Non default number of
  27         digits can be specified with --abbrev=<n>.
  28
  29 -B::
  30         Break complete rewrite changes into pairs of delete and create.
  31
  32 -M::
  33         Detect renames.
  34
  35 -C::
  36         Detect copies as well as renames.
  37
  38 --find-copies-harder::
  39         For performance reasons, by default, -C option finds copies only
  40         if the original file of the copy was modified in the same
  41         changeset.  This flag makes the command
  42         inspect unmodified files as candidates for the source of
  43         copy.  This is a very expensive operation for large
  44         projects, so use it with caution.
  45
  46 -l<num>::
  47         -M and -C options require O(n^2) processing time where n
  48         is the number of potential rename/copy targets.  This
  49         option prevents rename/copy detection from running if
  50         the number of rename/copy targets exceeds the specified
  51         number.
  52
  53 -S<string>::
  54         Look for differences that contain the change in <string>.
  55
  56 --pickaxe-all::
  57         When -S finds a change, show all the changes in that
  58         changeset, not just the files that contain the change
  59         in <string>.
  60
  61 -O<orderfile>::
  62         Output the patch in the order specified in the
  63         <orderfile>, which has one shell glob pattern per line.
  64
  65 -R::
  66         Swap two inputs; that is, show differences from index or
  67         on-disk file to tree contents.
  68
  69 For more detailed explanation on these common options, see also
  70 link:diffcore.html[diffcore documentation].