From 57ff990fe8708f801835ee38177366e360d11f22 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sat, 19 Nov 2022 14:11:35 -0800 Subject: [PATCH] docs: describe `git commit --fixup` equivalent It's probably not obvious that `jj move` can be used for the `git commit --fixup` usecase. --- docs/git-comparison.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/git-comparison.md b/docs/git-comparison.md index d63b9f34c..4bbf8d7b1 100644 --- a/docs/git-comparison.md +++ b/docs/git-comparison.md @@ -226,6 +226,11 @@ parent. jj squash/amend -i git add -p; git commit --amend + + Move the diff in the working copy into an ancestor + jj move --to X + git commit --fixup=X; git rebase -i --autosquash X^ + Interactively move part of the diff in an arbitrary change to another arbitrary change