News for hackers. Stuff that matters.
Re:Jujutsu – A Git-compatible DVCS that is both simple and p... by detaro on Saturday February 19, 2022 @02:21PM (#30399698)
so just for understanding: repeated `git add -p` followed by a `git commit` turns into repeated `jj split; jj squash`, since you create a commit each time?
Re:Jujutsu – A Git-compatible DVCS that is both simple and p... by martinvonz on Saturday February 19, 2022 @02:29PM (#30399754)
That would work, yes, but there's also `jj squash -i` to move part of the child commit into the parent. There's also the more generic `jj move` command for moving part of any commit into any other commit (ancestor, descendant, sibling), so you `jj squash -i` is equivalent to `jj move -i --from @ --to @-` (where `@` is syntax for the working copy commit and `@-` is syntax for its parents).