Code

History

Commits on ig/vimdiffwarn to cli/src525+
  1. store: make `get_tree()` functions take owned repo pathMartin von Zweigbergk committed 1 year ago409be2e
  2. config: replace LayeredConfigs with StackedConfigYuya Nishihara committed 1 year agobf17067
  3. config: extract remainder of LayeredConfigs methods to free functionsYuya Nishihara committed 1 year ago08b1ebe
  4. config: move read_user/repo_config() methods to ConfigEnvYuya Nishihara committed 1 year agoa890e1a
  5. config: manage repo config path by ConfigEnvYuya Nishihara committed 1 year ago1d485b7
  6. cli: fix typo in config path not found errorYuya Nishihara committed 1 year ago6ec3fcc
  7. completion: include bookmarks and tags in revisionsRemo Senekowitsch committed 1 year ago92adf89
  8. completion: allow calling jj multiple timesRemo Senekowitsch committed 1 year agofaa4fff
  9. config: rename ConfigEnv methods to clarify the intentYuya Nishihara committed 1 year ago3186d91
  10. config: make ConfigEnv public, replace global functionsYuya Nishihara committed 1 year ago39063f1
  11. config: make ConfigEnv methods not consume selfYuya Nishihara committed 1 year ago7249280
  12. config: extract user path resolution from ConfigEnvYuya Nishihara committed 1 year ago99c790f
  13. config: inline check() function in test casesYuya Nishihara committed 1 year ago34ef4d8
  14. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  15. config: rename AnnotatedValue::path to ::nameYuya Nishihara committed 1 year agoe029e8d
  16. config: add doc comment to AnnotatedValueYuya Nishihara committed 1 year ago14798d3
  17. config: move resolved_config_values() to free functionYuya Nishihara committed 1 year ago0b23bbb
  18. cli: call resolved_config_values() directly from cmd_config_list()Yuya Nishihara committed 1 year ago0df1ac6
  19. cli: simplify-parents: add default `revsets.simplify-parents` configBenjamin Tan committed 1 year agoee37409
  20. cli: Fix error message grammar and associated testsNathanael Huffman committed 1 year agof6210aa
  21. config: extract layer management from cli LayeredConfigs to jj-libYuya Nishihara committed 1 year agof819dc9
  22. config: move ConfigSource to jj-lib, make it Copy + OrdYuya Nishihara committed 1 year agod75aaf3
  23. config: split ConfigSource::Env reflecting layer precedenceYuya Nishihara committed 1 year ago75b8e9b
  24. cli `util gc`: document the fact that it does not abandon operationsIlya Grigoriev committed 1 year ago8c5b39e
  25. merged_tree: propagate errors from conflict iteratorMartin von Zweigbergk committed 1 year ago10c90a5
  26. cli_util: take conflicts by value to `print_conflicted_paths()`Martin von Zweigbergk committed 1 year ago9ec216a
  27. cli `git push`: short alias -N for --allow-newIlya Grigoriev committed 1 year ago118072a
  28. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  29. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  30. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  31. cli: hyphenate "working-copy commit" in `--ignore-working-copy` helpMartin von Zweigbergk committed 1 year ago4d19a0a
  32. settings: add forwarding getters, replace most of .config() usesYuya Nishihara committed 1 year agofc57139
  33. settings: pass around &UserSettings instead of &config::Config consistentlyYuya Nishihara committed 1 year agof239b1e
  34. config: add type alias for config::ConfigErrorYuya Nishihara committed 1 year ago6d26d53
  35. config: rename jj_cli::config::ConfigError to ConfigEnvErrorYuya Nishihara committed 1 year agoc0250f1