From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Nov 2017 00:26:42 GMT
Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Message-ID: <xmqqmv3hokvx.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <459f9455-5edb-39a2-1511-1590e50d4545@gmail.com>

Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:

> On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote:
>>>   test -f "$apply_dir"/applying &&
>>> -	die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
>>> +	die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")"
>>
>> Probably not, as 'am' alone would be confusing.
>>
>>      "It looks like 'git am' is in progress. Cannot rebase."
>>
>> may be a more sensible improvement.
>
> Let me guess, 'am' alone would be confusing because it follows 'an' in
> the error message.

With a, an or the, or without, 'am' alone, unlike 'status',
'rebase', etc., do not look much like a subcommand name, and that is
why the original chose to say git-am.  The suggestion is to make the
primary change (i.e. remove mention of dashed form) without changing
or breaking what the original wanted to do.