[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: usage: add a comma between short and long command line options
From: |
David Kastrup |
Subject: |
Re: usage: add a comma between short and long command line options |
Date: |
Mon, 11 Nov 2013 11:31:46 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
James <address@hidden> writes:
> On 11/11/13 10:24, David Kastrup wrote:
>> James <address@hidden> writes:
>>
>>> On 10/11/13 11:33, Federico Bruni wrote:
>>>> @item -nd --no-articulation-directions
>>> I've done and pushed this
>>>
>>> Doc: External.itely - add missing comma
>>> author James Lowe <address@hidden>
>>> Mon, 11 Nov 2013 10:14:22 +0000 (10:14 +0000)
>>> committer James Lowe <address@hidden>
>>> Mon, 11 Nov 2013 10:15:04 +0000 (10:15 +0000)
>>> commit 5c4e47b46b49f1f33268396bbc4db440f565ea34
>>>
>>> Hope that was OK.
>> Well, it will mean a bunch of cherry-picking and/or trivial conflict
>> resolution over just putting this in translations, but then you were the
>> first giving off any indication for getting on this problem, so I can't
>> complain.
>>
> I can push this to stable/2.18 if you like?
Please don't. Introducing changes separately leads to merge conflicts.
I'll take this on with cherry-picking later (once it is in master). It
should do the trick to cherry-pick it into translations from where it
will get merged into stable/2.18 at some later time.
Yes, maintaining translations and similarly parallel 2.18 and 2.19
branches is a bit of a headache. The fewer people try helping out, the
less of a headache it becomes...
Going through master probably was ok. Most non-trivial fixes will go
that way anyway (unless they are 2.18-only, but I hope to avoid seeing
too many of those).
--
David Kastrup