Code

History

Commits on workspace-cli35+
  1. docs: document git-worktree interop for colocated workspaces; regen cli-referenceSami Jawhar committed 3 months agoa0e7ebe
  2. tests: cover secondary-workspace Git status/diff, worktree metadata, merge/conflict/undoSami Jawhar committed 3 months ago3ddfc1c
  3. workspace add: gate auto worktree registration on git.auto-register-worktrees; add --colocateSami Jawhar committed 3 months agofac3096
  4. git: never prune registered worktrees during `jj util gc`Sami Jawhar committed 3 months ago3217de8
  5. workspace forget: clean up Git worktree when forgetting colocated workspaceSami Jawhar committed 9 months agoeb225cb
  6. op_store: add per-workspace git_head trackingSami Jawhar committed 9 months agof9d1438
  7. git import: check all worktrees' HEAD for external changesSami Jawhar committed 9 months ago4e5cd66
  8. workspace add --colocate: create Git worktree for colocated workspaceSami Jawhar committed 9 months agof02b19f
  9. workspace: Add worktree support to MaybeColocatedGitRepoCormac Relf committed 2 years ago45c5c07
  10. git: make GitBackend colocation-awareCormac Relf committed 2 years agodbbebd5
  11. git: Add MaybeColocatedGitRepo helperCormac Relf committed 2 years ago521bca7
  12. git: box all `gix::open::Error` as clippy keeps warning about itCormac Relf committed 2 years agod640054
  13. workspace: Reload the repo from disk in `workspace add`Cormac Relf committed 2 years agofb0f54d
  14. workspace: Make backend factories aware of the workspace rootCormac Relf committed 2 years ago8cc7be8
  15. cli: show workspace roots in workspace listJosh McKinney committed 3 months agof296bc3
  16. run: Add --ignore-errors optionStephen Jennings committed 5 months ago6671773
  17. git: permit pushing conflicted commitsRob Pilling committed 5 months ago7283d02
  18. secure_config: don't assume config file exists when copying from old repoYuya Nishihara committed 3 months ago74ed795
  19. run: Add --ignore-changes optionStephen Jennings committed 5 months agodd950ab
  20. github: bump the github-dependencies group across 1 directory with 8 updatesdependabot[bot] committed 3 months ago2e5b4be
  21. cargo: bump the cargo-dependencies group with 4 updatesdependabot[bot] committed 3 months ago013d1a8
  22. cli: create new mutable working-copy commit proactively at tx.finish()Yuya Nishihara committed 3 months ago2932844
  23. revset: propagate error from is_empty(), replace .try_next().is_some()Yuya Nishihara committed 3 months ago4e55a6c
  24. docs: fix conflict resolution error in changelogYuya Nishihara committed 3 months agofd3fdb0
  25. cli: reset Git HEAD to parent of newly created working-copy snapshotYuya Nishihara committed 3 months agob51edf0
  26. store: Use NonZeroUsize instead of usize for TREE_CACHE_CAPACITYKevin Liao committed 3 months ago651f355
  27. run: avoid unnecessary wrapping of commits in Arc for run_inner()Martin von Zweigbergk committed 4 months ago3fd40b8
  28. docs: add author date / committer date entries to glossaryMatt Van Horn committed 4 months agoc555f54
  29. lib: Implement converge_treesDavid Rieber committed 1 year ago104fab6
  30. lib: Implement converge_parentsDavid Rieber committed 1 year ago92231a3
  31. lib: converge.rs: implement create_value_mergeDavid Rieber committed 1 year ago2f45473
  32. lib: Implement TruncatedEvolutionGraph::newDavid Rieber committed 1 year ago4d3bcdf
  33. lib: New converge.rs library with functionality for jj converge CLIDavid Rieber committed 1 year agoc37aa26
  34. file-search: add --line-number/-n flagNitzan Raz committed 4 months ago9e297fa
  35. file-search: print matched lines instead of just pathsNitzan Raz committed 4 months agoce9d532