Code

History

Commits on ig/commit-debug to cli/tests/test_squash_command.rs70+
  1. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  2. cli: update "only_path" warnings to say fileset expression instead of pathYuya Nishihara committed 2 years ago5396138
  3. cli: squash: use draft description template to generate editor contentYuya Nishihara committed 1 year ago832e7b3
  4. cli: refer to fileset argument using `FILESETS` in synopsisMartin von Zweigbergk committed 1 year agoa414441
  5. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  6. cli: consider "JJ:" lines as comments also when not followed by spaceMartin von Zweigbergk committed 1 year ago7618b52
  7. log: emit working-copy branch first if included in the revsetYuya Nishihara committed 2 years ago1973c71
  8. cli: reorder updating and reporting for consistency.Essien Ita Essien committed 2 years ago76f40e5
  9. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  10. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  11. cli: rename `obslog` to `evolution-log`/`evolog`Martin von Zweigbergk committed 2 years agoa0fae76
  12. cli squash: explain --into in error message for merge commitsIlya Grigoriev committed 2 years ago6f44ed4
  13. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  14. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d
  15. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  16. obslog: reverse order of predecessors in topo traversalScott Taylor committed 2 years ago91504ca
  17. cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
  18. windows: avoid UNC paths in `run_ui_editor`mlcui committed 2 years agoc256ad8
  19. feat(squash): Add `--keep-emptied` flagMatt Stark committed 2 years agoca4eb60
  20. chore: Make squash tests log empty commits.Matt Stark committed 2 years ago7682a03
  21. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  22. cli: rename `jj file print` (formerly `jj cat`) to `jj file show`Ilya Grigoriev committed 2 years agoe6c2108
  23. feat: Create a `file` command containing `print` and `chmod`Matt Kulukundis committed 2 years ago47bd6f4
  24. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  25. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  26. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  27. squash: don't use unchanged source commit as predecessorMartin von Zweigbergk committed 2 years ago7093d5d
  28. squash: don't rewrite commits that didn't changeMartin von Zweigbergk committed 2 years ago09b9605
  29. squash: add more tests of no-op squashingMartin von Zweigbergk committed 2 years ago8c2c319
  30. git_backend: add a README to conflicted commitsMartin von Zweigbergk committed 2 years ago9d7ed54
  31. Add a --use-destination-message option to `jj squash`Evan Mesterhazy committed 2 years ago0ef25bb
  32. squash: accept multiple --from argumentsYuya Nishihara committed 2 years agoeaa15f8
  33. cli: add convenient methods to print hint or warning with default headingsYuya Nishihara committed 2 years agobd3d930
  34. squash: accept multiple `--from` revisionsMartin von Zweigbergk committed 2 years ago800f0f0
  35. description_utils: teach `combine_messages()` to handle more than two sourcesMartin von Zweigbergk committed 2 years agof3e35f1