Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.

[git.git] / Documentation / git-merge-index.txt

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index d072fda..fbc986a 100644 (file)
--- 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.
@@ -20,10 +20,10 @@ files are passed as arguments 5, 6 and 7.
 OPTIONS
 -------
 --::
-       Interpret all following arguments as filenames.
+       Do not interpret any more arguments as options.
 
 -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