History

Commits on ig/vimdiffwarn to cli2135+

cli diff help: add detailed explanation of `-r merge_commit`Ilya Grigoriev committed 2 years agod8df36b
cli diff: add short description to `jj help` and `jj diff -h`Ilya Grigoriev committed 2 years agoe3852ff
test_abandon_command: test avoidance of simultaneous direct and indirect descendantsIlya Grigoriev committed 2 years ago22ad4d7
test_abandon_command: remove obsolete TODOIlya Grigoriev committed 2 years agoe5cfada
merge_tools: use `left_file_mode` in `make_diff_files`Łukasz Kurowski committed 2 years agoe21ffb0
cli: move `make_branch_term` out of commands/mod.rsIlya Grigoriev committed 2 years ago0357915
cli: make dummy `revert` command accept any argumentsIlya Grigoriev committed 2 years agoaf81cbd
cli: adjust error message for dummy `revert` commandIlya Grigoriev committed 2 years ago1c5d0e0
clippy: fix new issues spotted by nightly versionMartin von Zweigbergk committed 2 years agoc2d5e3d
cli: Suggest `jj backout` or `jj restore` in place of `jj revert`Benjamin Saunders committed 3 years ago2526620
git: have import_refs() obtain git2::Repository instance from storeYuya Nishihara committed 3 years ago6c98dfc
operation: propagate OpStoreError from parents()Yuya Nishihara committed 3 years ago8e14354
cli: use op.parent_ids() where operation object isn't neededYuya Nishihara committed 3 years ago3f5e599
merge_tools: use `right_file_mode` in `make_diff_files`Łukasz Kurowski committed 3 years agoffd6884
git_backend: pass UserSettings to GitBackend constructorsYuya Nishihara committed 3 years agoea32c0c
repo: pass UserSettings to store factories and initializersYuya Nishihara committed 3 years ago8a2048a
cli: propagate read_operation() errorsYuya Nishihara committed 3 years ago0251c9f
cli: flatten check_stale_working_copy() resultYuya Nishihara committed 3 years ago4ab8a1a
op_store: embed details in operation/view not found errorYuya Nishihara committed 3 years ago6125fb1
cli: include branch name in non-fast-forwardable errorYuya Nishihara committed 3 years ago9533177
cli: inline check for non-fast-forwardable branch moveYuya Nishihara committed 3 years ago8706fad
tests: add test for moving conflicting branch to one of descendantsYuya Nishihara committed 3 years ago27751b0
cli: disallow to create new branch by "jj branch set"Yuya Nishihara committed 3 years ago0d21578
tests: don't create new branch by "jj branch set"Yuya Nishihara committed 3 years agoaca2a3c
diff_utils: return `&str` from `basic_diff_file_type()`Martin von Zweigbergk committed 3 years agobf36933
cli: pass `MaterializedTreeValue` into `diff_content()`Martin von Zweigbergk committed 3 years agoffbfd74
cli: pass `MaterializedTreeValue` into `git_diff_part()`Martin von Zweigbergk committed 3 years ago120115a
cli: generate commit template after selecting changesŁukasz Kurowski committed 3 years ago57d7aea
cli: reorder check of branch create/set arguments so they look similarYuya Nishihara committed 3 years agoe2fd309
cli: simplify check for conflicting branch name to createYuya Nishihara committed 3 years agoe880976
cli: include branch names in bulk branch creation/update warningYuya Nishihara committed 3 years ago70479a7
tests: add test for moving branch forward and backwardYuya Nishihara committed 3 years agoa6aa8aa
diff_utils: pass tree value into `diff_content()` by valueMartin von Zweigbergk committed 3 years agob11f7ee
conflicts: add another helper for materializing a tree valueMartin von Zweigbergk committed 3 years ago9b24d24
misc: drop a few low-hanging unsafesAnton Bulakh committed 3 years agod27351b