Hi, On Sat, 15 Apr 2006, Junio C Hamano wrote: > Honestly, the longer I look at it, the more I feel that this way > might break more things than it fixes. I haven't even looked at > blame.c or http-push.c to see what's broken yet. I do not have time to look at this closely, but it sounds to me like you need a two-stage approach: setup_diff_options(&options); [... set defaults ...] handle_cmdline_arguments(&options); [... possibly check if the user overrode some defaults ...] I think that the unified option parsing is the right approach. Ciao, Dscho - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html