Re: [RESEND v2] git-rebase.txt: rewrite docu for fixup/squash (again)

From: Marc Branchaud <marcnarc@xiplink.com>
Date: Oct 27, 2023, 12:39 UTC
Message-ID: <b71d066b-104a-4c60-9319-b3c635be6efc@xiplink.com>
In-Reply-To: <ZTg0zXkvSQ6L+4Oj@ugly>

On 2023-10-24 17:19, Oswald Buddenhagen wrote:

Show 10 quoted lines

> 
>>> +The commit message for the folded commit is the concatenation of the
>>> +message of the first commit with those of commits identified by 
>>> "squash"
>>
>> s/message of the first commit/picked commit's message/
>>
> that does indeed sound better, but i think it's more confusing (and 
> potentially even more so when translated directly). i guess one could 
> use "pick'd commit's", but that's kind of ugly again.

Let the translators worry about how to phrase it in other languages. In English "picked" is the right choice. You should not presume that other languages will want to use the word "pick" verbatim.

M.