linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oliver Hartkopp <socketcan@hartkopp.net>
To: Marc Kleine-Budde <mkl@pengutronix.de>,
	"linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Subject: Re: [can-utils] add 'v' command response (#2)
Date: Fri, 08 May 2015 12:59:39 +0200	[thread overview]
Message-ID: <554C971B.9080302@hartkopp.net> (raw)
In-Reply-To: <554C93EE.5010800@pengutronix.de>

Oh yes!

I thought klicking the "Merge" button at github was a good idea.

But it created some messy stuff in the git history :-(

I would really appreciate if you would fix that :-)

Thanks,
Oliver

On 05/08/2015 12:46 PM, Marc Kleine-Budde wrote:
> On 05/08/2015 12:41 PM, Oliver Hartkopp wrote:
>> Merged #2 <https://github.com/linux-can/can-utils/pull/2>.
> 
> Do you mind, if I rebase the patch and force push it to master
> to get rid of the two merges?
> 
>> 2015-05-08 12:41 Oliver Hartkopp     M─┐ {origin/master} Merge pull request #2 from bombilee/master
>> 2015-05-07 10:13 bombilee            │ M─┐ Merge pull request #1 from bombilee/bombilee-patch-1
>> 2015-05-07 10:11 bombilee            │ │ o add 'v' command response
>> 2015-04-09 22:55 Yegor Yefremov      o─┴─┘ canplayer: convert skipgap to unsigned long
> 
> Marc
> 

  reply	other threads:[~2015-05-08 10:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <linux-can/can-utils/pull/2@github.com>
     [not found] ` <linux-can/can-utils/pull/2/issue_event/300127103@github.com>
2015-05-08 10:46   ` [can-utils] add 'v' command response (#2) Marc Kleine-Budde
2015-05-08 10:59     ` Oliver Hartkopp [this message]
2015-05-08 11:00       ` Marc Kleine-Budde

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=554C971B.9080302@hartkopp.net \
    --to=socketcan@hartkopp.net \
    --cc=linux-can@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    /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 NNTP newsgroup(s).