|
|
|
|
git-diff(1)
|
|
|
|
|
===========
|
|
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
|
|
|
|
git-diff - Show changes between commits, commit and working tree, etc.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
|
|
|
|
'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
|
|
|
|
Show changes between two ents, an ent and the working tree, an
|
|
|
|
|
ent and the index file, or the index file and the working tree.
|
|
|
|
|
The combination of what is compared with what is determined by
|
|
|
|
|
the number of ents given to the command.
|
|
|
|
|
|
|
|
|
|
* When no <ent> is given, the working tree and the index
|
|
|
|
|
file is compared, using `git-diff-files`.
|
|
|
|
|
|
|
|
|
|
* When one <ent> is given, the working tree and the named
|
|
|
|
|
tree is compared, using `git-diff-index`. The option
|
|
|
|
|
`--cached` can be given to compare the index file and
|
|
|
|
|
the named tree.
|
|
|
|
|
|
|
|
|
|
* When two <ent>s are given, these two trees are compared
|
|
|
|
|
using `git-diff-tree`.
|
|
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
|
-------
|
|
|
|
|
--diff-options::
|
|
|
|
|
'--diff-options' are passed to the `git-diff-files`,
|
|
|
|
|
`git-diff-index`, and `git-diff-tree` commands. See the
|
|
|
|
|
documentation for these commands for description.
|
|
|
|
|
|
|
|
|
|
<path>...::
|
|
|
|
|
The <path> arguments are also passed to `git-diff-\*`
|
|
|
|
|
commands.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Author
|
|
|
|
|
------
|
|
|
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
|
--------------
|
|
|
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
|
|
GIT
|
|
|
|
|
---
|
|
|
|
|
Part of the gitlink:git[7] suite
|
|
|
|
|
|
