From: William Pursell Date: Sat, 25 Oct 2008 10:11:14 GMT Subject: Re: [PATCH 2/3] Add -n/--no-prompt option to mergetool Message-ID: <4902F0C2.2070709@gmail.com> In-Reply-To: <20081024225539.GA6119@hashpling.org> Charles Bailey wrote: > On Fri, Oct 24, 2008 at 11:32:17PM +0100, William Pursell wrote: >> If the short option is dropped, the config option should >> probably associated with mergetool..interactive rather >> than mergetool.interactive. (s/interactive/whatever) > > I'm not sure I understand your reasoning. The no-prompt/interactive > option affects the behaviour of the mergetool script independent of > which particular merge tool is being used. Why should the presence or > absence of a short option affect whether the config option is global > or per tool? > 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. -- William Pursell