All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: Junio C Hamano <gitster@pobox.com>,
	Ivan Zakharyaschev <imz@altlinux.org>
Cc: git@vger.kernel.org
Subject: Re: Re* manpage for git-pull mentions a non-valid option -m in a comment
Date: Tue, 14 Jan 2014 19:51:57 +0100	[thread overview]
Message-ID: <52D5874D.7070102@web.de> (raw)
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 ??)

  reply	other threads:[~2014-01-14 18:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-14  2:09 BUG: manpage for git-pull mentions a non-valid option -m in a comment Ivan Zakharyaschev
2014-01-14 18:26 ` Re* " Junio C Hamano
2014-01-14 18:51   ` Torsten Bögershausen [this message]
2014-01-14 19:39     ` Junio C Hamano
2014-01-14 19:54       ` [PATCH 1/2] Documentation: exclude irrelevant options from "git pull" Junio C Hamano
2014-01-14 19:57       ` [PATCH 2/2] Documentation: "git pull" does not have the "-m" option Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52D5874D.7070102@web.de \
    --to=tboegi@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=imz@altlinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.