login
Header Space

 
 

Re: A note on merging conflicts..

Previous thread: Re: [RFC/PATCH 14] autoconf: Added --with/--without for openssl, curl, expat to ./configure by Jakub Narebski on Saturday, July 1, 2006 - 1:55 pm. (2 messages)

Next thread: Re: [PATCH] autoconf: Use autoconf to write installation directories to config.mak by Jakub Narebski on Saturday, July 1, 2006 - 6:04 pm. (1 message)
To: <git@...>
Date: Saturday, July 1, 2006 - 2:22 pm

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?

As postfix operator "^" means "dereference", i.e. parent in the case 
of commit; allows choosing a parent (commit^n) and listing all parents 
(commit^@). Using it as binary infix operator that would be I think 
too much. 

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git


-
To: Jakub Narebski <jnareb@...>
Cc: <git@...>
Date: Saturday, July 1, 2006 - 2:52 pm

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
-
Previous thread: Re: [RFC/PATCH 14] autoconf: Added --with/--without for openssl, curl, expat to ./configure by Jakub Narebski on Saturday, July 1, 2006 - 1:55 pm. (2 messages)

Next thread: Re: [PATCH] autoconf: Use autoconf to write installation directories to config.mak by Jakub Narebski on Saturday, July 1, 2006 - 6:04 pm. (1 message)
speck-geostationary