Merge branch 'ug/doc-lose-dircache' Doc update. * ug/doc-lose-dircache: doc: remove "directory cache" from man pages
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index cbcf526..0a3b526 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt
@@ -23,9 +23,8 @@ 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 1489cb0..2853f16 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt
@@ -30,9 +30,8 @@ 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.