# [PATCH v2] Document the --no-gui option in difftool 2 messages from 2017-02-07 to 2017-02-08. Participants: Denton Liu, Junio C Hamano. Thread: https://gitlist.dev/t/45066 ## Denton Liu, 2017-02-07 06:32 Subject: [PATCH v2] Document the --no-gui option in difftool Message-ID: <20170207063207.GA12746@arch-attack.localdomain> URL: https://gitlist.dev/e/20170207063207.GA12746%40arch-attack.localdomain ``` 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 --- 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. -- 2.11.1 ``` ## Junio C Hamano, 2017-02-08 21:30 Subject: Re: [PATCH v2] Document the --no-gui option in difftool Message-ID: URL: https://gitlist.dev/e/xmqqo9ycv09u.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20170207063207.GA12746@arch-attack.localdomain> ``` Denton Liu 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 > --- 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. ```