Code

History

Commits on ig/diff-multiples-warning to cli/tests/test_squash_command.rs35+
  1. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  2. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  3. tests: fix comment describing destination of commit inserted by squashVincent Ging Ho Yim committed 10 months ago9c243ed
  4. conflicts: use "revision" instead of "commit" in labelsScott Taylor committed 10 months ago389c778
  5. rewrite: add conflict labels for squashed commitsScott Taylor committed 1 year ago5fd1b2f
  6. cli: remove newline addition between template and contentDavid Higgs committed 10 months ago2234702
  7. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  8. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  9. templates: show change offsets for divergent and hidden commitsScott Taylor committed 1 year ago0dffb6f
  10. revset: enable glob string matching by defaultYuya Nishihara committed 12 months ago97375fa
  11. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  12. tests: exercise squashing a non-revset fileDavid Higgs committed 11 months agob0f2f33
  13. tests: exercise interactively squashing no changesDavid Higgs committed 11 months agobfcef5d
  14. tests: exercise squashing @ with destinationDavid Higgs committed 11 months ago4191f13
  15. tests: demonstrate squash-moves with bookmarksDavid Higgs committed 11 months agoa1c9c3d
  16. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  17. tests: specify string pattern prefix, use subject(glob:_) accordinglyYuya Nishihara committed 12 months ago3b37ed1
  18. cli: `jj squash` warns when fileset doesn't existTejas Sanap committed 1 year agod5355b4
  19. cli: deprecate --destination/-d in favor of --onto/-oMartin von Zweigbergk committed 1 year ago32aee9d
  20. cli: squash: add --editor flagLuke Randall committed 1 year ago9cc1ed1
  21. squash: fix -A -B behaviorGaëtan Lehmann committed 1 year agob3ea95f
  22. tests: do not use "jj undo" to run multiple tests with the same setupYuya Nishihara committed 1 year agob384097
  23. tests: insert explicit snapshot after setting up test workspaceYuya Nishihara committed 1 year ago827a87f
  24. tests: get current operation id without running jjYuya Nishihara committed 1 year ago3599551
  25. templates: remove operation timestamp from default evolog templateYuya Nishihara committed 1 year ago6e63c5d
  26. undo: revert progressively older operations with repeated callsRemo Senekowitsch committed 1 year ago12b3a26
  27. config: show IDs in draft descriptionHegui Dai committed 1 year ago569ec5d
  28. cli: evolog: migrate to evolution template typeYuya Nishihara committed 1 year agoa4cf4f2
  29. squash: add -A/-B/-d optionsGaëtan Lehmann committed 1 year ago1e58ca2
  30. cli: allow "large" revsets by defaultYuya Nishihara committed 1 year ago6c8f6e9
  31. squash: allow to squash into the sourcesGaëtan Lehmann committed 1 year agoa59607d
  32. squash: allow --interactive and fileset to be used togetherGaëtan Lehmann committed 1 year ago0536c4c
  33. cli: evolog: group graph nodes topologicallyYuya Nishihara committed 1 year agob0f3c98
  34. cli: evolog: show associated operations alongside commitsYuya Nishihara committed 1 year ago6dfc9de
  35. evolution: walk operations to build predecessors graphYuya Nishihara committed 1 year ago60f8bdd