Code

History

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