Martin von Zweigbergk a898847333 cli: make jj rebase not simplify ancestor merges ... I think I prefer this behavior because it's less lossy. The user can manually simplify the history with `jj rebase -s <merge commit> -d <one of the parents>` afterwards. We can roll this change back later if we find it annoying.		2024-02-19 14:20:18 -08:00
..
examples	cli: drop handling of legacy revset dag range operator	2024-02-14 10:04:56 +09:00
src	cli: make jj rebase not simplify ancestor merges	2024-02-19 14:20:18 -08:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	cli: make jj rebase not simplify ancestor merges	2024-02-19 14:20:18 -08:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	completion: Add support for Nushell completions	2024-02-18 19:08:38 +01:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00