From: Nicholas Guriev <nicholas@guriev.su>
To: git@vger.kernel.org
Subject: [RFC PATCH v2 3/3] doc: describe new difftool.tabbed feature
Date: Tue, 19 Jan 2021 00:00:03 +0300 [thread overview]
Message-ID: <20210118210003.3071205-4-nicholas@guriev.su> (raw)
In-Reply-To: <20210118210003.3071205-1-nicholas@guriev.su>
And related the `--tabbed` command line option and the
GIT_DIFFTOOL_TABBED environment variable.
---
Documentation/config/difftool.txt | 6 ++++++
Documentation/git-difftool.txt | 19 +++++++++++++++----
Documentation/git.txt | 4 ++++
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt
index 6762594480..ac609aee66 100644
--- a/Documentation/config/difftool.txt
+++ b/Documentation/config/difftool.txt
@@ -12,3 +12,9 @@ difftool.<tool>.cmd::
difftool.prompt::
Prompt before each invocation of the diff tool.
+
+difftool.tabbed::
+ Show compared files in different tabs using single invocation of
+ the diff tool. Must be a boolean value. Only the following tools
+ are currently supported: vimdiff and related, meld. Tools with
+ overridden command line will ignore this configuration variable.
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 484c485fd0..1b7a5345ad 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -69,6 +69,13 @@ with custom merge tool commands and has the same value as `$MERGED`.
--tool-help::
Print a list of diff tools that may be used with `--tool`.
+--[no-]tabbed::
+ Open compared files in different tabs using single invocation
+ of the diff tool. This overrides configuration or environment.
+ Currently, only the following tools are supported: vimdiff and
+ related, meld. Tools with overridden command line will ignore
+ this option.
+
--[no-]symlinks::
'git difftool''s default behavior is create symlinks to the
working tree when run in `--dir-diff` mode and the right-hand
@@ -95,10 +102,11 @@ instead. `--no-symlinks` is the default on Windows.
`diff.tool`, `merge.tool` until a tool is found.
--[no-]trust-exit-code::
- 'git-difftool' invokes a diff tool individually on each file.
- Errors reported by the diff tool are ignored by default.
- Use `--trust-exit-code` to make 'git-difftool' exit when an
- invoked diff tool returns a non-zero exit code.
+ 'git-difftool' invokes a diff tool individually on each file
+ unless tabbed mode is active. Errors reported by the diff tool
+ are ignored by default. Use `--trust-exit-code` to make
+ 'git-difftool' exit immediately when an invoked diff tool
+ returns a non-zero exit code.
+
'git-difftool' will forward the exit code of the invoked tool when
`--trust-exit-code` is used.
@@ -128,6 +136,9 @@ See the `--tool=<tool>` option above for more details.
difftool.prompt::
Prompt before each invocation of the diff tool.
+difftool.tabbed::
+ Configure default value of the `--tabbed` option. See above.
+
difftool.trustExitCode::
Exit difftool if the invoked diff tool returns a non-zero exit status.
+
diff --git a/Documentation/git.txt b/Documentation/git.txt
index a6d4ad0818..d7cd6650c9 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -583,6 +583,10 @@ For each path `GIT_EXTERNAL_DIFF` is called, two environment variables,
`GIT_DIFF_PATH_TOTAL`::
The total number of paths.
+`GIT_DIFFTOOL_TABBED`::
+ Run the diff tool in tabbed mode opening all compared files
+ together. It must contain a boolean value.
+
other
~~~~~
`GIT_MERGE_VERBOSITY`::
--
2.27.0
next prev parent reply other threads:[~2021-01-18 21:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 5:59 [RFC PATCH] mergetools: support difftool.tabbed setting Nicholas Guriev
2021-01-18 21:00 ` [RFC PATCH v2 0/3] implement tabbed mode in difftools Nicholas Guriev
2021-01-18 21:00 ` [RFC PATCH v2 1/3] mergetools: support difftool.tabbed setting Nicholas Guriev
2021-01-18 23:25 ` Junio C Hamano
2021-01-18 21:00 ` [RFC PATCH v2 2/3] difftool-helper: conciliate difftool.tabbed and difftool.prompt settings Nicholas Guriev
2021-01-18 21:00 ` Nicholas Guriev [this message]
2021-01-25 21:21 ` [PATCH v3 0/4] difftools in tabbed mode Nicholas Guriev
2021-01-25 21:21 ` [PATCH v3 1/4] mergetools: support difftool.tabbed setting Nicholas Guriev
2021-01-25 21:21 ` [PATCH v3 2/4] difftool-helper: conciliate difftool.tabbed and difftool.prompt settings Nicholas Guriev
2021-01-25 23:04 ` Junio C Hamano
2021-01-25 21:21 ` [PATCH v3 3/4] doc: describe new difftool.tabbed feature Nicholas Guriev
2021-01-25 21:21 ` [PATCH v3 4/4] t7800: new tests of " Nicholas Guriev
2021-02-12 5:51 ` [RFC PATCH] mergetools: support difftool.tabbed setting David Aguilar
2021-02-12 22:21 ` Junio C Hamano
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=20210118210003.3071205-4-nicholas@guriev.su \
--to=nicholas@guriev.su \
--cc=git@vger.kernel.org \
/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).