ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli/src
Martin von Zweigbergk a9d0300b11 rewrite: make simplification of ancestor merges optional
I think the conclusion from #2600 is that at least auto-rebasing
should not simplify merge commits that merge a commit with its
ancestor. Let's start by adding an option for that in the library.
2024-02-19 14:20:18 -08:00
..
commands rewrite: make simplification of ancestor merges optional 2024-02-19 14:20:18 -08:00
config cli: change workspace@ symbol color to green (the color of HEAD@git) 2024-02-16 11:12:43 +09:00
merge_tools cli: rename --verbose to --debug to better fit what it does 2024-02-18 18:45:48 +01:00
cleanup_guard.rs
cli_util.rs cli: rename --verbose to --debug to better fit what it does 2024-02-18 18:45:48 +01:00
commit_templater.rs
config-schema.json
config.rs
description_util.rs
diff_util.rs
formatter.rs
git_util.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
graphlog.rs graphlog: refactor graphlog::Edge enum and its usage 2024-02-17 20:54:20 +05:00
lib.rs
main.rs
operation_templater.rs
progress.rs
template.pest
template_builder.rs
template_parser.rs
templater.rs
text_util.rs
time_util.rs
ui.rs