From: Pavel Machek <pavel@ucw.cz>
To: David Miller <davem@davemloft.net>
Cc: torvalds@osdl.org, ctpm@ist.utl.pt, linux-kernel@vger.kernel.org
Subject: Re: Unintended commit?
Date: Tue, 24 Oct 2006 08:40:03 +0000 [thread overview]
Message-ID: <20061024084002.GB4299@ucw.cz> (raw)
In-Reply-To: <20061023.141040.59654407.davem@davemloft.net>
Hi!
> Perhaps it would be cool if you could tell GIT "Look, I know I have
> a change to foo.c, but it's a local hack and please act like it's
> not there unless I try to do an operation where ignoring that change
> is impossible, such as a merge."
When I was solving that problem, I ended up with two repositories:
clean-linus <-> linux-pavels-hacks <-> linux.
That behaves mostly as you want it...
Pavel
--
Thanks for all the (sleeping) penguins.
next prev parent reply other threads:[~2006-10-24 19:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-23 17:09 Claudio Martins
2006-10-23 17:13 ` Linus Torvalds
2006-10-23 21:10 ` David Miller
2006-10-23 21:27 ` Linus Torvalds
2006-10-24 8:40 ` Pavel Machek [this message]
2006-10-24 12:04 ` Jan Engelhardt
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=20061024084002.GB4299@ucw.cz \
--to=pavel@ucw.cz \
--cc=ctpm@ist.utl.pt \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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
all inboxes | Powered by JetHome®