* Re: [can-utils] add 'v' command response (#2)
[not found] ` <linux-can/can-utils/pull/2/issue_event/300127103@github.com>
@ 2015-05-08 10:46 ` Marc Kleine-Budde
2015-05-08 10:59 ` Oliver Hartkopp
0 siblings, 1 reply; 3+ messages in thread
From: Marc Kleine-Budde @ 2015-05-08 10:46 UTC (permalink / raw)
To: linux-can@vger.kernel.org, Oliver Hartkopp
[-- Attachment #1: Type: text/plain, Size: 879 bytes --]
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
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [can-utils] add 'v' command response (#2)
2015-05-08 10:46 ` [can-utils] add 'v' command response (#2) Marc Kleine-Budde
@ 2015-05-08 10:59 ` Oliver Hartkopp
2015-05-08 11:00 ` Marc Kleine-Budde
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Hartkopp @ 2015-05-08 10:59 UTC (permalink / raw)
To: Marc Kleine-Budde, linux-can@vger.kernel.org
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [can-utils] add 'v' command response (#2)
2015-05-08 10:59 ` Oliver Hartkopp
@ 2015-05-08 11:00 ` Marc Kleine-Budde
0 siblings, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2015-05-08 11:00 UTC (permalink / raw)
To: Oliver Hartkopp, linux-can@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
On 05/08/2015 12:59 PM, Oliver Hartkopp wrote:
> 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 :-)
done
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-08 11:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
2015-05-08 11:00 ` Marc Kleine-Budde
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).