ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

docs: describe git commit --fixup equivalent

Browse source 
It's probably not obvious that `jj move` can be used for the `git
commit --fixup` usecase.
This commit is contained in:
Martin von Zweigbergk 2022-11-19 14:11:35 -08:00 committed by Martin von Zweigbergk
parent 928da6e363
commit 57ff990fe8
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/git-comparison.md
View file

@ -226,6 +226,11 @@ parent.
<td><code>jj squash/amend -i</code></td> <td><code>jj squash/amend -i</code></td>
<td><code>git add -p; git commit --amend</code></td> <td><code>git add -p; git commit --amend</code></td>
</tr> </tr>
<tr>
<td>Move the diff in the working copy into an ancestor</td>
<td><code>jj move --to X</code></td>
<td><code>git commit --fixup=X; git rebase -i --autosquash X^</code></td>
</tr>
<tr> <tr>
<td>Interactively move part of the diff in an arbitrary change to another <td>Interactively move part of the diff in an arbitrary change to another
arbitrary change</td> arbitrary change</td>