assume zx denotes a local revset.

rebase

rebase a “branch” (parent including all children) to a “destination”

jj git fetch

jj rebase [-b/--branch <REVSETS>] -d/--destination <REVSETS>

# example
jj rebase -d main@github
jj rebase -b zx -d main@github

split

jj split [-r/--revision @] [FILESETS]...

# example
jj split -r zx
jj split path/to/file.txt # split path/to/file.txt out of @ 
jj split -i path/to/file.txt # split, but interactive

my $0.02, sometimes maybe, it’s simpler to jj edit <REVSET> and fix the conflicts instead of trying to mess around with jj split

bookmarks

(the most confusing.)

enable auto-tracking

[remotes.origin]
auto-track-bookmarks = "*"

[remotes.github]
auto-track-bookmarks = "*"

local to remote

apparently jj tug’s the way to go; picking mine from here.

[aliases]
tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "latest(::@ ~ empty())"]

creation of the base bookmark

jj git push --named myfeature=@

# example
jj git push --named myfeature=b

or

jj bookmark create [-r/--revision <REVSET>] <NAMES>

# example
jj bookmark create -r zx myfeature

push

jj git push [-b/--bookmark <BOOKMARK>]

rebase changes atop merged PR

since jj tracks bookmarks automatically, and on github, you have the ‘delete branch after PR merged’ feature (idk what it’s called); then jj gets confused.

to resolve this, first untrack the bookmark

assume you have the 3 commits; <foo>, <bar>, <baz>.

jj bookmark untrack feat/foo
jj new main@github
jj rebase -b <baz> --onto main@github

<foo> should show up as (empty), and can be jj abandoned.