index 60306429fb7cad45e063cef8f70fc79005df7f70..332e023d0f14be813ead6cb6915938910ea3a719 100644 (file)
SYNOPSIS
--------
-'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
DESCRIPTION
-----------
OPTIONS
-------
---::
- Interpret all following arguments as filenames.
+\--::
+ Do not interpret any more arguments as options.
-a::
Run merge against all files in the index that need merging.