Yuya Nishihara 13d9dc4460 cli: allow to set ui.diff/merge-editor arguments inline ... For stock merge-tools, having name -> args indirection makes sense. For user-specific settings, it's simpler to set command name and arguments together. It might be a bit odd that "name with whitespace" can be parsed differently depending on the existence of merge-tools."name with whitespace".		2023-02-06 11:28:40 +09:00
..
technical	docs: mention that the "view" object knows about all workspaces	2022-12-08 17:30:29 -08:00
branches.md	templater: indicate if branch needs to be pushed to a remote	2022-11-09 22:44:55 -08:00
code-of-conduct.md	Boilerplate for new Google open source project	2020-12-11 23:37:59 -08:00
config.md	cli: allow to set ui.diff/merge-editor arguments inline	2023-02-06 11:28:40 +09:00
config.toml	Documentation for jj resolve and merge tool config	2022-12-03 15:12:40 -08:00
conflicts.md	docs: indent conflict marker examples to not confuse tools	2022-12-12 16:20:40 -08:00
contributing.md	contributing.md: Add a link to the "Comprehensive Rust" course	2023-01-25 21:10:10 -08:00
git-comparison.md	Rename jj touchup to jj diffedit	2022-12-21 08:15:06 -08:00
git-compatibility.md	feature: support git credential helpers	2022-11-19 22:06:27 -08:00
github.md	style: fix typos found by codespell	2023-01-28 07:23:45 -08:00
operation-log.md	docs: mention that the "view" object knows about all workspaces	2022-12-08 17:30:29 -08:00
related-work.md	docs: hyphenate "working-copy" when used as a compound modifier	2022-08-25 18:08:36 -07:00
revsets.md	style: fix typos found by codespell	2023-01-28 07:23:45 -08:00
tutorial.md	style: fix typos found by codespell	2023-01-28 07:23:45 -08:00
working-copy.md	workspace: add a root subcommand to print the workspace root path	2023-01-24 16:53:54 +01:00