From 8fe21b0438c5710f444146551439baa02338727b Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Fri, 28 Jan 2022 22:47:18 -0800 Subject: [PATCH] docs: mention history rewriting as a feature in README I think we have better support rewriting history than most other tools do, so it seems worth mentioning. --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a3f33cc52..23baa6168 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Jujutsu is a [Git-compatible](docs/git-compatibility.md) features from Git (data model, [speed](https://github.com/martinvonz/jj/discussions/49)), Mercurial (anonymous branching, simple CLI [free from "the index"](docs/git-comparison.md#the-index), -[revsets](docs/revsets.md)), and Pijul/Darcs +[revsets](docs/revsets.md), powerful history-rewriting), and Pijul/Darcs ([first-class conflicts](docs/conflicts.md)), with features not found in either of them ([working-copy-as-a-commit](docs/working-copy.md), [undo functionality](docs/operation-log.md), automatic rebase, @@ -95,8 +95,16 @@ 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. +### Comprehensive support for rewriting history -## Status ## +Besides the usual rebase command, there's `jj describe` for editing the +description (commit message) of an arbitrary commit. There's also `jj edit`, +which lets you edit the changes in a commit without checking it out. To split +a commit into two, use `jj split`. You can even move part of the changes in a +commit to any other commit using `jj move`. + + +## Status The tool is quite feature-complete, but some important features like (the equivalent of) `git blame` and `git log ` are not yet supported. There