diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-08-05 17:05:02 +0200 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-05 23:07:00 -0700 |
commit | 2c6e4771959dbe8116f39587d912f1215c06cd0d (patch) | |
tree | 4a0507fb450fc5c74ecc489701917f188a0a5077 /Documentation/git-ls-files.txt | |
parent | eca35ecdcaa1448de8cc9ec64590f47a9012264a (diff) | |
download | git-2c6e4771959dbe8116f39587d912f1215c06cd0d.tar.gz |
[PATCH] Assorted documentation patches
[jc: Johannes spent time and effort to see how consistent our
use of terminilogy is, and as a byproduct made these corrections
not related to the terminology unification. I really appreciate
it.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index d207219405..d05827f611 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -87,7 +87,7 @@ 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 +the user (or the porcelain) to see what should eventually be recorded at the path. (see read-cache for more information on state) @@ -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 |