ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Commit graph

  • e385653064 chore: nix flake update Austin Seipp 2024-09-06 14:56:38 -0500
  • 8b6fc40b9a Deployed a31fe7f to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-06 21:23:18 +0000
  • a31fe7f6d6 cli: implement workspace add --sparse-patterns Austin Seipp 2024-09-06 11:48:57 -0500
  • a677d2adfa security: cargo update with vuln fix for gix-path < 0.10.11 Austin Seipp 2024-09-06 14:58:54 -0500
  • 12df64eb15 Deployed bf54340 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-06 18:51:00 +0000
  • bf543402cc cli: fix: add --include-unchanged-files flag to allow fixing as yet unchanged files Danny Hooper 2024-07-26 19:44:03 -0500
  • 24c4d431db cargo: bump the cargo-dependencies group with 3 updates dependabot[bot] 2024-09-06 15:36:34 +0000
  • 3133534b32 conflicts: don't panic when a conflict marker is missing removes Martin von Zweigbergk 2024-09-05 09:03:58 -0700
  • 4f656f3e02 tests: test parsing conflicts with missing removes (#2611) Martin von Zweigbergk 2024-09-05 08:45:36 -0700
  • 0783f248bd Deployed fee706d to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-06 04:07:42 +0000
  • fee706dfea signing: allow disabling by setting backend to "none" Martin von Zweigbergk 2024-09-05 17:27:49 -0700
  • 8f603f1a9c demos: fixup, working_copy.png wasn't regenerated properly Ilya Grigoriev 2024-09-05 17:38:46 -0700
  • 6ea46b930b op diff: resolve GraphStyle by caller, remove &CommandHelper argument Yuya Nishihara 2024-09-03 17:30:58 +0900
  • dda0980c4d graphlog: inline node_template_for_key() Yuya Nishihara 2024-09-03 17:18:49 +0900
  • 36ab165b57 cli: parse graph node settings strictly Yuya Nishihara 2024-09-03 17:01:22 +0900
  • 406ead241b graphlog: load settings by caller Yuya Nishihara 2024-09-03 16:59:13 +0900
  • bd7cbaaffb graphlog: add enum describing graph style Yuya Nishihara 2024-09-03 16:51:06 +0900
  • 3ad54ad38d settings: move graph node helpers to CLI Yuya Nishihara 2024-09-03 16:37:25 +0900
  • 42dee7d08c demos: generate pngs Ilya Grigoriev 2024-08-07 22:51:31 -0700
  • d3b0f1b970 demos: redact one of the conflict outputs Ilya Grigoriev 2024-08-07 23:12:40 -0700
  • 51c374e917 demo git_compat and README: repurpose the demo somewhat Ilya Grigoriev 2024-08-07 22:36:01 -0700
  • 12fb514736 README: mention gitoxide in addition to libgit2 Ilya Grigoriev 2024-09-04 19:41:56 -0700
  • 1cc10783a2 demos: update demos as little as possible to regenerate them Ilya Grigoriev 2024-08-07 22:00:46 -0700
  • 6d573ef6d7 demos: replace ImageMagkick's obsolete convert with magick Ilya Grigoriev 2024-08-08 14:30:19 -0700
  • 61e4242021 Deployed 058249c to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-06 00:22:36 +0000
  • 058249cc57 cli: update docs URLs to point to https://martinvonz.github.io/jj/latest/ Yuya Nishihara 2024-09-05 14:38:56 +0900
  • 4eafe92c8a Deployed a0fae76 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-05 20:45:50 +0000
  • a0fae76622 cli: rename obslog to evolution-log/evolog Martin von Zweigbergk 2024-07-24 06:49:18 -0700
  • e8d7909526 cargo: bump the cargo-dependencies group with 4 updates dependabot[bot] 2024-09-05 15:47:06 +0000
  • ce04e61dd4 tests: set $COLUMNS when running CLI tests Martin von Zweigbergk 2024-09-05 08:24:01 -0700
  • 6f44ed4f51 cli squash: explain --into in error message for merge commits Ilya Grigoriev 2024-09-04 19:33:48 -0700
  • 6aec456b8f Deployed 24c2636 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-05 03:06:23 +0000
  • 24c263698b readme: rename Roadmap to Development Roadmap Ilya Grigoriev 2024-09-04 18:53:12 -0700
  • 7ec0b59714 docs roadmap: add to list of all docs Ilya Grigoriev 2024-09-04 18:49:41 -0700
  • 5e620bb7ef tree: when merging files, read all sides concurrently Martin von Zweigbergk 2024-09-04 09:25:54 -0700
  • fd6c3b500f Deployed bc06b2a to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-05 01:34:44 +0000
  • bc06b2a442 store: make write_symlink() async Martin von Zweigbergk 2024-09-03 23:05:19 -0700
  • 4a8d250f2c store: make write_file() async Martin von Zweigbergk 2024-09-03 20:13:46 -0700
  • ecb2847ef5 store: make write_tree() async Martin von Zweigbergk 2024-09-03 21:52:54 -0700
  • 3136426dd6 store: make write_commit() async Martin von Zweigbergk 2024-09-03 20:13:46 -0700
  • 8eb3d85b1c backend: make write methods async Martin von Zweigbergk 2024-08-20 10:33:54 -0700
  • 5912631767 vscode: use buck for rust-analyzer settings Austin Seipp 2024-06-28 17:57:10 -0500
  • 4619b1688f github: add buck2 ci build Austin Seipp 2024-06-26 06:21:50 -0500
  • d4cce209d8 cli: add BUILD files Austin Seipp 2023-08-06 17:50:00 -0500
  • 38fe6fcb29 lib: add BUILD files Austin Seipp 2023-08-06 17:50:00 -0500
  • 6fd0844306 proc-macros: add BUILD files Austin Seipp 2023-08-06 17:50:00 -0500
  • 897786e552 gen-protos: add BUILD files Austin Seipp 2023-08-06 17:50:00 -0500
  • 4e68eecf96 buck: cargo<->buck sync tool Austin Seipp 2024-06-24 18:44:19 -0500
  • d33fee54fa tools: add a script for checking workspace dependencies Austin Seipp 2024-07-03 21:29:36 -0500
  • e56d714021 cargo: suppress warnings for cfg(buck_build) Austin Seipp 2024-06-24 22:56:52 -0500
  • 0e53927e97 buck: unify cargo deps with reindeer deps Austin Seipp 2023-08-06 17:46:57 -0500
  • d295c3d447 buck: add many reindeer fixups Austin Seipp 2023-08-06 17:40:36 -0500
  • af2610b305 buck: add initial reindeer scaffold Austin Seipp 2023-08-06 17:40:36 -0500
  • d563775c1e buck: build libgit2 Austin Seipp 2024-06-25 20:29:11 -0500
  • 3088b3781d buck: build libssh2 Austin Seipp 2024-06-25 20:16:31 -0500
  • 9b9acb2a17 buck: build boringssl Austin Seipp 2024-05-10 17:47:13 -0500
  • 948cc449b8 buck: build libz Austin Seipp 2024-06-25 20:01:27 -0500
  • 60f2a44273 buck: build zstd Austin Seipp 2024-06-25 18:38:28 -0500
  • 5547e28cea buck: repository prep work Austin Seipp 2023-08-06 17:03:24 -0500
  • 82e9884823 tools: initialize useful dotslash tools Austin Seipp 2023-08-06 17:03:24 -0500
  • 5d17ad3ee9 editor: initialize .vscode settings directory Austin Seipp 2023-08-06 17:03:24 -0500
  • e9167cadfd Deployed 3fcb6ee to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-04 18:07:37 +0000
  • 3fcb6eedfd docs(roadmap): minor typo, as should be ask Ethan Brierley 2024-09-04 18:38:24 +0100
  • b6f71c5781 Deployed d002a5a to v0.21.0 with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-04 17:17:24 +0000
  • d002a5ad35 release version 0.21.0 v0.21.0 Martin von Zweigbergk 2024-09-04 08:41:29 -0700
  • de86cdab7a Deployed 7d274a9 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-04 07:04:02 +0000
  • 7d274a911e docs: add link to roadmap from docs main page Martin von Zweigbergk 2024-09-03 21:44:34 -0700
  • dbb579adec cli/build-rs: remove metadata command dependency in favor of env vars Kaleb Pace 2024-09-03 22:28:35 -0500
  • f954b50810 Deployed 250a28b to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-04 04:42:57 +0000
  • 250a28b5a5 docs: add a roadmap Martin von Zweigbergk 2024-08-18 22:58:10 -0700
  • f17008d8b4 Deployed 0658701 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-04 04:32:16 +0000
  • 065870160b docs: minor fix to Markdown formatting Ilya Grigoriev 2024-09-03 20:13:48 -0700
  • 52499e84cc config: add color for renamed and copied in summary Scott Taylor 2024-09-03 17:35:03 -0500
  • 36198e687e Deployed 1c672d7 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-04 00:24:42 +0000
  • 1c672d7563 docs: Add FAQ for keeping changes to tracked files Stephen Jennings 2024-08-22 08:42:51 -0700
  • 8017224699 cargo: bump whoami from 1.5.1 to 1.5.2 in the cargo-dependencies group dependabot[bot] 2024-09-03 15:52:32 +0000
  • e41eaffcf0 Deployed 6fdef8b to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-03 15:42:05 +0000
  • 6fdef8bf67 cli: make WorkspaceCommandHelper keep a CommandHelper Martin von Zweigbergk 2024-09-01 13:42:37 -0700
  • 34425a2501 cli: make CommandHelper cheaply cloneable Martin von Zweigbergk 2024-09-02 07:00:13 -0700
  • c32aa9a62a RevsetExpressionEvaluator: extract resolve() from evaluate() jt/extractresolve Jonathan Tan 2024-09-02 19:29:25 -0700
  • da7b1e9e18 github: bump actions/upload-artifact in the github-dependencies group dependabot[bot] 2024-09-02 15:13:28 +0000
  • 7270c7dc4c cargo: bump the cargo-dependencies group with 3 updates dependabot[bot] 2024-09-02 15:23:11 +0000
  • 4a5f7eec0c Deployed 982ee63 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-02 00:20:36 +0000
  • 11b9888cdf refs: retry trivial resolution after merging targets Yuya Nishihara 2024-09-01 13:44:05 +0900
  • 982ee63ba8 rewrite: remove redundant workspace lookup from update_all_references() Yuya Nishihara 2024-08-31 21:59:31 +0900
  • 38bd5fbf32 rewrite: use intersperse() to interleave new/old commit ids Yuya Nishihara 2024-09-01 13:52:52 +0900
  • 1b6617bbd7 rewrite: remove redundant branch lookup from update_all_references() Yuya Nishihara 2024-08-31 21:32:36 +0900
  • 781351e4d0 local_working_copy: delete obsolete comment about libgit2 Martin von Zweigbergk 2024-08-30 09:38:06 -0700
  • 3d449973d4 Deployed 8e500c0 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-09-01 02:11:51 +0000
  • 8e500c0182 rewrite: do not resolve transitive parents repeatedly when updating refs Yuya Nishihara 2024-08-30 20:01:03 +0900
  • cb16b5afd0 rewrite: ensure that rewritten refs move across divergent entries Yuya Nishihara 2024-08-31 11:16:10 +0900
  • 780692c2f1 rewrite: extract new_parents() that doesn't ignore divergent entries Yuya Nishihara 2024-08-31 11:00:14 +0900
  • 81565be5d5 Deployed cc15ecf to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-31 04:56:53 +0000
  • cc15ecf7c7 op log: change "resolve concurrent" to "reconcile divergent" Martin von Zweigbergk 2024-08-29 21:59:09 -0700
  • d77bd049e6
         workspace: move path canonicalization out of init_with_backend() push-uztrruquzmzn Martin von Zweigbergk 2024-08-30 11:27:49 -0700
  • fce4cfc0b4
         workspace: canonicalize path before passing to working copy Martin von Zweigbergk 2024-08-30 09:38:06 -0700
  • 4754461761
         repo: move path canonicalization out of ReadonlyRepo::init() Martin von Zweigbergk 2024-08-30 08:41:05 -0700
  • 99c6bd10c0
         local_working_copy: delete obsolete comment about libgit2 Martin von Zweigbergk 2024-08-30 09:38:06 -0700
  • 017972e863
         workspace: move path canonicalization out of Workspace::new() Martin von Zweigbergk 2024-08-29 17:34:05 -0700
  • 3a90340118 Deployed f963af3 to prerelease with MkDocs 1.6.0 and mike 2.1.1 jj-docs[bot] 2024-08-30 17:36:30 +0000