Release v0.1.0-beta1 (#125)

abhinav · May 28, 2024 · f2ac82c · f2ac82c
1 parent 5e7a823
commit f2ac82c
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 30 deletions.
diff --git a/.changes/unreleased/Added-20240527-202119.yaml b/.changes/unreleased/Added-20240527-202119.yaml
diff --git a/.changes/unreleased/Added-20240527-211704.yaml b/.changes/unreleased/Added-20240527-211704.yaml
diff --git a/.changes/unreleased/Changed-20240527-202155.yaml b/.changes/unreleased/Changed-20240527-202155.yaml
diff --git a/.changes/unreleased/Changed-20240527-202308.yaml b/.changes/unreleased/Changed-20240527-202308.yaml
diff --git a/.changes/unreleased/Changed-20240527-211604.yaml b/.changes/unreleased/Changed-20240527-211604.yaml
diff --git a/.changes/unreleased/Changed-20240527-220542.yaml b/.changes/unreleased/Changed-20240527-220542.yaml
diff --git a/.changes/unreleased/Changed-20240528-052729.yaml b/.changes/unreleased/Changed-20240528-052729.yaml
diff --git a/.changes/unreleased/Fixed-20240527-203929.yaml b/.changes/unreleased/Fixed-20240527-203929.yaml
diff --git a/.changes/unreleased/Fixed-20240528-053746.yaml b/.changes/unreleased/Fixed-20240528-053746.yaml
diff --git a/.changes/v0.1.0-beta1.md b/.changes/v0.1.0-beta1.md
@@ -0,0 +1,13 @@
+## v0.1.0-beta1 - 2024-05-28
+### Added
+- Add `gs rebase continue` (alias `gs rbc`) and `gs rebase abort` (alias `gs rba`) to continue git-spice operations interrupted by rebase conflicts.
+- Add 'upstack onto' command to move a branch and its upstack onto a new base. This was previously the behavior of 'branch onto'.
+### Changed
+- branch {edit, onto}: Support continuing the operation after resolving conflicts with `gs rebase continue`.
+- {branch, upstack, stack} restack: Support continuing the operation after resolving conflicts with `gs rebase continue`.
+- (*Breaking*) branch onto: Extract only the commits of the target branch onto the new base. The upstack will be rebased to point to its base. Use 'upstack onto' to graft the entire upstack onto the new base.
+- (*Breaking*) branch delete: Remove commits of the deleted branch from the stack. If you want to keep them around, untrack the branch instead.
+- branch delete: In the selection prompt for deleting a branch, default to the current branch. 
+### Fixed
+- Reduce boilerplate in rebase error messages.
+- branch delete: Don't report an empty hash for untracked branches.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## v0.1.0-beta1 - 2024-05-28
+### Added
+- Add `gs rebase continue` (alias `gs rbc`) and `gs rebase abort` (alias `gs rba`) to continue git-spice operations interrupted by rebase conflicts.
+- Add 'upstack onto' command to move a branch and its upstack onto a new base. This was previously the behavior of 'branch onto'.
+### Changed
+- branch {edit, onto}: Support continuing the operation after resolving conflicts with `gs rebase continue`.
+- {branch, upstack, stack} restack: Support continuing the operation after resolving conflicts with `gs rebase continue`.
+- (*Breaking*) branch onto: Extract only the commits of the target branch onto the new base. The upstack will be rebased to point to its base. Use 'upstack onto' to graft the entire upstack onto the new base.
+- (*Breaking*) branch delete: Remove commits of the deleted branch from the stack. If you want to keep them around, untrack the branch instead.
+- branch delete: In the selection prompt for deleting a branch, default to the current branch. 
+### Fixed
+- Reduce boilerplate in rebase error messages.
+- branch delete: Don't report an empty hash for untracked branches.
+
 ## v0.1.0-alpha5 - 2024-05-27
 ### Added
 - branch {checkout, delete, onto, rename}: Prompt for branch if not provided.