diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-05-26 00:37:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-25 20:54:23 -0700 |
| commit | 5adf317b31729707fad4967c1aef6cdba43d0dd3 (patch) | |
| tree | 7426b5e25922ca0e335a620f2ba3892c2b2b1b66 /Documentation/git-ls-files.txt | |
| parent | a58f3c01f7e6aecb486aadece040a6293eb43059 (diff) | |
| download | git-5adf317b31729707fad4967c1aef6cdba43d0dd3.tar.gz | |
Replace the last 'dircache's by 'index'
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-ls-files.txt')
| -rw-r--r-- | Documentation/git-ls-files.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 79e0b7b71a..b7c8ab5f7a 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -124,7 +124,7 @@ which case it outputs: detailed information on unmerged paths. For an unmerged path, instead of recording a single mode/SHA1 pair, -the dircache records up to three such pairs; one from tree O in stage +the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see git-read-tree for more information on state) |