Code

History

Commits on ig/commit-debug2555+
  1. config: extract user path resolution from ConfigEnvYuya Nishihara committed 1 year ago99c790f
  2. config: inline check() function in test casesYuya Nishihara committed 1 year ago34ef4d8
  3. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  4. config: rename AnnotatedValue::path to ::nameYuya Nishihara committed 1 year agoe029e8d
  5. config: add doc comment to AnnotatedValueYuya Nishihara committed 1 year ago14798d3
  6. config: move resolved_config_values() to free functionYuya Nishihara committed 1 year ago0b23bbb
  7. cli: call resolved_config_values() directly from cmd_config_list()Yuya Nishihara committed 1 year ago0df1ac6
  8. cli: simplify-parents: add default `revsets.simplify-parents` configBenjamin Tan committed 1 year agoee37409
  9. cli: Fix error message grammar and associated testsNathanael Huffman committed 1 year agof6210aa
  10. tutorial: fix conflict formatting issueScott Taylor committed 1 year agoea72a4a
  11. github: bump astral-sh/setup-uv in the github-dependencies groupdependabot[bot] committed 1 year ago61f0000
  12. cargo: bump hashbrown in the cargo-dependencies groupdependabot[bot] committed 1 year ago73e456a
  13. faq: add an entry about why merge commits are often emptyMartin von Zweigbergk committed 1 year ago5aee10a
  14. config: extract layer management from cli LayeredConfigs to jj-libYuya Nishihara committed 1 year agof819dc9
  15. config: move ConfigSource to jj-lib, make it Copy + OrdYuya Nishihara committed 1 year agod75aaf3
  16. config: split ConfigSource::Env reflecting layer precedenceYuya Nishihara committed 1 year ago75b8e9b
  17. cli `util gc`: document the fact that it does not abandon operationsIlya Grigoriev committed 1 year ago8c5b39e
  18. merged_tree: propagate errors from conflict iteratorMartin von Zweigbergk committed 1 year ago10c90a5
  19. cli_util: take conflicts by value to `print_conflicted_paths()`Martin von Zweigbergk committed 1 year ago9ec216a
  20. nix: flake updateAustin Seipp committed 2 years ago81251c9
  21. cli `git push`: short alias -N for --allow-newIlya Grigoriev committed 1 year ago118072a
  22. docs: rewrite conflict marker docs to include new stylesScott Taylor committed 1 year ago472fd35
  23. conflicts: add "git" conflict marker styleScott Taylor committed 1 year ago26f5d61
  24. merge: add `as_slice()` methodScott Taylor committed 1 year agoec6220d
  25. conflicts: extract function for materializing hunkScott Taylor committed 1 year ago54c453b
  26. conflicts: add "snapshot" conflict marker styleScott Taylor committed 1 year agod2b06b9
  27. conflicts: extract header output into separate functionsScott Taylor committed 1 year ago863cba3
  28. conflicts: replace "if let" with "let else"Scott Taylor committed 1 year ago3c18268
  29. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  30. local_working_copy: fix documentation of `TreeState::snapshot()`Martin von Zweigbergk committed 1 year agod409a31
  31. cli: hyphenate "working-copy commit" in `--ignore-working-copy` helpMartin von Zweigbergk committed 1 year ago4d19a0a
  32. settings: simply forward .get_<type>(key) to .get::<type>(key)Yuya Nishihara committed 1 year agoa5c96bc
  33. settings: add forwarding getters, replace most of .config() usesYuya Nishihara committed 1 year agofc57139
  34. settings: pass around &UserSettings instead of &config::Config consistentlyYuya Nishihara committed 1 year agof239b1e
  35. config: add type alias for config::ConfigErrorYuya Nishihara committed 1 year ago6d26d53