mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 02:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

readme: drop repeated "a merge commit"

Browse source
This commit is contained in:
Martin von Zweigbergk 2020-12-18 14:35:12 -08:00
parent 6721b576b7
commit 9f4c3bab5e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -130,9 +130,9 @@ commit to be the difference compared to the merged parents (the so-called "evil"
part of the merge), so that's what Jujube does. Rebasing merge commits therefore part of the merge), so that's what Jujube does. Rebasing merge commits therefore
works as you would expect (Git and Mercurial both handle rebasing of merge works as you would expect (Git and Mercurial both handle rebasing of merge
commits poorly). It's even possible to change the number of parents while commits poorly). It's even possible to change the number of parents while
rebasing, so if A is non-merge commit, you can make it a merge commit a merge rebasing, so if A is non-merge commit, you can make it a merge commit with `jj
commit with `jj rebase -r A -d B -d C`. `jj diff -r <commit>` will show you the rebase -r A -d B -d C`. `jj diff -r <commit>` will show you the diff compared to
diff compared to the merged parents. the merged parents.
I intend for commands that present the contents of a tree (such as listing I intend for commands that present the contents of a tree (such as listing
files) to use the "add" state(s) of the conflict, but that's not yet done. files) to use the "add" state(s) of the conflict, but that's not yet done.