git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Add --gui option to mergetool

From
David Aguilar <davvid@gmail.com>
Date
Feb 5, 2017, 10:18 UTC
Message-ID
<20170205101825.jdhklpoadt4ingcf@gmail.com>
In-Reply-To
<20170204064303.GA14990@arch-attack.localdomain>
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
Previous: Denton Liu
Message 2 of 2 in “Add --gui option to mergetool”
  1. Add --gui option to mergetoolDenton Liu, Feb 4, 2017
  2. David AguilarFeb 5, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.