From f33117b2f86e390dba6d842a0e0404d335574af0 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sun, 3 Oct 2021 10:17:47 -0700 Subject: [PATCH] README: update to describe "automatic rebase" instead of evolution (#32) --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 512658670..d387bb1cb 100644 --- a/README.md +++ b/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 ##