Re: [PATCH] Add --gui option to mergetool
From: David Aguilar <hidden>
Date: 2017-02-05 10:18:35
On Fri, Feb 03, 2017 at 10:43:03PM -0800, Denton Liu wrote:
* fix the discrepancy between difftool and mergetool where the former has the --gui flag and the latter does not by adding the functionality to mergetool
Please avoid bullet points in commit messages when a simple paragraph will suffice. The implementation of this feature seems ok, but tests are needed in t/t7610-mergetool.sh.
* make difftool read 'merge.guitool' as a fallback, in accordance to the manpage for difftool: "git difftool falls back to git mergetool config variables when the difftool equivalents have not been defined"
I did not spot this change in the code. Nonetheless, this should be split off as a separate patch, and tests should be added.
* add guitool-related completions
This should be split off as a separate patch as well. Generally, 3 bullet points suggests there should be 3 patches in this series. Thanks, -- David