History

Commits on ig/commit-debug6125+

cli: when splitting change without description, skip it on second partMartin von Zweigbergk committed 3 years ago873634a
cargo: bump the cargo-dependencies group with 2 updatesdependabot[bot] committed 3 years ago2685d4a
cli: refactor default_description to UserSettingsVamsi Avula committed 3 years ago3869b7c
cli: replace CommandHelper with UserSettings where sufficientVamsi Avula committed 3 years ago72d6e20
cli: respect `ui.default-description` in split as wellVamsi Avula committed 3 years ago088cc78
cli: hide irrelevant information about root commit in default log templatesAnton Bulakh committed 3 years agodc6e1d7
templater: add `root` keywordAnton Bulakh committed 3 years ago82923af
working_copy: use `MergedTree` for current tree when snapshottingMartin von Zweigbergk committed 3 years ago9138bb5
working_copy: make `write_path_to_store()` work with merged valuesMartin von Zweigbergk committed 3 years agoc126e75
merged_tree: add `path_value()`Martin von Zweigbergk committed 3 years ago1d55a40
merged_tree: import `create_tree()` in tests to reduce line wrappingMartin von Zweigbergk committed 3 years ago2238c87
working_copy: avoid adding unchanged values to tree builderMartin von Zweigbergk committed 3 years ago3f97a6d
working_copy: move writing of conflicts to receiver side of channelMartin von Zweigbergk committed 3 years agoeacdad3
working_copy: return `Merge<Option<TreeValue>>` over channelMartin von Zweigbergk committed 3 years ago03f00bb
working_copy: delete duplicate commentMartin von Zweigbergk committed 3 years ago6c5d6d7
working_copy: propagate errors from writing conflict parts to storeMartin von Zweigbergk committed 3 years ago4eadb06
index: import commits in chronological orderYuya Nishihara committed 3 years ago6286cde
dag_walk: add topological sort that runs Kahn's algorithm with heap queueYuya Nishihara committed 3 years agocc6e915
cleanup: fix warnings from nightly clippyMartin von Zweigbergk committed 3 years agof1b817e
cli: leverage `Merge::map()` in `jj chmod`Martin von Zweigbergk committed 3 years ago9a2a8f8
cli: in `jj chmod`, check if all sides are files firstMartin von Zweigbergk committed 3 years ago725f79c
cli: say that `jj chmod` errors out if there are any non-file sidesMartin von Zweigbergk committed 3 years agoa80259c
add error message when running from a non-existent directoryTal Pressman committed 3 years ago32fef36
cargo: bump the cargo-dependencies group with 1 updatedependabot[bot] committed 3 years ago440a7a8
conflicts: combine loops for adds/removes in `update_from_content()`Martin von Zweigbergk committed 3 years agob16fd3b
conflicts: check earlier for edited absent part in conflict markersMartin von Zweigbergk committed 3 years agof45b805
merge: implement `Iterator` and `FromIterator`Martin von Zweigbergk committed 3 years ago01ac97f
conflicts: remove redundant check of `num_sides` from conditionMartin von Zweigbergk committed 3 years agodffe069
cli: include hint when push is not fast-forwardMartin von Zweigbergk committed 3 years agoaf145e8
Small addition to index comparisontp-woven committed 3 years agoa112a93
merge_tools: move symbols to `external.rs`Waleed Khan committed 3 years ago9ea9c06
docs: `ui.difftool` -> `ui.diff-editor`Waleed Khan committed 3 years ago2e44eaa
git: scan new commits all at once from multiple headsYuya Nishihara committed 3 years ago7ddced7
repo: extract add_heads() that can import commits from multiple headsYuya Nishihara committed 3 years ago73a4b7f
git: add separate step to apply HEAD@git changeYuya Nishihara committed 3 years ago157a0e7