Code

History

Commits on ig/commit-debug245+
  1. op_store: add error propagation path to view_from_proto()Yuya Nishihara committed 1 year agoc344547
  2. cli: basic `jj gerrit upload` implementationAustin Seipp committed 2 years ago35ad063
  3. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  4. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  5. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  6. cli: merge-tools: make check_out_trees() get store from MergedTreeYuya Nishihara committed 1 year agod9552c4
  7. tests: rewrite test_fsmonitor() to use TreeState APIYuya Nishihara committed 1 year ago3e02975
  8. simplify-parents: call `RevsetExpression::descendants()` using method syntaxMartin von Zweigbergk committed 1 year ago5e6e235
  9. github: bump the github-dependencies group with 3 updatesdependabot[bot] committed 1 year agof7d83dc
  10. cargo: bump the cargo-dependencies group with 10 updatesdependabot[bot] committed 1 year ago7435db4
  11. ci: use cachix/install-nix-actionloudgolem committed 1 year ago665e22a
  12. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  13. local_working_copy: remove Default from TreeStateSettingsYuya Nishihara committed 1 year ago79a2a77
  14. working_copy: move SnapshotOptions::empty_for_test() to testutilsYuya Nishihara committed 1 year agoccd1373
  15. git: remove Default from GitSettingsYuya Nishihara committed 1 year ago4ea52e1
  16. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  17. revset engine: remove stale clippy exemptions for missing docsMartin von Zweigbergk committed 1 year agoc0dfa2f
  18. local_working_copy: remove stale clippy exemptionYuya Nishihara committed 1 year agocee5ea6
  19. completion: match files in revision for `file list`Martin von Zweigbergk committed 1 year agob6c5c23
  20. tree: move try_resolve_file_conflict() to tree_merge()Martin von Zweigbergk committed 1 year agoc12ee12
  21. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  22. merged_tree: extract `merge_tree()` to new moduleMartin von Zweigbergk committed 1 year ago5d93019
  23. ci: ignore flaky test on windowsRemo Senekowitsch committed 1 year agoddb3e4a
  24. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  25. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  26. merge: parameterize same-change rule of trivial_merge()Yuya Nishihara committed 1 year ago949fd2a
  27. cli metaedit: fix --update-author if author was unsetRemo Senekowitsch committed 1 year ago0a96591
  28. config: add platforms conditional configurationStephen Jennings committed 1 year ago08f2e21
  29. working_copy: Move `FsmonitorSettings` to `TreeStateSettings` and add test method to update settingsIan Wrzesinski committed 1 year ago5f6f938
  30. templates: add `hyperlink` aliasAustin Seipp committed 1 year ago8e2820f
  31. files: add option to resolve conflicts word by wordYuya Nishihara committed 2 years ago9589bec
  32. files: introduce Cow-like wrapper for merge hunksYuya Nishihara committed 2 years agoeb75fc5
  33. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  34. docs: provide analogue for git checkoutMatt T. Proud committed 1 year ago3c20da3
  35. cargo: bump the cargo-dependencies group with 3 updatesdependabot[bot] committed 1 year ago28cd105