ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

changelog: asking for a combined description is a feature, not a bug fix

Browse source 
I suppose it could be seen as a bug fix that we no longer discard a
description without asking, but it was intentionally done the way it
was before.

While at it, I also clarified that the source commit gets abandoned if
it becomes empty.
This commit is contained in:
Martin von Zweigbergk 2022-08-30 22:24:35 -07:00 committed by Martin von Zweigbergk
parent b5378caa81
commit 0d1c23bf02
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -67,6 +67,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
mode). For example, use `jj move --to @-- foo` to move the changes to file
(or directory) `foo` in the working copy to the grandparent commit.
* When `jj move/squash/unsquash` abandons the source commit because it became
empty and both the source and the destination commits have non-empty
descriptions, it now asks for a combined description. If either description
was empty, it uses the other without asking.
* `jj split` now lets you specify on the CLI which paths to include in the first
commit. The interactive diff-editing is not started when you do that.
@ -184,11 +189,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* When checking out a commit, the previous commit is no longer abandoned if it
has a non-empty description.
* When `jj move/squash/unsquash` abandons the source commit and both the source
and the destination commits have non-empty descriptions, it now asks for a
combined description. If either description was empty, it uses the other
without asking.
* All commands now consistently snapshot the working copy (it was missing from
e.g. `jj undo` and `jj merge` before).