📋 List of jj aliases
#8484
Replies: 31 comments 38 replies
Discussion threadPlease reply to this comment to discuss the list. |
2 replies
|
I have prowled the web for aliases. I have tried to find the original source, but feel free to correct me if the info should be updated. |
|
these are sick, thank you for collecting them |
tug: Find the closest bookmark in history and advance it forward to closest non-empty commit (using bookmark move) |
4 replies
Code[revset-aliases]
'closest_bookmark(to)' = 'heads(::to & bookmarks())'
'closest_pushable(to)' = 'heads(::to & ~description(exact:"") & (~empty() | merges()))'
[aliases]
tug = ["bookmark", "move", "--from", "closest_bookmark(@)", "--to", "closest_pushable(@)"]Authorglehmann Source |
|
This is now available in |
|
Good point! However, does it take Would this be the correct syntax? Or maybe it is even better to set |
|
I use the latter, but I've also thought about just changing my habits to advance before committing lol. |
rebase-all: Rebase all my branches on trunk() |
1 reply
Coderebase-all = ["rebase", "-s", "(::trunk())+ & mutable()", "-o", "trunk()"]Authorsteveklabnik Source |
restack: Rebase all my branches/megamerge on trunk(). |
2 replies
Code[aliases]
# `jj restack` to rebase your changes onto `trunk()`
restack = ["rebase", "-o", "trunk()", "-s", "roots(trunk()..) & mutable()"]AuthorIsaac Corbrey Sourcehttps://discord.com/channels/968932220549103686/1450483739225227325/1450578202966757406 |
Code[revset-aliases]
"mutable_roots()" = "roots(trunk()..) & mutable()"
[aliases]
restack = ["rebase", "-o", "trunk()", "-s", "mutable_roots()"]AuthorIsaac Corbrey Sourcehttps://github.com/icorbrey/dotnix/blob/main/modules%2Fhome%2Fjujutsu%2Fdefault.nix#L117 Changesmutable_roots() revset alias. Link to more "offical" source. |
fetch-pr : Fetch PR from origin and create pr- bookmark (using git) |
1 reply
Codefetch-pr = ['util', 'exec', '--', 'bash', '-c', '''
count=1
while true; do
git fetch origin pull/$1/head:pr-$1-$count && break
((count++))
done
jj git import
''', '']Dependenciesbash Authorase Sourcehttps://discord.com/channels/968932220549103686/1444274388324061235/1444320724692111510 |
track-github-PR / untrack-github-PR: fetching and pushing to someone else's PR on Github, with additional remote bookmark to show PR's number (using git, gh) |
1 reply
Code[aliases]
track-github-PR = ["util", "exec", "--", 'sh', '-euxc', '''
PR=$1
gh pr view --json headRepository,headRefName,headRepositoryOwner $PR --jq '"
set_remote() {
jj 2>/dev/null git remote add \"$1\" \"$2\" ||
jj git remote set-url \"$1\" \"$2\"
}
set_remote \(.headRepositoryOwner.login) git@github.com:\(.headRepositoryOwner.login)/\(.headRepository.name)
jj git fetch --remote \(.headRepositoryOwner.login) --branch \(.headRefName)
jj bookmark track \(.headRefName)@\(.headRepositoryOwner.login)
origin=$(gh repo view --json owner,name --jq .owner.login)
set_remote \"$origin\" \"$(gh repo view --json sshUrl --jq .sshUrl)\"
git fetch --force --update-head-ok \"$origin\" \"refs/pull/'"$PR"'/head:refs/remotes/$origin/pull/'"$PR"'\"
"' |
sh -euxs
''', "jj-track-github-PR"]
untrack-github-PR = ["util", "exec", "--", 'sh', '-euxc', '''
PR=$1
gh pr view --json headRepository,headRefName,headRepositoryOwner $PR --jq '"
jj bookmark forget \(.headRefName) || true
origin=$(gh repo view --json owner,name --jq .owner.login)
git for-each-ref --format \"delete %(refname)\" \\
\"refs/remotes/\(.headRepositoryOwner.login)/\(.headRefName)\" \\
\"refs/remotes/$origin/pull/'"$PR"'\" |
tee /dev/stderr |
git update-ref --stdin
"' |
sh -euxs
''', "jj-untrack-github-PR"]Dependenciessh Authorju1m Source |
difft: Diff using difftastic (without having it as default) |
1 reply
Codedifft = ["diff", "--tool", "difft"]Source |
sync: Fetch from all remotes |
1 reply
Codesync = ['git', 'fetch', '--all-remotes']Source |
collapse: Collapse the current branch into one commit |
1 reply
Code[revset-aliases]
# From indigo
"branch_start(to)" = "heads(::to & trunk())+ & ::to"
[aliases]
collapse = ["squash", "-f", "branch_start(@)+::@", "-t", "branch_start(@)"]Authormrnugget Source |
long: Show detailed log |
1 reply
Codelong = ["log", "-T", "builtin_log_detailed"]Sourcehttps://github.com/zanshin/dotfiles/blob/fa746e027f3127dc87f7731db6d9f5bae9c7a1f4/jj/config.toml#L28 |
short: Show oneline log |
1 reply
Codelong = ["log", "-T", "builtin_log_oneline"]Sourcehttps://github.com/zanshin/dotfiles/blob/fa746e027f3127dc87f7731db6d9f5bae9c7a1f4/jj/config.toml#L29 |
l: Show log of commits up to @ |
1 reply
Codel = ["log", "-r", "ancestors(@)"]Source |
precommit: Manually run pre-commit hooks |
1 reply
Codeprecommit = [
"util",
"exec",
"--",
"bash",
"-c",
"jj diff $1 $2 --name-only --no-pager | xargs pre-commit run --files", ""
]Dependenciesbash Authorhdemers Source |
open: My branches (heads) that are not yet merged to trunk() |
1 reply
Codeopen = ["log", "-r", "heads(mine()) ~ ::trunk()"]Sourcehttps://github.com/sharnik/dotfiles/blob/42b8f18ab9f86e88c3e7f06de36e3adbbd6afadf/jjconfig.toml#L26 |
open: My commits that are not yet merged to trunk() |
1 reply
Code[revset-aliases]
# stack(x, n) is the set of mutable commits reachable from 'x', with 'n'
# parents. 'n' is often useful to customize the display and return set for
# certain operations. 'x' can be used to target the set of 'roots' to traverse,
# e.g. @ is the current stack.
'stack()' = 'stack(@)'
'stack(x)' = 'stack(x, 2)'
'stack(x, n)' = 'ancestors(reachable(x, mutable()), n)'
# The current set of "open" works. It is defined as: all stacks that are
# reachable from my working copy, or any other commit I wrote.
# n = 1, meaning that nothing from `trunk()` is included, so all resulting
# commits are mutable by definition.
'open()' = 'stack(mine() | @, 1) ~ hidden()'
[aliases]
# Get all open stacks of work
open = ["log", "-r", "open()"]Source |
blame: Annotate file with authors. Shorthand for jj file annotate. |
1 reply
Codeblame = ["file", "annotate"]Source |
slice: View the entire branch being worked on in the log |
1 reply
Code[revset-aliases]
# View the entire branch being worked on
'slice()' = 'slice(@)'
'slice(from)' = 'ancestors(reachable(from, mutable()), 2)'
[aliases]
slice = ["log", "-r", "slice()"]Authorjennings Source |
issueprefix: Add [ISSUE-] prefix to every non-prefixed commit in the current branch |
2 replies
Code[aliases]
issueprefix = ["util", "exec", "--", "bash", "-c", """
set -euo pipefail
NUM=$1
PREFIX="[ISSUE-$NUM] "
# We don't actually need the editor, since we format the commit using the commit description template,
# but we want a command that returns success.
export JJ_EDITOR=/usr/bin/true
# Change all offending commits at once, to get only one operation in the operation log.
jj desc -r "((trunk()..@) | @::) ~ subject(glob:'\\[*')" --config templates.draft_commit_description="concat(\\"$PREFIX\\",coalesce(description, default_commit_description, \\"\n\\"))\"
""", ""]Dependenciesbash Authorthomasa88 SourceRetrieved2026-01-06 |
|
i think the link should be: #8492 |
plan: Create empty commit with description at the branch tip |
1 reply
Code
Authorthomasa88 Source |
l : Show log for the given revset |
1 reply
Codel = ["log", "-r"]Authorprkl Sourcehttps://discord.com/channels/968932220549103686/1459086554252447921/1459138173035614250 |
restack: Rebase all my active branches on trunk (reachable through mutable() from @) |
1 reply
Code[revset-aliases]
'stack()' = 'stack(@)'
'stack(x)' = 'stack(x, 2)'
'stack(x, n)' = 'ancestors(reachable(x, mutable()), n)'
[aliases]
restack = ["rebase", "-o", "trunk()", "-s", "roots(trunk()..) & stack()"]AuthorIsaac Corbrey |
|
stack r: Move revset 'r' into the megamerge |
1 reply
Code[revset-aliases]
# Returns the closest merge commit to `to`
"closest_merge(to)" = "heads(::to & merges())"
[aliases]
# `jj stack <revset>` to include specific revs
stack = ["rebase", "-A", "trunk()", "-B", "closest_merge(@)", "-r"]AuthorIsaac Corbrey |
|
stage: Move all commits after megamerge into megamerge |
2 replies
Code[revset-aliases]
# Returns the closest merge commit to `to`
"closest_merge(to)" = "heads(::to & merges())"
[aliases]
# `jj stack <revset>` to include specific revs
stack = ["rebase", "-A", "trunk()", "-B", "closest_merge(@)", "-r"]
# `jj stage` to include the whole stack after the megamerge
stage = ["stack", "closest_merge(@).. ~ empty()"]AuthorIsaac Corbrey |
|
Explained very well in https://isaaccorbrey.com/notes/jujutsu-megamerges-for-fun-and-profit |
1 reply
Code[aliases]
# Get the commit IDs a bookmark has pointed locally to over time
# Usage: jj bookmark_revs <bookmark-name>
bookmark_revs = ["util", "exec", "--", "bash", "-c", """
(
# Grab the current commit ID in case the bookmark has never been set locally
jj log -n1 -G -T "concat(commit_id, '\n')" -r "$1"
jj op log -G -T "bookmark_set_revs('$1')"
) | uniq
""", ""]
[template-aliases]
# Get all commit IDs a bookmark has been set to locally over time from the op log.
# Note: It will not return any revisions if a bookmark has only been set remotely.
# " " around the branch name guarantees exact match.
# Matches both `create bookmark BOOKMARK pointing to commit COMMIT` and `point bookmark BOOKMARK to commit COMMIT`
'bookmark_set_revs(name)' = 'if(description.contains(" " ++ name ++ " ") && description.match(glob:"*bookmark*to commit*") != "",concat(description.match(regex:"([0-9a-z]{40})"),"\n"))'Dependenciesbash Authorthomasa88 Sourcehttps://discord.com/channels/968932220549103686/1461960377247203359/1462036713248522280 |
bookmark_revs / bookmark_change_ids : List commit/change IDs a local bookmark has had over time |
1 reply
Code[aliases]
# Get the commit IDs a bookmark has pointed locally to over time
# Usage: jj bookmark_revs <bookmark-name>
bookmark_revs = ["util", "exec", "--", "bash", "-c", """
(
# Grab the current commit ID in case the bookmark has never been set locally
jj log -n1 -G -T "concat(commit_id, '\n')" -r "$1"
jj op log -G -T "bookmark_set_revs('$1')"
) | uniq
""", ""]
# Get the change IDs a bookmark has pointed locally to over time
# Usage: jj bookmark_change_ids <bookmark-name>
bookmark_change_ids = ["util", "exec", "--", "bash", "-c", """
jj bookmark_revs "$1" | \
while read line; do
jj log -n1 -G -T "concat(change_id, '\n')" -r "$line"
done | uniq
""", ""]
[template-aliases]
# Get all commit IDs a bookmark has been set to locally over time from the op log.
# Note: It will not return any revisions if a bookmark has only been set remotely.
# " " around the branch name guarantees exact match.
# Matches both `create bookmark BOOKMARK pointing to commit COMMIT` and `point bookmark BOOKMARK to commit COMMIT`
'bookmark_set_revs(name)' = 'if(description.contains(" " ++ name ++ " ") && description.match(glob:"*bookmark*to commit*") != "",concat(description.match(regex:"([0-9a-z]{40})"),"\n"))'Dependenciesbash Authorthomasa88 Sourcehttps://discord.com/channels/968932220549103686/1461960377247203359/1462036713248522280 |
stack : Put the given revset into the megamerge |
1 reply
Code[revset-aliases]
"closest_merge(to)" = "heads(::to & merges())"
[aliases]
stack = ["rebase", "-A", "trunk()", "-B", "closest_merge(@)", "-r"]AuthorIsaac Corbrey Source |
stage: Put all commits after megamerge into the megamerge |
1 reply
Code[revset-aliases]
"closest_merge(to)" = "heads(::to & merges())"
[aliases]
stack = ["rebase", "-A", "trunk()", "-B", "closest_merge(@)", "-r"]
stage = ["stack", "closest_merge(@)+:: ~ empty()"]AuthorIsaac Corbrey Source |
tug: Find the closest bookmark in history and advance it forward to closest non-empty commit (using bookmark advance arguments) |
1 reply
Code[revset-aliases]
'closest_pushable(to)' = 'heads(::to & ~description(exact:"") & (~empty() | merges()))'
[aliases]
tug = ["bookmark", "advance", "--to", "closest_pushable(@)"]Dependenciesjj >= 0.40 Authorglehmann Source |
tug: Find the closest bookmark in history and advance it forward to closest non-empty commit (using bookmark advance settings) |
1 reply
Code[revsets]
bookmark-advance-to = "closest_pushable(@)"
[revset-aliases]
'closest_pushable(to)' = 'heads(::to & ~description(exact:"") & (~empty() | merges()))'
[aliases]
tug = ["bookmark", "advance"]Dependenciesjj >= 0.40 Authorglehmann Source |
chop: Split out a change from the history (evolog) of the current change |
1 reply
Code# Splits the current change at the provided revision from its evolog
#
# Usage: jj chop <rev>
#
# The updates after <rev> are put in a new change on top of <rev>.
# <rev> keeps its bookmarks original commit ID (useful for shared branches).
#
# Example:
# jj evolog -p # --> Found lvn/2
# jj chop lvn/2
chop = ["util", "exec", "--", "bash", "-c", """
set -euo pipefail
START_OP=$(jj op log -n1 -G -T 'id.short()')
# FIRST_REV and SECOND_REV will be the final change revisions.
# The code never explictly refers to SECOND_REV.
# Make sure the provided rev is a commit ID and not a change offset or a
# branch name, to protect from changes.
FIRST_REV=$(jj log -n1 -G -T "commit_id" -r "$1")
FIRST_CHANGE=$(jj log -G -T 'change_id.short()' -r "$FIRST_REV")
START_REV="$(jj log -n1 -G -T "commit_id" -r @)"
# Create a new change (SECOND_REV) on top of the first revision. The change
# will diverge.
jj new "$FIRST_REV" -m "Chopped from $FIRST_CHANGE"
# Get the contents from the start revision into the change
jj restore --from "$START_REV"
# Move bookmarks to the first revision
jj bookmark move --from "$START_REV" --to "$FIRST_REV" --allow-backwards
# Resolve the divergence by dropping the first, left-over, revision.
jj abandon "$START_REV"
echo "Revision chopped. Undo with: jj op restore $START_OP"
""", ""]Dependenciesbash Authorthomasa88 Sourcehttps://discord.com/channels/968932220549103686/968932220549103689/1512793686851977238 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
I have created a list of jj aliases. Or rather, I'm going to render the list from this very discussion post! Everyone can add links to aliases (see instructions on the list webpage).
The goal is to create a list of (popular) jj aliases, to inform users of the cool aliases that exist and to give users a common vocabulary. It will also allow for competing alias names and/or implementations, by letting users vote on their favorite aliases.
The entries in this list did originally not contain the definitions of the aliases, only links to source of the definitions. This was to avoid duplicate sources of definitions and outdated definitions. However, it became cumbersome to get to the alias definitions, especially on other sites requiring login. Therefore, the list now contain copies of the definitions with date.
https://www.lysator.liu.se/~axl/jj-aliases/
Any replies in this discussion not following the correct linking format will be ignored by the list webpage. To discuss the list, please comment in the comment labelled Discussion thread
All reactions