mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-11 05:45:30 +03:00
README: update to describe "automatic rebase" instead of evolution (#32)
This commit is contained in:
parent
5be75d0e31
commit
f33117b2f8
12
README.md
12
README.md
@ -61,11 +61,13 @@ Features:
|
||||
This design also lets Jujutsu rebase merge commits correctly (unlike both Git
|
||||
and Mercurial).
|
||||
|
||||
* **Supports Evolution**
|
||||
Jujutsu copies the Evolution feature from Mercurial (see
|
||||
https://www.mercurial-scm.org/wiki/ChangesetEvolution). However, you will
|
||||
often not need to know that because the conflict design described above lets
|
||||
Jujutsu keep commits rebased even if there are conflicts.
|
||||
* **Automatic rebase**
|
||||
|
||||
Whenever you modify a commit, any descendants of the old commit will be
|
||||
rebased onto the new commit. Thanks to the conflict design described above,
|
||||
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 ##
|
||||
|
Loading…
Reference in New Issue
Block a user