From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: git@vger.kernel.org, davvid@gmail.com
Subject: Re: [PATCH] Document the --no-gui option in difftool
Date: Mon, 06 Feb 2017 10:53:50 -0800 [thread overview]
Message-ID: <xmqqa89z2ls1.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170206034118.GA29517@arch-attack.localdomain> (Denton Liu's message of "Sun, 5 Feb 2017 19:41:18 -0800")
Denton Liu <liu.denton@gmail.com> writes:
> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
> index 224fb3090..a2661d9cc 100644
> --- a/Documentation/git-difftool.txt
> +++ b/Documentation/git-difftool.txt
> @@ -87,9 +87,11 @@ instead. `--no-symlinks` is the default on Windows.
>
> -g::
> --gui::
> +--no-gui::
> When 'git-difftool' is invoked with the `-g` or `--gui` option
> the default diff tool will be read from the configured
> - `diff.guitool` variable instead of `diff.tool`.
> + `diff.guitool` variable instead of `diff.tool`. The `--no-gui`
> + option can be used to override this setting.
>
> --[no-]trust-exit-code::
> 'git-difftool' invokes a diff tool individually on each file.
Reading the whole of this file before applying this patch, I notice
that we have descriptions of negative forms only for some but not
all options. "--[no-]symlinks" and "--[no-]trust-exit-code" are
already there, but not this one.
Shouldn't the patch be more like
---gui::
+--[no-]gui::
to be consistent with its existing friends, though?
prev parent reply other threads:[~2017-02-06 18:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 3:41 [PATCH] Document the --no-gui option in difftool Denton Liu
2017-02-06 18:53 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa89z2ls1.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.