Documentation/git-diff-files.txt

   1 git-diff-files(1)
   2 =================
   3
   4 NAME
   5 ----
   6 git-diff-files - Compares files in the working tree and the index
   7
   8
   9 SYNOPSIS
  10 --------
  11 [verse]
  12 'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
  13
  14 DESCRIPTION
  15 -----------
  16 Compares the files in the working tree and the index.  When paths
  17 are specified, compares only those named paths.  Otherwise all
  18 entries in the index are compared.  The output format is the
  19 same as for 'git diff-index' and 'git diff-tree'.
  20
  21 OPTIONS
  22 -------
  23 include::diff-options.txt[]
  24
  25 -1 --base::
  26 -2 --ours::
  27 -3 --theirs::
  28 -0::
  29         Diff against the "base" version, "our branch" or "their
  30         branch" respectively.  With these options, diffs for
  31         merged entries are not shown.
  32 +
  33 The default is to diff against our branch (-2) and the
  34 cleanly resolved paths.  The option -0 can be given to
  35 omit diff output for unmerged entries and just show "Unmerged".
  36
  37 -c::
  38 --cc::
  39         This compares stage 2 (our branch), stage 3 (their
  40         branch) and the working tree file and outputs a combined
  41         diff, similar to the way 'diff-tree' shows a merge
  42         commit with these flags.
  43
  44 -q::
  45         Remain silent even on nonexistent files
  46
  47
  48 include::diff-format.txt[]
  49
  50 GIT
  51 ---
  52 Part of the linkgit:git[1] suite