From: Torsten Bögershausen <tboegi@web.de>
Date: Tue, 14 Jan 2014 18:51:57 GMT
Subject: Re: Re* manpage for git-pull mentions a non-valid option -m in a comment
Message-ID: <52D5874D.7070102@web.de>
In-Reply-To: <xmqqvbxm4dyq.fsf@gitster.dls.corp.google.com>

On 2014-01-14 19.26, Junio C Hamano wrote:
> Ivan Zakharyaschev <imz@altlinux.org> writes:
> 
>> Hello!
>>
>> git-1.8.4.4
>>
>> The manpage for git-pull mentions -m in a comment:
>>
>> --edit, -e, --no-edit
>> Invoke an editor before committing successful mechanical merge to further edit
>> the auto-generated merge message, so that the user can explain and justify the
>> merge. The --no-edit option can be used to accept the auto-generated message
>> (this is generally discouraged). The --edit (or -e) option is still useful if
>> you are giving a draft message with the -m option from the command line and
>> want to edit it in the editor.
>>
>> but it is not accepted actually:
> 
> I do not think "git pull" ever had the "-m <message>" option; what
> you are seeing probably is a fallout from attempting to share the
> documentation pieces between "git pull" and "git merge" too
> agressively without proofreading.
> 
> It seems that there are two issues; here is an untested attempt to
> fix.
> 
> -- >8 --
> Subject: Documentaiotn: exclude irrelevant options from "git pull"
           ^^^^^^^^^^^^^^
(Small nit ??)