diff --git a/.changes/unreleased/Added-20240622-122401.yaml b/.changes/unreleased/Added-20240622-122401.yaml deleted file mode 100644 index 46e462d9..00000000 --- a/.changes/unreleased/Added-20240622-122401.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: Add 'stack edit' command to edit an entire stack, similarly to 'downstack edit'. -time: 2024-06-22T12:24:01.28252-07:00 diff --git a/.changes/unreleased/Added-20240623-094932.yaml b/.changes/unreleased/Added-20240623-094932.yaml deleted file mode 100644 index 56d7d708..00000000 --- a/.changes/unreleased/Added-20240623-094932.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: Add 'branch split' command to split an existing branch with multiple commits into one or more new branches. -time: 2024-06-23T09:49:32.655626-07:00 diff --git a/.changes/unreleased/Changed-20240623-180309.yaml b/.changes/unreleased/Changed-20240623-180309.yaml deleted file mode 100644 index 1bfdec66..00000000 --- a/.changes/unreleased/Changed-20240623-180309.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'upstack restack: Rename --no-base to --skip-start.' -time: 2024-06-23T18:03:09.389623-07:00 diff --git a/.changes/unreleased/Changed-20240623-181151.yaml b/.changes/unreleased/Changed-20240623-181151.yaml deleted file mode 100644 index e7b11617..00000000 --- a/.changes/unreleased/Changed-20240623-181151.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'upstack restack: Target branch name is now a --branch flag.' -time: 2024-06-23T18:11:51.283741-07:00 diff --git a/.changes/unreleased/Changed-20240623-182028.yaml b/.changes/unreleased/Changed-20240623-182028.yaml deleted file mode 100644 index f85fe408..00000000 --- a/.changes/unreleased/Changed-20240623-182028.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'downstack submit: Optional positional branch argument is now --branch flag.' -time: 2024-06-23T18:20:28.467858-07:00 diff --git a/.changes/unreleased/Changed-20240623-182507.yaml b/.changes/unreleased/Changed-20240623-182507.yaml deleted file mode 100644 index ff0ecacb..00000000 --- a/.changes/unreleased/Changed-20240623-182507.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'downstack edit: Optional positional branch argument is now a --branch flag.' -time: 2024-06-23T18:25:07.211419-07:00 diff --git a/.changes/unreleased/Changed-20240623-202355.yaml b/.changes/unreleased/Changed-20240623-202355.yaml deleted file mode 100644 index f84a3151..00000000 --- a/.changes/unreleased/Changed-20240623-202355.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch fold: The optional branch name argument is now a flag.' -time: 2024-06-23T20:23:55.080492-07:00 diff --git a/.changes/unreleased/Changed-20240623-203917.yaml b/.changes/unreleased/Changed-20240623-203917.yaml deleted file mode 100644 index d000aac6..00000000 --- a/.changes/unreleased/Changed-20240623-203917.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch restack: The optional positional argument is now a --branch flag.' -time: 2024-06-23T20:39:17.967871-07:00 diff --git a/.changes/unreleased/Changed-20240623-204332.yaml b/.changes/unreleased/Changed-20240623-204332.yaml deleted file mode 100644 index 65c5c444..00000000 --- a/.changes/unreleased/Changed-20240623-204332.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch submit: Optional branch positional argument is now the --branch flag.' -time: 2024-06-23T20:43:32.41291-07:00 diff --git a/.changes/unreleased/Fixed-20240619-043611.yaml b/.changes/unreleased/Fixed-20240619-043611.yaml deleted file mode 100644 index 1a7e49bc..00000000 --- a/.changes/unreleased/Fixed-20240619-043611.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'branch submit: If there''s a PR template but no commit body, don''t add extraneous newlines at the start of the default PR description.' -time: 2024-06-19T04:36:11.516142-07:00 diff --git a/.changes/unreleased/Fixed-20240622-072144.yaml b/.changes/unreleased/Fixed-20240622-072144.yaml deleted file mode 100644 index b8752ae0..00000000 --- a/.changes/unreleased/Fixed-20240622-072144.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'upstack restack: Fix --no-base ignored when there''s only one branch.' -time: 2024-06-22T07:21:44.549109-07:00 diff --git a/.changes/unreleased/Fixed-20240622-072219.yaml b/.changes/unreleased/Fixed-20240622-072219.yaml deleted file mode 100644 index 79c62d59..00000000 --- a/.changes/unreleased/Fixed-20240622-072219.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'commit {create, amend}: Fix unintended restacking of current branch when there''s only one branch in the stack.' -time: 2024-06-22T07:22:19.986177-07:00 diff --git a/.changes/unreleased/Fixed-20240622-115811.yaml b/.changes/unreleased/Fixed-20240622-115811.yaml deleted file mode 100644 index 273d4315..00000000 --- a/.changes/unreleased/Fixed-20240622-115811.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'branch onto: Move the upstack of the target branch before the brach itself. This makes the operation better able to recover from conflicts.' -time: 2024-06-22T11:58:11.90579-07:00 diff --git a/.changes/v0.1.0-beta6.md b/.changes/v0.1.0-beta6.md new file mode 100644 index 00000000..8cc38533 --- /dev/null +++ b/.changes/v0.1.0-beta6.md @@ -0,0 +1,17 @@ +## v0.1.0-beta6 - 2024-06-28 +### Added +- Add 'stack edit' command to edit an entire stack, similarly to 'downstack edit'. +- Add 'branch split' command to split an existing branch with multiple commits into one or more new branches. +### Changed +- upstack restack: Rename --no-base to --skip-start. +- upstack restack: Target branch name is now a --branch flag. +- downstack submit: Optional positional branch argument is now --branch flag. +- downstack edit: Optional positional branch argument is now a --branch flag. +- branch fold: The optional branch name argument is now a flag. +- branch restack: The optional positional argument is now a --branch flag. +- branch submit: Optional branch positional argument is now the --branch flag. +### Fixed +- branch submit: If there's a PR template but no commit body, don't add extraneous newlines at the start of the default PR description. +- upstack restack: Fix --no-base ignored when there's only one branch. +- commit {create, amend}: Fix unintended restacking of current branch when there's only one branch in the stack. +- branch onto: Move the upstack of the target branch before the brach itself. This makes the operation better able to recover from conflicts. diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fcd352d..591bcfde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,24 @@ 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-beta6 - 2024-06-28 +### Added +- Add 'stack edit' command to edit an entire stack, similarly to 'downstack edit'. +- Add 'branch split' command to split an existing branch with multiple commits into one or more new branches. +### Changed +- upstack restack: Rename --no-base to --skip-start. +- upstack restack: Target branch name is now a --branch flag. +- downstack submit: Optional positional branch argument is now --branch flag. +- downstack edit: Optional positional branch argument is now a --branch flag. +- branch fold: The optional branch name argument is now a flag. +- branch restack: The optional positional argument is now a --branch flag. +- branch submit: Optional branch positional argument is now the --branch flag. +### Fixed +- branch submit: If there's a PR template but no commit body, don't add extraneous newlines at the start of the default PR description. +- upstack restack: Fix --no-base ignored when there's only one branch. +- commit {create, amend}: Fix unintended restacking of current branch when there's only one branch in the stack. +- branch onto: Move the upstack of the target branch before the brach itself. This makes the operation better able to recover from conflicts. + ## v0.1.0-beta5 - 2024-06-17 ### Added - branch create: Add -b/--base flag to specify a different base branch for the new branch.