Re: A note on merging conflicts..

From: Linus Torvalds <torvalds@osdl.org>
Date: Jul 1, 2006, 18:52 UTC
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:

Show 5 quoted lines

> 
> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.