force push with lease by default

Author: skarim

README.md

@@ -197,19 +197,17 @@ Push all branches in the current stack and create or update pull requests.
 gh stack push [flags]
 ```
 
-Pushes every branch to the remote, then for each branch either creates a new PR (with the correct base branch) or updates the base of an existing PR if it has changed.
+Pushes every branch to the remote, then for each branch either creates a new PR (with the correct base branch) or updates the base of an existing PR if it has changed. Uses `--force-with-lease` by default to safely update rebased branches.
 
 | Flag | Description |
 |------|-------------|
-| `-f, --force` | Force-push branches |
 | `--draft` | Create new PRs as drafts |
 | `--dry-run` | Show what would be pushed without actually pushing |
 
 **Examples:**
 
 ```sh
 gh stack push
-gh stack push --force
 gh stack push --draft
 gh stack push --dry-run
 ```
@@ -350,8 +348,8 @@ gh stack bottom
 # 6. Rebase the rest of the stack on top of your fix
 gh stack rebase
 
-# 7. Force-push the updated stack
-gh stack push --force
+# 7. Push the updated stack
+gh stack push
 
 # 8. When the first PR is merged, sync the stack
 gh stack sync

cmd/push.go

@@ -10,7 +10,6 @@ import (
 )
 
 type pushOptions struct {
-	force  bool
 	draft  bool
 	dryRun bool
 }
@@ -26,7 +25,6 @@ func PushCmd(cfg *config.Config) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().BoolVarP(&opts.force, "force", "f", false, "Force-push branches")
 	cmd.Flags().BoolVar(&opts.draft, "draft", false, "Create PRs as drafts")
 	cmd.Flags().BoolVar(&opts.dryRun, "dry-run", false, "Show what would be pushed without pushing")
 
@@ -83,7 +81,7 @@ func runPush(cfg *config.Config, opts *pushOptions) error {
 		}
 
 		cfg.Printf("Pushing %s...", b.Branch)
-		if err := git.Push("origin", []string{b.Branch}, opts.force, false); err != nil {
+		if err := git.Push("origin", []string{b.Branch}, true, false); err != nil {
 			cfg.Errorf("failed to push %s: %s", b.Branch, err)
 			return nil
 		}

cmd/rebase.go

@@ -320,7 +320,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 
 	cfg.Printf("%s rebased locally with %s", rangeDesc, s.Trunk.Branch)
 	cfg.Printf("To push up your changes and open/update the stack of PRs, run %s",
-		cfg.ColorCyan("gh stack push -f"))
+		cfg.ColorCyan("gh stack push"))
 
 	return nil
 }
@@ -505,7 +505,7 @@ func continueRebase(cfg *config.Config, gitDir string) error {
 
 	cfg.Printf("All branches in stack rebased locally with %s", s.Trunk.Branch)
 	cfg.Printf("To push up your changes and open/update the stack of PRs, run %s",
-		cfg.ColorCyan("gh stack push -f"))
+		cfg.ColorCyan("gh stack push"))
 
 	return nil
 }

cmd/sync.go

@@ -249,10 +249,10 @@ func runSync(cfg *config.Config, _ *syncOptions) error {
 		if !force {
 			cfg.Warningf("Push failed — branches may need force push after rebase")
 			cfg.Printf("  Run %s to push with --force-with-lease.",
-				cfg.ColorCyan("gh stack push -f"))
+				cfg.ColorCyan("gh stack push"))
 		} else {
 			cfg.Warningf("Push failed: %v", err)
-			cfg.Printf("  Run %s to retry.", cfg.ColorCyan("gh stack push -f"))
+			cfg.Printf("  Run %s to retry.", cfg.ColorCyan("gh stack push"))
 		}
 	} else {
 		cfg.Successf("Pushed %d branches", len(branches))