From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] added infozip package
Date: Thu, 10 Jan 2013 11:22:46 +0100 [thread overview]
Message-ID: <20130110112246.74db4cc0@skate> (raw)
In-Reply-To: <1357812808-3317-1-git-send-email-jp@jp-embedded.com>
Dear Jan Pedersen,
On Thu, 10 Jan 2013 11:13:27 +0100, Jan Pedersen wrote:
>
> Signed-off-by: Jan Pedersen <jp@jp-embedded.com>
> ---
> package/Config.in | 1 +
> package/infozip/Config.in | 10 ++++++++++
> package/infozip/infozip.mk | 43 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 54 insertions(+)
> create mode 100644 package/infozip/Config.in
> create mode 100644 package/infozip/infozip.mk
Thanks, but your patches 1/2 and 2/2 should be only one patch. Please
merge them together.
In order to do that, you'll have to do an interactive git rebase:
1. Tell git to rebase the last two patches
git rebase -i HEAD~2
2. A text editor will open, which will show two lines
pick <some SHA1> added infozip package
pick <some SHA1> now using generic-package
Change the "pick" word on the second line to "squash", and exit your
text editor.
3. A new text editor will open, which allows you to edit the commit
message. Change the commit message to be:
===
infozip: new package
This commit adds a package for infozip, compression and file
packaging/archive utility.
Signed-off-by: Jan Pedersen <jp@jp-embedded.com>
===
And exit your text editor.
And voil?, you have only one commit combining your two changes.
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
prev parent reply other threads:[~2013-01-10 10:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 10:13 [Buildroot] [PATCH 1/2] added infozip package Jan Pedersen
2013-01-10 10:13 ` [Buildroot] [PATCH 2/2] now using generic-package Jan Pedersen
2013-01-10 10:22 ` Thomas Petazzoni [this message]
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=20130110112246.74db4cc0@skate \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/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