diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:35:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:35:55 -0700 |
| commit | c9d9a2d6b60178d604a2b78886b031d250980e9f (patch) | |
| tree | a2ad98c455cc7f811d521fadebc28197c71ed757 | |
| parent | 897175f1073dac328bc009bbe79bc3c45c9399c3 (diff) | |
| parent | b3d6e6e7075967659dc2f5064b4829902cca67da (diff) | |
| download | git-c9d9a2d6b60178d604a2b78886b031d250980e9f.tar.gz | |
Merge branch 'an/diff-index-doc' into maint
* an/diff-index-doc:
Documentation/diff-index: mention two modes of operation
| -rw-r--r-- | Documentation/git-diff-index.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index c0b7c581ad..a86cf62e68 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -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 @@ -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 ------- |