Commits

Commit history

1. Commits on Oct 11, 2026

   • config schema: Fix "valid under more than one of the schemas" error

     Show description for 10c1a9f
     josephlou5

     committed
     10c1a9fView commit details

     Copy full SHA for 10c1a9f

     Browse repository at this point

   • revset_backend: add missing documentation

     Show description for c795894
     martinvonz

     committed
     c795894View commit details

     Copy full SHA for c795894

     Browse repository at this point

   • files: add missing documentation

     Show description for ac72ee4
     martinvonz

     committed
     ac72ee4View commit details

     Copy full SHA for ac72ee4

     Browse repository at this point

   • diff: add missing documentation

     Show description for 8619b53
     martinvonz

     committed
     8619b53View commit details

     Copy full SHA for 8619b53

     Browse repository at this point

   • graph: add missing documentation

     Show description for 87bbf07
     martinvonz

     committed
     87bbf07View commit details

     Copy full SHA for 87bbf07

     Browse repository at this point

   • tree_builder: add missing documentation

     Show description for 0f8260f
     martinvonz

     committed
     0f8260fView commit details

     Copy full SHA for 0f8260f

     Browse repository at this point

   • tree: add missing documentation

     Show description for 5618bc9
     martinvonz

     committed
     5618bc9View commit details

     Copy full SHA for 5618bc9

     Browse repository at this point

   • index: add missing documentation

     Show description for 31da26a
     martinvonz

     committed
     31da26aView commit details

     Copy full SHA for 31da26a

     Browse repository at this point

   • store: add missing documentation

     Show description for fe6a44f
     martinvonz

     committed
     fe6a44fView commit details

     Copy full SHA for fe6a44f

     Browse repository at this point

   • commit: add missing documentation

     Show description for 2a1db7d
     martinvonz

     committed
     2a1db7dView commit details

     Copy full SHA for 2a1db7d

     Browse repository at this point

   • commit: add convenience for merging commit trees and resolving

     martinvonz

     committed
     7edde7cView commit details

     Copy full SHA for 7edde7c

     Browse repository at this point

   • commit: drop `_without_repo` suffix from function name

     Show description for 3bf0450
     martinvonz

     committed
     3bf0450View commit details

     Copy full SHA for 3bf0450

     Browse repository at this point

   • core: move `commit`, `index`, `store`, `merged_tree` and related modules to jj-core

     Show description for 90c4dc8
     martinvonz

     committed
     90c4dc8View commit details

     Copy full SHA for 90c4dc8

     Browse repository at this point

   • resolve: add `:editor` merge tool for editing conflict markers in a text editor

     Show description for 0558176
     martinvonz

     committed
     0558176View commit details

     Copy full SHA for 0558176

     Browse repository at this point

   • merge_tools: extract loop for resolving files one by one

     Show description for ab78e13
     martinvonz

     committed
     ab78e13View commit details

     Copy full SHA for ab78e13

     Browse repository at this point

   • merge_tools: extract helper for building tree value from merge result

     Show description for 10fc7a4
     martinvonz

     committed
     10fc7a4View commit details

     Copy full SHA for 10fc7a4

     Browse repository at this point

   • time_util: move to core

     Show description for 13008ad
     martinvonz

     committed
     13008adView commit details

     Copy full SHA for 13008ad

     Browse repository at this point

   • merge_tools: apply builtin diff editor selections by merging trees

     Show description for df9946d
     martinvonz

     committed
     df9946dView commit details

     Copy full SHA for df9946d

     Browse repository at this point

   • tests: use a conflicted base tree when building conflicted tree in checkout test

     Show description for 6b10100
     martinvonz

     committed
     6b10100View commit details

     Copy full SHA for 6b10100

     Browse repository at this point

   • rewrite: leverage MergedTree::filtered() in restore_tree()

     Show description for d1741d4
     martinvonz

     committed
     d1741d4View commit details

     Copy full SHA for d1741d4

     Browse repository at this point

   • merged_tree: add a method for getting tree filtered by matcher

     Show description for 38157f8
     martinvonz

     committed
     38157f8View commit details

     Copy full SHA for 38157f8

     Browse repository at this point
2. Commits on Oct 10, 2026

   • cli: diff: add generic symbol extraction rule

     Show description for 987c084
     yuja

     committed
     987c084View commit details

     Copy full SHA for 987c084

     Browse repository at this point

   • rewrite: move merge_commit_trees_no_resolve_without_repo() to commit module

     Show description for 889e5a6
     martinvonz

     committed
     889e5a6View commit details

     Copy full SHA for 889e5a6

     Browse repository at this point

   • rewrite: make rebase_to_dest_parent() take index instead of repo

     Show description for ec36c2a
     martinvonz

     committed
     ec36c2aView commit details

     Copy full SHA for ec36c2a

     Browse repository at this point

   • commit: inline is_hidden() into caller

     Show description for 24e9875
     martinvonz

     committed
     24e9875View commit details

     Copy full SHA for 24e9875

     Browse repository at this point

   • commit: make is_empty() and is_discardable() take index instead of repo

     Show description for 86b0b4d
     martinvonz

     committed
     86b0b4dView commit details

     Copy full SHA for 86b0b4d

     Browse repository at this point

   • commit: make parent_tree() take index instead of repo

     Show description for 0b32255
     martinvonz

     committed
     0b32255View commit details

     Copy full SHA for 0b32255

     Browse repository at this point

   • rewrite: move fast path for parent of single commit into lower-level function

     Show description for 796d718
     martinvonz

     committed
     796d718View commit details

     Copy full SHA for 796d718

     Browse repository at this point

   • index: move `IndexStore` to new `index_store` module

     Show description for 9a1ad09
     martinvonz

     committed
     9a1ad09View commit details

     Copy full SHA for 9a1ad09

     Browse repository at this point

   • docs: clarify `fork_point` is `merge-base`

     Show description for e9bc7ba
     9999years

     committed
     e9bc7baView commit details

     Copy full SHA for e9bc7ba

     Browse repository at this point

   • core: move `files` to jj-core

     Show description for 0738c22
     martinvonz

     committed
     0738c22View commit details

     Copy full SHA for 0738c22

     Browse repository at this point

   • files: move MergeOptions from tree_merge to files

     Show description for 29eda03
     martinvonz

     committed
     29eda03View commit details

     Copy full SHA for 29eda03

     Browse repository at this point

   • settings: move MergeOptions::from_settings() to UserSettings::merge_options()

     Show description for 58e08ed
     martinvonz

     committed
     58e08edView commit details

     Copy full SHA for 58e08ed

     Browse repository at this point

   • cli: report remotes before fetching

     Show description for 8ed0e38
     joshka

     committed
     8ed0e38View commit details

     Copy full SHA for 8ed0e38

     Browse repository at this point
3. Commits on Oct 9, 2026

   • dsl: move the `TemplateParser` from `cli` to it

     Show description for bf7c1b5
     PhilipMetzger

     committed
     bf7c1b5View commit details

     Copy full SHA for bf7c1b5

     Browse repository at this point