Skip to content

Stacked Git 2.1.0
Compare
Choose a tag to compare
@jpgrayson jpgrayson released this 12 Dec 16:42
· 796 commits to master since this release
v2.1.0
This tag was signed with the committer’s verified signature.
jpgrayson Pete Grayson
GPG key ID: 806EE62CA45D41B9
Verified
Learn about vigilant mode.
35a9822
This commit was signed with the committer’s verified signature.
jpgrayson Pete Grayson
GPG key ID: 806EE62CA45D41B9
Verified
Learn about vigilant mode.

This minor release introduces several long-awaited features, including some potentially breaking changes.

The main breaking feature is relaxed stack initialization. Instead of needing to explicitly initialize a StGit stack on a branch, patch creating commands such as stg new and stg import will automatically initialize the stack, if needed. Most other commands that previously required an initialized stack will now operate as if there is an empty stack if the stack is not yet initialized.

Another potentially breaking change is that the stgit.gpgsign configuration variable is now independent of commit.gpgsign. I.e. to have signed stack metadata commits, stgit.gpgsign must be set to true.

Added

  • feat: Configurable push conflict policy (#60)
  • feat: Add --committer-date-is-author-date option (#47)
  • feat(import): Add --3way option (#36)
  • feat(import): Add --directory option (#36)

Changed

  • feat!: Relaxed stack initialization (#238)
  • feat!: Only sign stack based on stgit.gpgsign (#238)
  • fix!: Allow "---" separator in messages (#243)
  • feat: More descriptive push conflict message (#60)
  • feat: Avoid post-edit commits when no change
  • chore: Update dependencies to latest versions

Fixed

  • fix: Improved error message for uninitialized stack
  • fix: Improve error for re-initialization attempt
  • fix(prev): Different error message for empty stack
  • fix: Accept full ref name for branches
  • fix(zsh): Complete --edit and --diff for stg new
Assets 3
Loading