-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make auto-staging resolved conflicts optional #3870
Make auto-staging resolved conflicts optional #3870
Conversation
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesCodacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
So far, lazygit has always auto-staged files as soon as the conflict markers disappeared from them, which means that we could rely on any file that still had a status of "UU" to still contain conflict markers. We are going to make the auto-staging optional in the next commit, and in that case the user will want to manually stage "UU" files; so we must now check whether the file contains conflict markers, and disallow the staging in that case.
93f2961
to
90b8fd2
Compare
…ving conflicts (#3879) - **PR Description** When lazygit sees that all conflicts were resolved, it auto-stages all previously conflicted files and asks to continue the rebase. (There is [a PR](#3870) open to make this optional.) It is a common situation for this popup to be opened in the background, while the user is still busy fixing build errors in their editor. In this case, coming back to lazygit and confirming the continue prompt would result in an error because not all files are staged. Improve this by opening another popup in this case, asking to stage the newly modified files too and continue. See #3111 (comment) and the following discussion further down in that issue.
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.43.1` -> `v0.44.1` | 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>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.44.1`](https://github.com/jesseduffield/lazygit/releases/tag/v0.44.1) [Compare Source](jesseduffield/lazygit@v0.44.0...v0.44.1) #### What's Changed ##### Enhancements 🔥 - With stacked branches, create fixup commit at the end of the branch it belongs to by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3892 - Add options for disabling switching to the Files panel after popping or applying a stash by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3913 ##### Fixes 🔧 - Fix crash when viewing the divergence of a branch which is up to date with its upstream by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3918 ##### Performance improvements 📊 - Improve performance with large numbers of untracked or modified files by [@​parthokunda](https://github.com/parthokunda) in jesseduffield/lazygit#3919 ##### I18n 🌎 - Update language files from Crowdin by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3898 #### New Contributors - [@​parthokunda](https://github.com/parthokunda) made their first contribution in jesseduffield/lazygit#3919 **Full Changelog**: jesseduffield/lazygit@v0.44.0...v0.44.1 ### [`v0.44.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.44.0) [Compare Source](jesseduffield/lazygit@v0.43.1...v0.44.0) #### What's Changed Lots of great changes in this release. Thanks to everybody who contributed! ##### Enhancements 🔥 - Per-repo config files (and reloading of edited config files) by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3787 - In addition to the global config file you can now create repo-specific config files in `<repo>/.git/lazygit.yml`. Settings in these files override settings in the global config file. In addition, files called `.lazygit.yml` in any of the parent directories of a repo will also be loaded; this can be useful if you have settings that you want to apply to a group of repositories. - We now also automatically apply (most) config changes without the need to restart lazygit - Easily view diff across range of commits by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3869 - If you select a range of commits, we now show the diff across the range (inclusive). This makes it easy to see the total changes across a number of commits. Likewise, if you press enter when a range of commits are selected, we will show the changed files for the range. https://github.com/user-attachments/assets/6646c78b-5770-41c1-93b9-5442d32404de - Support hyperlinks from pagers by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3825 - If you're using delta as a pager (which I highly recommend trying), you can now click on line numbers to go to that line in your editor by using the following config: ```yaml git: paging: colorArg: always pager: delta --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}" ``` https://github.com/user-attachments/assets/75fef6c4-d437-4595-ab00-b8990215cfed - Switch to Files panel after popping/applying a stash by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3888 - This is a nice quality of life improvement. You generally want to go straight to the files panel after you pop or apply from the stash - Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3879 - Another quality of life improvement: often you resolve some conflicts, then make another couple changes, then in lazygit you say to continue and you get an error saying there are unstaged changes. Now instead of showing an error, lazygit asks if you want to stage those changes and continue. - Offer autostash option when creating new branch by [@​brandondong](https://github.com/brandondong) in jesseduffield/lazygit#3871 - Another great quality of life improvement - Allow using shell aliases in interactive custom commands by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3793 - Switch tabs with panel jump keys by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3794 - If you've already been using the number keys (1-5) for jumping to specific side panels, you'll be pleased to know that you can now also use those keys for jumping to tabs within a side panel. E.g. to go to the reflog panel, you can now press 4 to jump to the commits panel, then 4 again to go to the reflog tab. - Rename "Custom Command" to "Shell Command" by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3800 - There are two ways of invoking a 'custom' command in Lazygit: first by pre-defining a command in your config, and second by pressing ':' and typing in the command directly. We referred to both of these as 'custom commands' which was confusing. We now refer to the second approach as invoking a 'shell command'. - Improve template placeholders for custom commands by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3809 - Now you can use `SelectedCommit` to refer to the selected commit regardless of which commits panel you're in (local commits, reflog, etc) - Likewise, you can use `SelectedPath` whether you're in the files panel or the commit-files panel. - feat(custom command): support multiple contexts within one command by [@​yam-liu](https://github.com/yam-liu) in jesseduffield/lazygit#3784 - You can now use a comma-separated list of contexts for which a custom command can be invoked. For example: ```yaml customCommands: - description: 'Add empty commit' key: 'E' context: 'commits,files' ``` - Improve mouse support for commit message panel by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3836 - Make auto-staging resolved conflicts optional by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3870 - If you set `git.autoStageResolvedConflicts` to false in your config, lazygit will no longer auto-stage files in which you've resolved merge conflicts. - Allow using `<`/`>` and `,`/`.` in sticky range select mode in patch explorer by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3837 - Add Zed editor support to editorPreset by [@​susl](https://github.com/susl) in jesseduffield/lazygit#3886 ##### Fixes 🔧 - Allow GPG reword for last commit by [@​Neko-Box-Coder](https://github.com/Neko-Box-Coder) in jesseduffield/lazygit#3815 - Don't exit app when GetRepoPaths call fails during startup by [@​ppoum](https://github.com/ppoum) in jesseduffield/lazygit#3779 - Fix lack of icon when extension isn't lowercase by [@​hasecilu](https://github.com/hasecilu) in jesseduffield/lazygit#3810 - Fix redraw bug (stale content) in commits view by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3783 - Fix line coloring when using the delta pager by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3820 - Fix pressing escape after clicking in diff view by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3828 - Fix fast-forward issue caused by a conflicting tag name [@​Neko-Box-Coder](https://github.com/Neko-Box-Coder) in jesseduffield/lazygit#3807 - Fix range select -> stage failure when deleted file is already staged by [@​brandondong](https://github.com/brandondong) in jesseduffield/lazygit#3631 - Scroll views up if needed to show all their content by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3839 - Fix crash when filtering commits by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3838 - Fix cancelled autostash resulting in stuck inline status by [@​brandondong](https://github.com/brandondong) in jesseduffield/lazygit#3860 - Don't allow opening a menu while the search or filter prompt is open by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3878 ##### Maintenance ⚙️ - Reapply "Check for fixup commits on CI" by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3745 - Some cleanups for APIs related to contexts by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3808 - Improve fixup commits script by [@​jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#3853 - Fix linter warnings by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3854 - Add codespell support (config, workflow to detect/not fix) and make it fix few typos by [@​yarikoptic](https://github.com/yarikoptic) in jesseduffield/lazygit#3751 - Get rid of a lot of error return values by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3890 - Add a readme file for the JSON files in pkg/i18n/translations by [@​stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3781 #### New Contributors - [@​yam-liu](https://github.com/yam-liu) made their first contribution in jesseduffield/lazygit#3784 - [@​ppoum](https://github.com/ppoum) made their first contribution in jesseduffield/lazygit#3779 - [@​Neko-Box-Coder](https://github.com/Neko-Box-Coder) made their first contribution in jesseduffield/lazygit#3815 - [@​yarikoptic](https://github.com/yarikoptic) made their first contribution in jesseduffield/lazygit#3751 - [@​susl](https://github.com/susl) made their first contribution in jesseduffield/lazygit#3886 **Full Changelog**: jesseduffield/lazygit@v0.43.1...v0.44.0 </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:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [BurntSushi/ripgrep](https://redirect.github.com/BurntSushi/ripgrep) | patch | `14.1.0` -> `14.1.1` | | [ajeetdsouza/zoxide](https://redirect.github.com/ajeetdsouza/zoxide) | patch | `v0.9.4` -> `v0.9.5` | | [aquaproj/aqua-registry](https://redirect.github.com/aquaproj/aqua-registry) | minor | `v4.219.0` -> `v4.220.1` | | [charmbracelet/gum](https://redirect.github.com/charmbracelet/gum) | patch | `v0.14.4` -> `v0.14.5` | | [cli/cli](https://redirect.github.com/cli/cli) | minor | `v2.55.0` -> `v2.56.0` | | [dandavison/delta](https://redirect.github.com/dandavison/delta) | patch | `0.18.1` -> `0.18.2` | | [eza-community/eza](https://redirect.github.com/eza-community/eza) | patch | `v0.19.2` -> `v0.19.3` | | [golangci/golangci-lint](https://redirect.github.com/golangci/golangci-lint) | minor | `v1.60.3` -> `v1.61.0` | | [helm/helm](https://redirect.github.com/helm/helm) | minor | `v3.15.4` -> `v3.16.1` | | [jesseduffield/lazygit](https://redirect.github.com/jesseduffield/lazygit) | minor | `v0.43.1` -> `v0.44.0` | | [konradsz/igrep](https://redirect.github.com/konradsz/igrep) | minor | `v1.2.0` -> `v1.3.0` | | [kubernetes/minikube](https://redirect.github.com/kubernetes/minikube) | minor | `v1.33.1` -> `v1.34.0` | | [nektos/act](https://redirect.github.com/nektos/act) | patch | `v0.2.66` -> `v0.2.67` | | [snyk/cli](https://redirect.github.com/snyk/cli) | patch | `v1.1293.0` -> `v1.1293.1` | | [tofuutils/tenv](https://redirect.github.com/tofuutils/tenv) | minor | `v3.1.0` -> `v3.2.2` | | [twpayne/chezmoi](https://redirect.github.com/twpayne/chezmoi) | patch | `v2.52.1` -> `v2.52.2` | --- ### Release Notes <details> <summary>BurntSushi/ripgrep (BurntSushi/ripgrep)</summary> ### [`v14.1.1`](https://redirect.github.com/BurntSushi/ripgrep/blob/HEAD/CHANGELOG.md#1411-2024-09-08) [Compare Source](https://redirect.github.com/BurntSushi/ripgrep/compare/14.1.0...14.1.1) \=================== This is a minor release with a bug fix for a matching bug. In particular, a bug was found that could cause ripgrep to ignore lines that should match. That is, false negatives. It is difficult to characterize the specific set of regexes in which this occurs as it requires multiple different optimization strategies to collide and produce an incorrect result. But as one reported example, in ripgrep, the regex `(?i:e.x|ex)` does not match `e-x` when it should. (This bug is a result of an inner literal optimization performed in the `grep-regex` crate and not in the `regex` crate.) Bug fixes: - [BUG #​2884](https://redirect.github.com/BurntSushi/ripgrep/issues/2884): Fix bug where ripgrep could miss some matches that it should report. Miscellaneous: - [MISC #​2748](https://redirect.github.com/BurntSushi/ripgrep/issues/2748): Remove ripgrep's `simd-accel` feature because it was frequently broken. </details> <details> <summary>ajeetdsouza/zoxide (ajeetdsouza/zoxide)</summary> ### [`v0.9.5`](https://redirect.github.com/ajeetdsouza/zoxide/releases/tag/v0.9.5): 0.9.5 [Compare Source](https://redirect.github.com/ajeetdsouza/zoxide/compare/v0.9.4...v0.9.5) ##### Added - zsh: improved `cd` completions. - Lazily delete excluded directories from the database. - fish: detect infinite loop when using `alias cd=z`. - Installer: added flags for `--bin-dir`, `--man-dir`, `--arch`, and `--sudo`. - Nushell: support for v0.94.0+. - bash/fish/zsh: support for `z -- dir` style queries. - fish: improved Space-Tab completions. - ksh: added support for the Korn shell. ##### Changed - fzf: removed `--select-1` from default options. The interactive selector will now open up even if there is only one match. - Enforce that `$_ZO_DATA_DIR` is an absolute path. ##### Fixed - zsh: Space-Tab completion repeating output multiple times when matching single directory - fish / Nushell / PowerShell: handle queries that look like args (e.g. `z -x`). - elvish: `z -` now works as expected. - fish: generated shell code avoids using aliased builtins. - fish: `cd` command is now copied directly from `$__fish_data_dir/functions/cd.fish`. This should minimize the chances of an infinite loop when aliasing `cd=z`. - Symlinks not getting added to the database when `$_ZO_RESOLVE_SYMLINKS=0`. - Symlinked database files getting replaced instead of the actual files. </details> <details> <summary>aquaproj/aqua-registry (aquaproj/aqua-registry)</summary> ### [`v4.220.1`](https://redirect.github.com/aquaproj/aqua-registry/releases/tag/v4.220.1) [Compare Source](https://redirect.github.com/aquaproj/aqua-registry/compare/v4.220.0...v4.220.1) [Issues](https://redirect.github.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.220.1) | [Pull Requests](https://redirect.github.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.220.1) | https://github.com/aquaproj/aqua-registry/compare/v4.220.0...v4.220.1 ##### Fixes [#​26717](https://redirect.github.com/aquaproj/aqua-registry/issues/26717) tailscale/tailscale: Add the command tailscaled on Linux ### [`v4.220.0`](https://redirect.github.com/aquaproj/aqua-registry/releases/tag/v4.220.0) [Compare Source](https://redirect.github.com/aquaproj/aqua-registry/compare/v4.219.1...v4.220.0) [Issues](https://redirect.github.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.220.0) | [Pull Requests](https://redirect.github.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.220.0) | https://github.com/aquaproj/aqua-registry/compare/v4.219.1...v4.220.0 ##### 🎉 New Packages [#​26714](https://redirect.github.com/aquaproj/aqua-registry/issues/26714) [tailscale/tailscale](https://redirect.github.com/tailscale/tailscale): The easiest, most secure way to use WireGuard and 2FA ### [`v4.219.1`](https://redirect.github.com/aquaproj/aqua-registry/releases/tag/v4.219.1) [Compare Source](https://redirect.github.com/aquaproj/aqua-registry/compare/v4.219.0...v4.219.1) [Issues](https://redirect.github.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.219.1) | [Pull Requests](https://redirect.github.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.219.1) | https://github.com/aquaproj/aqua-registry/compare/v4.219.0...v4.219.1 ##### Fixes [#​26642](https://redirect.github.com/aquaproj/aqua-registry/issues/26642) fix(sxyazi/yazi): add `ya` command [@​wancup](https://redirect.github.com/wancup) Yazi introduced a separate command called ya in Yazi v0.2.5. https://github.com/sxyazi/yazi/releases/tag/v0.2.5 [#​26528](https://redirect.github.com/aquaproj/aqua-registry/issues/26528) its-danny/koji: Rename the package to `cococonscious/koji` The repository was transferred. [#​26386](https://redirect.github.com/aquaproj/aqua-registry/issues/26386) zoncoen/scenarigo: Fix scenarigo using vars :warning: aqua must be [v2.31.0](https://redirect.github.com/aquaproj/aqua/releases/tag/v2.31.0) or later. - [https://github.com/aquaproj/aqua/pull/3052](https://redirect.github.com/aquaproj/aqua/pull/3052) </details> <details> <summary>charmbracelet/gum (charmbracelet/gum)</summary> ### [`v0.14.5`](https://redirect.github.com/charmbracelet/gum/releases/tag/v0.14.5) [Compare Source](https://redirect.github.com/charmbracelet/gum/compare/v0.14.4...v0.14.5) This is a small maintenance release to bump dependencies, update linter config, and adjust [GoReleaser](https://redirect.github.com/goreleaser/goreleaser) configuration. #### Changelog ##### Bug fixes - [`b9611e1`](https://redirect.github.com/charmbracelet/gum/commit/b9611e1d8300c9a76380275e87d2862f4779ddf7): fix: lint issues ([#​663](https://redirect.github.com/charmbracelet/gum/issues/663)) ([@​caarlos0](https://redirect.github.com/caarlos0)) ##### Dependency updates - [`6837ed2`](https://redirect.github.com/charmbracelet/gum/commit/6837ed2d4580ed50d18e4e324c750a56ee42e178): feat(deps): bump github.com/charmbracelet/bubbletea from 0.27.0 to 1.0.0 ([#​661](https://redirect.github.com/charmbracelet/gum/issues/661)) ([@​dependabot](https://redirect.github.com/dependabot)\[bot]) - [`8ab6253`](https://redirect.github.com/charmbracelet/gum/commit/8ab6253ca117a625132f5e430c7a5559490e737a): feat(deps): bump github.com/charmbracelet/bubbletea from 1.0.0 to 1.1.0 ([#​665](https://redirect.github.com/charmbracelet/gum/issues/665)) ([@​dependabot](https://redirect.github.com/dependabot)\[bot]) - [`65e46d6`](https://redirect.github.com/charmbracelet/gum/commit/65e46d6e84d8d677fe30f4cd45586e66d3bc088b): feat(deps): bump github.com/charmbracelet/x/ansi from 0.2.2 to 0.2.3 ([#​656](https://redirect.github.com/charmbracelet/gum/issues/656)) ([@​dependabot](https://redirect.github.com/dependabot)\[bot]) ##### Other work - [`a30dda5`](https://redirect.github.com/charmbracelet/gum/commit/a30dda54eb0ac32efe017e19e4e3693f078a5fa9): build: fix goreleaser version ([@​caarlos0](https://redirect.github.com/caarlos0)) - [`1917023`](https://redirect.github.com/charmbracelet/gum/commit/19170239015a0a3c865d6f87db2cb286d677964c): ci: fix dependabot config ([@​caarlos0](https://redirect.github.com/caarlos0)) *** <details> <summary>Verifying the artifacts</summary> First, download the [`checksums.txt` file](https://redirect.github.com/charmbracelet/gum/releases/download/0.14.5/checksums.txt), for example, with `wget`: ```bash wget 'https://github.com/charmbracelet/gum/releases/download/v0.14.5/checksums.txt' ``` Then, verify it using [`cosign`](https://redirect.github.com/sigstore/cosign): ```bash cosign verify-blob \ --certificate-identity 'https://github.com/charmbracelet/meta/.github/workflows/goreleaser.yml@refs/heads/main' \ --certificate-oidc-issuer 'https://token.actions.githubusercontent.com' \ --cert 'https://github.com/charmbracelet/gum/releases/download/v0.14.5/checksums.txt.pem' \ --signature 'https://github.com/charmbracelet/gum/releases/download/v0.14.5/checksums.txt.sig' \ ./checksums.txt ``` If the output is `Verified OK`, you can safely use it to verify the checksums of other artifacts you downloaded from the release using `sha256sum`: ```bash sha256sum --ignore-missing -c checksums.txt ``` Done! You artifacts are now verified! </details> <a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-badge.jpg" width="400"></a> Thoughts? Questions? We love hearing from you. Feel free to reach out on [Twitter](https://twitter.com/charmcli), [The Fediverse](https://mastodon.technology/@​charm), or on [Discord](https://charm.sh/chat). </details> <details> <summary>cli/cli (cli/cli)</summary> ### [`v2.56.0`](https://redirect.github.com/cli/cli/releases/tag/v2.56.0): GitHub CLI 2.56.0 [Compare Source](https://redirect.github.com/cli/cli/compare/v2.55.0...v2.56.0) #### Important note about renewed GPG key The Debian and RedHat releases have been signed with a new GPG key. If you are experiencing issues updating your `.deb` or `.rpm` packages, please read [cli/cli#9569](https://redirect.github.com/cli/cli/issues/9569). #### What's Changed - Always print URL scheme to stdout by [@​heaths](https://redirect.github.com/heaths) in [https://github.com/cli/cli/pull/9471](https://redirect.github.com/cli/cli/pull/9471) - Quote repo names consistently in `gh repo sync` stdout by [@​muzimuzhi](https://redirect.github.com/muzimuzhi) in [https://github.com/cli/cli/pull/9491](https://redirect.github.com/cli/cli/pull/9491) - Fetch bundle from OCI registry for verify by [@​ejahnGithub](https://redirect.github.com/ejahnGithub) in [https://github.com/cli/cli/pull/9421](https://redirect.github.com/cli/cli/pull/9421) - Remove `Internal` from `gh repo create` prompt when owner is not an org by [@​jtmcg](https://redirect.github.com/jtmcg) in [https://github.com/cli/cli/pull/9465](https://redirect.github.com/cli/cli/pull/9465) - Drop surplus trailing space char in flag names in web by [@​muzimuzhi](https://redirect.github.com/muzimuzhi) in [https://github.com/cli/cli/pull/9495](https://redirect.github.com/cli/cli/pull/9495) - fix the trimming of log filenames for `gh run view` by [@​benebsiny](https://redirect.github.com/benebsiny) in [https://github.com/cli/cli/pull/9482](https://redirect.github.com/cli/cli/pull/9482) - "offline" verification using the bundle of attestations without any additional handling of the file by [@​aryanbhosale](https://redirect.github.com/aryanbhosale) in [https://github.com/cli/cli/pull/9523](https://redirect.github.com/cli/cli/pull/9523) - build(deps): bump actions/attest-build-provenance from 1.4.1 to 1.4.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/cli/cli/pull/9518](https://redirect.github.com/cli/cli/pull/9518) - Fix doc typo for `repo sync` by [@​muzimuzhi](https://redirect.github.com/muzimuzhi) in [https://github.com/cli/cli/pull/9509](https://redirect.github.com/cli/cli/pull/9509) - Correct the help message for -F by [@​Goooler](https://redirect.github.com/Goooler) in [https://github.com/cli/cli/pull/9525](https://redirect.github.com/cli/cli/pull/9525) - chore: fix some function names by [@​crystalstall](https://redirect.github.com/crystalstall) in [https://github.com/cli/cli/pull/9555](https://redirect.github.com/cli/cli/pull/9555) - verify 2nd artifact without swapping order by [@​aryanbhosale](https://redirect.github.com/aryanbhosale) in [https://github.com/cli/cli/pull/9532](https://redirect.github.com/cli/cli/pull/9532) - `gh attestation verify` handles empty JSONL files by [@​malancas](https://redirect.github.com/malancas) in [https://github.com/cli/cli/pull/9541](https://redirect.github.com/cli/cli/pull/9541) - Enhance Linux installation docs to redirect users to GPG renewal issue, better troubleshooting support by [@​andyfeller](https://redirect.github.com/andyfeller) in [https://github.com/cli/cli/pull/9573](https://redirect.github.com/cli/cli/pull/9573) - Upgrade sigstore-go to v0.6.1 by [@​codysoyland](https://redirect.github.com/codysoyland) in [https://github.com/cli/cli/pull/9566](https://redirect.github.com/cli/cli/pull/9566) - Check for nil values to prevent nil dereference panic by [@​codysoyland](https://redirect.github.com/codysoyland) in [https://github.com/cli/cli/pull/9578](https://redirect.github.com/cli/cli/pull/9578) - build(deps): bump actions/attest-build-provenance from 1.4.2 to 1.4.3 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/cli/cli/pull/9575](https://redirect.github.com/cli/cli/pull/9575) #### New Contributors - [@​aryanbhosale](https://redirect.github.com/aryanbhosale) made their first contribution in [https://github.com/cli/cli/pull/9523](https://redirect.github.com/cli/cli/pull/9523) - [@​Goooler](https://redirect.github.com/Goooler) made their first contribution in [https://github.com/cli/cli/pull/9525](https://redirect.github.com/cli/cli/pull/9525) - [@​crystalstall](https://redirect.github.com/crystalstall) made their first contribution in [https://github.com/cli/cli/pull/9555](https://redirect.github.com/cli/cli/pull/9555) **Full Changelog**: https://github.com/cli/cli/compare/v2.55.0...v2.56.0 </details> <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.2`](https://redirect.github.com/dandavison/delta/releases/tag/0.18.2) [Compare Source](https://redirect.github.com/dandavison/delta/compare/0.18.1...0.18.2) This patch release fixes various panics reported by users that were due to v0.1.13 of the `unicode-width` crate. See [https://github.com/dandavison/delta/pull/1858](https://redirect.github.com/dandavison/delta/pull/1858) and [https://github.com/unicode-rs/unicode-width/issues/66](https://redirect.github.com/unicode-rs/unicode-width/issues/66). #### What's Changed - Move AmbiguousDiffMinusCounter to hunk_header by [@​dandavison](https://redirect.github.com/dandavison) in [https://github.com/dandavison/delta/pull/1825](https://redirect.github.com/dandavison/delta/pull/1825) - Fix `Catppuccin Latte` name in `LIGHT_SYNTAX_THEMES` list by [@​injust](https://redirect.github.com/injust) in [https://github.com/dandavison/delta/pull/1823](https://redirect.github.com/dandavison/delta/pull/1823) - Handle quoted file paths in hunk headers by [@​th1000s](https://redirect.github.com/th1000s) in [https://github.com/dandavison/delta/pull/1840](https://redirect.github.com/dandavison/delta/pull/1840) - Fix clippy warnings by [@​bash](https://redirect.github.com/bash) in [https://github.com/dandavison/delta/pull/1851](https://redirect.github.com/dandavison/delta/pull/1851) - Allow `--dark` to override dark/light detected from syntax theme by [@​bash](https://redirect.github.com/bash) in [https://github.com/dandavison/delta/pull/1843](https://redirect.github.com/dandavison/delta/pull/1843) - Upgrade and pin unicode-width to v0.1.12 by [@​th1000s](https://redirect.github.com/th1000s) in [https://github.com/dandavison/delta/pull/1858](https://redirect.github.com/dandavison/delta/pull/1858) **Full Changelog**: https://github.com/dandavison/delta/compare/0.18.1...0.18.2 </details> <details> <summary>eza-community/eza (eza-community/eza)</summary> ### [`v0.19.3`](https://redirect.github.com/eza-community/eza/releases/tag/v0.19.3): eza v0.19.3 [Compare Source](https://redirect.github.com/eza-community/eza/compare/v0.19.2...v0.19.3) ##### Changelog ##### \[0.19.3] - 2024-09-12 ##### Bug Fixes - Convert empty space to %20 when render hyperlinks - Split commit workflows and run no-merge-commits only on PRs - Correct naming of commit related workflows ##### Documentation - Better version bump commit summary ##### Features - Add no-merge-commits job to commits workflow ##### Miscellaneous Tasks - Rename justfile - Eza v0.19.3 changelogs, version bump ##### Refactor - Rename conventional-commits workflow to commits ##### Build - Bump DeterminateSystems/nix-installer-action from 13 to 14 - Bump DeterminateSystems/flake-checker-action from 8 to 9 - Bump actions/checkout from 3 to 4 - Bump libc from 0.2.155 to 0.2.158 - Bump nu-ansi-term from 0.50.0 to 0.50.1 ##### Checksums ##### sha256sum e748eccd34bc570ab77418e58f0f0ff0a9a8f39dadf5711ed2347eeeda8d6b5f ./target/bin-0.19.3/eza_aarch64-unknown-linux-gnu.tar.gz 9aa4ee3e6399e2977c38411a218e95b96c690036215b8f1cb63ce5c096c2ced5 ./target/bin-0.19.3/eza_aarch64-unknown-linux-gnu.zip 948c9856f1db1d0a82747468008c736d2aeea1146ba679bdc8cc1d41ad299d89 ./target/bin-0.19.3/eza_arm-unknown-linux-gnueabihf.tar.gz 467ab533aff2a6dee2b347fe805fb139b8ff2b13a258f33d9c4d5d6f19af8ff1 ./target/bin-0.19.3/eza_arm-unknown-linux-gnueabihf.zip dd72dd457d3bc57d546381227feb3264afed17c9fe676e16e0746bf67e68bc23 ./target/bin-0.19.3/eza.exe_x86_64-pc-windows-gnu.tar.gz cf67d26bc2e6e38219c7478e302c5a40e46ed6e237f43f1cc86a6a10e43dc652 ./target/bin-0.19.3/eza.exe_x86_64-pc-windows-gnu.zip 5f5146b7ec561329c7e6d840500602c282d8b536063e8db465ce406d34710309 ./target/bin-0.19.3/eza_x86_64-unknown-linux-gnu.tar.gz 39a650179d58a677cc86240ccc9d3ffd49ae38e2103c34b0992a1ded1b573463 ./target/bin-0.19.3/eza_x86_64-unknown-linux-gnu.zip 69224e0f11b66f6bd661e1e97474fa57d2d34415089527ab6bf2b0d656c5008d ./target/bin-0.19.3/eza_x86_64-unknown-linux-musl.tar.gz d44d768d5a62c22e3d5dc7e61aa172adee0c7e71b4b59b12f6e31133ad60b20e ./target/bin-0.19.3/eza_x86_64-unknown-linux-musl.zip ##### md5sum 60ed736778e430164e177d155dc475ba ./target/bin-0.19.3/eza_aarch64-unknown-linux-gnu.tar.gz 83a61431fbdbecfcff89a6d5e3d9f76c ./target/bin-0.19.3/eza_aarch64-unknown-linux-gnu.zip 8234d08ca67e0150c32f326bde222bb6 ./target/bin-0.19.3/eza_arm-unknown-linux-gnueabihf.tar.gz 2b079576e60b1d8711fa2a0ad16d6685 ./target/bin-0.19.3/eza_arm-unknown-linux-gnueabihf.zip bb1730963ee5e887e52b789d00f709a8 ./target/bin-0.19.3/eza.exe_x86_64-pc-windows-gnu.tar.gz 8fce0bdb61978b82e1bde84d9ce2d748 ./target/bin-0.19.3/eza.exe_x86_64-pc-windows-gnu.zip ad515cafab69475f08f2a7fcca3326f1 ./target/bin-0.19.3/eza_x86_64-unknown-linux-gnu.tar.gz 2403571ceeb10fb6f5276817f8c63333 ./target/bin-0.19.3/eza_x86_64-unknown-linux-gnu.zip 35e792666807cd89205b0b93df3e18e6 ./target/bin-0.19.3/eza_x86_64-unknown-linux-musl.tar.gz fc2a3a6aa4537a43e66d0fcc42df4955 ./target/bin-0.19.3/eza_x86_64-unknown-linux-musl.zip ##### blake3sum 768b6391e36d079f51ed7279e129430f9321062c4ecf5208f53d298654cecbef ./target/bin-0.19.3/eza_aarch64-unknown-linux-gnu.tar.gz 5512ffe48f353fb5545b2cae94cdf3ec102cd97e72f4f0489751e41c7e32158f ./target/bin-0.19.3/eza_aarch64-unknown-linux-gnu.zip ee81c074febffc031afbe7555a2a848cbec2bc02237ca7fd469f00eadda2cd73 ./target/bin-0.19.3/eza_arm-unknown-linux-gnueabihf.tar.gz 514b8b7024751265894fce93bf56cfab66c839dac97a84f4035880f96c6168bc ./target/bin-0.19.3/eza_arm-unknown-linux-gnueabihf.zip 08aa874af77e3b9d37f80b4e8e5768f39c8b50839075bd32537df2a5df7ef419 ./target/bin-0.19.3/eza.exe_x86_64-pc-windows-gnu.tar.gz 568ec4bab7577ddac95fa48de8929754451339c5c4b0388ef3b9ec211c17fc55 ./target/bin-0.19.3/eza.exe_x86_64-pc-windows-gnu.zip a3bea8306162058f0d56b6e3a0d91d9d8f4dbd419344cc3b7bea6ea7c62c8c13 ./target/bin-0.19.3/eza_x86_64-unknown-linux-gnu.tar.gz bcc38a591e2763d1334b26853469331d005a2ade71b66581117216fdd000977b ./target/bin-0.19.3/eza_x86_64-unknown-linux-gnu.zip b22c3e0d006381dddf1c07894828cba6be927fb451db8f2ca68422fc04f2c75f ./target/bin-0.19.3/eza_x86_64-unknown-linux-musl.tar.gz 79ac8ee01058474516a38091811a73351755cebaa4356840813d6c0eb41056b1 ./target/bin-0.19.3/eza_x86_64-unknown-linux-musl.zip </details> <details> <summary>golangci/golangci-lint (golangci/golangci-lint)</summary> ### [`v1.61.0`](https://redirect.github.com/golangci/golangci-lint/compare/v1.60.3...v1.61.0) [Compare Source](https://redirect.github.com/golangci/golangci-lint/compare/v1.60.3...v1.61.0) </details> <details> <summary>helm/helm (helm/helm)</summary> ### [`v3.16.1`](https://redirect.github.com/helm/helm/compare/v3.16.0-rc.1...v3.16.1) [Compare Source](https://redirect.github.com/helm/helm/compare/v3.16.0-rc.1...v3.16.1) ### [`v3.16.0`](https://redirect.github.com/helm/helm/compare/v3.15.4...v3.16.0) [Compare Source](https://redirect.github.com/helm/helm/compare/v3.15.4...v3.16.0-rc.1) </details> <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.44.0`](https://redirect.github.com/jesseduffield/lazygit/releases/tag/v0.44.0) [Compare Source](https://redirect.github.com/jesseduffield/lazygit/compare/v0.43.1...v0.44.0) #### What's Changed Lots of great changes in this release. Thanks to everybody who contributed! ##### Enhancements 🔥 - Per-repo config files (and reloading of edited config files) by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3787](https://redirect.github.com/jesseduffield/lazygit/pull/3787) - In addition to the global config file you can now create repo-specific config files in `<repo>/.git/lazygit.yml`. Settings in these files override settings in the global config file. In addition, files called `.lazygit.yml` in any of the parent directories of a repo will also be loaded; this can be useful if you have settings that you want to apply to a group of repositories. - We now also automatically apply (most) config changes without the need to restart lazygit - Easily view diff across range of commits by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3869](https://redirect.github.com/jesseduffield/lazygit/pull/3869) - If you select a range of commits, we now show the diff across the range (inclusive). This makes it easy to see the total changes across a number of commits. Likewise, if you press enter when a range of commits are selected, we will show the changed files for the range. https://github.com/user-attachments/assets/6646c78b-5770-41c1-93b9-5442d32404de - Support hyperlinks from pagers by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3825](https://redirect.github.com/jesseduffield/lazygit/pull/3825) - If you're using delta as a pager (which I highly recommend trying), you can now click on line numbers to go to that line in your editor by using the following config: ```yaml git: paging: colorArg: always pager: delta --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}" ``` https://github.com/user-attachments/assets/75fef6c4-d437-4595-ab00-b8990215cfed - Switch to Files panel after popping/applying a stash by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3888](https://redirect.github.com/jesseduffield/lazygit/pull/3888) - This is a nice quality of life improvement. You generally want to go straight to the files panel after you pop or apply from the stash - Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3879](https://redirect.github.com/jesseduffield/lazygit/pull/3879) - Another quality of life improvement: often you resolve some conflicts, then make another couple changes, then in lazygit you say to continue and you get an error saying there are unstaged changes. Now instead of showing an error, lazygit asks if you want to stage those changes and continue. - Offer autostash option when creating new branch by [@​brandondong](https://redirect.github.com/brandondong) in [https://github.com/jesseduffield/lazygit/pull/3871](https://redirect.github.com/jesseduffield/lazygit/pull/3871) - Another great quality of life improvement - Allow using shell aliases in interactive custom commands by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3793](https://redirect.github.com/jesseduffield/lazygit/pull/3793) - Switch tabs with panel jump keys by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3794](https://redirect.github.com/jesseduffield/lazygit/pull/3794) - If you've already been using the number keys (1-5) for jumping to specific side panels, you'll be pleased to know that you can now also use those keys for jumping to tabs within a side panel. E.g. to go to the reflog panel, you can now press 4 to jump to the commits panel, then 4 again to go to the reflog tab. - Rename "Custom Command" to "Shell Command" by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3800](https://redirect.github.com/jesseduffield/lazygit/pull/3800) - There are two ways of invoking a 'custom' command in Lazygit: first by pre-defining a command in your config, and second by pressing ':' and typing in the command directly. We referred to both of these as 'custom commands' which was confusing. We now refer to the second approach as invoking a 'shell command'. - Improve template placeholders for custom commands by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3809](https://redirect.github.com/jesseduffield/lazygit/pull/3809) - Now you can use `SelectedCommit` to refer to the selected commit regardless of which commits panel you're in (local commits, reflog, etc) - Likewise, you can use `SelectedPath` whether you're in the files panel or the commit-files panel. - feat(custom command): support multiple contexts within one command by [@​yam-liu](https://redirect.github.com/yam-liu) in [https://github.com/jesseduffield/lazygit/pull/3784](https://redirect.github.com/jesseduffield/lazygit/pull/3784) - You can now use a comma-separated list of contexts for which a custom command can be invoked. For example: ```yaml customCommands: - description: 'Add empty commit' key: 'E' context: 'commits,files' ``` - Improve mouse support for commit message panel by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3836](https://redirect.github.com/jesseduffield/lazygit/pull/3836) - Make auto-staging resolved conflicts optional by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3870](https://redirect.github.com/jesseduffield/lazygit/pull/3870) - If you set `git.autoStageResolvedConflicts` to false in your config, lazygit will no longer auto-stage files in which you've resolved merge conflicts. - Allow using `<`/`>` and `,`/`.` in sticky range select mode in patch explorer by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3837](https://redirect.github.com/jesseduffield/lazygit/pull/3837) - Add Zed editor support to editorPreset by [@​susl](https://redirect.github.com/susl) in [https://github.com/jesseduffield/lazygit/pull/3886](https://redirect.github.com/jesseduffield/lazygit/pull/3886) ##### Fixes 🔧 - Allow GPG reword for last commit by [@​Neko-Box-Coder](https://redirect.github.com/Neko-Box-Coder) in [https://github.com/jesseduffield/lazygit/pull/3815](https://redirect.github.com/jesseduffield/lazygit/pull/3815) - Don't exit app when GetRepoPaths call fails during startup by [@​ppoum](https://redirect.github.com/ppoum) in [https://github.com/jesseduffield/lazygit/pull/3779](https://redirect.github.com/jesseduffield/lazygit/pull/3779) - Fix lack of icon when extension isn't lowercase by [@​hasecilu](https://redirect.github.com/hasecilu) in [https://github.com/jesseduffield/lazygit/pull/3810](https://redirect.github.com/jesseduffield/lazygit/pull/3810) - Fix redraw bug (stale content) in commits view by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3783](https://redirect.github.com/jesseduffield/lazygit/pull/3783) - Fix line coloring when using the delta pager by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3820](https://redirect.github.com/jesseduffield/lazygit/pull/3820) - Fix pressing escape after clicking in diff view by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3828](https://redirect.github.com/jesseduffield/lazygit/pull/3828) - Fix fast-forward issue caused by a conflicting tag name [@​Neko-Box-Coder](https://redirect.github.com/Neko-Box-Coder) in [https://github.com/jesseduffield/lazygit/pull/3807](https://redirect.github.com/jesseduffield/lazygit/pull/3807) - Fix range select -> stage failure when deleted file is already staged by [@​brandondong](https://redirect.github.com/brandondong) in [https://github.com/jesseduffield/lazygit/pull/3631](https://redirect.github.com/jesseduffield/lazygit/pull/3631) - Scroll views up if needed to show all their content by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3839](https://redirect.github.com/jesseduffield/lazygit/pull/3839) - Fix crash when filtering commits by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3838](https://redirect.github.com/jesseduffield/lazygit/pull/3838) - Fix cancelled autostash resulting in stuck inline status by [@​brandondong](https://redirect.github.com/brandondong) in [https://github.com/jesseduffield/lazygit/pull/3860](https://redirect.github.com/jesseduffield/lazygit/pull/3860) - Don't allow opening a menu while the search or filter prompt is open by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3878](https://redirect.github.com/jesseduffield/lazygit/pull/3878) ##### Maintenance ⚙️ - Reapply "Check for fixup commits on CI" by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3745](https://redirect.github.com/jesseduffield/lazygit/pull/3745) - Some cleanups for APIs related to contexts by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3808](https://redirect.github.com/jesseduffield/lazygit/pull/3808) - Improve fixup commits script by [@​jesseduffield](https://redirect.github.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3853](https://redirect.github.com/jesseduffield/lazygit/pull/3853) - Fix linter warnings by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3854](https://redirect.github.com/jesseduffield/lazygit/pull/3854) - Add codespell support (config, workflow to detect/not fix) and make it fix few typos by [@​yarikoptic](https://redirect.github.com/yarikoptic) in [https://github.com/jesseduffield/lazygit/pull/3751](https://redirect.github.com/jesseduffield/lazygit/pull/3751) - Get rid of a lot of error return values by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3890](https://redirect.github.com/jesseduffield/lazygit/pull/3890) - Add a readme file for the JSON files in pkg/i18n/translations by [@​stefanhaller](https://redirect.github.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3781](https://redirect.github.com/jesseduffield/lazygit/pull/3781) #### New Contributors - [@​yam-liu](https://redirect.github.com/yam-liu) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3784](https://redirect.github.com/jesseduffield/lazygit/pull/3784) - [@​ppoum](https://redirect.github.com/ppoum) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3779](https://redirect.github.com/jesseduffield/lazygit/pull/3779) - [@​Neko-Box-Coder](https://redirect.github.com/Neko-Box-Coder) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3815](https://redirect.github.com/jesseduffield/lazygit/pull/3815) - [@​yarikoptic](https://redirect.github.com/yarikoptic) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3751](https://redirect.github.com/jesseduffield/lazygit/pull/3751) - [@​susl](https://redirect.github.com/susl) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3886](https://redirect.github.com/jesseduffield/lazygit/pull/3886) **Full Changelog**: https://github.com/jesseduffield/lazygit/compare/v0.43.1...v0.44.0 </details> <details> <summary>konradsz/igrep (konradsz/igrep)</summary> ### [`v1.3.0`](https://redirect.github.com/konradsz/igrep/blob/HEAD/CHANGELOG.md#v130-2024-09-08) [Compare Source](https://redirect.github.com/konradsz/igrep/compare/v1.2.0...v1.3.0) *** - locate editor executable using `which` crate - add `-w`/`--word-regexp` arg - add option to open Context Viewer at startup - add follow symlinks option - ability to specify custom command - read custom editor from environment - add `less` as an editor option - add a keybindings popup - add keybindings for changing context viewer size - fix flushing infinitely when opening nvim with no results found </details> <details> <summary>kubernetes/minikube (kubernetes/minikube)</summary> ### [`v1.34.0`](https://redirect.github.com/kubernetes/minikube/releases/tag/v1.34.0) [Compare Source](https://redirect.github.com/kubernetes/minikube/compare/v1.33.1...v1.34.0) 📣😀 **Please fill out our [fast 5-question survey](https://forms.gle/Gg3hG5ZySw8c1C24A)** so that we can learn how & why you use minikube, and what improvements we should make. Thank you! 💃🎉 #### Release Notes #### Version 1.34.0 - 2024-09-04 Breaking Changes: - Bump minimum podman version to 4.9.0 [#​19457](https://redirect.github.com/kubernetes/minikube/pull/19457) - Disallow using Docker Desktop 4.34.0 [#​19576](https://redirect.github.com/kubernetes/minikube/pull/19576) Features: - Bump default Kubernetes version to v1.31.0 [#​19435](https://redirect.github.com/kubernetes/minikube/pull/19435) - Add new driver for macOS: vfkit [#​19423](https://redirect.github.com/kubernetes/minikube/pull/19423) - Add Parallels driver support for darwin/arm64 [#​19373](https://redirect.github.com/kubernetes/minikube/pull/19373) - Add new volcano addon [#​18602](https://redirect.github.com/kubernetes/minikube/pull/18602) - Addons ingress-dns: Added support for all architectures [#​19198](https://redirect.github.com/kubernetes/minikube/pull/19198) - Support privileged ports on WSL [#​19370](https://redirect.github.com/kubernetes/minikube/pull/19370) - VM drivers with docker container-runtime now use docker-buildx for image building [#​19339](https://redirect.github.com/kubernetes/minikube/pull/19339) - Support running x86 QEMU on arm64 [#​19228](https://redirect.github.com/kubernetes/minikube/pull/19228) - Add `-o json` option for `addon images` command [#​19364](https://redirect.github.com/kubernetes/minikube/pull/19364) Improvements: - add -d shorthand for --driver [#​19356](https://redirect.github.com/kubernetes/minikube/pull/19356) - add -c shorthand for --container-runtime [#​19217](https://redirect.github.com/kubernetes/minikube/pull/19217) - kvm2: Don't delete the "default" libvirt network [#​18920](https://redirect.github.com/kubernetes/minikube/pull/18920) - Update MINIKUBE_HOME usage [#​18648](https://redirect.github.com/kubernetes/minikube/pull/18648) - CNI: Updated permissions to support network policies on kindnet [#​19360](https://redirect.github.com/kubernetes/minikube/pull/19360) - GPU: Set `NVIDIA_DRIVER_CAPABILITIES` to `all` when GPU is enabled [#​19345](https://redirect.github.com/kubernetes/minikube/pull/19345) - Improved error message when trying to use `mount` on system missing 9P [#​18995](https://redirect.github.com/kubernetes/minikube/pull/18995) - Improved error message when enabling KVM addons on non-KVM cluster [#​19195](https://redirect.github.com/kubernetes/minikube/pull/19195) - Added warning when loading image with wrong arch [#​19229](https://redirect.github.com/kubernetes/minikube/pull/19229) - `profile list --output json` handle empty config folder [#​16900](https://redirect.github.com/kubernetes/minikube/pull/16900) - Check connectivity outside minikube when connectivity issuse [#​18859](https://redirect.github.com/kubernetes/minikube/pull/18859) Bugs: - Fix not creating API server tunnel for QEMU w/ builtin network [#​19191](https://redirect.github.com/kubernetes/minikube/pull/19191) - Fix waiting for user input on firewall unblock when `--interactive=false` [#​19531](https://redirect.github.com/kubernetes/minikube/pull/19531) - Fix network retry check when subnet already in use for podman [#​17779](https://redirect.github.com/kubernetes/minikube/pull/17779) - Fix empty tarball when generating image save [#​19312](https://redirect.github.com/kubernetes/minikube/pull/19312) - Fix missing permission for kong-serviceaccount [#​19002](https://redirect.github.com/kubernetes/minikube/pull/19002) Version Upgrades: - Addon cloud-spanner: Update cloud-spanner-emulator/emulator image from 1.5.17 to 1.5.23 [#​19341](https://redirect.github.com/kubernetes/minikube/pull/19341) [#​19501](https://redirect.github.com/kubernetes/minikube/pull/19501) - Addon headlamp: Update headlamp-k8s/headlamp image from v0.23.2 to v0.25.0 [#​18992](https://redirect.github.com/kubernetes/minikube/pull/18992) [#​19152](https://redirect.github.com/kubernetes/minikube/pull/19152) [#​19349](https://redirect.github.com/kubernetes/minikube/pull/19349) - Addon kong: Update kong image from 3.6.1 to 3.7.1 [#​19046](https://redirect.github.com/kubernetes/minikube/pull/19046) [#​19124](https://redirect.github.com/kubernetes/minikube/pull/19124) - Addon kubevirt: Update bitnami/kubectl image from 1.30.0 to 1.31.0 [#​18929](https://redirect.github.com/kubernetes/minikube/pull/18929) [#​19087](https://redirect.github.com/kubernetes/minikube/pull/19087) [#​19313](https://redirect.github.com/kubernetes/minikube/pull/19313) [#​19479](https://redirect.github.com/kubernetes/minikube/pull/19479) - Addon ingress: Update ingress-nginx/controller image from v1.10.1 to v1.11.2 [#​19302](https://redirect.github.com/kubernetes/minikube/pull/19302) [#​19461](https://redirect.github.com/kubernetes/minikube/pull/19461) - Addon inspektor-gadget: Update inspektor-gadget image from v0.27.0 to v0.32.0 [#​18872](https://redirect.github.com/kubernetes/minikube/pull/18872) [#​18931](https://redirect.github.com/kubernetes/minikube/pull/18931) [#​19011](https://redirect.github.com/kubernetes/minikube/pull/19011) [#​19166](https://redirect.github.com/kubernetes/minikube/pull/19166) [#​19411](https://redirect.github.com/kubernetes/minikube/pull/19411) [#​19554](https://redirect.github.com/kubernetes/minikube/pull/19554) - Addon istio-provisioner: Update istio/operator image from 1.21.2 to 1.23.0 [#​18932](https://redirect.github.com/kubernetes/minikube/pull/18932) [#​19052](https://redirect.github.com/kubernetes/minikube/pull/19052) [#​19167](https://redirect.github.com/kubernetes/minikube/pull/19167) [#​19283](https://redirect.github.com/kubernetes/minikube/pull/19283) [#​19450](https://redirect.github.com/kubernetes/minikube/pull/19450) - Addon nvidia-device-plugin: Update nvidia/k8s-device-plugin image from v0.15.0 to v0.16.2 [#​19162](https://redirect.github.com/kubernetes/minikube/pull/19162) [#​19266](https://redirect.github.com/kubernetes/minikube/pull/19266) [#​19336](https://redirect.github.com/kubernetes/minikube/pull/19336) [#​19409](https://redirect.github.com/kubernetes/minikube/pull/19409) - Addon metrics-server: Update metrics-server/metrics-server image from v0.7.1 to v0.7.2 [#​19529](https://redirect.github.com/kubernetes/minikube/pull/19529) - Addon YAKD: bump marcnuri/yakd image from 0.0.4 to 0.0.5 [#​19145](https://redirect.github.com/kubernetes/minikube/pull/19145) - CNI: Update calico from v3.27.3 to v3.28.1 [#​18870](https://redirect.github.com/kubernetes/minikube/pull/18870) [#​19377](https://redirect.github.com/kubernetes/minikube/pull/19377) - CNI: Update cilium from v1.15.3 to v1.16.1 [#​18925](https://redirect.github.com/kubernetes/minikube/pull/18925) [#​19084](https://redirect.github.com/kubernetes/minikube/pull/19084) [#​19247](https://redirect.github.com/kubernetes/minikube/pull/19247) [#​19337](https://redirect.github.com/kubernetes/minikube/pull/19337) [#​19476](https://redirect.github.com/kubernetes/minikube/pull/19476) - CNI: Update kindnetd from v20240202-8f1494ea to v20240813-c6f155d6 [#​18933](https://redirect.github.com/kubernetes/minikube/pull/18933) [#​19252](https://redirect.github.com/kubernetes/minikube/pull/19252) [#​19265](https://redirect.github.com/kubernetes/minikube/pull/19265) [#​19307](https://redirect.github.com/kubernetes/minikube/pull/19307) [#​19378](https://redirect.github.com/kubernetes/minikube/pull/19378) [#​19446](https://redirect.github.com/kubernetes/minikube/pull/19446) - CNI: Update flannel from v0.25.1 to v0.25.6 [#​18966](https://redirect.github.com/kubernetes/minikube/pull/18966) [#​19008](https://redirect.github.com/kubernetes/minikube/pull/19008) [#​19085](https://redirect.github.com/kubernetes/minikube/pull/19085) [#​19297](https://redirect.github.com/kubernetes/minikube/pull/19297) [#​19522](https://redirect.github.com/kubernetes/minikube/pull/19522) - Kicbase: Update nerdctld from 0.6.0 to 0.6.1 [#​19282](https://redirect.github.com/kubernetes/minikube/pull/19282) - Kicbase: Bump ubuntu:jammy from [`2024042`](https://redirect.github.com/kubernetes/minikube/commit/20240427) to [`2024080`](https://redirect.github.com/kubernetes/minikube/commit/20240808) [#​19068](https://redirect.github.com/kubernetes/minikube/pull/19068) [#​19184](https://redirect.github.com/kubernetes/minikube/pull/19184) [#​19478](https://redirect.github.com/kubernetes/minikube/pull/19478) - Kicbase/ISO: Update buildkit from v0.13.1 to v0.15.2 [#​19024](https://redirect.github.com/kubernetes/minikube/pull/19024) [#​19116](https://redirect.github.com/kubernetes/minikube/pull/19116) [#​19264](https://redirect.github.com/kubernetes/minikube/pull/19264) [#​19355](https://redirect.github.com/kubernetes/minikube/pull/19355) [#​19452](https://redirect.github.com/kubernetes/minikube/pull/19452) - Kicbase/ISO: Update cni-plugins from v1.4.1 to v1.5.1 [#​19044](https://redirect.github.com/kubernetes/minikube/pull/19044) [#​19128](https://redirect.github.com/kubernetes/minikube/pull/19128) - Kicbase/ISO: Update containerd from v1.7.15 to v1.7.21 [#​18934](https://redirect.github.com/kubernetes/minikube/pull/18934) [#​19106](https://redirect.github.com/kubernetes/minikube/pull/19106) [#​19186](https://redirect.github.com/kubernetes/minikube/pull/19186) [#​19298](https://redirect.github.com/kubernetes/minikube/pull/19298) [#​19521](https://redirect.github.com/kubernetes/minikube/pull/19521) - Kicbase/ISO: Update cri-dockerd from v0.3.12 to v0.3.15 [#​19199](https://redirect.github.com/kubernetes/minikube/pull/19199) [#​19249](https://redirect.github.com/kubernetes/minikube/pull/19249) - Kicbase/ISO: Update crun from 1.14.4 to 1.16.1 [#​19112](https://redirect.github.com/kubernetes/minikube/pull/19112) [#​19389](https://redirect.github.com/kubernetes/minikube/pull/19389) [#​19443](https://redirect.github.com/kubernetes/minikube/pull/19443) - Kicbase/ISO: Update docker from 26.0.2 to 27.2.0 [#​18993](https://redirect.github.com/kubernetes/minikube/pull/18993) [#​19038](https://redirect.github.com/kubernetes/minikube/pull/19038) [#​19142](https://redirect.github.com/kubernetes/minikube/pull/19142) [#​19153](https://redirect.github.com/kubernetes/minikube/pull/19153) [#​19175](https://redirect.github.com/kubernetes/minikube/pull/19175) [#​19319](https://redirect.github.com/kubernetes/minikube/pull/19319) [#​19326](https://redirect.github.com/kubernetes/minikube/pull/19326) [#​19429](https://redirect.github.com/kubernetes/minikube/pull/19429) [#​19530](https://redirect.github.com/kubernetes/minikube/pull/19530) - Kicbase/ISO: Update nerdctl from 1.7.5 to 1.7.6 [#​18869](https://redirect.github.com/kubernetes/minikube/pull/18869) - Kicbase/ISO: Update runc from v1.1.12 to v1.1.13 [#​19104](https://redirect.github.com/kubernetes/minikube/pull/19104) For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://redirect.github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! - Anders F Björklund - Anjali Chaturvedi - Artem Basalaev - Benjamin P. Jung - Daniel Iwaniec - Dylan Piergies - Gabriel Pelouze - Hritesh Mondal - Jack Brown - Jeff MAURY - Marc Nuri - Matteo Mortari - Medya Ghazizadeh - Nir Soffer - Philippe Miossec - Predrag Rogic - Radoslaw Smigielski - Raghavendra Talur - Sandipan Panda - Steven Powell - Sylvester Carolan - Tom McLaughlin - Tony-Sol - aiyijing - chubei - daniel-iwaniec - hritesh04 - joaquimrocha - ljtian - mitchell amihod - shixiuguo - sunyuxuan - thomasjm - tianlijun - tianlj - 錦南路之花 - 锦南路之花 Thank you to our PR reviewers for this release! - spowelljr (67 comments) - medyagh (53 comments) - nirs (14 comments) - cfergeau (4 comments) - liangyuanpeng (2 comments) - ComradeProgrammer (1 comments) - afbjorklund (1 comments) - aojea (1 comments) - bobsira (1 comments) Thank you to our triage members for this release! - kundan2707 (55 comments) - medyagh (29 comments) - afbjorklund (28 comments) - T-Lakshmi (20 comments) - Ritikaa96 (16 comments) Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.34.0/) for this release! #### Installation See [Getting Started](https://minikube.sigs.k8s.io/docs/start/) #### Binary Checksums darwin-amd64: `0f73648ab726c6d7822444536e7a5d7eb4d8b0c193ecfc17771d4811c4efa5c0` darwin-arm64: `d760e65502017b716dec55c17e2c94c8e7a739d30650ffa698f4f4104a18314c` linux-amd64: `c4a625f9b4a4523e74b745b6aac8b0bf45062472be72cd38a23c91ec04d534c9` linux-arm: `19172329d564e68e6379e90de1a653aa445d7a91e3521ed9b8a3bfbbb257bbae` linux-arm64: `fbe55f563ac33328320d64c319f635386fe020eedf25cba8ebf3850048deb7ae` linux-ppc64le: `e1bd56569a49713eec99f931cb755b4836163321f1744480099387250e12b127` linux-s390x: `cca05a534ad7454bb07e6c27fd206988b1ad20b4f194d8d73a6e8165d4a70952` windows-amd64.exe: `cb80b30202901c10baf207441bf5c7a18b33e11618a2a474a9403eabdf2de26b` #### ISO Checksums amd64: `0da9cfaa98f2c9f37b401519d846145fccdd8bf0cae46b32c0b8a4c054a4c070`\ arm64: `526783ddba495fe611bc38e937a53f8f2c4d77de243b469185f611ba80908f17` </details> <details> <summary>nektos/act (nektos/act)</summary> ### [`v0.2.67`](https://redirect.github.com/nektos/act/releases/tag/v0.2.67) [Compare Source](https://redirect.github.com/nektos/act/compare/v0.2.66...v0.2.67) #### Changelog ##### Bug fixes - [`4143017`](https://redirect.github.com/nektos/act/commit/4143017) fix: schema validation for job if functions ([#​2446](https://redirect.github.com/nektos/act/issues/2446)) - [`32b6bb7`](https://redirect.github.com/nektos/act/commit/32b6bb7) fix: artifact v4 upload above 8MB ([#​2402](https://redirect.github.com/nektos/act/issues/2402)) ##### Other - [`f75a2d8`](https://redirect.github.com/nektos/act/commit/f75a2d8) chore: bump VERSION to 0.2.67 - [`d8b6f61`](https://redirect.github.com/nektos/act/commit/d8b6f61) build(deps): bump golang.org/x/term from 0.23.0 to 0.24.0 ([#​2442](https://redirect.github.com/nektos/act/issues/2442)) </details> <details> <summary>snyk/cli (snyk/cli)</summary> ### [`v1.1293.1`](https://redirect.github.com/snyk/cli/releases/tag/v1.1293.1) [Compare Source](https://redirect.github.com/snyk/cli/compare/v1.1293.0...v1.1293.1) The Snyk CLI is being deployed to different deployment channels, users can select the stability level according to their needs. For details please see [this documentation](https://docs.snyk.io/snyk-cli/releases-and-channels-for-the-snyk-cli) ##### News - Starting with this version, Snyk cli binaries will be distributed via `downloads.snyk.io` instead of `static.snyk.io`. This includes intallation from `npm`. </details> <details> <summary>tofuutils/tenv (tofuutils/tenv)</summary> ### [`v3.2.2`](https://redirect.github.com/tofuutils/tenv/releases/tag/v3.2.2) [Compare Source](https://redirect.github.com/tofuutils/tenv/compare/v3.2.1...v3.2.2) #### What's Changed - Fix : read iac files from WorkPath (chdir proxy flag) by [@​dvaumoron](https://redirect.github.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/250](https://redirect.github.com/tofuutils/tenv/pull/250) **Full Changelog**: https://github.com/tofuutils/tenv/compare/v3.2.1...v3.2.2 ### [`v3.2.1`](https://redirect.github.com/tofuutils/tenv/releases/tag/v3.2.1) [Compare Source](https://redirect.github.com/tofuutils/tenv/compare/v3.1.0...v3.2.1) #### What's Changed - fix : skip all cosign tests by [@​dvaumoron](https://redirect.github.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/248](https://redirect.github.com/tofuutils/tenv/pull/248) **Full Changelog**: https://github.com/tofuutils/tenv/compare/v3.2.0...v3.2.1 </details> <details> <summary>twpayne/chezmoi (twpayne/chezmoi)</summary> ### [`v2.52.2`](https://redirect.github.com/twpayne/chezmoi/releases/tag/v2.52.2) [Compare Source](https://redirect.github.com/twpayne/chezmoi/compare/v2.52.1...v2.52.2) #### Changelog ##### Features - [`7aee332`](https://redirect.github.com/twpayne/chezmoi/commit/7aee332250ebde2b20be4b2f938c1adb1f406b38) feat: Support YubiKeys in KeePassXC open mode ##### Documentation updates - [`f67e048`](https://redirect.github.com/twpayne/chezmoi/commit/f67e048b73e2c2c24cbae300e7799675f7604d49) docs: Add home page section on getting help - [`ea8d95d`](https://redirect.github.com/twpayne/chezmoi/commit/ea8d95d031f62769117b4bb1796e4d58557d72cb) docs: Add Stack Overflow to social media links - [`37eab81`](https://redirect.github.com/twpayne/chezmoi/commit/37eab816d118c914779ad626c39951dcc5d0416b) docs: Add FAQ entry on using delta as the diff tool - [`fdb2065`](https://redirect.github.com/twpayne/chezmoi/commit/fdb2065f166daec64a9df59fcdf7ad7d8f68710f) docs: Add FAQ entry on running scripts periodically - [`a3de4a8`](https://redirect.github.com/twpayne/chezmoi/commit/a3de4a83a22bd248f83a7ab5fa15345ce226bada) docs: Add FAQ entry on running a script when a git-repo external changes - [`b56a600`](https://redirect.github.com/twpayne/chezmoi/commit/b56a6005e871d1ba3abe60bd8b923f1ec2ce42f7) docs: Add FAQ entry on literal {{ and }} in templates - [`d414e0f`](https://redirect.github.com/twpayne/chezmoi/commit/d414e0fc7839ca97d20b82904a290ff444c4575c) docs: Add warning on using externals for large files or archives - [`d9f4717`](https://redirect.github.com/twpayne/chezmoi/commit/d9f471784e354f8230c3d2a5e69edb04b15e6f2c) docs: Add how to use VSCode as the diff and merge tool - [`2a64e42`](https://redirect.github.com/twpayne/chezmoi/commit/2a64e42821988400257e1214e755bfa65a790f5a) docs: Make features and portability more prominent on home page - [`3a17101`](https://redirect.github.com/twpayne/chezmoi/commit/3a171018f76c814f0e1c88136058e5627f2d8d35) docs: Add links to articles - [`0355a62`](https://redirect.github.com/twpayne/chezmoi/commit/0355a62a8afdb820ffa22291e56e0dafec6f49c0) docs: Add link to blog - [`1ac3014`](https://redirect.github.com/twpayne/chezmoi/commit/1ac30149615b248b17dc82f38ca2d19a7f9a180a) docs: Add github.com/b3nj5m1n/xdg-ninja to related software </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 4pm on thursday" in timezone America/Los_Angeles, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/scottames/dots). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC43NC4xIiwidXBkYXRlZEluVmVyIjoiMzguNzQuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: scottames-github-bot[bot] <162828115+scottames-github-bot[bot]@users.noreply.github.com>
Add user config
git.autoStageResolvedConflicts
(default true). When set to false, users need to stage their conflicted files manually after resolving conflicts, and also continue a merge/rebase manually when all conflicted files are resolved.Fixes #3111.
go generate ./...
)