Compare commits
2 commits
acb1bc3743
...
fb3750706d
Author | SHA1 | Date | |
---|---|---|---|
fb3750706d | |||
cd5c7c3248 |
2 changed files with 8 additions and 0 deletions
5
.config/fish/functions/jj-sync.fish
Normal file
5
.config/fish/functions/jj-sync.fish
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
function jj-sync
|
||||||
|
jj git fetch
|
||||||
|
jj rebase -b 'all:bookmarks() & mine() ~ trunk()' -d 'trunk()' --skip-emptied
|
||||||
|
jj git push --tracked
|
||||||
|
end
|
|
@ -24,3 +24,6 @@ log = "trunk() | ancestors(reachable(@ | mine(), mutable()), 2) | @"
|
||||||
|
|
||||||
[git]
|
[git]
|
||||||
push-bookmark-prefix = "sloane/push-"
|
push-bookmark-prefix = "sloane/push-"
|
||||||
|
|
||||||
|
[aliases]
|
||||||
|
rebase-bookmarks = ["rebase", "-b", "all:bookmarks() & mine() ~trunk()", "-d", "main", "--skip-emptied"]
|
||||||
|
|
Loading…
Reference in a new issue