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 v2] Document the --no-gui option in difftool
Date: Wed, 08 Feb 2017 13:30:05 -0800 [thread overview]
Message-ID: <xmqqo9ycv09u.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170207063207.GA12746@arch-attack.localdomain> (Denton Liu's message of "Mon, 6 Feb 2017 22:32:07 -0800")
Denton Liu <liu.denton@gmail.com> writes:
> Prior to this, the `--no-gui` option was not documented in the manpage.
> This commit introduces this into the manpage
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
Looks good, thanks.
> Documentation/git-difftool.txt | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
> index 224fb3090..96c26e6aa 100644
> --- a/Documentation/git-difftool.txt
> +++ b/Documentation/git-difftool.txt
> @@ -86,10 +86,11 @@ instead. `--no-symlinks` is the default on Windows.
> Additionally, `$BASE` is set in the environment.
>
> -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.
prev parent reply other threads:[~2017-02-08 21:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 6:32 [PATCH v2] Document the --no-gui option in difftool Denton Liu
2017-02-08 21:30 ` 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
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=xmqqo9ycv09u.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.
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).