This commit is contained in:
2025-09-03 16:10:58 +02:00
parent d3e9c4afd7
commit 424c9661db
+3 -2
View File
@@ -690,7 +690,8 @@ pr $number=`just _a_pr`:
local remote="$(cut <<<"$upstream_branch" -d'/' -f1)"
local branch="$(cut <<<"$upstream_branch" -d'/' -f2)"
# TODO: gitignore ./checkout-upstream-branch.sh
printf "git checkout --autostash %q\n" "$(git rev-parse --abbrev-ref HEAD)" > checkout-upstream-branch.sh
printf "git checkout %q\n" "$(git rev-parse --abbrev-ref HEAD)" > checkout-upstream-branch.sh
chmod +x checkout-upstream-branch.sh
(set -x;
$GIT checkout -b pr-"$number"-rebased-"$remote"-"$branch-{{ epoch }}" ||:
$GIT pull --rebase "$remote" "$branch" || $GIT rebase --abort
@@ -788,7 +789,7 @@ checkout-commit-in-worktree $commit=`just _a_commit`:
cd "$(just _new_worktree "$@")"; exec just _enter_interactive_shell
@_a_wt_type:
gum choose feat fix init bump doc migrate backport drop tmp
gum choose feat fix init bump doc migrate backport drop tmp tmp-bump tmp-fix
@_a_wt_name:
gum input --placeholder="Branch name?"