Skip to content

Commit 32583b6

Browse files
ECG Bottmeijn
authored andcommitted
build(deps): update git-town/git-town to v22.2.0
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [git-town/git-town](https://github.com/git-town/git-town) | minor | `v22.1.0` -> `v22.2.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>git-town/git-town (git-town/git-town)</summary> ### [`v22.2.0`](https://github.com/git-town/git-town/releases/tag/v22.2.0) [Compare Source](git-town/git-town@v22.1.0...v22.2.0) ##### New Features - Git Town now supports a non-hidden config file, i.e. `git-town.toml`, in addition to the existing config file names ([#&#8203;5614](git-town/git-town#5614)). - The new [order](https://www.git-town.com/preferences/order.html) configuration setting allows displaying lists of branches in reverse order, for example in [switch](https://www.git-town.com/commands/switch.html), [branch](https://www.git-town.com/commands/branch.html), [up](https://www.git-town.com/commands/up.html), [down](https://www.git-town.com/commands/down.html), and [config](https://www.git-town.com/commands/config.html). This is useful if you prefix your branches with the creation date like `YYYYMM` and want to see the newest branches on top ([#&#8203;5615](git-town/git-town#5615)). - The new [display-types](https://www.git-town.com/preferences/display-types.html) configuration setting allows configuring which branch types Git Town shows in lists of branches. This affects the [branch](https://www.git-town.com/commands/branch.html), [switch](https://www.git-town.com/commands/switch.html), [config](https://www.git-town.com/commands/config.html), [down](https://www.git-town.com/commands/down.html), and [up](https://www.git-town.com/commands/up.html) commands and all internal dialogs that ask to select a branch or parent branch ([#&#8203;5659](git-town/git-town#5659)). - switch: you can now toggle to show all branches on and off using the `a` hotkey ([#&#8203;5624](git-town/git-town#5624)). - setup assistant: now runs in the presence of invalid configuration data and overwrites it ([#&#8203;5598](git-town/git-town#5598)). - Git Town now uses the Git user name also from the environment variables `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, `GIT_AUTHOR_NAME`, and `GIT_COMMITTER_NAME` if they aren't set in Git metadata `user.email` and `user.name` ([#&#8203;5668](git-town/git-town#5668)). ##### Bug Fixes - compress: works if a folder has the same name as a branch ([#&#8203;5594](git-town/git-town#5594)). - ship: works if a folder has the same name as a branch ([#&#8203;5657](git-town/git-town#5657)). - set-parent: only changes commits of feature or prototype branches ([#&#8203;5605](git-town/git-town#5605)). - propose: correctly passes on a `--body` tag without content ([#&#8203;5496](git-town/git-town#5496)). - propose: the `gh` connector no longer crashes if the user chooses `Continue in browser` ([#&#8203;5681](git-town/git-town#5681)). - sync: pruning a freshly created branch no longer crashes ([#&#8203;5660](git-town/git-town#5660)). - hack: now always sets the correct branch type ([#&#8203;5609](git-town/git-town#5609)). - hack: `--beam` from a branch without parent now asks for the branch parent ([#&#8203;5121](git-town/git-town#5121)). - init: no longer crashes if if there are no remotes ([#&#8203;5608](git-town/git-town#5608)). - switch: can now combine `--all` and `--display-types` ([#&#8203;5648](git-town/git-town#5648)). - dead links on the "Contributing" tab on GitHub are fixed ([#&#8203;5679](git-town/git-town#5679)). ##### Contributors Shoutout to [@&#8203;AmitJoki](https://github.com/AmitJoki), [@&#8203;GamerGirlandCo](https://github.com/GamerGirlandCo), [@&#8203;Varedis](https://github.com/Varedis), [@&#8203;caccavale](https://github.com/caccavale), [@&#8203;derekspelledcorrectly](https://github.com/derekspelledcorrectly), [@&#8203;j2fw](https://github.com/j2fw), [@&#8203;james-harlyy](https://github.com/james-harlyy), [@&#8203;kevgo](https://github.com/kevgo), [@&#8203;kevinmichaelchen](https://github.com/kevinmichaelchen), [@&#8203;mrmarufpro](https://github.com/mrmarufpro), [@&#8203;nebbles](https://github.com/nebbles), [@&#8203;ruudk](https://github.com/ruudk), [@&#8203;stephenwade](https://github.com/stephenwade), [@&#8203;thattomperson](https://github.com/thattomperson), [@&#8203;tranhl](https://github.com/tranhl), [@&#8203;tugrulates](https://github.com/tugrulates), [@&#8203;yaadata](https://github.com/yaadata) for contributing code, feedback, ideas, and bug fixes to 58 shipped pull requests and 24 resolved issues! </details> --- ### 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 MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNjkuMSIsInVwZGF0ZWRJblZlciI6IjQxLjE2OS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
1 parent cd1194b commit 32583b6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

chezmoi/dot_config/aquaproj-aqua/aqua.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ packages:
5353
- name: getsops/[email protected]
5454
description: Simple and flexible tool for managing secrets
5555
link: https://github.com/getsops/sops
56-
- name: git-town/git-town@v22.1.0
56+
- name: git-town/git-town@v22.2.0
5757
description: Git workflow automation to keep branches in sync and reduce merge conflicts
5858
link: https://github.com/git-town/git-town
5959
- name: mr-karan/[email protected]

0 commit comments

Comments
 (0)