Code

History

Commits on ig/vimdiffwarn to cli735+
  1. config: split ConfigSource::Env reflecting layer precedenceYuya Nishihara committed 1 year ago75b8e9b
  2. cli `util gc`: document the fact that it does not abandon operationsIlya Grigoriev committed 1 year ago8c5b39e
  3. merged_tree: propagate errors from conflict iteratorMartin von Zweigbergk committed 1 year ago10c90a5
  4. cli_util: take conflicts by value to `print_conflicted_paths()`Martin von Zweigbergk committed 1 year ago9ec216a
  5. cli `git push`: short alias -N for --allow-newIlya Grigoriev committed 1 year ago118072a
  6. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  7. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  8. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  9. cli: hyphenate "working-copy commit" in `--ignore-working-copy` helpMartin von Zweigbergk committed 1 year ago4d19a0a
  10. settings: simply forward .get_<type>(key) to .get::<type>(key)Yuya Nishihara committed 1 year agoa5c96bc
  11. settings: add forwarding getters, replace most of .config() usesYuya Nishihara committed 1 year agofc57139
  12. settings: pass around &UserSettings instead of &config::Config consistentlyYuya Nishihara committed 1 year agof239b1e
  13. config: add type alias for config::ConfigErrorYuya Nishihara committed 1 year ago6d26d53
  14. config: rename jj_cli::config::ConfigError to ConfigEnvErrorYuya Nishihara committed 1 year agoc0250f1
  15. config: extract ConfigNamePathBuf to jj-libYuya Nishihara committed 1 year ago5ad0f3d
  16. cli: simplify-parents: avoid multiple rebases of the same commitsBenjamin Tan committed 2 years ago4f2e72a
  17. tests: add additional test case for `jj simplify-parents`Benjamin Tan committed 2 years ago1ae8f0c
  18. signing: remove unused SignInitError::Backend variant, simplify error handlingYuya Nishihara committed 1 year ago5e13a4a
  19. cargo: bump toml_edit to 0.22.22Yuya Nishihara committed 1 year ago99c2698
  20. cli: delete deprecated `jj merge` commandAustin Seipp committed 1 year agoe060ef2
  21. cli: delete deprecated `jj checkout` commandAustin Seipp committed 1 year ago0371341
  22. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  23. rewrite: fix duplicated commits to be rebased onto destinationYuya Nishihara committed 1 year ago5cc0bd0
  24. cli: provide short flags for rev rangesRemo Senekowitsch committed 1 year agoac0e531
  25. log: emit working-copy branch first if included in the revsetYuya Nishihara committed 2 years ago1973c71
  26. cli: git push: do not push new bookmarks by defaultYuya Nishihara committed 2 years ago296961c
  27. nightly clippy fixesIlya Grigoriev committed 1 year ago0c6c471
  28. cli: delete the deprecated `jj move` commandMartin von Zweigbergk committed 1 year ago7323c2e
  29. completion: teach config about keysRemo Senekowitsch committed 1 year agoecd64aa
  30. completion: teach forget about workspacesRemo Senekowitsch committed 1 year ago1a121ea
  31. completion: pad empty argument at $_CLAP_COMPLETE_INDEXYuya Nishihara committed 1 year ago2005811
  32. cli: fix "config unset" to not delete a whole tableYuya Nishihara committed 1 year ago896ab5f
  33. log: describe how to see all revisions, point to revset docsMartin von Zweigbergk committed 1 year agoe11bc5d
  34. log: describe the different graph node symbols in help textMartin von Zweigbergk committed 1 year ago77477ae
  35. completion: teach operation commands about idsRemo Senekowitsch committed 2 years ago2def0ce