flag to specify remote and bypass interactive prompt

Author: skarim

README.md

@@ -179,6 +179,7 @@ If a rebase conflict occurs, the operation pauses and prints the conflicted file
 | `--upstack` | Only rebase branches from the current branch to the top |
 | `--continue` | Continue the rebase after resolving conflicts |
 | `--abort` | Abort the rebase and restore all branches to their pre-rebase state |
+| `--remote <name>` | Remote to fetch from (defaults to auto-detected remote) |
 
 | Argument | Description |
 |----------|-------------|
@@ -208,7 +209,7 @@ gh stack rebase --abort
 Fetch, rebase, push, and sync PR state in a single command.
 
 ```
-gh stack sync
+gh stack sync [flags]
 ```
 
 Performs a safe, non-interactive synchronization of the entire stack:
@@ -219,6 +220,10 @@ Performs a safe, non-interactive synchronization of the entire stack:
 4. **Push** — pushes all branches (uses `--force-with-lease` if a rebase occurred)
 5. **Sync PRs** — syncs PR state from GitHub and reports the status of each PR
 
+| Flag | Description |
+|------|-------------|
+| `--remote <name>` | Remote to fetch from and push to (defaults to auto-detected remote) |
+
 **Examples:**
 
 ```sh
@@ -242,6 +247,7 @@ When creating new PRs, you will be prompted to enter a title for each one. Press
 | `--auto` | Use auto-generated PR titles without prompting |
 | `--draft` | Create new PRs as drafts |
 | `--skip-prs` | Push branches without creating or updating PRs |
+| `--remote <name>` | Remote to push to (defaults to auto-detected remote) |
 
 **Examples:**
 

cmd/push.go

@@ -16,6 +16,7 @@ type pushOptions struct {
 	auto    bool
 	draft   bool
 	skipPRs bool
+	remote  string
 }
 
 func PushCmd(cfg *config.Config) *cobra.Command {
@@ -32,6 +33,7 @@ func PushCmd(cfg *config.Config) *cobra.Command {
 	cmd.Flags().BoolVar(&opts.auto, "auto", false, "Use auto-generated PR titles without prompting")
 	cmd.Flags().BoolVar(&opts.draft, "draft", false, "Create PRs as drafts")
 	cmd.Flags().BoolVar(&opts.skipPRs, "skip-prs", false, "Push branches without creating or updating PRs")
+	cmd.Flags().StringVar(&opts.remote, "remote", "", "Remote to push to (defaults to auto-detected remote)")
 
 	return cmd
 }
@@ -75,7 +77,7 @@ func runPush(cfg *config.Config, opts *pushOptions) error {
 	}
 
 	// Push all active branches atomically
-	remote, err := pickRemote(cfg, currentBranch)
+	remote, err := pickRemote(cfg, currentBranch, opts.remote)
 	if err != nil {
 		if !errors.Is(err, errInterrupt) {
 			cfg.Errorf("%s", err)
@@ -225,11 +227,16 @@ func humanize(s string) string {
 	}, s)
 }
 
-// pickRemote determines which remote to push to. It delegates to
+// pickRemote determines which remote to push to. If remoteOverride is
+// non-empty, it is returned directly. Otherwise it delegates to
 // git.ResolveRemote for config-based resolution and remote listing.
 // If multiple remotes exist with no configured default, the user is
 // prompted to select one interactively.
-func pickRemote(cfg *config.Config, branch string) (string, error) {
+func pickRemote(cfg *config.Config, branch, remoteOverride string) (string, error) {
+	if remoteOverride != "" {
+		return remoteOverride, nil
+	}
+
 	remote, err := git.ResolveRemote(branch)
 	if err == nil {
 		return remote, nil

cmd/rebase.go

@@ -20,6 +20,7 @@ type rebaseOptions struct {
 	upstack   bool
 	cont      bool
 	abort     bool
+	remote    string
 }
 
 type rebaseState struct {
@@ -61,6 +62,7 @@ layer in its commit history, rebasing if necessary.`,
 	cmd.Flags().BoolVar(&opts.upstack, "upstack", false, "Only rebase branches from current branch to top")
 	cmd.Flags().BoolVar(&opts.cont, "continue", false, "Continue rebase after resolving conflicts")
 	cmd.Flags().BoolVar(&opts.abort, "abort", false, "Abort rebase and restore all branches")
+	cmd.Flags().StringVar(&opts.remote, "remote", "", "Remote to fetch from (defaults to auto-detected remote)")
 
 	return cmd
 }
@@ -94,7 +96,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 	}
 
 	// Resolve remote for fetch and trunk comparison
-	remote, err := pickRemote(cfg, currentBranch)
+	remote, err := pickRemote(cfg, currentBranch, opts.remote)
 	if err != nil {
 		if !errors.Is(err, errInterrupt) {
 			cfg.Errorf("%s", err)

cmd/sync.go

@@ -11,7 +11,9 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type syncOptions struct{}
+type syncOptions struct {
+	remote string
+}
 
 func SyncCmd(cfg *config.Config) *cobra.Command {
 	opts := &syncOptions{}
@@ -37,10 +39,12 @@ conflicts interactively.`,
 		},
 	}
 
+	cmd.Flags().StringVar(&opts.remote, "remote", "", "Remote to fetch from and push to (defaults to auto-detected remote)")
+
 	return cmd
 }
 
-func runSync(cfg *config.Config, _ *syncOptions) error {
+func runSync(cfg *config.Config, opts *syncOptions) error {
 	result, err := loadStack(cfg, "")
 	if err != nil {
 		return ErrNotInStack
@@ -51,7 +55,7 @@ func runSync(cfg *config.Config, _ *syncOptions) error {
 	currentBranch := result.CurrentBranch
 
 	// Resolve remote once for fetch and push
-	remote, err := pickRemote(cfg, currentBranch)
+	remote, err := pickRemote(cfg, currentBranch, opts.remote)
 	if err != nil {
 		if !errors.Is(err, errInterrupt) {
 			cfg.Errorf("%s", err)