aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLukas_Sandström <lukass@etek.chalmers.se>2005-11-11 02:12:27 +0100
committerJunio C Hamano <junkio@cox.net>2005-11-11 15:12:29 -0800
commit5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9 (patch)
tree4283a10bb54027c8d53e6807e159c0f2de8d6945 /Documentation/git-merge-index.txt
parent3cab3594e9cfd5e98cbcb819b1bed91a7b3a974b (diff)
downloadgit-5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9.tar.gz
git-5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9.tar.xz
Change 'cache' to 'index' in the docs
This patch makes the documentation refer to the index as index instead of cache, but some references still remain. (e.g. git-update-index.txt) Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
-rw-r--r--Documentation/git-merge-index.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index d072fdaa4..60306429f 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -12,7 +12,7 @@ SYNOPSIS
DESCRIPTION
-----------
-This looks up the <file>(s) in the cache and, if there are any merge
+This looks up the <file>(s) in the index and, if there are any merge
entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
argument if no file), and <file> as argument 4. File modes for the three
files are passed as arguments 5, 6 and 7.
@@ -23,7 +23,7 @@ OPTIONS
Interpret all following arguments as filenames.
-a::
- Run merge against all files in the cache that need merging.
+ Run merge against all files in the index that need merging.
-o::
Instead of stopping at the first failed merge, do all of them