Skip to contentSkip to conversation

add 'v' command response (#2)

can-utils Marc Kleine-Budde 2 participants 3 messages May 8, 2015 2 messages not in the archive CAN network drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): linux-can/can-utils/pull/[email protected]

A message that is not in the archive (sent off-list or not yet received): linux-can/can-utils/pull/2/issue_event/[email protected]

Marc Kleine-Budde

author maintainer
#2 lore raw
Quoted 1 line · Oliver Hartkopp

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?

Quoted 4 lines
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

Signature · 4 lines
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   |
#3 lore raw

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

Quoted 13 lines · Marc Kleine-Budde
Quoted 1 line · Oliver Hartkopp

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?

Quoted 4 lines
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

author maintainer
#4 lore raw
Quoted 7 lines · Oliver Hartkopp

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

Signature · 4 lines
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   |