Skip to content
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Use typed exit codes defined in `cmd/utils.go`:
| 3 | `ErrConflict` | Rebase conflict |
| 4 | `ErrAPIFailure` | GitHub API error |
| 5 | `ErrInvalidArgs` | Invalid arguments or flags |
| 6 | `ErrDisambiguate` | Multiple stacks/remotes, can't auto-select |
| 6 | `ErrDisambiguate` | Multiple stacks, can't auto-select |
| 7 | `ErrRebaseActive` | Rebase already in progress |
| 8 | `ErrLockFailed` | Stack file lock contention |
| 9 | `ErrStacksUnavailable` | Stacked PRs not enabled for repository |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ You can optionally stage changes and create a commit as part of the `add` flow.

| Flag | Description |
|------|-------------|
| `-A, --all` | Stage all changes (including untracked files); requires `-m` |
| `-u, --update` | Stage changes to tracked files only; requires `-m` |
| `-A, --all` | Stage all changes (including untracked files) |
| `-u, --update` | Stage changes to tracked files only |
| `-m, --message <string>` | Create a commit with this message before creating the branch |

> **Note:** `-A` and `-u` are mutually exclusive.
Expand Down
4 changes: 2 additions & 2 deletions docs/src/content/docs/reference/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ gh stack add [flags] [branch]

| Flag | Description |
|------|-------------|
| `-A, --all` | Stage all changes (including untracked files); requires `-m` |
| `-u, --update` | Stage changes to tracked files only; requires `-m` |
| `-A, --all` | Stage all changes (including untracked files) |
| `-u, --update` | Stage changes to tracked files only |
| `-m, --message <string>` | Create a commit with this message before creating the branch |

> **Note:** `-A` and `-u` are mutually exclusive.
Expand Down
2 changes: 1 addition & 1 deletion skills/gh-stack/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ gh stack sync --prune # also delete local branches for merged PRs
```

Pruning never happens without `--prune` when non-interactive. If the local and remote stacks have
diverged, `sync` prints both chains, makes no changes, and exits 0 with `Sync aborted` — see
diverged, `sync` prints both chains and exits 0 with `Sync aborted` — see
`references/troubleshooting.md`.

## Merging
Expand Down
8 changes: 4 additions & 4 deletions skills/gh-stack/references/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ selects a non-default trunk.
- **`add -Am` commits in place when the current branch has no commits yet** — for example
immediately after `init` — instead of creating a branch. This is deliberate: the first layer
usually needs its content before a second layer exists.
- `-A` and `-u` are mutually exclusive, and both require `-m`.
- `-A` and `-u` are mutually exclusive.
- Existing branches owned by another worktree may be adopted without checkout. Commit/stage
shortcuts are rejected before staging or membership changes; they never commit another
worktree's files.
Expand Down Expand Up @@ -74,9 +74,9 @@ first non-merged ancestor, then links them into a Stack on GitHub.
`submit` forks the remaining unmerged branches into a **new** stack rooted at the trunk and creates
it on GitHub, leaving the merged stack untouched.
- **Title generation with `--auto`:** a branch with a single commit uses that commit's subject as
the title and its body as the PR body. A branch with multiple commits humanizes the branch name
(hyphens and underscores become spaces). There is no flag for a custom title or body; use
`gh pr edit` afterwards.
the title and uses its body for the PR body unless a repository PR template supplies nonempty
content. A branch with multiple commits humanizes the branch name (hyphens and underscores
become spaces). There is no flag for a custom title or body; use `gh pr edit` afterwards.
- `--open` marks new *and existing* PRs ready for review; without it new PRs are drafts.
- Requires stacked PRs to be enabled on the repository. If not, `submit` exits **9** when
non-interactive (under a TTY it offers to create ordinary unstacked PRs instead).
Expand Down
2 changes: 1 addition & 1 deletion skills/gh-stack/references/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ merged PRs.
Divergence means the local stack and the stack on GitHub changed in different ways — for example
branches were added locally while a PR was added to the stack on github.com.

When non-interactive, `sync` prints both chains, changes nothing, and exits **0** with
When non-interactive, `sync` prints both chains and exits **0** with
`Sync aborted`. Success here does not mean the sync happened; check for that message, or re-run
`gh stack view --json` and compare.

Expand Down
Loading