On Tue, Apr 12, 2011 at 22:57, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx> writes:
>
>>>> + Â Â Â Â Â Â "Warning: you are leaving %d commit behind, "
>>>> ...
>>>> Â Â Â Â Â Â Â "If you want to keep them by creating a new branch, "
>>>
>>> s/them/it/ as this is a singular case, no?
>>
>> I just used the message as-is, we were using that for the singular before.
>
> Heh, you cannot claim innocence in this case; it used to be "leaving %d
> commit(s) behind, ... if you want _them_", which was consistent with the
> earlier use of "commit(s)" ;-).
No, it was:
"Warning: you are leaving %d commit%s behind, "
[...]
lost, ((1 < lost) ? "s" : "")
So it would be "commit" or "commits" depending on the value of the
"lost" variable.
Anyway I could re-submit this or you could fix it up, either is fine by me.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html