X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-ls-files.txt;h=9c5ef8e7a41425a02eeda8b28fafa26907aa7f47;hb=ee6566e8d70da682ac4926dd8a67ac821b2c1743;hp=d2072194059c65f92487c84c53b9f6b5da780d14;hpb=638ccfdf0eeabf3d985426308b2a82db6207ae28;p=git.git diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index d2072194..9c5ef8e7 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -87,8 +87,8 @@ 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 1, A in stage 2, and B in stage 3. This information can be used by -the user (or Cogito) to see what should eventually be recorded at the -path. (see read-cache for more information on state) +the user (or the porcelain) to see what should eventually be recorded at the +path. (see git-read-tree for more information on state) Exclude Patterns @@ -130,7 +130,7 @@ time. They are built and ordered in the following way: are popped off when leaving the directory. Each pattern in the pattern list specifies "a match pattern" and -optionally the fate;n either a file that matches the pattern is +optionally the fate; either a file that matches the pattern is considered excluded or included. A filename is matched against the patterns in the three lists; the --exclude-from list is checked first, then the --exclude-per-directory list, and then @@ -180,7 +180,7 @@ An example: See Also -------- -link:read-cache.html[read-cache] +link:git-read-tree.html[git-read-tree] Author