From: Karel Zak <kzak@redhat.com>
To: Ruediger Meier <sweet_f_a@gmx.de>
Cc: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>,
util-linux@vger.kernel.org
Subject: Re: [PATCH 0/2] docs: renice(1) patches
Date: Fri, 9 Dec 2016 13:36:47 +0100 [thread overview]
Message-ID: <20161209123647.mhbzm57f5phjtg3k@ws.net.home> (raw)
In-Reply-To: <201612071552.38043.sweet_f_a@gmx.de>
On Wed, Dec 07, 2016 at 03:52:37PM +0100, Ruediger Meier wrote:
> On Wednesday 07 December 2016, Michael Kerrisk (man-pages) wrote:
> > Karel,
> >
> > The two following patches contain nontrivial content
> > changes to the renice(1) page. They depend on changes
> > sent in my just-sent git pull request that includes
> > trivial changes to the renice(1) page.
>
>
> For example like this:
>
> $ rm -rf /tmp/patches
> $ git format-patch --cover-letter o /tmp/patches master..HEAD
> $ git send-email --to=util-linux@vger.kernel.org /tmp/patches/*
+1
I have problem to apply the patches, for example:
Applying: docs: renice(1): Remove obsolete BUGS text
fatal: sha1 information is lacking or useless (sys-utils/renice.1).
error: could not build fake ancestor
Patch failed at 0001 docs: renice(1): Remove obsolete BUGS text
The copy of the patch that failed is found in: .git/rebase-apply/patch
the both patches are applied now, but manually.
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
next prev parent reply other threads:[~2016-12-09 12:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 13:54 [PATCH 0/2] docs: renice(1) patches Michael Kerrisk (man-pages)
2016-12-07 14:52 ` Ruediger Meier
2016-12-09 12:36 ` Karel Zak [this message]
2016-12-09 12:39 ` Karel Zak
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=20161209123647.mhbzm57f5phjtg3k@ws.net.home \
--to=kzak@redhat.com \
--cc=mtk.manpages@gmail.com \
--cc=sweet_f_a@gmx.de \
--cc=util-linux@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox