gflows 0.1.15 → 0.1.16

package/README.md

@@ -401,10 +401,10 @@ Switch to a workflow branch. With TTY and no branch name, shows a picker; otherw
 
 | Option | Description |
 | ------ | ----------- |
+| **Move** | Move current changes to the target branch. |
+| **Restore** | Save changes for this branch; restore target's saved state (if any). |
+| **Clean** | Discard changes and switch clean at HEAD. |
 | **Cancel** | Abort switching. |
-| **Move changes to target** | Take current changes with you to the target branch (stash → switch → pop). |
-| **Restore** | Save changes for the current branch; switch; restore any saved changes for the target branch (if any). |
-| **Clean** | Discard changes and switch to the target branch clean at HEAD. |
 
 You can skip the prompt by passing exactly one of the flags below. If the target branch has saved changes and you use **Clean**, a warning is shown (unless `-q`).
 
@@ -425,9 +425,9 @@ bun gflows -W feature/auth-refactor
 | -------------- | ----- | --------------------------------------------------------------------------- |
 | `--path <dir>` | `-C`  | Run as if in `<dir>`.                                                      |
 | `--branch <name>` | `-B` | Branch to switch to (alternative to positional).                           |
-| `--move`       | —     | Take current changes to the target branch; no prompt.                       |
-| `--restore`    | —     | Per-branch save/restore; no prompt.                                         |
-| `--clean`      | —     | Discard changes and switch clean; no prompt.                               |
+| `--move`       | —     | Move current changes to the target branch; no prompt.                       |
+| `--restore`    | —     | Save for this branch; restore target's saved state (if any); no prompt.     |
+| `--clean`      | —     | Discard changes and switch clean at HEAD; no prompt.                       |
 | `--cancel`     | —     | Abort switching; no prompt.                                                |
 | `--verbose`    | `-v`  | Verbose output.                                                            |
 | `--quiet`      | `-q`  | Minimal output (suppresses Clean warning about saved changes on target).  |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gflows",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "A lightweight CLI for consistent Git branching workflows (main + dev, feature/bugfix/chore/release/hotfix).",
   "license": "MIT",
   "type": "module",

package/src/commands/help.ts

@@ -48,7 +48,10 @@ Start:  --force         Allow dirty working tree
 Finish: --no-ff         Always create merge commit; -D/--delete, -N/--no-delete;
         -s/--sign, -T/--no-tag, -M/--tag-message, -m/--message
 List:   -r, --include-remote   Include remote-tracking branches
-Switch: --move, --restore, --clean, --cancel   Explicit mode when uncommitted (no prompt)
+Switch: --move      Move current changes to the target branch
+        --restore   Save for this branch; restore target's saved state (if any)
+        --clean     Discard changes and switch clean at HEAD
+        --cancel    Abort switching
 
 Exit codes: 0 success, 1 usage/validation, 2 Git or system error.
 

package/src/commands/switch.ts

@@ -111,19 +111,13 @@ export async function run(args: ParsedArgs): Promise<void> {
     whenUncommitted = await selectPrompt({
       message: "Working tree has uncommitted changes. What do you want to do?",
       choices: [
-        { name: "Cancel — Abort switching", value: "cancel" as const },
-        {
-          name: "Move changes to target — Take current changes with you to the target branch",
-          value: "move" as const,
-        },
+        { name: "Move — Move current changes to the target branch", value: "move" as const },
         {
-          name: "Restore — Save for this branch; switch; restore target's saved changes (if any)",
+          name: "Restore — Save changes for this branch; restore target's saved state (if any)",
           value: "restore" as const,
         },
-        {
-          name: "Clean — Discard changes and switch to target clean at HEAD",
-          value: "clean" as const,
-        },
+        { name: "Clean — Discard changes and switch clean at HEAD", value: "clean" as const },
+        { name: "Cancel — Abort switching", value: "cancel" as const },
       ],
     });
   } else if (!treeClean) {