Code

History

Commits on ig/docs-commitid to cli/tests/test_absorb_command.rs26
  1. cli: evolog: show associated operations alongside commitsYuya Nishihara committed 1 year ago6dfc9de
  2. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  3. rebase: avoid using "onto destination" when argument can be `-A/-B`Martin von Zweigbergk committed 1 year agoee9917e
  4. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  5. absorb: add basic support for file deletionYuya Nishihara committed 1 year ago39f481f
  6. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  7. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  8. cli: truncate list of abandoned/created/updated commitsYuya Nishihara committed 1 year ago976f358
  9. tests: port test_absorb_command.rs to TestWorkDir API, add read_file() helperYuya Nishihara committed 1 year agod5d4c7f
  10. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  11. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  12. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  13. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  14. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  15. cli: improve hint message when suggesting `--ignore-immutable`Bryce Berger committed 1 year ago708e1c5
  16. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  17. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  18. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  19. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  20. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  21. absorb: print status if source commit still contains diffsYuya Nishihara committed 1 year ago646bdab
  22. absorb: show warning if source commit contains file deletionYuya Nishihara committed 1 year ago3711979
  23. absorb: abandon source commit if it becomes discardableYuya Nishihara committed 1 year ago75ce7f6
  24. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  25. diff: fix unified diff to emit one-lower start line number for empty hunksYuya Nishihara committed 1 year ago8c4ba4a
  26. cli: add "absorb" machinery and commandYuya Nishihara committed 2 years agoce3436b