Code

History

Commits on ig/vimdiffwarn to cli/src1785+
  1. cli diff help: add detailed explanation of `-r merge_commit`Ilya Grigoriev committed 2 years agod8df36b
  2. cli diff: add short description to `jj help` and `jj diff -h`Ilya Grigoriev committed 2 years agoe3852ff
  3. merge_tools: use `left_file_mode` in `make_diff_files`Łukasz Kurowski committed 2 years agoe21ffb0
  4. cli: move `make_branch_term` out of commands/mod.rsIlya Grigoriev committed 2 years ago0357915
  5. cli: make dummy `revert` command accept any argumentsIlya Grigoriev committed 2 years agoaf81cbd
  6. cli: adjust error message for dummy `revert` commandIlya Grigoriev committed 2 years ago1c5d0e0
  7. cli: Suggest `jj backout` or `jj restore` in place of `jj revert`Benjamin Saunders committed 3 years ago2526620
  8. git: have import_refs() obtain git2::Repository instance from storeYuya Nishihara committed 3 years ago6c98dfc
  9. operation: propagate OpStoreError from parents()Yuya Nishihara committed 3 years ago8e14354
  10. cli: use op.parent_ids() where operation object isn't neededYuya Nishihara committed 3 years ago3f5e599
  11. merge_tools: use `right_file_mode` in `make_diff_files`Łukasz Kurowski committed 3 years agoffd6884
  12. cli: propagate read_operation() errorsYuya Nishihara committed 3 years ago0251c9f
  13. cli: flatten check_stale_working_copy() resultYuya Nishihara committed 3 years ago4ab8a1a
  14. op_store: embed details in operation/view not found errorYuya Nishihara committed 3 years ago6125fb1
  15. cli: include branch name in non-fast-forwardable errorYuya Nishihara committed 3 years ago9533177
  16. cli: inline check for non-fast-forwardable branch moveYuya Nishihara committed 3 years ago8706fad
  17. cli: disallow to create new branch by "jj branch set"Yuya Nishihara committed 3 years ago0d21578
  18. diff_utils: return `&str` from `basic_diff_file_type()`Martin von Zweigbergk committed 3 years agobf36933
  19. cli: pass `MaterializedTreeValue` into `diff_content()`Martin von Zweigbergk committed 3 years agoffbfd74
  20. cli: pass `MaterializedTreeValue` into `git_diff_part()`Martin von Zweigbergk committed 3 years ago120115a
  21. cli: generate commit template after selecting changesŁukasz Kurowski committed 3 years ago57d7aea
  22. cli: reorder check of branch create/set arguments so they look similarYuya Nishihara committed 3 years agoe2fd309
  23. cli: simplify check for conflicting branch name to createYuya Nishihara committed 3 years agoe880976
  24. cli: include branch names in bulk branch creation/update warningYuya Nishihara committed 3 years ago70479a7
  25. diff_utils: pass tree value into `diff_content()` by valueMartin von Zweigbergk committed 3 years agob11f7ee
  26. conflicts: add another helper for materializing a tree valueMartin von Zweigbergk committed 3 years ago9b24d24
  27. misc: drop a few low-hanging unsafesAnton Bulakh committed 3 years agod27351b
  28. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  29. merge_tools: borrow file contents without consuming Merge objectYuya Nishihara committed 3 years agoe4b0e62
  30. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  31. cli: move description utils to description_util.rsAntoine Cezar committed 3 years agoafc2382
  32. merge_tools: do not follow or change permission of symlinksYuya Nishihara committed 3 years agod8a7822
  33. git: add config to disable abandoning of unreachable commitsMartin von Zweigbergk committed 3 years ago7c92351
  34. merge: have Merge::adds()/removes() return iteratorYuya Nishihara committed 3 years agod9fbf21
  35. merge tools: use `MergedTree::diff_stream()`Martin von Zweigbergk committed 3 years ago5b02987