Skip to content

Commit 7d1e035

Browse files
authored
Release v0.11.0 (#596)
1 parent b86a99d commit 7d1e035

14 files changed

+38
-43
lines changed

.changes/unreleased/Added-20250103-052535.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.changes/unreleased/Added-20250202-192729.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.changes/unreleased/Added-20250219-110433.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changes/unreleased/Fixed-20250221-092625.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.changes/unreleased/Fixed-20250221-101254.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.changes/unreleased/Fixed-20250221-120939.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changes/unreleased/Fixed-20250222-113654.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.changes/v0.11.0.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## <a name="v0.11.0">v0.11.0</a> - 2025-02-24
2+
### Added
3+
- Add 'branch squash' command to squash commits in a branch into a single commit and restack upstack branches.
4+
- Add 'spice.branchPrompt.sort' configuration option to control the sort order of branches in the branch selection prompt used by 'branch checkout', 'branch onto', 'branch delete', and others.
5+
- branch rename: Provide shell completions for the current branch.
6+
### Changed
7+
- Homebrew tap: Install shell completions.
8+
- upstack onto: When prompting for a new base, do not allow selecting branches that are being moved as the operation will always be rejected to keep the graph acyclic.
9+
### Fixed
10+
- branch onto: Fix infinite rebase conflict handling loop that occurred when a branch is moved onto another branch that is upstack from the original base, and the operation encounters a rebase conflict.
11+
- Fix debug logs using incorrect prefix for Git command output logs.

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
66
and is generated by [Changie](https://github.com/miniscruff/changie).
77

8+
## <a name="v0.11.0">v0.11.0</a> - 2025-02-24
9+
### Added
10+
- Add 'branch squash' command to squash commits in a branch into a single commit and restack upstack branches.
11+
- Add 'spice.branchPrompt.sort' configuration option to control the sort order of branches in the branch selection prompt used by 'branch checkout', 'branch onto', 'branch delete', and others.
12+
- branch rename: Provide shell completions for the current branch.
13+
### Changed
14+
- Homebrew tap: Install shell completions.
15+
- upstack onto: When prompting for a new base, do not allow selecting branches that are being moved as the operation will always be rejected to keep the graph acyclic.
16+
### Fixed
17+
- branch onto: Fix infinite rebase conflict handling loop that occurred when a branch is moved onto another branch that is upstack from the original base, and the operation encounters a rebase conflict.
18+
- Fix debug logs using incorrect prefix for Git command output logs.
19+
820
## <a name="v0.10.0">v0.10.0</a> - 2025-01-02
921

1022
This release addresses a long-standing limitation of navigation comments:

branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type branchCmd struct {
2222
Delete branchDeleteCmd `cmd:"" aliases:"d,rm" help:"Delete branches"`
2323
Fold branchFoldCmd `cmd:"" aliases:"fo" help:"Merge a branch into its base"`
2424
Split branchSplitCmd `cmd:"" aliases:"sp" help:"Split a branch on commits"`
25-
Squash branchSquashCmd `cmd:"" aliases:"sq" help:"Squash a branch into one commit" released:"unreleased"`
25+
Squash branchSquashCmd `cmd:"" aliases:"sq" help:"Squash a branch into one commit" released:"v0.11.0"`
2626

2727
// Mutation
2828
Edit branchEditCmd `cmd:"" aliases:"e" help:"Edit the commits in a branch"`

0 commit comments

Comments
 (0)