git-merge: exclude unnecessary options from OPTIONS_SPEC
commitc3170a83d6fee30c5d10afe33d88867ba0b68218
authorMiklos Vajna <vmiklos@frugalware.org>
Mon, 12 May 2008 17:22:56 +0000 (12 19:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 19:54:49 +0000 (21 12:54 -0700)
treecdaa24213da23edf0784529cca0913660f7418e5
parent26ec126a9166be39f79e746a3a8c92205c983820
git-merge: exclude unnecessary options from OPTIONS_SPEC

gitcli(5) already documents them, and there are no options named
--no-no-stat, --no-no-summary and --no-no-log.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge.sh