Martin von Zweigbergk b5378caa81 cli: make jj move/squash/unsquash ask for combined description ... In 8ae9540f2c, I made `jj move/squash/unsquash` not abandon the working copy if it became empty because that would lose any description associated with it. It turned out that the new behavior was also confusing because it made it unclear if the working-copy commit was actually abandoned. Let's roll back that change and instead ask the user for a combined description when both the source and destination commits have non-empty descriptions. Not discarding a non-empty description seems like a good improvement regardless of the behavior related to working-copy commits. It's also how `hg fold` behaves (though hg doesn't allow the description to be empty).		2022-08-30 21:41:26 -07:00
..
commands.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
config.rs	config: move NO_COLOR handling from ui, don't override user setting	2022-06-10 12:47:06 +09:00
diff_edit.rs	cleanup: fix some cargo clippy warnings	2022-05-02 21:49:01 -07:00
formatter.rs	cli: jj branch can accept any number of branches	2022-05-02 21:33:58 -07:00
graphlog.rs	graphlog: don't de-indent multi-line text at end of chain	2022-05-11 04:42:44 -07:00
lib.rs	cli: move config-reading to new config module	2022-05-10 10:21:22 -07:00
main.rs	cli: allow config in ~/.jjconfig.toml	2022-05-10 10:21:22 -07:00
template.pest	import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo	2020-12-12 00:23:38 -08:00
template_parser.rs	cli: indicate each workspace's checkout in log (#13)	2022-02-02 21:36:14 -08:00
templater.rs	cleanup: remove some unused lifetimes	2022-05-21 10:41:45 -07:00
ui.rs	ui: add function to recreate formatters with new color choice	2022-06-10 12:47:06 +09:00