X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=332e023d0f14be813ead6cb6915938910ea3a719;hb=3adac0afe2f27aead02ed5dcf918e42e2172c3a4;hp=d072fdaa4f74a6508abcae17001b1321c73bb000;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index d072fdaa..332e023d 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -8,22 +8,22 @@ git-merge-index - Runs a merge for files needing merging SYNOPSIS -------- -'git-merge-index' [-o] [-q] (-a | -- | \*) +'git-merge-index' [-o] [-q] (-a | \-- | \*) DESCRIPTION ----------- -This looks up the (s) in the cache and, if there are any merge +This looks up the (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 as argument 4. File modes for the three 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