Code

History

Commits on ig/commit-debug to cli/src/commands/squash.rs35+
  1. squash: fix -A -B behaviorGaëtan Lehmann committed 1 year agob3ea95f
  2. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  3. squash: document use of `-A`/`-B`/`-d` with `--from` and not `-r`Ilya Grigoriev committed 1 year agob205985
  4. squash: mark `-A`/`-B`/`-d` options as experimentalIlya Grigoriev committed 1 year agoaf12944
  5. squash: add -A/-B/-d optionsGaëtan Lehmann committed 1 year ago1e58ca2
  6. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  7. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  8. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  9. squash: allow to squash into the sourcesGaëtan Lehmann committed 1 year agoa59607d
  10. squash: allow --interactive and fileset to be used togetherGaëtan Lehmann committed 1 year ago0536c4c
  11. commands: Make all description_template call sites look the sameManuel Mendez committed 1 year ago32e841c
  12. completion: revset expression completerDaniel Luz committed 1 year ago87f6db0
  13. squash: don't add trailers to an empty descriptionGaëtan Lehmann committed 1 year ago7073811
  14. squash: add trailer supportGaëtan Lehmann committed 1 year ago6d240be
  15. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  16. rewrite: Rename CommitToSquash to CommitWithSelectionEvan Mesterhazy committed 1 year ago707680b
  17. cli: update "only_path" warnings to say fileset expression instead of pathYuya Nishihara committed 2 years ago5396138
  18. cli: squash: use draft description template to generate editor contentYuya Nishihara committed 1 year ago832e7b3
  19. rewrite: move description handling from squash_commits() to callerYuya Nishihara committed 1 year agoe85a5c4
  20. cli: replace run_ui_editor() and edit_temp_file() with editor typeYuya Nishihara committed 1 year ago641ec52
  21. cli: squash: use indoc::formatdoc! to indent formatted instructions nicelyYuya Nishihara committed 1 year ago2304db6
  22. cli: squash: inline move_diff() to address "too many arguments" linter warningYuya Nishihara committed 1 year ago5adeb63
  23. cli: squash: extract first half of move_diff() to separate functionYuya Nishihara committed 1 year ago3cdd571
  24. repo: remove &UserSettings argument from new/rewrite_commit(), use self.settingsYuya Nishihara committed 1 year agocff7384
  25. cli: refer to revset argument using `REVSET(S)` in synopsisMartin von Zweigbergk committed 1 year ago822f016
  26. cli: refer to fileset argument using `FILESETS` in synopsisMartin von Zweigbergk committed 1 year agoa414441
  27. completion: suggest file paths incrementallyRemo Senekowitsch committed 1 year agoa8c35db
  28. completion: teach commands about filesRemo Senekowitsch committed 1 year ago5fcc549
  29. cli: delete the deprecated `jj move` commandMartin von Zweigbergk committed 1 year ago7323c2e
  30. completion: teach commands about revisionsRemo Senekowitsch committed 1 year agodd6479f
  31. squash: add -f/-t shorthands for --from/--[in]toVamsi Avula committed 2 years ago93a4fcf
  32. squash: move the core functionality to jj_libdploch committed 2 years ago4f15ca4
  33. description_util: remove dependency on WorkspaceCommandHelperdploch committed 2 years ago85f1ac3
  34. cli: pass &Ui to parse fileset/revset/template functionsYuya Nishihara committed 2 years ago4533e81
  35. squash doc: --keep-emptied let the description unchangedSamuel Tardieu committed 2 years agoc1a032f