Code

History

Commits on ig/docs-commitid to cli/tests/test_status_command.rs35+
  1. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  2. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  3. tests: port test_status_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago16c788a
  4. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  5. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  6. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  7. config: Allow hiding the 'how to resolve conflicts' hintJonathan Gilchrist committed 1 year ago742bc8a
  8. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  9. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  10. tests: migrate non-snapshot users of jj_cmd_success() to run_jj_in().success()Yuya Nishihara committed 1 year agoc83abc9
  11. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  12. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  13. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  14. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  15. cli: status: do not label message lines as "conflict"Yuya Nishihara committed 1 year ago1fa4e5a
  16. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
  17. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  18. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  19. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  20. cli: status: replace "is clean" by "has no changes"Martin von Zweigbergk committed 1 year ago1e25101
  21. local_working_copy: scan directory entries excluded by auto-track patternYuya Nishihara committed 1 year ago6574f12
  22. status: show untracked filesChristian Stoitner committed 1 year agoae91f22
  23. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  24. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  25. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  26. status: report copies and renamesMartin von Zweigbergk committed 2 years agob78c83e
  27. Change conflict hint depending on state of working commit.Essien Ita Essien committed 2 years ago7c4185c
  28. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d
  29. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  30. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  31. print_conflicted_paths: simplify file conflicts before printingBenjamin Tan committed 2 years ago9d4ac81
  32. tests: add tests showing that individual file conflicts are not simplified/deduplicatedBenjamin Tan committed 2 years agof74991c
  33. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  34. cli: status: when current change has conflicts, display instructions to resolve themAlexis (Poliorcetics) Bourget committed 2 years ago52e494d
  35. cli: support filtering by paths in `status`Scott Olson committed 2 years agoe22370c