Documentation / git-diff.txton commit Merge http://www.kernel.org/pub/scm/gitk/gitk (8fc66df)
   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`----------------`--------`-----------------------------`------------------
  21Number of ents    Options  What's Compared               Underlying command
  22---------------------------------------------------------------------------
  230                 -        index file and working tree   git-diff-files
  241                 --cached ent and index file            git-diff-index
  251                 -        ent and working tree          git-diff-index
  262                 -        two ents                      git-diff-tree
  27---------------------------------------------------------------------------
  28
  29OPTIONS
  30-------
  31--diff-options::
  32        '--diff-options' are passed to the `git-diff-files`,
  33        `git-diff-index`, and `git-diff-tree` commands.  See the
  34        documentation for these commands for description.
  35
  36<path>...::
  37        The <path> arguments are also passed to `git-diff-\*`
  38        commands.
  39
  40
  41Author
  42------
  43Written by Linus Torvalds <torvalds@osdl.org>
  44
  45Documentation
  46--------------
  47Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
  48
  49GIT
  50---
  51Part of the gitlink:git[7] suite
  52