2 files changed,
8 insertions(+),
4 deletions(-)
Author:
Oleksandr Smirnov
olexsmir@gmail.com
Committed at:
2026-03-14 23:36:29 +0200
Parent:
5862f8a
jump to
| A | bin/jj-fetch-pr |
| M | config/jj/config.toml |
A
bin/jj-fetch-pr
··· 1 +#!/usr/bin/env bash 2 +git fetch origin pull/"$1"/head:pr-"$1" 3 +jj git import
M
config/jj/config.toml
··· 20 20 private-commits = "private()" 21 21 22 22 [remotes] 23 -origin.auto-track-bookmarks = "glob:*" 24 -olexsmir.auto-track-bookmarks = "glob:*" 23 +origin.auto-track-bookmarks = "*" 24 +olexsmir.auto-track-bookmarks = "*" 25 25 upstream.auto-track-bookmarks = "main | master" 26 26 27 27 [aliases] 28 28 e = ["edit"] 29 29 llog = ["log", "-r", ".."] 30 -restack = ["rebase", "-d", "trunk()", "-s", "mutable_roots()"] 31 -sync = ["util", "exec", "--", "sh", "-c", "jj git fetch && jj new 'trunk()'"] 30 +restack = ["rebase", "-d", "trunk()", "-s", "mutable_roots()", "--simplify-parents"] 31 +solve = ["resolve", "--tool", "mergiraf"] 32 +sync = ["util", "exec", "--", "sh", "-c", "jj git fetch && jj rebase -d 'trunk()'"] 32 33 tug = ["bookmark", "advance"] 33 34 34 35 [revsets]