[PATCH] defaults for where to merge from (take 3)

Actually, how about making the default configurable _AND_ have
the --no-track option (for scripting)?

Fine by me.  And also --track in case you want to try it out.  ;-)

I made it default true, environment.c can be changed by Junio if he 
applies the patch.

Patch attached.  --remove-section will go in a separate patch.

Paolo