From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 01 Jul 2006 18:52:23 GMT
Subject: Re: A note on merging conflicts..
Message-ID: <Pine.LNX.4.64.0607011146530.12404@g5.osdl.org>
In-Reply-To: <e86ega$gnc$1@sea.gmane.org>



On Sat, 1 Jul 2006, Jakub Narebski wrote:
> 
> Caret is used twice, with different meaning. As prefix operator "^" means 
> "exclude lineage of commit" (while commit without "^" in front means:
> "include lineage of commit and commit itself"). BTW. why we don't use '!'
> for that?

Using '!' is really nasty with most shells. Avoid, avoid, avoid.

It would be more sensible to use ~ (mathematical negation), but that also 
has magic meaning for shell at the beginning of a word..

			Linus