From fb0265ecb4082030707fc7fe4e306213a203c817 Mon Sep 17 00:00:00 2001 From: Waleed Khan Date: Sun, 19 Feb 2023 00:32:53 -0800 Subject: [PATCH] fix(docs): separate 0.7.0 changes from 0.6.0 I accidentally kept updating v0.6.0 instead of starting a new section for v0.7.0. This commit extracts the v0.7.0 changes from the v0.6.0 notes. --- CHANGELOG.md | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f34fdef76..9019785a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,10 +13,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- (#576) EXPERIMENTAL: Created `git test` command to run a command on each commit in your stack. -- (#589, #593) `git sync --pull` rebases the local main branch on top of the remote main branch. -- (#619) `git smartlog` now renders revsets with non-contiguous commits. -- (#638) `git smartlog` now deduplicates merge commits which appear in the smartlog. - (#646) `git amend` now supports a `--reparent` option to adjust the contents of a commit while keeping the children commits exactly the same. - (#686) `git branchless init` will now populate the internal commit graph structure, rather than waiting for the first invocation of a `git branchless` subcommand. - (#725) Added `siblings()` revset function to determine the siblings of a given commit. @@ -31,22 +27,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- (#526) BREAKING: When checking out a commit with a single branch attached to it, that branch will also be checked out. -- (#589) BREAKING: Remote main branches are no longer supported. To upgrade you'll need to create a local main branch which tracks the remote main branch. You can use `git sync` to keep it up-to-date. - (#730) BREAKING: The default revset for `git reword` is now `stack() | @` instead of `@`, to simultaneously reword all commits in the current stack. - (#763) BREAKING: `git branchless switch` no longer implicitly opens the interactive commit selector when no target is provided. You must explicitly pass `-i`/`--interactive` to do so. -- (#571) Added `current()` revset function to determine the latest versions of a set of rewritten commits. -- (#582) Added `main()`, `public()` revset functions. -- (#593, #608) `git sync` produces more descriptive output. - (#685) `git submit` now colorizes the names of the affected branches. - (#763) Running `git branchless switch` with no arguments will switch to the branch associate with the current commit, if there is exactly one such branch and the `branchless.navigation.autoSwitchBranches` configuration variable is set to `true`. - (#791) The name for the temporary file created by `git reword` is now of the form `COMMIT_EDITMSG-*.txt`, which your editor can use to detect it as a Git commit message file. ### Fixed -- (#588) `git branchless init` now works when invoked in a worktree. -- (#589) `git reword --force-rewrite` no longer moves remote-tracking branches. -- (#589) `git smartlog` no longer uses 100% CPU in certain cases with remote main branches (because remote main branches are no longer supported). - (#646) Adjusted messaging during merge conflicts with `git move --in-memory` to be more accurate. - (#647) `git test run` now recovers from previously-failed tests instead of failing indefinitely in future runs. - (#670) `git submit` no longer force-pushes the current branch in the circumstance that all branches are currently up-to-date. @@ -57,6 +45,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - (#743) `git sync`, etc. now correctly clean up remote branch information for branches which have been merged upstream. Previously, the remote branch information would be left behind, which would cause future branches with the same names to incorrectly become associated with the old remote branch. - (#764) `git sync` will no longer attempt to resolve merge conflicts unless you pass `--merge`. Previously, this could happen when attempting to sync merge commits. +## [0.6.0] - 2022-11-14 + +### Added + +- (#576) EXPERIMENTAL: Created `git test` command to run a command on each commit in your stack. +- (#589, #593) `git sync --pull` rebases the local main branch on top of the remote main branch. +- (#619) `git smartlog` now renders revsets with non-contiguous commits. +- (#638) `git smartlog` now deduplicates merge commits which appear in the smartlog. + +### Changed + +- (#526) BREAKING: When checking out a commit with a single branch attached to it, that branch will also be checked out. +- (#589) BREAKING: Remote main branches are no longer supported. To upgrade you'll need to create a local main branch which tracks the remote main branch. You can use `git sync` to keep it up-to-date. +- (#571) Added `current()` revset function to determine the latest versions of a set of rewritten commits. +- (#582) Added `main()`, `public()` revset functions. +- (#593, #608) `git sync` produces more descriptive output. + +### Fixed + +- (#588) `git branchless init` now works when invoked in a worktree. +- (#589) `git reword --force-rewrite` no longer moves remote-tracking branches. +- (#589) `git smartlog` no longer uses 100% CPU in certain cases with remote main branches (because remote main branches are no longer supported). + ## [0.5.0] - 2022-09-28 ### Added