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. So, the user might mistake it to be some kind of typo
in the error message. Is that close to why 'am' alone would be confusing?
Anyways, I stole that from a message shown by 'git status',
"You are in the middle of an am session."
So, does that require a change too?
---
Kaartic
