diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-06 03:31:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-06 03:31:26 +0300 |
| commit | 71217353da985f18f7a3697a4a350928272a08b0 (patch) | |
| tree | 8895b669c4155f480b47b39a203c71d296052d1b /Documentation | |
| parent | 40a2eeda421c8c016b1d480ce9eb63a521205970 (diff) | |
| parent | b356d236389979f8c65ee76562d44acc62efdc46 (diff) | |
Merge branch 'ug/doc-lose-dircache' into maint
Doc update.
* ug/doc-lose-dircache:
doc: remove "directory cache" from man pages
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index cbcf5263dd..0a3b5265b3 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -23,9 +23,8 @@ SYNOPSIS DESCRIPTION ----------- -This merges the file listing in the directory cache index with the -actual working directory list, and shows different combinations of the -two. +This merges the file listing in the index with the actual working +directory list, and shows different combinations of the two. One or more of the options below may be used to determine the files shown: diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 1489cb09a0..2853f168d9 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -30,9 +30,8 @@ SYNOPSIS DESCRIPTION ----------- -Modifies the index or directory cache. Each file mentioned is updated -into the index and any 'unmerged' or 'needs updating' state is -cleared. +Modifies the index. Each file mentioned is updated into the index and +any 'unmerged' or 'needs updating' state is cleared. See also linkgit:git-add[1] for a more user-friendly way to do some of the most common operations on the index. |