Update dependency git-town/git-town to v16

[renovate]

This PR contains the following updates:

Package	Update	Change
git-town/git-town	major	v14.2.3 -> v16.4.0

---

Release Notes

git-town/git-town (git-town/git-town)

v16.4.0

Compare Source

Git Town 16.4 improves the usability in busy monorepos as well as the stability and resilience of Git Town in more environments.

Many thanks to @​FirelightFlagboy, @​JamieMcKernanKaizen, @​alexw10, @​blaggacao, @​charlierudolph, @​ericcao52, @​ianjsikes, @​kevgo, @​ruudk, @​sheldonhull, @​shiv19, @​stephenwade, @​tranhl, @​waldyrious for improving Git Town through 39 shipped PRs and 13 resolved issues!

New Features

• Git Town's append, hack, prepend, and propose commands now have a --detached flag that prevents them from pulling in additional changes from the main branch. This together with the existing --detached flag for git town sync allows controlling exactly when changes from the main branch get synced into your branch hierarchy (#​4095).
• New config settings contribution-regex and observed-regex allow marking branches created by external services like Renovate or Dependabot appropriately (#​3985).
• Git Town is now much more resilient against unexpected Git failures, for example when another Git process is running concurrently, because most Git Town operations are now fully reentrant (#​4082).
• git town sync now syncs branches whose ancestors aren't available locally better: It pulls the tracking branches of all non-local ancestors until it finds a local ancestor (#​3769).

Bug Fixes

• git town hack no longer panics if the main branch isn't available locally (#​3703).
• git town hack no longer panics when the Git repo has a detached HEAD (#​3694).
• Git Town now loads all applicable settings from the config file (#​4072).

v16.3.0

Compare Source

Git Town 16.3 is packed with some long-requested features we've been working towards for years!

Big shoutout to @​LogvinovLeon, @​alexw10, @​charlierudolph, @​cjol, @​ericcao52, @​kevgo, @​mw00120, @​ruudk, @​stephenwade, @​tranhl, @​waldyrious, @​zodman for your insightful contributions, feedback, and ideas. Git Town is a much better product thanks to you and the 52 shipped PRs and 6 resolved issues in this release!

New Features

• Full integration of proposals (#​2745):
  • Git Town now updates all affected pull requests when you rename, prepend, or remove a branch or change its parent.
  • If the parent of a branch is unknown but there's an open PR, Git Town will now grab the PR’s base branch as the parent.
  • git town undo now also reverts any changes made to pull requests (#​4049).
• Full integration with the Bitbucket Cloud API (#​973) and the gitea API (#​4044).
• git town rename-branch now maintains the Git configuration and reflog for renamed branches (#​4023).
• Git Town now logs all API interactions in the CLI, showing details like PR numbers and branch names it retrieves from the APIs. This makes it easier to see where information and possible slowness come from (#​4020, #​4026).

v16.2.1

Compare Source

Thanks to @​kevgo, @​ruudk, @​stephenwade, @​zodman for reporting and fixing unintuitive behavior that can and should be improved, leading to 13 shipped PRs and 2 resolved issues!

Bug Fixes

• git town switch no longer asks for the ancestry of unrelated branches (#​4004).
• git town branch no longer prints a redundant newline (#​4011).

v16.2.0

Compare Source

Git Town 16.2 makes it easier for you to manage the branches in your local repository.

Big thanks to @​kevgo, @​ruudk, @​stephenwade, @​zodman for coming up with the ideas for these new features and helping polish them in 38 shipped PRs and 6 resolved issues!

New Features

• The new git town branch command displays the local branch hierarchy, and the types of all branches except for main and feature branches (#​3807).
• git town switch can now displays the types of branches (except for the main and feature branches) when called with the --display-types flag (#​3937).
• git town switch can now filter the branches to switch to via regular expressions ((#​3980)[https://github.com/git-town/git-town/pull/3980](https://redirect.github.com/git-town/git-town/pull/3980)0/files])
• You can now use git town switch to check out a remote branch using the --all flag (#​3941)

Bug Fixes

• git town switch now exits with a nice error message if there are no branches to switch to (#​3979)
• logs of API calls are now capitalized (#​3975)

v16.1.1

Compare Source

Git Town 16.1.1 ships important bug fixes for the new features introduced in v16.1.

Thanks to @​kevgo, @​rbardini, @​stephenwade!

Bug Fixes

• The setup assistant now always stores default-branch-type and feature-regex in the Git-based configuration, not in the config file. These settings are typically developer-specific. You can still manually add them to the config file if needed (#​3961).
• Fixes various documentation errors (#​3953).

v16.1.0

Compare Source

Git Town 16.1 provides multiple killer features for power users.

Big thanks to @​FFdhorkin, @​breml, @​bryanlarsen, @​buscape, @​enigma, @​heyitsaamir, @​kevgo, @​rbardini, @​ruudk, @​stephenwade, @​tranhl, @​zeronacer for contributing really good ideas, feedback, and code to 39 shipped PRs and 9 resolved issues!

New Features

• Automatic branch detection: Git Town can now automatically detect feature and contribution or observed branches if you configure the new default-branch-type and feature-regex options (#​3683).
• Detached syncing: Use git sync --detached to sync without pulling updates from the main branch. This helps keep development momentum if the main branch receives frequent updates and these updates trigger costly follow-up activities like npm install or long-running recompiles (more info, #​2657).
• More concise branch switching: Running git town switch --type=<branch types> displays only branches of the given type (more info, #​3933).

Bug Fixes

• Git Town no longer errors if the previously checked out Git branch is active in another worktree (#​3916).

v16.0.0

Compare Source

Git Town 16 brings the "git ship" command back in a big way 🚢 - Git Town now supports shipping stacked changes without merge conflicts - even on platforms that don't support it natively, like GitHub!

Big thanks to @​FFdhorkin, @​antoineMoPa, @​breml, @​bryanlarsen, @​buscape, @​kevgo, @​tranhl, @​zeronacer for the great feedback that led to this awesome new solution! This releaese contains 9 shipped PRs and 7 resolved issues.

BREAKING CHANGES

The default behavior of git ship tightens. Previously it shipped via the API if an API key is configured, and without an API key it did a local squash-merge. The new default behavior is to ship only via API or not at all. The new default behavior is safer because it only automates what the user would normally do online. You can specify a different behavior for git ship via the new ship-strategy configuration option (see below).

New Features

• You can now configure how Git Town ships branches via the new ship-strategy configuration setting. Possible options are:
  • api ships the branch by merging its proposal via the API of your code hosting platform.
  • fast-forward is a new shipping strategy that prevents the false merge conflicts you get when shipping a branch from a stack using squashes or merges. It merges the branch to ship via git merge --ff-only into its parent (typically the main branch) on your local machine and then pushes the new commits to the remote main branch.
  • squash-merge as before merges the branch to ship via git merge --squash into its parent.

v15.3.0

Compare Source

15.3.0 (2024-08-26)

Git Town 15.3 brings sweet quality-of-life improvements.

Massive thanks to @​ChiefMateStarbuck, @​IvanVas, @​WhosNickDoglio, @​alphatroya, @​charlierudolph, @​cirego, @​erik-rw, @​gstamp, @​guusw, @​kelbyers, @​kevgo, @​marcelpanse, @​nishchay-manwani-glean, @​rnystrom, @​ruigomeseu, @​sergej-koscejev for helping evolve Git Town with useful feedback, ideas, and code contributions to 21 shipped PRs and 14 resolved issues!

New Features

• Automatic retry for concurrent Git access: Git Town now waits and retries Git operations if another Git process is running concurrently. Super handy when your IDEs is running Git commands in the background (#​3629).
• Shell prompt status indicator: If a Git Town command gets interrupted by a merge conflict, you can now add the name of the pending Git Town command to your shell prompt. This reminds you to run git town continue to finish the job (#​2208).
• git town propose now takes you directly to the existing proposal's webpage if one already exists (#​2362).
• API activity logs. Git Town now logs its communication with hosting APIs in the CLI output. This shows you what Git Town is doing and where slowness is coming from (#​3892).
• git town kill no longer asks for the ancestry of branches it is about to delete as long as these branches don't have descendents (#​3870).
• Setting up shell autocompletion on ZSH is now better documented (#​3889).

Bug Fixes

• If you have a merge conflict between your uncommitted changes and branch ancestry, Git Town commands will fail when running git stash pop at the end. Previously when running git town continue it tried to pop the stash again, causing the same merge conflict to happen again. Now Git Town assumes you have resolved the merge conflicts when running git town continue and deletes the stash entry. If you need to re-apply the conflicting stash entry, run git stash pop manually before running git town continue. This keeps your Git stash clean (#​3886).
• git town continue now re-runs all failed Git operations, helping recover from a wider range of unexpected issues (#​3887, #​3885).

v15.2.0

Compare Source

Big thanks to @​kevgo, @​mball-agathos, @​ruudk, @​sergej-koscejev for contributing super useful feedback, ideas, and code to 32 shipped PRs and 5 resolved issues!

New Features

• The new "compress" sync strategy always compresses branches while syncing them (#​3320).
• Basic support for integrating Git Town into lazygit (#​3872).

Bug Fixes

• Renaming branches now keeps their contribution, observed, parked, and prototype status (#​3864).
• The commands git town contribute, observe, park, and prototype now behave more correct and consistent (#​3880).

v15.1.0

Compare Source

Numerous thanks to @​FirelightFlagboy, @​Iron-Ham, @​IvanVas, @​JaredSharplin, @​JustinBis, @​TheHolyWaffle, @​WhosNickDoglio, @​alexus37, @​alphatroya, @​anikrajc, @​blaggacao, @​charlierudolph, @​cjol, @​connected-rmcleod, @​cridasilva, @​defunctzombie, @​erik-rw, @​kevgo, @​pattiereaves, @​sgarfinkel, @​stephenwade, @​teumas, @​zodman for the super useful feedback, ideas, and code contributions to 31 shipped PRs and 19 resolved issues.

New Features

• git repo can now take the name of a remote to open the repo at that remote (#​1204).
• The new sync-tags config option disables syncing of Git tags (#​3212).
• git ship can now ship into any type of parent branch with the --to-parent option (#​2605).
• git sync --stack syncs all branches in the current stack (#​3816).

v15.0.0

Compare Source

Git Town 15.0 improves Git Town's compatibility with monorepos and removes technical drift.

Major thanks to @​ianjsikes, @​kevgo, @​ruudk, @​seadowg, @​stephenwade, @​zodman for contributing valuable feedback, ideas, and code to 41 shipped PRs and 8 resolved issues!

BREAKING CHANGES

• git town ship no longer syncs branches when shipping. From now on it only ships branches that are in sync. This ensures that only fully tested and reviewed changes get shipped (#​3350).
• This also makes the sync-before-ship config option obsolete, it no longer exists (#​3644).
• git town prepend no longer syncs when uncommitted changes are present. This allows committing your uncommitted changes first, then syncing later (#​3778).
• The term main development branch gets shortened to main branch since there are no other development branches in Git Town's domain model (#​3643).

New Features

• A new branch type called prototype branches syncs only locally, i.e. they don't create or push to a tracking branch until they are proposed. This helps reduce stress on the CI server, allows developers to prototype using sensitive information or potentially problematic code or data that they don't want to share (#​3646).
• The new sync-prototype-strategy setting allows defining a dedicated sync strategy for prototype branches. This allows rebasing your commits while they are local, and switching to merging once other developers can see them (#​3785).
• The new create-prototype-branches setting makes Git Town always create prototype branches (#​3779).

v14.4.1

Compare Source

Many thanks to @​charlierudolph, @​ianjsikes, @​kevgo, @​seadowg, @​stephenwade for contributing feedback, ideas, and code to 10 shipped PRs and 4 resolved issues.

Bug Fixes

• git town undo now only undoes changes to branches that the previous Git Town command has touched (#​3765)
• git town continue now does not ask for additional lineage information (#​3725)

v14.4.0

Compare Source

Git Town v14.4 ships features suggested by Git Town users and fixes a severe bug in the undo feature.

Many thanks to @​ianjsikes, @​kevgo, @​ruudk, @​stephenwade who contributed ideas for great new features and helped identify and solve a severe bug, resulting in 46 shipped PRs and 2 resolved issues.

New Features

• Prototype branches are fully synced branches that don't have a tracking branch. They are useful when working with sensitive information or to save on CI minutes (#​3646).

Bug Fixes

• Undo only local branches and their tracking branches (#​3764).
• Use correct parent when deleting shipped observed branches (#​3757, #​3756, #​3755, #​3754).
• Undo for configuration commands now correctly undoes branch changes (#​3741).

v14.3.1

Compare Source

Bug Fixes

• git sync --no-push now also doesn't push when the rebase sync-strategy is configured (#​3271)
• git town config get-parent no longer prints an unnecessary empty line (#​3717)

Many thanks to @​dannykingme, @​defunctzombie, @​kevgo, @​marcosfelt, @​nekitk, @​opeik, @​pcfreak30, @​ruudk, and @​stephenwade for identifying the issues fixed in this release and providing helpful feedback to resolve them, resulting in 19 shipped PRs and 4 resolved issues!

v14.3.0

Compare Source

This release ships a few of the most requested community features.

New Features

• git propose now supports flags to pre-populate more fields of the pull requests to create:
  • --title=<value> sets the title to the given value
  • --body=<value> sets the body to the given value
  • --body-file=<file path> sets the body to the content of the file with the given path. Providing - as the file path reads the body from STDIN (#​3207).
• a new command git town config get-parent [branch] prints the parent of the given branch, or the current branch if no branch is provided (#​3207).
• the new --no-push flag for git sync temporarily disables pushing local changes when sync-feature-strategy is merge. Please note that when sync-feature-strategy is rebase, it still force-pushes to avoid keeping outdated commits around, which avoids data loss in edge cases.

Heartfelt thanks to @​dannykingme, @​defunctzombie, @​kevgo, @​marcosfelt, @​nekitk, @​opeik, @​pcfreak30, @​ruudk, @​stephenwade for contributing code, ideas, and feedback to 29 shipped PRs and 9 resolved issues!

---

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

---

• If you want to rebase/retry this PR, check this box

---

This PR was generated by Mend Renovate. View the repository job log.