index 5caee90adc43d2f59893f3e59fda23b5a05462a9..332e023d0f14be813ead6cb6915938910ea3a719 100644 (file)
git-merge-index(1)
==================
-v0.1, May 2005
NAME
----
SYNOPSIS
--------
-'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
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.
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