mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'an/diff-index-doc' into maint

Browse Source 
* an/diff-index-doc:
  Documentation/diff-index: mention two modes of operation
This commit is contained in:
Junio C Hamano
2013-07-03 15:35:55 -07:00
parent 897175f107 b3d6e6e707
commit c9d9a2d6b6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/git-diff-index.txt
View File

@ -3,7 +3,7 @@ git-diff-index(1)
NAME 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 SYNOPSIS
@ -13,11 +13,11 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
Compares the content and mode of the blobs found via a tree Compares the content and mode of the blobs found in a tree object
object with the content of the current index and, optionally with the corresponding tracked files in the working tree, or with the
ignoring the stat state of the file on disk. When paths are corresponding paths in the index. When <path> arguments are present,
specified, compares only those named paths. Otherwise all compares only paths matching those patterns. Otherwise all tracked
entries in the index are compared. files are compared.
OPTIONS OPTIONS
------- -------