mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

README: update to describe "automatic rebase" instead of evolution (#32)

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-10-03 10:17:47 -07:00
parent 5be75d0e31
commit f33117b2f8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -61,11 +61,13 @@ Features:
This design also lets Jujutsu rebase merge commits correctly (unlike both Git This design also lets Jujutsu rebase merge commits correctly (unlike both Git
and Mercurial). and Mercurial).
* **Supports Evolution** * **Automatic rebase**
Jujutsu copies the Evolution feature from Mercurial (see
https://www.mercurial-scm.org/wiki/ChangesetEvolution). However, you will Whenever you modify a commit, any descendants of the old commit will be
often not need to know that because the conflict design described above lets rebased onto the new commit. Thanks to the conflict design described above,
Jujutsu keep commits rebased even if there are conflicts. that can be done even if there are conflicts. Branches pointing to rebased
commits will be updated. So will the working copy if it points to a rebased
commit.
## Status ## ## Status ##