Gerrit Pape c7fae5fc68 git-merge-index documentation: clarify synopsis ...

The options following <merge-program> are not -a, --, or <file>...,
but either -a, or -- <file>..., while -- is optional.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-02-22 07:02:40 -08:00

2.4 KiB

Raw Blame History

View Raw