From: David Craven <david@craven.ch>
To: help-guix@gnu.org
Subject: Re: no patch applies
Date: Sat, 6 Aug 2016 19:12:01 +0200 [thread overview]
Message-ID: <CAL1_immGiDS83bm=+v01f8oBJe0rJU9xvFh3Hg40Kk61acKkig@mail.gmail.com> (raw)
From the git docs:
> This command applies the patch but does not create a commit.
> Use git-am[1] to create commits from patches generated by
> git-format-patch[1] and/or received by email.
When you do:
git diff > a-patch.patch
git reset --hard
git apply a-patch.patch
the a-patch.patch file doesn't contain a header like this one:
```
From 7ae32701d13295eb380455af885eaf466303368c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Sun, 12 Jun 2016 21:15:00 +0200
Subject: [PATCH] kde porting aids
```
and git am fails when it's applied. The same is true for git format-patch
and git apply.
next reply other threads:[~2016-08-06 17:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-06 17:12 David Craven [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-08-05 3:28 no patch applies Catonano
2016-08-05 3:45 ` Leo Famulari
2016-08-05 7:59 ` Vincent Legoll
2016-08-05 10:09 ` Ricardo Wurmus
2016-08-05 13:07 ` Catonano
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAL1_immGiDS83bm=+v01f8oBJe0rJU9xvFh3Hg40Kk61acKkig@mail.gmail.com' \
--to=david@craven.ch \
--cc=help-guix@gnu.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).