Documentation / git-diff.txton commit Merge http://www.kernel.org/pub/scm/gitk/gitk (5e80092)
   1git-diff(1)
   2===========
   3
   4NAME
   5----
   6git-diff - Show changes between commits, commit and working tree, etc.
   7
   8
   9SYNOPSIS
  10--------
  11'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
  12
  13DESCRIPTION
  14-----------
  15Show changes between two ents, an ent and the working tree, an
  16ent and the index file, or the index file and the working tree.
  17The combination of what is compared with what is determined by
  18the number of ents given to the command.
  19
  20* When no <ent> is given, the working tree and the index
  21  file is compared, using `git-diff-files`.
  22
  23* When one <ent> is given, the working tree and the named
  24  tree is compared, using `git-diff-index`.  The option
  25  `--cached` can be given to compare the index file and
  26  the named tree.
  27
  28* When two <ent>s are given, these two trees are compared
  29  using `git-diff-tree`.
  30
  31OPTIONS
  32-------
  33--diff-options::
  34        '--diff-options' are passed to the `git-diff-files`,
  35        `git-diff-index`, and `git-diff-tree` commands.  See the
  36        documentation for these commands for description.
  37
  38<path>...::
  39        The <path> arguments are also passed to `git-diff-\*`
  40        commands.
  41
  42
  43Author
  44------
  45Written by Linus Torvalds <torvalds@osdl.org>
  46
  47Documentation
  48--------------
  49Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
  50
  51GIT
  52---
  53Part of the gitlink:git[7] suite
  54