Code

History

Commits on ig/diffline to cli/src35+
  1. docs `diff --help`: document what a "linear chain of revisions" meansIlya Grigoriev committed 1 year agobc37c02
  2. cli `diff`: warn if combining diffs of non-linear set of revisionsIlya Grigoriev committed 1 year ago7d9dd3b
  3. rewrite: make merge_commit_trees() asyncMartin von Zweigbergk committed 1 year ago48ac617
  4. merged_tree: make resolve() and merge() asyncMartin von Zweigbergk committed 1 year ago8022a49
  5. cli: remove remaining users of glob crateYuya Nishihara committed 1 year ago451189a
  6. merged_tree: make `merge()` take all args by valueMartin von Zweigbergk committed 1 year ago191369f
  7. str_util: rename "matches" to "is_match"Jade Lovelace committed 1 year ago1acd2a0
  8. template_builder: stop eating non-TemplateError error sources in testsJade Lovelace committed 1 year ago800b5f8
  9. config: fix migration rule for core.watchman.register-snapshot-triggerYuya Nishihara committed 1 year ago1471655
  10. cli help: document the `ci` alias, add comment for futureIlya Grigoriev committed 1 year agoe160f7d
  11. split: Clarify help text for --destinationDaniel Danner committed 1 year ago4f0cb93
  12. annotate: add original line number to templateDaniel Luz committed 1 year ago2c0a133
  13. docs: move mention of `jj file track` having no effect to the top of its descriptionOri Avtalion committed 1 year ago0c81caa
  14. cli: remove `amend` aliasIlya Grigoriev committed 1 year ago06d9960
  15. cli: describe how `commit` is different from `split`Martin von Zweigbergk committed 1 year agoa00b5b8
  16. diffedit: add support for filesetsGeorge Christou committed 1 year agof7377bd
  17. merge_tools: builtin: preserve unmatched paths from right treeGeorge Christou committed 1 year agof20e99b
  18. absorb: complete only files changed in the --from revisionRemo Senekowitsch committed 1 year ago00145e6
  19. config: move fsmonitor settings out of `core`Kaiyi Li committed 1 year ago9d817b6
  20. index: rename remaining "commit" index types as prep for changed-paths segmentsYuya Nishihara committed 1 year agoe8bce6f
  21. templater: reorder OperationList items accordinglyYuya Nishihara committed 1 year agoeec028d
  22. diff stat: ensure bar always has 2 spaces for commits with adds and removesBryce Berger committed 1 year ago38a23f9
  23. cli completion: remove non-functional diff editors/formattersIlya Grigoriev committed 1 year agod9c031c
  24. `merge-tools.toml`: disable diff editing and/or viewing with tools that don't support itIlya Grigoriev committed 1 year ago7dadc13
  25. cli merge tools: allow setting `diff-args=[]` to disable diff formatting with a toolIlya Grigoriev committed 1 year agofedbc30
  26. cli merge tools: allow setting `edit-args=[]` to disable diff editing with a toolIlya Grigoriev committed 1 year agodae9ce7
  27. cli merge tools: rename internal `DiffTool` type to `DiffEditTool`Ilya Grigoriev committed 1 year ago1b16132
  28. cli merge_tools.toml: add diff viewing config for `diffedit3` and `vscode`Ilya Grigoriev committed 1 year agoc6338a5
  29. templater: add parents() method for OperationJosh Steadmon committed 1 year agod7fa04f
  30. local working copy: add support for EOL conversionKaiyi Li committed 1 year agof1f1556
  31. working copy: pass `UserSettings` to `WorkingCopyFactory`Kaiyi Li committed 1 year ago74fb5a6
  32. cli: make diff --stat fill available widthEvan Martin committed 1 year agod9b0a42
  33. cli: move `desc` and `st` aliases to configMartin von Zweigbergk committed 1 year ago59de83a
  34. status: collapse entirely untracked directoriesHubert Głuchowski committed 1 year ago8ec0196
  35. cli completion: complete diff tools such as `:git` and `:summary`Ilya Grigoriev committed 1 year ago13d747c