diff --git a/.changes/unreleased/Added-20241127-125953.yaml b/.changes/unreleased/Added-20241127-125953.yaml deleted file mode 100644 index cab40186..00000000 --- a/.changes/unreleased/Added-20241127-125953.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: 'commit create: Added a --fixup flag to allow adding a fixup commit.' -time: 2024-11-27T12:59:53.626214-08:00 diff --git a/.changes/unreleased/Added-20241130-172501.yaml b/.changes/unreleased/Added-20241130-172501.yaml deleted file mode 100644 index b8cb3dea..00000000 --- a/.changes/unreleased/Added-20241130-172501.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Added -body: >- - rebase continue: - Add `--[no-]edit` flag to skip opening an editor when continuing a rebase, - or opt into it if the new `spice.rebaseContinue.edit` configuration is `true`. -time: 2024-11-30T17:25:01.584724-08:00 diff --git a/.changes/unreleased/Added-20241201-115758.yaml b/.changes/unreleased/Added-20241201-115758.yaml deleted file mode 100644 index af28092d..00000000 --- a/.changes/unreleased/Added-20241201-115758.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: 'Add --no-verify flag to bypass pre-commit and commit-msg hooks to commands that create new commits.' -time: 2024-12-01T11:57:58.209941-08:00 diff --git a/.changes/unreleased/Added-20241201-205446.yaml b/.changes/unreleased/Added-20241201-205446.yaml deleted file mode 100644 index 9cc57cd2..00000000 --- a/.changes/unreleased/Added-20241201-205446.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Added -body: >- - submit: Include merged changes in navigation comments - when restacking and resubmitting changes based on them. -time: 2024-12-01T20:54:46.755566Z diff --git a/.changes/unreleased/Added-20241220-194631.yaml b/.changes/unreleased/Added-20241220-194631.yaml deleted file mode 100644 index de1c856d..00000000 --- a/.changes/unreleased/Added-20241220-194631.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Added -body: >- - state: Track version of the state store layout in use. - This should be a no-op for users, but it guards against corruption - in case of future changes to the layout. -time: 2024-12-20T19:46:31.685098-05:00 diff --git a/.changes/unreleased/Added-20241220-211843.yaml b/.changes/unreleased/Added-20241220-211843.yaml deleted file mode 100644 index 85ed18f9..00000000 --- a/.changes/unreleased/Added-20241220-211843.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Added -body: >- - submit: New `--update-only` flag tells submit commands to update open CRs but not create new ones. - Branches that would create new CRs are igonred. -time: 2024-12-20T21:18:43.773073-05:00 diff --git a/.changes/unreleased/Changed-20241129-120946.yaml b/.changes/unreleased/Changed-20241129-120946.yaml deleted file mode 100644 index 611ac9d0..00000000 --- a/.changes/unreleased/Changed-20241129-120946.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'commit amend: Deprecate ''-n'' form of ''--no-edit''. This will be removed in a future version.' -time: 2024-11-29T12:09:46.681512-08:00 diff --git a/.changes/unreleased/Changed-20241220-091825.yaml b/.changes/unreleased/Changed-20241220-091825.yaml deleted file mode 100644 index 446b4c73..00000000 --- a/.changes/unreleased/Changed-20241220-091825.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch delete: If multiple branches are provided, they will be deleted in a more predictable order.' -time: 2024-12-20T09:18:25.243952-08:00 diff --git a/.changes/unreleased/Fixed-20241221-151600.yaml b/.changes/unreleased/Fixed-20241221-151600.yaml deleted file mode 100644 index b3fe29a8..00000000 --- a/.changes/unreleased/Fixed-20241221-151600.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: Reduce repeated work between git-spice commands that invoke each other. -time: 2024-12-21T15:16:00.059639-05:00 diff --git a/.changes/v0.10.0.md b/.changes/v0.10.0.md new file mode 100644 index 00000000..a5da3ac1 --- /dev/null +++ b/.changes/v0.10.0.md @@ -0,0 +1,13 @@ +## v0.10.0 - 2025-01-02 +### Added +- commit create: Added a --fixup flag to allow adding a fixup commit. +- rebase continue: Add `--[no-]edit` flag to skip opening an editor when continuing a rebase, or opt into it if the new `spice.rebaseContinue.edit` configuration is `true`. +- Add --no-verify flag to bypass pre-commit and commit-msg hooks to commands that create new commits. +- submit: Include merged changes in navigation comments when restacking and resubmitting changes based on them. +- state: Track version of the state store layout in use. This should be a no-op for users, but it guards against corruption in case of future changes to the layout. +- submit: New `--update-only` flag tells submit commands to update open CRs but not create new ones. Branches that would create new CRs are igonred. +### Changed +- commit amend: Deprecate '-n' form of '--no-edit'. This will be removed in a future version. +- branch delete: If multiple branches are provided, they will be deleted in a more predictable order. +### Fixed +- Reduce repeated work between git-spice commands that invoke each other. diff --git a/CHANGELOG.md b/CHANGELOG.md index 6266a228..a738dc47 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.10.0 - 2025-01-02 +### Added +- commit create: Added a --fixup flag to allow adding a fixup commit. +- rebase continue: Add `--[no-]edit` flag to skip opening an editor when continuing a rebase, or opt into it if the new `spice.rebaseContinue.edit` configuration is `true`. +- Add --no-verify flag to bypass pre-commit and commit-msg hooks to commands that create new commits. +- submit: Include merged changes in navigation comments when restacking and resubmitting changes based on them. +- state: Track version of the state store layout in use. This should be a no-op for users, but it guards against corruption in case of future changes to the layout. +- submit: New `--update-only` flag tells submit commands to update open CRs but not create new ones. Branches that would create new CRs are igonred. +### Changed +- commit amend: Deprecate '-n' form of '--no-edit'. This will be removed in a future version. +- branch delete: If multiple branches are provided, they will be deleted in a more predictable order. +### Fixed +- Reduce repeated work between git-spice commands that invoke each other. + ## v0.9.0 - 2024-11-26 This release adds support for using git-spice with GitLab. diff --git a/doc/src/cli/config.md b/doc/src/cli/config.md index 9d3cfa0a..2da67e51 100644 --- a/doc/src/cli/config.md +++ b/doc/src/cli/config.md @@ -103,7 +103,7 @@ instead of showing just the current stack. ### spice.rebaseContinue.edit - + Whether $$gs rebase continue$$ should open an editor to modify the commit message when continuing after resolving a rebase conflict. diff --git a/doc/src/guide/cr.md b/doc/src/guide/cr.md index c5aa4565..4e92a385 100644 --- a/doc/src/guide/cr.md +++ b/doc/src/guide/cr.md @@ -82,7 +82,7 @@ configuration key. !!! info "Stack history in navigation comments" - + When possible, git-spice will remember CRs as they're merged into trunk, and continue to list them in navigation comments of branches based on those changes. @@ -137,7 +137,7 @@ and push to a branch anyway, use the `--force` flag. ### Update existing CRs only - + All submit commands support the `--update-only` flag. If provided, the submission will update existing CRs in a stack,