mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
jj/docs
History
Exact
Scott Taylor 2ce2a445b0
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
Details
website / prerelease-docs-build-deploy (ubuntu-24.04) (push) Waiting to run
Details
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Details
conflicts: show "noeol" state separately for each side of a diff 
Now that we can put the "from" and "to" sides on separate lines, we can
use the normal "(no terminating newline)" comment on each side
separately. This should also be more clear, since previously the
"(no terminating newline)" comment could possibly be confused for
"(removes terminating newline)".

Before:

```
<<<<<<< conflict 1 of 1
+++++++ rtsqusxu 2768b0b9 "commit A" (no terminating newline)
grapefruit
%%%%%%% diff from: vpxusssl 38d49363 "merge base"
\\\\\\\        to: ysrnknol 7a20f389 "commit B" (adds terminating newline)
-grape
+grape
>>>>>>> conflict 1 of 1 ends
```

After:

```
<<<<<<< conflict 1 of 1
+++++++ rtsqusxu 2768b0b9 "commit A" (no terminating newline)
grapefruit
%%%%%%% diff from: vpxusssl 38d49363 "merge base" (no terminating newline)
\\\\\\\        to: ysrnknol 7a20f389 "commit B"
-grape
+grape
>>>>>>> conflict 1 of 1 ends
```
2025-12-20 17:43:41 +00:00
..
design revset: enable glob string matching by default 2025-12-15 04:27:32 +00:00
governance docs: fix markdown sublists for the produced web pages 2025-11-19 03:53:18 +00:00
guides templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
images Replace the PNG logo with a vector SVG version. 2025-03-11 22:44:13 +00:00
technical docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
bookmarks.md cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
changelog.md website: Add the CHANGELOG 2025-07-17 22:59:58 +00:00
cli-reference.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
code-of-conduct.md code of conduct: Update @icorbrey's email for CoC enforcement 2025-10-22 22:52:44 +00:00
community_tools.md docs: delete a dead TODO and sort some links 2025-12-02 21:23:14 +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: enable glob string matching globally 2025-12-15 04:27:32 +00:00
config.toml cli: Default to nano editor on Linux 2025-09-04 14:52:36 +00:00
conflicts.md conflicts: show "noeol" state separately for each side of a diff 2025-12-20 17:43:41 +00:00
contributing.md docs: improve profiling documentation 2025-12-12 17:27:10 +00:00
core_tenets.md docs: interop => interoperability 2025-11-22 22:45:06 +00:00
design_doc_blueprint.md docs: Remove trailing whitespace in markdown files 2024-09-13 13:06:28 +02:00
design_docs.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
FAQ.md templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
filesets.md docs: clarify that some template parameters require literal strings 2025-12-19 19:57:54 +00:00
gerrit.md Gerrit Docs: Update Flag for Pushing to a Remote Branch 2025-10-29 04:49:29 +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 cli: bookmark: add --remote argument to track/untrack, deprecate name@remote 2025-12-13 01:32:49 +00:00
git-comparison.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
git-compatibility.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
git-experts.md docs: Add Jujutsu for Git experts 2025-11-28 06:08:41 +00:00
github.md cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
glossary.md templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
index.md docs: jj-vcs.github.io -> jj-vcs.dev 2025-11-26 00:36:39 +00:00
install-and-setup.md docs: remove non-functional xonsh completion instructions 2025-12-16 22:02:02 +00:00
operation-log.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
paid_contributors.md docs: Add myself as paid contributor (under IMC Trading) 2025-12-17 00:30:17 +00:00
related-work.md docs: Add GitButler to related-work 2025-07-06 12:51:44 +00:00
releasing.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
revsets.md docs: clarify that some template parameters require literal strings 2025-12-19 19:57:54 +00:00
revsets.toml website: Add the CHANGELOG 2025-07-17 22:59:58 +00:00
roadmap.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00
sapling-comparison.md cli: add jj bisect run command 2025-09-04 14:30:52 +00:00
style_guide.md style-guide: say that we prefer lower-level tests over e2e test 2025-08-19 06:30:00 +00:00
templates.md docs: clarify that some template parameters require literal strings 2025-12-19 19:57:54 +00:00
testimonials.md docs: add some more testimonials 2025-04-08 20:55:09 +00:00
tutorial.md templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
windows.md cli: ignore $PAGER in environment by default 2025-11-12 23:22:33 +00:00
working-copy.md docs: fix MD012 markdown lint 2025-12-09 07:26:38 +00:00