From eeb54502dd250af9fd09792a6888cd6a8809ae67 Mon Sep 17 00:00:00 2001 From: McAmner Date: Thu, 2 Jul 2026 23:40:25 +0200 Subject: [PATCH] docs(git): explain squash/merge/rebase in the PR-merge method prompt The merge method picker listed 1/2/3 with no guidance. Add a one-line explanation per option (squash combines commits, merge keeps them plus a merge commit, rebase replays without a merge commit) so the choice is clear at the prompt. Co-Authored-By: Claude Opus 4.8 --- terminal/launchers/gitpr-merge-safe.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terminal/launchers/gitpr-merge-safe.sh b/terminal/launchers/gitpr-merge-safe.sh index b2ef7ac..4f8cb4d 100755 --- a/terminal/launchers/gitpr-merge-safe.sh +++ b/terminal/launchers/gitpr-merge-safe.sh @@ -152,9 +152,9 @@ method="${2:-}" if [[ -z "$method" ]]; then echo echo "Merge method:" - echo " 1) squash (default)" - echo " 2) merge commit" - echo " 3) rebase" + echo " 1) squash (default) - combine all PR commits into one commit on $base_ref" + echo " 2) merge commit - keep every PR commit and add a merge commit" + echo " 3) rebase - replay PR commits onto $base_ref, no merge commit" read -r -p "Choice [1-3, Enter=1]: " m case "${m:-1}" in 1|"") method="squash" ;;