Skip to content

v1.2.0

Choose a tag to compare

View all tags
@github-actions github-actions released this 01 Aug 12:02
· 216 commits to main since this release
v1.2.0
3c58002

Added

  • git flow integrate command to merge changes from a parent branch into a topic branch, with options resolved from an integrate config namespace
  • finish now pushes the finished branches and release tag to the remote after merging, honoring push options
  • update --continue and update --abort to resume or cancel an update interrupted by conflicts
  • finish now detects and auto-clears stale merge state left by a previous interrupted operation
  • delete now fetches and runs a remote sync-check before deleting a branch (--fetch, gitflow.<type>.delete.fetch)
  • start can derive the branch name from a configured version filter
  • Windows arm64 build target

Changed

  • finish now runs a stricter pre-merge sync check: it aborts when the parent (merge-target) branch or the topic branch is behind or has diverged from its remote (with a diverged-specific message), while tolerating either being ahead; --force skips the check
  • finish now treats a fetch failure against a reachable-but-failing remote as fatal (was a silent note); the error names the cause and suggests --no-fetch / --force
  • start now fetches by default before creating a branch (skipped silently when no remote is configured); disable with --no-fetch or gitflow.<type>.start.fetch false. Shares the unified fetch resolution (default → config → flag) with finish
  • Commands now refuse to act on merge state owned by a foreign operation and on structurally-incomplete state, returning exit code 3 instead of proceeding destructively

Fixed

  • init now fails fast when the git user identity is missing
  • Branch names are validated with git check-ref-format, and dots are now allowed in base branch names
  • Branch names are resolved case-insensitively while preserving their original case
  • Leaf commands now reject unexpected positional arguments
  • delete, rename, and finish are gated when git-flow is uninitialized
  • Base-branch config cleanup is scoped to local config and treats a missing key as a no-op
  • finish --abort is a no-op when no merge is in progress
  • Hooks and filters now run on Windows (executed via sh)

Installation

See the installation instructions in the README.

Checksums

SHA-256 checksums for the release artifacts are available in the checksums.txt file.

Assets 11
Loading