From: rennes@openmailbox.org
To: guix-devel@gnu.org
Subject: Re: [PATCH 2/2] gnu: Add bluefish.
Date: Tue, 11 Oct 2016 10:27:43 -0500 [thread overview]
Message-ID: <5240359a432b4bc31c68ba68e544d084@openmailbox.org> (raw)
In-Reply-To: <mailman.8862.1476111449.22739.guix-devel@gnu.org>
Hello,
some help to check my procedure is correct?.
> If you do not have a branch, do the follwoing:
>
> git checkout -b gnome-bluefish
> # search for your two patches, e.g using "git reflog | grep gunimap"
> and "git reflog | grep bluefish"
> git cherry-pick abcdefg # use commit-id of gunimap patch
> git cherry-pick abcdefg # use commit-id of bluefish patch
^
In this way it does not work for me.
$ git checkout -b gnome-blue
Switched to a new branch 'gnome-blue'
$ git add gnu/packages/gnome.scm
$ git commit -m 'gnu: Add gucharmap.'
[gnome-blue 8291bac] gnu: Add gucharmap.
1 file changed, 33 insertions(+)
$ git add gnu/packages/gnome.scm
$ git commit -m 'gnu: Add bluefish.'
[gnome-blue a9c8770] gnu: Add bluefish.
1 file changed, 31 insertions(+)
$ git rebase master
Current branch gnome-blue is up to date.
$ git format-patch master
0001-gnu-Add-gucharmap.patch
0002-gnu-Add-bluefish.patch
Then this produces two patches!, I attach to both?
Thanks.
next parent reply other threads:[~2016-10-11 15:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <mailman.8862.1476111449.22739.guix-devel@gnu.org>
2016-10-11 15:27 ` rennes [this message]
[not found] <mailman.9097.1476199680.22739.guix-devel@gnu.org>
2016-10-17 23:33 ` [PATCH 2/2] gnu: Add bluefish rennes
2016-10-21 1:39 ` rennes
[not found] <mailman.8756.1476089051.22739.guix-devel@gnu.org>
2016-10-10 13:42 ` rennes
2016-10-10 13:59 ` Hartmut Goebel
[not found] <mailman.7342.1475666564.22739.guix-devel@gnu.org>
2016-10-05 23:13 ` rennes
2016-10-09 11:00 ` Hartmut Goebel
2016-10-09 14:05 ` Ricardo Wurmus
2016-10-09 20:25 ` rennes
2016-10-09 21:04 ` Ricardo Wurmus
2016-10-09 21:20 ` rennes
2016-10-10 7:36 ` Hartmut Goebel
2016-10-05 2:27 rennes
2016-10-05 9:40 ` Hartmut Goebel
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=5240359a432b4bc31c68ba68e544d084@openmailbox.org \
--to=rennes@openmailbox.org \
--cc=guix-devel@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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
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.