| ... | @@ -60,10 +60,16 @@ in | ... | @@ -60,10 +60,16 @@ in |
| 60 | enable = true; | 60 | enable = true; |
| 61 | shellAliases = { | 61 | shellAliases = { |
| 62 | switch = "~/config/switch"; | 62 | switch = "~/config/switch"; |
| 63 | gg = "lazygit"; | 63 | |
| 64 | ga = "git add"; | 64 | # move a bookmark from the previous commit |
| 65 | g = "git status"; | 65 | jf = "jj git fetch"; |
| 66 | gp = "git pull --rebase && git push"; | 66 | e = "jj edit"; |
| | 67 | d = "jj desc"; |
| | 68 | bup = "jj b m --from 'parents(@)' --to '@'"; |
| | 69 | push = "jj git push"; |
| | 70 | moveself = "jj rebase -r @ -d"; |
| | 71 | logall = "jj log -r 'all()'"; |
| | 72 | cherry = "jj git fetch && jj split -i -p -m 'SPLIT_CHANGES' && jj edit -r 'description(\"SPLIT_CHANGES\")' && jj desc -m '' --edit"; |
| 67 | }; | 73 | }; |
| 68 | initContent = '' | 74 | initContent = '' |
| 69 | export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " | 75 | export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " |
| ... | @@ -75,6 +81,21 @@ in | ... | @@ -75,6 +81,21 @@ in |
| 75 | fi | 81 | fi |
| 76 | uv run --project "$dirname" "$@" | 82 | uv run --project "$dirname" "$@" |
| 77 | } | 83 | } |
| | 84 | |
| | 85 | function pr() { |
| | 86 | message=$(jj log -r '@' -T 'description' --no-graph) |
| | 87 | if [[ -z "$message" ]] || [[ "$message" = "WIP:"* ]]; then |
| | 88 | jj desc |
| | 89 | fi |
| | 90 | if [ -n "$1" ]; then |
| | 91 | jj git push --named "clo/$1"=@ |
| | 92 | branch="clo/$1" |
| | 93 | else |
| | 94 | branch="$(jj log -r '@' -T '"clo/push-" ++ change_id.short()' --no-graph)" |
| | 95 | jj git push -c @ |
| | 96 | fi |
| | 97 | open "$(git remote get-url origin | sed 's/git@github\.com:/https:\/\/github.com\//' | sed 's/\.git$//')/compare/master...$branch" |
| | 98 | } |
| 78 | ''; | 99 | ''; |
| 79 | }; | 100 | }; |
| 80 | | 101 | |
clover caruso <git@paperclover.net> 2025-10-22 18:18:44-07:00