From: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
To: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Cc: mtk.manpages@gmail.com, linux-man@vger.kernel.org
Subject: Re: [PATCH] man3/*: ffix, change '-' to '\-' for options
Date: Mon, 6 Jul 2020 10:45:00 +0200 [thread overview]
Message-ID: <3defbf91-5022-b042-ee2b-779fa5931343@gmail.com> (raw)
In-Reply-To: <20200704000211.GA1330@rhi.hi.is>
On 7/4/20 2:02 AM, Bjarni Ingi Gislason wrote:
> On Thu, Jul 02, 2020 at 12:27:25PM +0200, Michael Kerrisk (man-pages) wrote:
>> Hello Bjarni,
>>
>> On 7/2/20 12:50 AM, Bjarni Ingi Gislason wrote:
>>> Change '-' to '\-' for the prefix of names to indicate an option.
>>>
>>> Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
>>
>> Patch applied, but:
>>
>>> ---
>>> man3/dlopen.3 | 2 +-
>>> man3/fts.3 | 2 +-
>>> man3/getsubopt.3 | 2 +-
>>> man3/insque.3 | 2 +-
>>> man3/mq_getattr.3 | 2 +-
>>> man3/posix_spawn.3 | 8 ++++----
>>> man3/pthread_setname_np.3 | 2 +-
>>> man3/sincos.3 | 2 +-
>>> man3/strfromd.3 | 6 +++---
>>
>> The above piece was broken, so I applied manually. Was your patch
>> against master?
>>
> I always use my own copy of the repository where I apply my new
> patches to.
Please don't. When I've rejected particular changes (as below),
for reasons that I already explained (several times), then basing
your patches on private repo that still has those changes will
just cause breakage and wasted time for me. Please base patches
off a pristine master.
Thanks,
Michael
> The difference is the non-applied patches to master, that change a
> two-fonts macro to a single-font macro for a single argument.
>
> In this case in the man3/strfromd.3, ".B f" (master has ".BR f").
>
> So my "git pull" sometimes causes a merge conflict, which is easy for
> me to correct.
>
--
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/
next prev parent reply other threads:[~2020-07-06 8:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 22:50 [PATCH] man3/*: ffix, change '-' to '\-' for options Bjarni Ingi Gislason
2020-07-02 10:27 ` Michael Kerrisk (man-pages)
2020-07-04 0:02 ` Bjarni Ingi Gislason
2020-07-06 8:45 ` Michael Kerrisk (man-pages) [this message]
2020-07-13 18:58 ` Bjarni Ingi Gislason
2020-07-17 11:20 ` Michael Kerrisk (man-pages)
2020-07-30 0:07 ` Bjarni Ingi Gislason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3defbf91-5022-b042-ee2b-779fa5931343@gmail.com \
--to=mtk.manpages@gmail.com \
--cc=bjarniig@rhi.hi.is \
--cc=linux-man@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.