{"thread":{"id":"45056","subject":"[PATCH] Document the --no-gui option in difftool","startedAt":"2017-02-06T03:41:32Z","lastAt":"2017-02-06T18:54:07Z","messageCount":2,"participants":["Denton Liu","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"310897","messageId":"20170206034118.GA29517@arch-attack.localdomain","threadId":"45056","inReplyTo":null,"subject":"[PATCH] Document the --no-gui option in difftool","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2017-02-06T03:41:18Z","receivedAt":"2017-02-06T03:41:32Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"Prior to this, the `--no-gui` option was not documented in the manpage.\nThis commit introduces this into the manpage\n\nSigned-off-by: Denton Liu <liu.denton@gmail.com>\n---\n Documentation/git-difftool.txt | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 224fb3090..a2661d9cc 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -87,9 +87,11 @@ instead.  `--no-symlinks` is the default on Windows.\n \n -g::\n --gui::\n+--no-gui::\n \tWhen 'git-difftool' is invoked with the `-g` or `--gui` option\n \tthe default diff tool will be read from the configured\n-\t`diff.guitool` variable instead of `diff.tool`.\n+\t`diff.guitool` variable instead of `diff.tool`. The `--no-gui`\n+\toption can be used to override this setting.\n \n --[no-]trust-exit-code::\n \t'git-difftool' invokes a diff tool individually on each file.\n-- \n2.12.0.rc0.208.g81c5d00b2\n\n"},{"id":"310934","messageId":"xmqqa89z2ls1.fsf@gitster.mtv.corp.google.com","threadId":"45056","inReplyTo":"20170206034118.GA29517@arch-attack.localdomain","subject":"Re: [PATCH] Document the --no-gui option in difftool","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-02-06T18:53:50Z","receivedAt":"2017-02-06T18:54:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Denton Liu <liu.denton@gmail.com> writes:\n\n> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\n> index 224fb3090..a2661d9cc 100644\n> --- a/Documentation/git-difftool.txt\n> +++ b/Documentation/git-difftool.txt\n> @@ -87,9 +87,11 @@ instead.  `--no-symlinks` is the default on Windows.\n>  \n>  -g::\n>  --gui::\n> +--no-gui::\n>  \tWhen 'git-difftool' is invoked with the `-g` or `--gui` option\n>  \tthe default diff tool will be read from the configured\n> -\t`diff.guitool` variable instead of `diff.tool`.\n> +\t`diff.guitool` variable instead of `diff.tool`. The `--no-gui`\n> +\toption can be used to override this setting.\n>  \n>  --[no-]trust-exit-code::\n>  \t'git-difftool' invokes a diff tool individually on each file.\n\nReading the whole of this file before applying this patch, I notice\nthat we have descriptions of negative forms only for some but not\nall options. \"--[no-]symlinks\" and \"--[no-]trust-exit-code\" are\nalready there, but not this one.  \n\nShouldn't the patch be more like\n\n    ---gui::\n    +--[no-]gui::\n\nto be consistent with its existing friends, though?\n\n"}]}