Repository navigation
What's shipped since 1.0 (through 2.1.0) #248
alexrinass
announced in
Announcements
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
It's been about seven months since the 1.0 announcement here, and four releases have shipped since — 1.1.0, 1.2.0, 2.0.0, and 2.1.0 today. Here's what each one brought.
1.1.0 — push options, configurable hooks
Push-option support for
publish(--push-option/-o), and a configurable hooks directory viagitflow.path.hooks/core.hooksPathinstead of the fixed.git/hooks. Plus several remote-validation fixes so delete/publish/track/finish fail cleanly instead of erroring deep inside a git call.1.2.0 — integrate, resumable updates, stricter sync checks
git flow integrateto merge a parent branch into a topic branch directly.update --continue/--abortto resume or cancel an interrupted update.finishnow pushes the merged branch and tag after merging, detects and clears stale merge state from an interrupted run, and runs a stricter pre-merge sync check (aborts on behind/diverged, tolerates ahead). Windows arm64 build target added.2.0.0 — shared config, shell completion
init --sharedwrites the git-flow setup to a committable.gitflowfile, so a team's branch model lives in the repo instead of every clone's local config —config sync/config statuskeep the two in sync and report drift. Shell tab completion for bash, zsh, and fish.init --initcan create the repository itself when run outside one. Breaking:git flow versionoutput changed shape (version number now comes first) to match tooling expectations from git-flow-avh.2.1.0 — worktree support, fast-forward-only finish
The headline feature: git-flow now manages Git worktrees across a topic branch's whole lifecycle.
<type> start --worktreecreates the branch in its own worktree,checkoutnavigates to it (withshell-initfor automaticcd),<type> list --worktreesshows what's linked, andfinish/deletefree the worktree — removing one git-flow created, or safely detaching one you made by hand so nothing in it is touched. Also new:finish --ff-onlyto require a clean fast-forward before finishing, andgitflow.branch.<type>.worktreeto make worktrees the default for a branch type.Install / upgrade
Or grab the latest from the Releases page. Full details in the changelog.
All reactions