diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:48:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:48:17 -0700 |
| commit | 7abc6b715148118518a6fbdcef82b3e0dabbaa17 (patch) | |
| tree | 3fd64d8bc843b718be6e4ee57dbb5473e2a60705 /Documentation | |
| parent | f241c08d40ad9d479fb88e99ff0bb90d6dd73eda (diff) | |
| parent | b3d6e6e7075967659dc2f5064b4829902cca67da (diff) | |
| download | git-7abc6b715148118518a6fbdcef82b3e0dabbaa17.tar.gz git-7abc6b715148118518a6fbdcef82b3e0dabbaa17.tar.xz | |
Merge branch 'an/diff-index-doc'
* an/diff-index-doc:
Documentation/diff-index: mention two modes of operation
Diffstat (limited to 'Documentation')
| -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 c0b7c581a..a86cf62e6 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 ------- |