Ilya Grigoriev fedbc3017f cli merge tools: allow setting diff-args=[] to disable diff formatting with a tool ... Not setting `diff-args` is equivalent to `diff-args=["$left", "$right"]`, which I also documented here. I couldn't decide whether the new error should be part of `DiffRenderError`, `DiffGenerateError`, or `MergeToolError`. Since the treatment of diff formatters is already very different from other merge tools, I just made it a CommandError for now.		2025-07-19 03:39:16 +00:00
..
design	docs: put bare URLs in angle brackets	2025-06-07 20:20:47 +00:00
governance	meta: add initial GOVERNANCE.md	2025-02-10 17:39:34 +00:00
images	Replace the PNG logo with a vector SVG version.	2025-03-11 22:44:13 +00:00
technical	conflicts: document the "same-change rule"	2025-05-14 15:08:29 +00:00
bookmarks.md	bookmarks: First step to make target revision a required argument to bookmark create/move/set.	2025-02-11 22:21:19 +00:00
changelog.md	website: Add the CHANGELOG	2025-07-17 22:59:58 +00:00
cli-reference.md	mkdocs: update mkdocs-material and mkdocs-include-markdown-plugin	2025-02-13 17:30:21 +00:00
code-of-conduct.md	code-of-conduct: replace @avamsi by @icorbrey as Community Leader	2025-07-11 17:14:07 +00:00
community_tools.md	docs: add jjui to the list of community tools	2025-05-19 13:45:45 +00:00
config-schema.json	docs: Expose config-schema.json in the docs site	2025-01-14 13:45:36 +00:00
config.md	cli merge tools: allow setting diff-args=[] to disable diff formatting with a tool	2025-07-19 03:39:16 +00:00
config.toml	docs: document git.fetch and git.push config options	2024-02-09 12:03:42 -06:00
conflicts.md	docs: fix syntax highlighting for conflicts.md	2025-03-03 22:42:14 +00:00
contributing.md	docs: put bare URLs in angle brackets	2025-06-07 20:20:47 +00:00
core_tenets.md	docs/core_tenets: fix typo	2025-05-10 15:36:46 +00:00
design_doc_blueprint.md	docs: Remove trailing whitespace in markdown files	2024-09-13 13:06:28 +02:00
design_docs.md	doc: update some references to "the native backend"	2025-03-21 16:27:51 +00:00
FAQ.md	faq: fix various issues in the new "undo merge" entry	2025-07-02 11:40:31 +00:00
filesets.md	fileset docs: edits to quoting and file pattern instructions	2025-03-11 03:00:58 +00:00
git-command-table.md	docs: convert Git command table from HTML to YAML	2025-04-21 00:45:01 +00:00
git-command-table.yml	docs: Add git log -G to git command table	2025-07-02 03:38:59 +00:00
git-comparison.md	docs: move Git command table to a separate page	2025-02-10 15:29:32 +00:00
git-compatibility.md	Don't blame libgit2 for lack of partial clone support	2025-06-08 00:49:53 +00:00
github.md	docs: Remove now outdated reference to issue 469	2025-06-13 12:25:38 +00:00
glossary.md	git_backend: derive the change ID from the git change-id header	2025-04-09 16:42:56 +00:00
index.md	website: Add the CHANGELOG	2025-07-17 22:59:58 +00:00
install-and-setup.md	docs: add scoop to windows installation	2025-07-16 20:34:53 +00:00
operation-log.md	docs/operation-log: Fix section header casing	2025-05-19 02:19:49 +00:00
paid_contributors.md	docs: record 06393993 as a contributor whose employer pays for contributions	2025-06-16 18:05:58 +00:00
related-work.md	docs: Add GitButler to related-work	2025-07-06 12:51:44 +00:00
releasing.md	docs: put bare URLs in angle brackets	2025-06-07 20:20:47 +00:00
revsets.md	docs: explain how e.g. the commit_id() revset can override a bookmark	2025-07-17 06:16:31 +00:00
revsets.toml	website: Add the CHANGELOG	2025-07-17 22:59:58 +00:00
roadmap.md	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
sapling-comparison.md	docs: update Sapling comparison logs	2025-02-01 16:50:53 +00:00
style_guide.md	docs: add a style guide	2025-04-10 22:01:48 +00:00
templates.md	templater: add parents() method for Operation	2025-07-18 17:16:09 +00:00
testimonials.md	docs: add some more testimonials	2025-04-08 20:55:09 +00:00
tutorial.md	docs/tutorial: fix op log output to show verbatim command	2025-05-23 03:34:55 +00:00
windows.md	local working copy: add support for EOL conversion	2025-07-17 15:36:28 +00:00
working-copy.md	docs/working-copy: fix missing link annotation	2025-06-20 23:42:09 +00:00