Kaartic Sivaraam <[email protected]> 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.
