Code

History

Commits on ig/vimdiffwarn to cli1330+
  1. cli: create `jj file list` and deprecate `jj files`Matt Kulukundis committed 2 years ago5d307e6
  2. feat: Create a `file` command containing `print` and `chmod`Matt Kulukundis committed 2 years ago47bd6f4
  3. conflicts: propagate error from conflict materializationMartin von Zweigbergk committed 2 years agof8a5ad0
  4. feat: add an option to monitor the filesystem asynchronouslyMatt Kulukundis committed 2 years ago8aa71f5
  5. test_generate_cli_reference: fixup to 52c415e, remove mysterious commentIlya Grigoriev committed 2 years agoce0c537
  6. test_generate_cli_reference: Fixup to 16ec185Ilya Grigoriev committed 2 years ago5cbe8d2
  7. docs CLI Reference: upgrade `clap-markdown` to 0.1.4Ilya Grigoriev committed 2 years agoe0af9a0
  8. cli: deprecate `jj split --siblings` in favor of `jj split --parallel`Martin von Zweigbergk committed 2 years agoa9953b3
  9. cli: deprecate `-l` short alias for `--limit` in favour of `-n`Manuel Caldeira committed 2 years ago72438fc
  10. merge_tools: simplify file conflicts before attempting to resolveBenjamin Tan committed 2 years ago7c9f28a
  11. test_resolve_command: accept filename in `check_resolve_produces_input_file`Benjamin Tan committed 2 years ago17c8daa
  12. print_conflicted_paths: simplify file conflicts before printingBenjamin Tan committed 2 years ago9d4ac81
  13. conflicts: materialize simplified file conflictsBenjamin Tan committed 2 years ago9be3372
  14. tests: add tests showing that individual file conflicts are not simplified/deduplicatedBenjamin Tan committed 2 years agof74991c
  15. revset, templater: implement arity-based alias overloadingYuya Nishihara committed 2 years agoa7bff04
  16. revset, templater: include parameter names in AliasIdYuya Nishihara committed 2 years agod38c9e8
  17. cli `fix`: change default from `-s @` to `-s 'reachable(@, mutable())'`Danny Hooper committed 2 years ago986630b
  18. cli `fix`: add `revsets.fix` config for default revset to be fixedDanny Hooper committed 2 years agofaf9a9d
  19. fileset, templater: in tests, make parse_normalized() unwrap resultYuya Nishihara committed 2 years ago53fa95d
  20. fix: add support for fixing only some pathsMartin von Zweigbergk committed 2 years ago78cbb51
  21. Show paths of config files when configurations contain errorsSimon Wollwage committed 2 years ago3cd1fe4
  22. diff-editor: pass reference to store into `apply_diff_builtin()`Martin von Zweigbergk committed 2 years ago6a57fa9
  23. merged_tree: make tree builder attempt to resolve conflictsMartin von Zweigbergk committed 2 years ago65a988e
  24. revset: represent program modifier as AST nodeYuya Nishihara committed 2 years agoeda7069
  25. diff_util: don't panic for file hashes < 10 hex charsdploch committed 2 years ago539edad
  26. cli: add --allow-empty-description flag to pushMichael Gattozzi committed 2 years ago3bc361a
  27. new: allow `--insert-before` and `--insert-after` simultaneouslyBenjamin Tan committed 2 years agoa3c6a9b
  28. new: extract out `ensure_no_commit_loop` functionBenjamin Tan committed 2 years agobbadc6f
  29. new: convert `--insert-before` and `--insert-after` into proper optionsBenjamin Tan committed 2 years ago256a51f
  30. new: refactor creation of new commit into common code pathBenjamin Tan committed 2 years agof74618f
  31. new: avoid manual `unwrap()` callBenjamin Tan committed 2 years agoa45a505
  32. revset: replace ParseState with &RevsetParseContextYuya Nishihara committed 2 years ago9f33d13
  33. revset: omit function name from type error messagesYuya Nishihara committed 2 years ago14421ac
  34. cli: git: split loop that collects push directions and new targetsYuya Nishihara committed 2 years agoe9db051
  35. cli: implement enough of `jj fix` to run a single tool on all filesDanny Hooper committed 2 years ago3050685