diff options
author | Gerrit Pape <pape@smarden.org> | 2008-02-22 08:55:29 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-22 07:02:40 -0800 |
commit | c7fae5fc68974eec9b60750424946a67cc143ad2 (patch) | |
tree | 8a6f4aaaed25c839a11a84b747679b6394cd7af5 /Documentation/git-help.txt | |
parent | send-email: fix In-Reply-To regression (diff) | |
download | tgif-c7fae5fc68974eec9b60750424946a67cc143ad2.tar.xz |
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>
Diffstat (limited to 'Documentation/git-help.txt')
0 files changed, 0 insertions, 0 deletions