{"thread":{"id":"45066","subject":"[PATCH v2] Document the --no-gui option in difftool","startedAt":"2017-02-07T06:32:23Z","lastAt":"2017-02-08T21:31:10Z","messageCount":2,"participants":["Denton Liu","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"310968","messageId":"20170207063207.GA12746@arch-attack.localdomain","threadId":"45066","inReplyTo":null,"subject":"[PATCH v2] Document the --no-gui option in difftool","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2017-02-07T06:32:07Z","receivedAt":"2017-02-07T06:32:23Z","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 | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 224fb3090..96c26e6aa 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -86,10 +86,11 @@ instead.  `--no-symlinks` is the default on Windows.\n \tAdditionally, `$BASE` is set in the environment.\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.11.1\n\n"},{"id":"311103","messageId":"xmqqo9ycv09u.fsf@gitster.mtv.corp.google.com","threadId":"45066","inReplyTo":"20170207063207.GA12746@arch-attack.localdomain","subject":"Re: [PATCH v2] Document the --no-gui option in difftool","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-02-08T21:30:05Z","receivedAt":"2017-02-08T21:31:10Z","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> Prior to this, the `--no-gui` option was not documented in the manpage.\n> This commit introduces this into the manpage\n>\n> Signed-off-by: Denton Liu <liu.denton@gmail.com>\n> ---\n\nLooks good, thanks.\n\n>  Documentation/git-difftool.txt | 5 +++--\n>  1 file changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\n> index 224fb3090..96c26e6aa 100644\n> --- a/Documentation/git-difftool.txt\n> +++ b/Documentation/git-difftool.txt\n> @@ -86,10 +86,11 @@ instead.  `--no-symlinks` is the default on Windows.\n>  \tAdditionally, `$BASE` is set in the environment.\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"}]}