diff --git a/.changes/unreleased/Added-20240527-202119.yaml b/.changes/unreleased/Added-20240527-202119.yaml deleted file mode 100644 index 8124f259..00000000 --- a/.changes/unreleased/Added-20240527-202119.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: Add `gs rebase continue` (alias `gs rbc`) and `gs rebase abort` (alias `gs rba`) to continue git-spice operations interrupted by rebase conflicts. -time: 2024-05-27T20:21:19.22906-07:00 diff --git a/.changes/unreleased/Added-20240527-211704.yaml b/.changes/unreleased/Added-20240527-211704.yaml deleted file mode 100644 index 1c723490..00000000 --- a/.changes/unreleased/Added-20240527-211704.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: Add 'upstack onto' command to move a branch and its upstack onto a new base. This was previously the behavior of 'branch onto'. -time: 2024-05-27T21:17:04.98707-07:00 diff --git a/.changes/unreleased/Changed-20240527-202155.yaml b/.changes/unreleased/Changed-20240527-202155.yaml deleted file mode 100644 index 30e9c2f4..00000000 --- a/.changes/unreleased/Changed-20240527-202155.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch {edit, onto}: Support continuing the operation after resolving conflicts with `gs rebase continue`.' -time: 2024-05-27T20:21:55.380558-07:00 diff --git a/.changes/unreleased/Changed-20240527-202308.yaml b/.changes/unreleased/Changed-20240527-202308.yaml deleted file mode 100644 index c692c142..00000000 --- a/.changes/unreleased/Changed-20240527-202308.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: '{branch, upstack, stack} restack: Support continuing the operation after resolving conflicts with `gs rebase continue`.' -time: 2024-05-27T20:23:08.650923-07:00 diff --git a/.changes/unreleased/Changed-20240527-211604.yaml b/.changes/unreleased/Changed-20240527-211604.yaml deleted file mode 100644 index c199de05..00000000 --- a/.changes/unreleased/Changed-20240527-211604.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Changed -body: >- - (*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. -time: 2024-05-27T21:16:04.325925-07:00 diff --git a/.changes/unreleased/Changed-20240527-220542.yaml b/.changes/unreleased/Changed-20240527-220542.yaml deleted file mode 100644 index f8514a5d..00000000 --- a/.changes/unreleased/Changed-20240527-220542.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: '(*Breaking*) branch delete: Remove commits of the deleted branch from the stack. If you want to keep them around, untrack the branch instead.' -time: 2024-05-27T22:05:42.385352-07:00 diff --git a/.changes/unreleased/Changed-20240528-052729.yaml b/.changes/unreleased/Changed-20240528-052729.yaml deleted file mode 100644 index d904a676..00000000 --- a/.changes/unreleased/Changed-20240528-052729.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch delete: In the selection prompt for deleting a branch, default to the current branch. ' -time: 2024-05-28T05:27:29.634388-07:00 diff --git a/.changes/unreleased/Fixed-20240527-203929.yaml b/.changes/unreleased/Fixed-20240527-203929.yaml deleted file mode 100644 index f636acc1..00000000 --- a/.changes/unreleased/Fixed-20240527-203929.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: Reduce boilerplate in rebase error messages. -time: 2024-05-27T20:39:29.578484-07:00 diff --git a/.changes/unreleased/Fixed-20240528-053746.yaml b/.changes/unreleased/Fixed-20240528-053746.yaml deleted file mode 100644 index 61a442f7..00000000 --- a/.changes/unreleased/Fixed-20240528-053746.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'branch delete: Don''t report an empty hash for untracked branches.' -time: 2024-05-28T05:37:46.288995-07:00 diff --git a/.changes/v0.1.0-beta1.md b/.changes/v0.1.0-beta1.md new file mode 100644 index 00000000..2b06b182 --- /dev/null +++ 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 index e2677fc4..a2ddbccc 100644 --- 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.