From: David Aguilar Date: Fri, 20 Jan 2012 07:25:31 GMT Subject: Re: difftool / mergetool waiting Message-ID: In-Reply-To: On Sat, Jan 14, 2012 at 12:38 AM, Andreas Schwab wrote: > Jonathan Seng writes: > >> If wait is false, git would fire off the tool command and proceed to >> the next then exit cleanly. > > That doesn't work for git mergetool, it wouldn't be able to postprocess > the result of calling the tool command. The difficulty on the difftool side is that the git-difftool--helper scriptlet is being driven by git diff (as a $GIT_EXTERNAL_DIFF) and depends on git diff to do the temp file cleanup. Not blocking would return control immediately to git diff. This is unwanted because the temp files would likely be removed before the tools have a chance to open them. You could write a script that simply forks off multiple difftool commands. The difftool stuff in git-cola does exactly that, for example. --             David