projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0fb7fc7) | patch
git-merge-index documentation: clarify synopsis
authorGerrit Pape <pape@smarden.org>
Fri, 22 Feb 2008 08:55:29 +0000 (08:55 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Feb 2008 15:02:40 +0000 (07:02 -0800)
commitc7fae5fc68974eec9b60750424946a67cc143ad2
tree8a6f4aaaed25c839a11a84b747679b6394cd7af5tree | snapshot
parent0fb7fc751d29cd1099556f71fc7c08158a6a78bccommit | diff
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>
Documentation/git-merge-index.txt diff | blob | history
merge-index.c diff | blob | history
Git—the stupid content tracker