From: Junio C Hamano <gitster@pobox•com>
To: Kaartic Sivaraam <kaartic.sivaraam@gmail•com>
Cc: Git mailing list <git@vger•kernel.org>
Subject: Re: [PATCH] git-rebase: clean up dashed-usages in messages
Date: Mon, 20 Nov 2017 09:26:42 +0900 [thread overview]
Message-ID: <xmqqmv3hokvx.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <459f9455-5edb-39a2-1511-1590e50d4545@gmail.com> (Kaartic Sivaraam's message of "Sun, 19 Nov 2017 22:58:40 +0530")
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.
next prev parent reply other threads:[~2017-11-20 0:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-18 16:18 [PATCH] git-rebase: clean up dashed-usages in messages Kaartic Sivaraam
2017-11-19 2:12 ` Junio C Hamano
2017-11-19 17:28 ` Kaartic Sivaraam
2017-11-20 0:26 ` Junio C Hamano [this message]
2017-11-20 15:26 ` Kaartic Sivaraam
2017-11-21 0:33 ` 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=xmqqmv3hokvx.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kaartic.sivaraam@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox