# [PATCH] Document the --no-gui option in difftool 2 messages from 2017-02-06 to 2017-02-06. Participants: Denton Liu, Junio C Hamano. Thread: https://gitlist.dev/t/45056 ## Denton Liu, 2017-02-06 03:41 Subject: [PATCH] Document the --no-gui option in difftool Message-ID: <20170206034118.GA29517@arch-attack.localdomain> URL: https://gitlist.dev/e/20170206034118.GA29517%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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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. -- 2.12.0.rc0.208.g81c5d00b2 ``` ## Junio C Hamano, 2017-02-06 18:53 Subject: Re: [PATCH] Document the --no-gui option in difftool Message-ID: URL: https://gitlist.dev/e/xmqqa89z2ls1.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20170206034118.GA29517@arch-attack.localdomain> ``` Denton Liu 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? ```