Skip to content

Commit

Permalink
Documentation/diff-index: mention two modes of operation
Browse files Browse the repository at this point in the history
"diff-index" can be used to compare a tree with the tracked working
tree files (when used without the --index option), or with the index
(when used with the --index option).

The text however did not say anything about the comparison with the
working tree at all.  Fix this.

Reported-by: Albert Netymk <albertnetymk@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed May 20, 2013
1 parent 92758dd commit b3d6e6e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Documentation/git-diff-index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git-diff-index(1)

NAME
----
git-diff-index - Compares content and mode of blobs between the index and repository
git-diff-index - Compare a tree to the working tree or index


SYNOPSIS
Expand All @@ -13,11 +13,11 @@ SYNOPSIS

DESCRIPTION
-----------
Compares the content and mode of the blobs found via a tree
object with the content of the current index and, optionally
ignoring the stat state of the file on disk. When paths are
specified, compares only those named paths. Otherwise all
entries in the index are compared.
Compares the content and mode of the blobs found in a tree object
with the corresponding tracked files in the working tree, or with the
corresponding paths in the index. When <path> arguments are present,
compares only paths matching those patterns. Otherwise all tracked
files are compared.

OPTIONS
-------
Expand Down

0 comments on commit b3d6e6e

Please sign in to comment.