Ilya Grigoriev 4ecf75efc1 docs config diff-editor: clean up, change KDiff3 example to Meld ...

I don't think recommending KDIff3 for diff editing is good advice in
most cases (as opposed to merge conflict resolution, for which KDiff3 is
very good). OTOH, trying Meld for diff editing is a good idea for many
people.

Historically, this part of the docs uses KDiff3 because it was written
when `meld` was the default and `:builtin` did not exist.

2024-11-04 19:14:18 -08:00

..

design

bookmarks: add support for git.auto-local-bookmark (to match docs)

2024-10-30 08:01:02 -07:00

governance

docs: introduce temporary governance voting process

2024-09-12 15:19:46 -07:00

technical

bookmarks: update some leftover uses of the word "branch"

2024-09-11 19:19:31 -07:00

bookmarks.md

bookmarks: update docs to try to clarify mapping to Git branches

2024-10-01 06:46:32 -07:00

cli-reference.md

docs: Remove trailing whitespace in markdown files

2024-09-13 13:06:28 +02:00

code-of-conduct.md

docs: s/socio-economics/socioeconomics/ per codespell suggestion

2024-05-24 11:34:03 +09:00

community_tools.md

docs: add link to VisualJJ

2024-10-05 01:18:52 -07:00

config.md

docs config diff-editor: clean up, change KDiff3 example to Meld

2024-11-04 19:14:18 -08:00

config.toml

docs: document git.fetch and git.push config options

2024-02-09 12:03:42 -06:00

conflicts.md

docs: Fix example with Git conflicts markers

2024-08-02 10:36:38 -07:00

contributing.md

docs: explain a bit about good commit messages

2024-10-07 17:02:49 -07:00

design_doc_blueprint.md

docs: Remove trailing whitespace in markdown files

2024-09-13 13:06:28 +02:00

design_docs.md

docs: Remove trailing whitespace in markdown files

2024-09-13 13:06:28 +02:00

FAQ.md

docs: Simplify instructions for using private commits

2024-10-25 17:07:02 -07:00

filesets.md

cli: enable fileset by default

2024-07-24 10:49:46 +09:00

git-comparison.md

docs: include remote add command

2024-10-29 09:15:45 -07:00

git-compatibility.md

git_backend: Support shallow git repositories

2024-10-14 20:01:08 +02:00

github.md

git: add --remote option to clone command

2024-09-13 18:14:57 +02:00

glossary.md

docs glossary & git-comparison: fixup & update bookmark->branch transition

2024-10-15 23:29:11 -07:00

index.md

docs: add link to roadmap from docs main page

2024-09-04 00:03:32 -07:00

install-and-setup.md

docs: fix typo in Mac install section

2024-10-26 14:21:52 +02:00

operation-log.md

bookmarks: update some leftover uses of the word "branch"

2024-09-11 19:19:31 -07:00

related-work.md

politics: delete references to Pijul

2024-04-14 13:16:08 -07:00

revsets.md

revset: drop support for HEAD@git symbol resolution

2024-10-21 09:21:34 +09:00

roadmap.md

docs(roadmap): minor typo, as should be ask

2024-09-04 20:07:04 +02:00

sapling-comparison.md

docs: explain that jj was started 3 years before Sapling announcement

2024-06-20 05:24:28 +09:00

templates.md

templater: make "git_head" return boolean, render it as "git_head()"

2024-10-21 09:21:34 +09:00

testimonials.md

docs: Remove trailing whitespace in markdown files

2024-09-13 13:06:28 +02:00

tutorial.md

unsquash: deprecate in favor of squash and diffedit

2024-09-26 16:34:48 +02:00

windows.md

docs: Remove trailing whitespace in markdown files

2024-09-13 13:06:28 +02:00

working-copy.md

docs: add more detail to section about stale working copies

2024-10-30 18:13:48 -07:00