From: David Aguilar <davvid@gmail.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add --gui option to mergetool
Date: Sun, 5 Feb 2017 02:18:25 -0800 [thread overview]
Message-ID: <20170205101825.jdhklpoadt4ingcf@gmail.com> (raw)
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
prev parent reply other threads:[~2017-02-05 10:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-04 6:43 [PATCH] Add --gui option to mergetool Denton Liu
2017-02-05 10:18 ` David Aguilar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170205101825.jdhklpoadt4ingcf@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).