From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-can@vger.kernel.org
Subject: Re: [PATCH can-utils] Don't overwrite PREFIX and DESTDIR when provided via the environment
Date: Tue, 20 Aug 2013 08:55:42 +0200 [thread overview]
Message-ID: <521312EE.4080606@pengutronix.de> (raw)
In-Reply-To: <5212FEB6.2080005@hartkopp.net>
[-- Attachment #1: Type: text/plain, Size: 969 bytes --]
On 08/20/2013 07:29 AM, Oliver Hartkopp wrote:
> On 19.08.2013 21:16, Marc Kleine-Budde wrote:
>> On 08/19/2013 07:23 PM, Oliver Hartkopp wrote:
>>> I did not intentionally replace you as author.
>>>
>>> When i do a similar commit from a mail, I’ll take care about not loosing the
>>> original author anymore.
>>>
>>> Git still is mystic to me 8-)
>>
>> If it's okay Oliver, I'm going to force push your branch, so that we
>> have a clean history again.
>>
>
> I would appreciate that.
Done. You can bring your local repo into a consistent state with:
$ pit pull --rebase
If you don't have any patches applied your HEAD should be equal to
origin/master.
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: 259 bytes --]
prev parent reply other threads:[~2013-08-20 7:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-17 19:28 [PATCH can-utils] Don't overwrite PREFIX and DESTDIR when provided via the environment Uwe Kleine-König
2013-08-17 19:32 ` Marc Kleine-Budde
2013-08-18 11:02 ` Oliver Hartkopp
2013-08-18 20:49 ` Uwe Kleine-König
2013-08-18 21:36 ` Marc Kleine-Budde
2013-08-19 8:24 ` Marc Kleine-Budde
2013-08-19 8:37 ` Uwe Kleine-König
2013-08-19 17:23 ` Oliver Hartkopp
2013-08-19 19:16 ` Marc Kleine-Budde
2013-08-20 5:29 ` Oliver Hartkopp
2013-08-20 6:55 ` Marc Kleine-Budde [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=521312EE.4080606@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=socketcan@hartkopp.net \
--cc=u.kleine-koenig@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).