summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 21:48:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 21:48:46 -0800
commiteecc5f0775ebbd454f92e1da02f83bc43b5f3703 (patch)
tree0cb605ee5ea3cada2e81ef0629e5e8cd9af5a17e /Documentation
parentMerge branch 'ad/t4129-setfacl-target-fix' (diff)
parentdoc: remove "directory cache" from man pages (diff)
downloadtgif-eecc5f0775ebbd454f92e1da02f83bc43b5f3703.tar.xz
Merge branch 'ug/doc-lose-dircache'
Doc update. * ug/doc-lose-dircache: doc: remove "directory cache" from man pages
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-ls-files.txt5
-rw-r--r--Documentation/git-update-index.txt5
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.