On Sat, Oct 25, 2008 at 11:11:14AM +0100, William Pursell wrote: > > My thinking is that when using an interactive tool > like vimdiff, the user is probably not going to > care as much about being prompted, or may prefer > to have the prompt in that situation. However, > if they've written a script to do the merge > non-interactively, then the prompt is undesirable. > > So a person might want to be prompted with > git mergetool -t vimdiff, and prefer no prompt > with git mergetool -t my-script. Being able > to configure the behavior on a per-tool > basis would allow that. I can see your point, although personally I feel that if you've gone to the trouble of writing a special script, the extra typing of an extra long option (if you prefer prompting normally) is not that big compared with the hassle of maintaining per-tool config settings if you like to regularly swap between merge tools. Both scenarios are probably not too common so I wouldn't object strongly to either. (But per tool configs is more dev work!) -- Charles Bailey http://ccgi.hashpling.plus.com/blog/ -- To unsubscribe from this list: 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