Add command to find base commit for creating a fixup #3105

stefanhaller · 2023-11-05T14:01:55Z

PR Description

Add a command to the files view (<c-f> by default) to select the right base commit for making a fixup based on the current uncommitted changes. See the added documentation (docs/Fixup_Commits.md) for more about how it works.

Please check if the PR fulfills these requirements

Cheatsheets are up-to-date (run go generate ./...)
Code has been formatted (see here)
Tests have been added/updated (see here for the integration test guide)
Text is internationalised (see here)
Docs (specifically docs/Config.md) have been updated if necessary
You've read through your own file changes for silly mistakes etc

stefanhaller · 2023-11-05T14:03:17Z

@jesseduffield Here's the PR that I was talking about the other day. I have been using it in production for weeks now (several times daily, literally), and I wouldn't want to work without it any more.

Reinis · 2023-11-07T20:49:39Z

docs/Fixup_Commits.md

+creates a commit with the appropriate subject line.
+
+Don't confuse this with the lowercase "f" command ("Fixup commit"); that one
+squashes the selected command into its parent, this is not what we want here.


typo: command should be commit

Thanks; fixed in 496794c.

jesseduffield · 2023-11-23T06:17:39Z

Nice Work. We may have discussed this in the discord but I can't find it so apologies if I'm repeating myself. I'd like to explore a couple things:

According to the docs in this PR, this feature does not work if you've only added lines, but that seems like a common thing (e.g. add a comment to explain why you've made a change). I'm not clear on why we care about the diff itself: why not just look at the staged files and find the latest commit where one of those files is modified?
It would be good if you could press ctrl+f again from within the commits panel to jump to the next commit which matches (or does this make no sense with a blame based approach? It does make sense with a file-based approach)

stefanhaller · 2023-11-23T07:34:23Z

According to the docs in this PR, this feature does not work if you've only added lines, but that seems like a common thing (e.g. add a comment to explain why you've made a change). I'm not clear on why we care about the diff itself: why not just look at the staged files and find the latest commit where one of those files is modified?

Yes, it has bothered me too that it doesn't work for only added lines, you are right that this is a common thing. However, it's a tradeoff between convenience and reliability; with the blame-based approach we can check if all hunks belong to the same base commit, and error out if not, and I find this very important. With the file-based approach we can't do that. Concrete scenario where this would be a problem: you have a commit history where you add several new functions to a file, each one in a separate commit. In code review you are told to add comments to all these functions, and you do that; pressing ctrl+f at this point would take you to the commit where the last function was added, with no error, which is wrong. I don't want to have to pay this much attention that I'm staging things correctly.

Edit: Thinking about this more I realize that the purely blame-based approach also has the same problem already, as it just ignores all added lines. So in the scenario above, if you also make a change to some code you will be taken to the base commit for that change, and all the added comments will silently go into that commit too. Maybe the command should warn when there are diff hunks with only added lines; but this could also be wrong if you are moving a piece of code over a longer distance so that the added and deleted lines don't end up in the same hunk. This is tricky.

It would be good if you could press ctrl+f again from within the commits panel to jump to the next commit which matches (or does this make no sense with a blame based approach? It does make sense with a file-based approach)

Indeed this only makes sense for the file-based approach, not for the blame-based one. Blaming the lines again from the first found base commit is very likely to take you to a commit that is already on master (in sane commit histories, at least 😄).

jesseduffield · 2023-11-27T02:06:50Z

Edit: Thinking about this more I realize that the purely blame-based approach also has the same problem already, as it just ignores all added lines. So in the scenario above, if you also make a change to some code you will be taken to the base commit for that change, and all the added comments will silently go into that commit too. Maybe the command should warn when there are diff hunks with only added lines; but this could also be wrong if you are moving a piece of code over a longer distance so that the added and deleted lines don't end up in the same hunk. This is tricky.

This makes me think that the file based approach is the better one: it requires a few more brain cells each time you use it compared to the blame based approach but it can be used in more situations and is easy to implement/explain.

stefanhaller · 2023-11-27T07:52:18Z

This makes me think that the file based approach is the better one: it requires a few more brain cells each time you use it compared to the blame based approach but it can be used in more situations and is easy to implement/explain.

Hm, I very much prefer the blame based approach. For the cases where it does work, it works so much better, especially in long branches with a lot of incremental development (i.e. where the same files change multiple times).

Personally I'd rather use those brain cells to decide whether the command works at all in a given situation; but if it does, I don't want to spend extra work to help it find the right commit.

I feel really strongly about this, if you don't want to have this in the official lazygit then I will have to maintain it in my fork forever, as I really don't want to work without this any more.

stefanhaller · 2023-11-27T09:06:24Z

I thought about this more during my morning run. Here's a proposal that could be the best of both worlds:

look at all hunks; if they all have some deleted lines, use the blame-based approach exactly as in this PR
if there are hunks that only have added lines, still use the same approach as in this PR, but show a warning "Some hunks have only added lines; be careful to check that these belong in the found base commit."
if all hunks have only added lines, fall back to the file-based approach, select the first found commit, and show a big red warning "Only added lines in diff; falling back to a weaker heuristic for finding the base commit. Be extra careful to verify that this is the right one."

The only functionality that's missing then is pressing the key multiple times to jump back in history for the file-based approach; I guess I could live without that though.

Do you think this would work for you?

jesseduffield · 2023-11-27T10:20:04Z

That approach works for me: with the caveat that we should mark the command as experimental and subject to change. We may end up wanting to:

have two separate commands with their own keybindings: one for finding the perfect base commit and one for a much simpler use case of 'highlight all commits which contain the selected file'
have a single command, with configurable behaviour
some other command that better captures what we're trying to do

I'm yet to test out the existing logic you've got so it's hard to comment on how reliable it is but I'm happy to take your word for it until I get the chance to test it out myself. I have a general bias against complexity which is what makes me hesitate about the fallback logic, but I'm happy to see how it looks.

jesseduffield · 2023-12-01T22:12:23Z

As discussed in town hall: we'll just have two separate commands: one for the blame-based approach, one for the file-based approach and this PR will only deal with the blame-based approach.

stefanhaller · 2024-01-07T15:37:14Z

I added a commit to implement the warning "Some hunks have only added lines; be careful to check that these belong in the found base commit." We'll have to see whether this gets annoying; see the commit message for some discussion.

codacy-production · 2024-01-07T15:37:22Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
✅ +0.08% (target: -2.00%)	✅ 90.75%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`33f933b`)	45523	37447	82.26%
Head commit (`b35f877`)	45815 (+292)	37726 (+279)	82.34% (+0.08%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#3105)	292	265	90.75%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

_{You may notice some variations in coverage metrics with the latest Coverage engine update. For more details, visit the documentation}

jesseduffield · 2024-01-08T10:36:19Z

pkg/commands/git_commands/blame.go

+	}
+}
+
+func (self *BlameCommands) BlameLineRange(filename string, commit string, firstLine int, numLines int) (string, error) {


I'd add a comment giving an example output from the function

Added in 17616fb

jesseduffield · 2024-01-08T10:36:26Z

pkg/commands/git_commands/commit.go

@@ -190,6 +190,15 @@ func (self *CommitCommands) GetCommitMessagesFirstLine(shas []string) (string, e
 	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
 }

+func (self *CommitCommands) GetShasAndCommitMessagesFirstLine(shas []string) (string, error) {


Added in 28373b0

jesseduffield · 2024-01-08T10:44:10Z

docs/Fixup_Commits.md

@@ -0,0 +1,64 @@
+# Fixup Commits


Great writeup

jesseduffield · 2024-01-08T10:51:27Z

pkg/gui/controllers/files_controller.go

+		{
+			Key:         opts.GetKey(opts.Config.Files.FindBaseCommitForFixup),
+			Handler:     self.c.Helpers().FixupHelper.HandleFindBaseCommitForFixupPress,
+			Description: self.c.Tr.FindBaseCommitForFixup,


This needs a tooltip: I can imagine seeing this description and not really knowing what it was talking about.

It could be something simple like 'Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <link to docs>'.

Added in 330151c

jesseduffield · 2024-01-08T11:16:44Z

pkg/gui/controllers/helpers/fixup_helper.go

+		return self.c.ErrorMsg("Base commit is not in current view")
+	}
+	if commit.Status == models.StatusMerged {
+		return self.c.ErrorMsg("The base commit for this change is already on master")


Two things here:

I wonder if users might still want to see the commit anyway. Like we could show an error and still point them at the commit

I'd change the wording from 'master' to 'the main branch' given that their main branch may not be named 'master'

I wonder if users might still want to see the commit anyway. Like we could show an error and still point them at the commit

I've never seen a reason for that (in the context of amending/fixing up, that is), and I'm kind of worried that people are starting to use it as a poor-man's blame feature and start complaining about it not working well enough for that. 😄 So I'd rather not do that.

I'd change the wording from 'master' to 'the main branch' given that their main branch may not be named 'master'

Changed in 8b76a81

jesseduffield · 2024-01-08T11:31:17Z

pkg/gui/controllers/helpers/fixup_helper.go

+	return deletedLineInfos
+}
+
+func (self *FixupHelper) blameDeletedLines(deletedLineInfos []*deletedLineInfo) []string {


I'd add a comment saying this returns the list of commit hashes that introduced the lines which have now been deleted.

Added in dc4dac5

jesseduffield · 2024-01-08T11:32:27Z

pkg/gui/controllers/helpers/fixup_helper.go

+		go func(info *deletedLineInfo) {
+			defer wg.Done()
+
+			blameOutput, err := self.c.Git().Blame.BlameLineRange(info.filename, "HEAD", info.startLineIdx, info.numLines)


Let me know if I understand what's happening here: we get the deleted line infos, and some of them are spread over several lines, and those lines may be from different commits. So for each set of lines we do a git blame to find out all the relevant commits. We then combine all of those together and return that as a slice of hashes.

That's right.

jesseduffield · 2024-01-08T11:44:34Z

pkg/gui/controllers/helpers/fixup_helper.go

+			return err
+		}
+		return self.c.ErrorMsg("Multiple base commits found. (" +
+			lo.Ternary(useIndex, "Try staging fewer changes", "Try staging some of the changes") +


Saying 'Try staging some of the changes' isn't very clear: it may not be obvious that this action only looks at staged changes if they're present. Perhaps: 'If you stage some of the changes, we'll only consider those staged changes when looking for the base commit, so we're more likely to find a single match". Perhaps it's even worth spelling that out in the case where there are already staged changes.

I'm not convinced; this additional information might be useful the very first time you run the command and are not yet familiar with how it works. After that, the important information is the list of subjects below, and the longer text above makes this stand out a lot less and makes it harder to grok the information. (I just tried it with the longer message, and didn't like it.)

jesseduffield · 2024-01-08T11:45:58Z

pkg/gui/controllers/helpers/fixup_helper.go

+		return commit.Sha == shas[0]
+	})
+	if !ok {
+		if self.c.Model().Commits[len(self.c.Model().Commits)-1].Status == models.StatusMerged {


I would assign self.c.Model().Commits to a variable before this line so that if the slice gets swapped out concurrently we don't run the risk of an out-of-bounds exception

This concurrency stuff still makes me dizzy... Like this? 092a40f

Yep that's right. To be clearer on what we're defending against, the original code is basically doing this:

a := self.c.Model().Commits b := self.c.Model().Commits if a[len(b)-1].Status ...

So consider the following situation:

we evaluate a and it's a slice of 5 commits

before we evaluate b, a background refresh happens and our model commits slice is swapped out for a slice of 10 commits. Because it's swapped out with a brand new slice rather than extending the original slice, the slice that a points to is unchanged so a still has only 5 commits.

we evaluate b and that now has 10 commits because it's pointing to the new slice

we try to evaluate a[9] and get an out-of-bounds error because a only has 5 commits

So by only using a single variable, we prevent this mismatch. A background refresh may happen and we may now be dealing with stale data, but that's harmless here, especially compared to a runtime panic.

Thanks for detailed explanation. Thing is, I'm afraid we're still not making this thread-safe just by using a single variable. The assignment to the variable isn't atomic; a slice has three fields, a data pointer, a length, and a capacity. Our code might be preempted by a background refresh right after it has assigned the data pointer to the variable, but before it assigned the length to the variable. The only ways to solve this are 1. to use a mutex, or 2. to ensure that the data is only accessed from a single thread (which is this long-term project of mine that I keep talking about, and still haven't make much progress on).

For the purpose of this PR I wouldn't worry about it too much; we have tons of similar concurrency issues all over the code, and the likelihood of running into them in practice is low enough.

jesseduffield · 2024-01-08T11:48:40Z

pkg/gui/controllers/helpers/fixup_helper.go

+		})
+	}
+
+	return doIt()


why do we need the doIt function? Seems like it would behave the same if inlined.

EDIT: ah, ignore me

It's called from both HandleConfirm and below; if you know a more elegant way to do this, I'm all ears.

Na I'm fine with this pattern

jesseduffield

Looking good!

I still feel like this is built for a very specific use case, and that it's too strict to be useful to me, but I'm going to try it anyway so that I can get a better feel for how it works.

One thing I'd like to double-check: why are deleted lines special compared to context lines? Is it that deleted lines are more likely to be from a more recent commit, whereas context lines could be from any random commit?

stefanhaller · 2024-01-09T14:43:29Z

One thing I'd like to double-check: why are deleted lines special compared to context lines? Is it that deleted lines are more likely to be from a more recent commit, whereas context lines could be from any random commit?

Deleted lines are the ones that let us find the commit that the current modifications are changing. Not "more likely", these are exactly the ones that we care about. Context lines are from some older commit that we don't care about here, so it doesn't make sense to blame those.

stefanhaller · 2024-01-09T14:44:21Z

Thanks for the thorough review! Lots of comments, I hope I addressed them all. Let me know if I missed one!

jesseduffield · 2024-01-09T22:47:06Z

Deleted lines are the ones that let us find the commit that the current modifications are changing. Not "more likely", these are exactly the ones that we care about. Context lines are from some older commit that we don't care about here, so it doesn't make sense to blame those.

This is not always true: if you want to add a comment to a function that was added in a prior commit on the same branch (as happened in this very PR!) then the context line below the comment will be for a recent commit. But, context lines exist above and below any given change, and in the case of adding a comment above a function, the context line above the comment will be from an old commit. I would like to experiment with seeing what happens if I just treat context lines and deleted lines the same but add some way of ignoring old commits and just see how that flow looks (I'm aware you're not a fan because it dramatically increases the chance of multiple matches). At any rate that's something I'm happy to test out on my own branch

jesseduffield

LGTM

stefanhaller · 2024-01-10T08:08:28Z

This is not always true: if you want to add a comment to a function that was added in a prior commit on the same branch (as happened in this very PR!) then the context line below the comment will be for a recent commit.

OK, that's true, but I'm not sure yet what the heuristic needs to be to decide in which cases we do or don't want to use them. Probably only for blocks with only added lines. Curious to see what you come up with. (It will be a bit tricky to do, as currently the algorithm doesn't see the context lines because of the -U0.)

The algorithm works by blaming the deleted lines, so if a hunk contains only added lines, we can only hope that it also belongs in the same commit. Warn the user about this. Note: the warning might be overly agressive, we'll have to see if this is annoying. The reason is that it depends on the diff context size whether added lines go into their own hunk or are grouped together with other added or deleted lines into one hunk. However, our algorithm uses a diff context size of 0, because that makes it easiest to parse the diff; this results in hunks having only added lines more often than what the user sees. For example, moving a line of code down by two lines will likely result in a single hunk for the user, but in two hunks for our algorithm. On the other hand, being this strict makes the warning consistent. We could consider using the user's diff context size in the algorithm, but then it would depend on the current context size whether the warning appears, which could be confusing. Plus, it would make the algorithm quite a bit more complicated.

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [aquaproj/aqua-registry](https://togithub.com/aquaproj/aqua-registry) | minor | `v4.154.0` -> `v4.155.1` | | [cli/cli](https://togithub.com/cli/cli) | minor | `v2.45.0` -> `v2.46.0` | | [derailed/k9s](https://togithub.com/derailed/k9s) | patch | `v0.32.3` -> `v0.32.4` | | [eza-community/eza](https://togithub.com/eza-community/eza) | patch | `v0.18.7` -> `v0.18.8` | | [golangci/golangci-lint](https://togithub.com/golangci/golangci-lint) | minor | `v1.56.2` -> `v1.57.1` | | [gruntwork-io/terragrunt](https://togithub.com/gruntwork-io/terragrunt) | patch | `v0.55.16` -> `v0.55.20` | | [jesseduffield/lazygit](https://togithub.com/jesseduffield/lazygit) | minor | `v0.40.2` -> `v0.41.0` | | [junegunn/fzf](https://togithub.com/junegunn/fzf) | patch | `0.48.0` -> `0.48.1` | | [lsd-rs/lsd](https://togithub.com/lsd-rs/lsd) | minor | `v1.0.0` -> `v1.1.2` | | [mikefarah/yq](https://togithub.com/mikefarah/yq) | minor | `v4.42.1` -> `v4.43.1` | | [simulot/immich-go](https://togithub.com/simulot/immich-go) | minor | `0.12.0` -> `0.13.0` | | [snyk/cli](https://togithub.com/snyk/cli) | minor | `v1.1284.0` -> `v1.1286.0` | | [starship/starship](https://togithub.com/starship/starship) | minor | `v1.17.1` -> `v1.18.1` | | [twpayne/chezmoi](https://togithub.com/twpayne/chezmoi) | patch | `v2.47.1` -> `v2.47.2` | | [weaveworks/eksctl](https://togithub.com/weaveworks/eksctl) | minor | `v0.174.0` -> `v0.175.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>aquaproj/aqua-registry (aquaproj/aqua-registry)</summary> ### [`v4.155.1`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.155.1) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.155.0...v4.155.1) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.155.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.155.0) | https://github.com/aquaproj/aqua-registry/compare/v4.155.0...v4.155.1 ##### Others [#21239](https://togithub.com/aquaproj/aqua-registry/issues/21239) Rename the package crates.io/shellharden to anordal/shellharden [@hituzi-no-sippo](https://togithub.com/hituzi-no-sippo) shellharden started releasing pre-built binaries, so we changed the package type from `cargo` to `github_release` from shellharden v4.3.1. [https://github.com/anordal/shellharden/pull/57](https://togithub.com/anordal/shellharden/pull/57) https://github.com/anordal/shellharden/releases/tag/v4.3.1 > \[!WARNING] > Please rename the package `crates.io/shellharden` to `anordal/shellharden` > > ```yaml > packages: > - name: anordal/[email protected] > ``` > > Note that Renovate will update crates.io/shellharden to crates.io/[email protected], but it wouldn't work. > You have to change the version to `v4.3.1`. ### [`v4.155.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.155.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.154.0...v4.155.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.154.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.154.0) | https://github.com/aquaproj/aqua-registry/compare/v4.154.0...v4.155.0 #### 🎉 New Packages [#21127](https://togithub.com/aquaproj/aqua-registry/issues/21127) [ynqa/jnv](https://togithub.com/ynqa/jnv): interactive JSON filter using jq [@ponkio-o](https://togithub.com/ponkio-o) [#21079](https://togithub.com/aquaproj/aqua-registry/issues/21079) [zaghaghi/openapi-tui](https://togithub.com/zaghaghi/openapi-tui): Terminal UI to list, browse and run APIs defined with openapi spec [@wancup](https://togithub.com/wancup) #### Fixes [#21122](https://togithub.com/aquaproj/aqua-registry/issues/21122) Update some packages to support Cosign v2 ⚠️ To install the following packages, aqua v2.25.1 or later is required. - aquaproj/aqua-registry-updater - aquaproj/registry-tool - argoproj/argo-workflows - chainguard-dev/apko - chainguard-dev/melange - charmbracelet/gum - goreleaser/nfpm - kubernetes-sigs/zeitgeist - lintnet/lintnet - suzuki-shunsuke/ci-info - suzuki-shunsuke/circleci-config-merge - suzuki-shunsuke/cmdx - suzuki-shunsuke/ghalint - suzuki-shunsuke/ghcp - suzuki-shunsuke/github-comment - suzuki-shunsuke/mkghtag - suzuki-shunsuke/nllint - suzuki-shunsuke/pinact - suzuki-shunsuke/renovate-issue-action - suzuki-shunsuke/tfcmt - suzuki-shunsuke/tfprovidercheck - terraform-linters/tflint - tfmigrator/cli - updatecli/updatecli - yuyaban/gitlab-comment [#21062](https://togithub.com/aquaproj/aqua-registry/issues/21062) [#21063](https://togithub.com/aquaproj/aqua-registry/issues/21063) [#21064](https://togithub.com/aquaproj/aqua-registry/issues/21064) [#21065](https://togithub.com/aquaproj/aqua-registry/issues/21065) [#21066](https://togithub.com/aquaproj/aqua-registry/issues/21066) Transfer [k0kubun/xremap/\*](https://togithub.com/k0kubun/xremap) to [xremap/xremap/\*](https://togithub.com/xremap/xremap) The GitHub Repository of the package "k0kubun/xremap/hypr" was transferred from [k0kubun/xremap](https://togithub.com/k0kubun/xremap) to [xremap/xremap](https://togithub.com/xremap/xremap) </details> <details> <summary>cli/cli (cli/cli)</summary> ### [`v2.46.0`](https://togithub.com/cli/cli/releases/tag/v2.46.0): GitHub CLI 2.46.0 [Compare Source](https://togithub.com/cli/cli/compare/v2.45.0...v2.46.0) #### What's Changed - Draft issue IDs are included in `project item-list` output by [@yasunori0418](https://togithub.com/yasunori0418) in [https://github.com/cli/cli/pull/8754](https://togithub.com/cli/cli/pull/8754) - New `--dry-run` option for `pr create` by [@v1v](https://togithub.com/v1v) in [https://github.com/cli/cli/pull/8376](https://togithub.com/cli/cli/pull/8376) - Bump go-keyring to fix race condition by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/8833](https://togithub.com/cli/cli/pull/8833) - PR numbers are prefixed with owner/repo for context by [@nobe4](https://togithub.com/nobe4) in [https://github.com/cli/cli/pull/8778](https://togithub.com/cli/cli/pull/8778) - Extra word removed in `codespaces` code comments by [@cuinix](https://togithub.com/cuinix) in [https://github.com/cli/cli/pull/8795](https://togithub.com/cli/cli/pull/8795) - Clarified description of the `-u`, `--user` option for `gh auth token` by [@gregsmi](https://togithub.com/gregsmi) in [https://github.com/cli/cli/pull/8797](https://togithub.com/cli/cli/pull/8797) - Fixed formatting for the description of `release upload` by [@malor](https://togithub.com/malor) in [https://github.com/cli/cli/pull/8834](https://togithub.com/cli/cli/pull/8834) - Clarified the usage of `auth status` to list all authenticated accounts by [@jsoref](https://togithub.com/jsoref) in [https://github.com/cli/cli/pull/8838](https://togithub.com/cli/cli/pull/8838) - Document auth switch behavior for two or more accounts by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/8839](https://togithub.com/cli/cli/pull/8839) - Document run watch and view not supporting fine grained PATs by [@williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/8843](https://togithub.com/cli/cli/pull/8843) - build(deps): bump google.golang.org/protobuf from 1.30.0 to 1.33.0 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/cli/cli/pull/8811](https://togithub.com/cli/cli/pull/8811) - build(deps): bump github.com/cpuguy83/go-md2man/v2 from 2.0.3 to 2.0.4 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/cli/cli/pull/8844](https://togithub.com/cli/cli/pull/8844) #### New Contributors - [@cuinix](https://togithub.com/cuinix) made their first contribution in [https://github.com/cli/cli/pull/8795](https://togithub.com/cli/cli/pull/8795) - [@gregsmi](https://togithub.com/gregsmi) made their first contribution in [https://github.com/cli/cli/pull/8797](https://togithub.com/cli/cli/pull/8797) - [@nobe4](https://togithub.com/nobe4) made their first contribution in [https://github.com/cli/cli/pull/8778](https://togithub.com/cli/cli/pull/8778) - [@malor](https://togithub.com/malor) made their first contribution in [https://github.com/cli/cli/pull/8834](https://togithub.com/cli/cli/pull/8834) - [@yasunori0418](https://togithub.com/yasunori0418) made their first contribution in [https://github.com/cli/cli/pull/8754](https://togithub.com/cli/cli/pull/8754) **Full Changelog**: https://github.com/cli/cli/compare/v2.45.0...v2.46.0 </details> <details> <summary>derailed/k9s (derailed/k9s)</summary> ### [`v0.32.4`](https://togithub.com/derailed/k9s/releases/tag/v0.32.4) [Compare Source](https://togithub.com/derailed/k9s/compare/v0.32.3...v0.32.4) <img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/k9s.png" align="center" width="800" height="auto"/> ### Release v0.32.4 #### Notes Thank you to all that contributed with flushing out issues and enhancements for K9s! I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev and see if we're happier with some of the fixes! If you've filed an issue please help me verify and close. Your support, kindness and awesome suggestions to make K9s better are, as ever, very much noted and appreciated! Also big thanks to all that have allocated their own time to help others on both slack and on this repo!! As you may know, K9s is not pimped out by corps with deep pockets, thus if you feel K9s is helping your Kubernetes journey, please consider joining our [sponsorship program](https://togithub.com/sponsors/derailed) and/or make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer) On Slack? Please join us [K9slackers](https://join.slack.com/t/k9sers/shared_invite/enQtOTA5MDEyNzI5MTU0LWQ1ZGI3MzliYzZhZWEyNzYxYzA3NjE0YTk1YmFmNzViZjIyNzhkZGI0MmJjYzhlNjdlMGJhYzE2ZGU1NjkyNTM) #### Maintenance Release! *** #### ♫ Sounds Behind The Release ♭ Thinking of all you at KubeCon Paris!! May I suggest a nice glass of `cold Merlote` or other fine grape juices from my country? - [Le Gorille - George Brassens](https://www.youtube.com/watch?v=KVfwvk_yVyA) - [Les Funerailles D'antan (Love this guy!) - George Brassens](https://www.youtube.com/watch?v=bwb5k4k2EMc) - [Poinconneur Des Lilas - Serge Gainsbourg](https://www.youtube.com/watch?v=eWkWCFzkOvU) - [Mon Legionaire (Yup! same guy??) - Serge Gainsbourg](https://www.youtube.com/watch?v=gl8gopryqWI) - [Les Cornichons - Nino Ferrer](https://www.youtube.com/watch?v=N7JSW4NhM8I) - [Paris s'eveille - Jacques Dutronc](https://www.youtube.com/watch?v=3WcCg6rm3uM) *** #### Videos Are In The Can! Please dial [K9s Channel](https://www.youtube.com/channel/UC897uwPygni4QIjkPCpgjmw) for up coming content... - [K9s v0.31.0 Configs+Sneak peek](https://youtu.be/X3444KfjguE) - [K9s v0.30.0 Sneak peek](https://youtu.be/mVBc1XneRJ4) - [Vulnerability Scans](https://youtu.be/ULkl0MsaidU) *** #### Resolved Issues - [#2608](https://togithub.com/derailed/k9s/issues/2608) Make the sanitize feature easier to use - [#2605](https://togithub.com/derailed/k9s/issues/2605) Built-in shortcuts being overridden by plugins result in excessive logging - [#2604](https://togithub.com/derailed/k9s/issues/2604) Ability to mark a plugin as Dangerous/destructive - [#2592](https://togithub.com/derailed/k9s/issues/2592) "list access denied" when switching contexts within k9s since 0.32.0 *** #### Contributed PRs Please be sure to give `Big Thanks!` and `ATTA Girls/Boys!` to all the fine contributors for making K9s better for all of us!! - [#2621](https://togithub.com/derailed/k9s/pull/2621) Fix snap build *** <img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/imhotep_logo.png" width="32" height="auto"/> © 2024 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0) </details> <details> <summary>eza-community/eza (eza-community/eza)</summary> ### [`v0.18.8`](https://togithub.com/eza-community/eza/releases/tag/v0.18.8): eza v0.18.8 [Compare Source](https://togithub.com/eza-community/eza/compare/v0.18.7...v0.18.8) ### Changelog #### \[0.18.8] - 2024-03-21 ##### Bug Fixes - Avoid deprecation warnings - Rustfmt issues ##### Features - Add fennel lang icon and associations ##### Miscellaneous Tasks - Release eza v0.18.8 ### Checksums #### sha256sum 80565916de55b23c3cabb363ba1cb7f323f99b158e75b6c029a64108de7bdad9 ./target/bin-0.18.8/eza_aarch64-unknown-linux-gnu.tar.gz d3532278f5eae1c1dd57bcc9373f05b49f40ffac880d5c4efb67ac5d93cdf0ea ./target/bin-0.18.8/eza_aarch64-unknown-linux-gnu.zip 2c1722afbb0f90e40047cfffa93f04fb9b89633402236fb75119c9105265271f ./target/bin-0.18.8/eza_arm-unknown-linux-gnueabihf.tar.gz a832c4694228780f43f467e2f0536bd4a8969a455edbb872eb8b4614ebd157e0 ./target/bin-0.18.8/eza_arm-unknown-linux-gnueabihf.zip 39cc743e9293a5e269b2b2baf167f4f868f682143dc8b1f87efd64848bb3bca4 ./target/bin-0.18.8/eza.exe_x86_64-pc-windows-gnu.tar.gz 9b331b2eee259a9afbffd39e5018735651f8053c5429714cdc46a02f571463e7 ./target/bin-0.18.8/eza.exe_x86_64-pc-windows-gnu.zip 2e12d0b714aa011d23abb72459a2478eb9e369ac564a9a7e39ba6ec7ef775ad4 ./target/bin-0.18.8/eza_x86_64-unknown-linux-gnu.tar.gz e3c9c3535732cecad5eb9d786e1f7a7c66aa28d42a3516046e5b1cf7f3799920 ./target/bin-0.18.8/eza_x86_64-unknown-linux-gnu.zip 2fc6c3ead5c8bc596643597737ba596aee2f61772792927e4e9e602525a6ae81 ./target/bin-0.18.8/eza_x86_64-unknown-linux-musl.tar.gz 543f69f52165f654c5ab869319663d7f4ebdc95b7fc9c23be003ca551aec5dc3 ./target/bin-0.18.8/eza_x86_64-unknown-linux-musl.zip #### md5sum f3dece765bb95c732bce9406c1eb825a ./target/bin-0.18.8/eza_aarch64-unknown-linux-gnu.tar.gz b655997af2b0df307abd3a126e48fc3d ./target/bin-0.18.8/eza_aarch64-unknown-linux-gnu.zip 9cd1ae35fd90e4341cf8ed1b4a3d6cd9 ./target/bin-0.18.8/eza_arm-unknown-linux-gnueabihf.tar.gz e9cd1a917b39827fc159c100faaf28b9 ./target/bin-0.18.8/eza_arm-unknown-linux-gnueabihf.zip 9f02446483003c219eecc1dc15273956 ./target/bin-0.18.8/eza.exe_x86_64-pc-windows-gnu.tar.gz db239fa66fde9800770384831e3a86fa ./target/bin-0.18.8/eza.exe_x86_64-pc-windows-gnu.zip 5722d3f4e4f2848d770713341c7c4bfd ./target/bin-0.18.8/eza_x86_64-unknown-linux-gnu.tar.gz c9f5ece20dc527fd4ecf4f77bbf70b56 ./target/bin-0.18.8/eza_x86_64-unknown-linux-gnu.zip 0826369c7f0ab3b17c4275f98ff1ab70 ./target/bin-0.18.8/eza_x86_64-unknown-linux-musl.tar.gz 3c3633a6c54d32ee9f04277f4b103edc ./target/bin-0.18.8/eza_x86_64-unknown-linux-musl.zip #### blake3sum 0c7fc89dd1cf514e62e644e8ff8dab8759d6bd42f364f2768c41df92ec9e9dfc ./target/bin-0.18.8/eza_aarch64-unknown-linux-gnu.tar.gz 540def87f4f455fcd6067648f05498db775c6c03f291088d03f1dc4cc8cf68e7 ./target/bin-0.18.8/eza_aarch64-unknown-linux-gnu.zip 1980d8004ad1f9b0291381c4d57db64fc8ebcf1c0961a8ac3c05c3697d7dfaf3 ./target/bin-0.18.8/eza_arm-unknown-linux-gnueabihf.tar.gz 9a80d9f0cfc83521d119778b52b55dce4b33f28b02624297c712efd3ade53f19 ./target/bin-0.18.8/eza_arm-unknown-linux-gnueabihf.zip 5d97ba1a2eaccc814aec982922f89ee218521b343b5f3ad6900596ad9574bfa3 ./target/bin-0.18.8/eza.exe_x86_64-pc-windows-gnu.tar.gz 2d274f097297ff222dc7756903dfb73fdc744051c75b815d2eea2e08ee0f4418 ./target/bin-0.18.8/eza.exe_x86_64-pc-windows-gnu.zip 04ca09128611f9719ac0a7c387282049489243bbe74be8de797d845ec380b9ee ./target/bin-0.18.8/eza_x86_64-unknown-linux-gnu.tar.gz 3e58bf50b39c1b20801f5282b612103b07b12089d2a24f3dcec9882ac8482c8c ./target/bin-0.18.8/eza_x86_64-unknown-linux-gnu.zip 1df711c44e08cc08fc26753f5c50f9de244fdbd7e2f8cc3961d82f101d775154 ./target/bin-0.18.8/eza_x86_64-unknown-linux-musl.tar.gz 9d71a5afbc797ca63eecf254fc4971c2a1dd188ce28c8cb4a10cf1a273d747d5 ./target/bin-0.18.8/eza_x86_64-unknown-linux-musl.zip </details> <details> <summary>golangci/golangci-lint (golangci/golangci-lint)</summary> ### [`v1.57.1`](https://togithub.com/golangci/golangci-lint/releases/tag/v1.57.1) [Compare Source](https://togithub.com/golangci/golangci-lint/compare/v1.57.0...v1.57.1) #### Changelog - [`87b6bf1`](https://togithub.com/golangci/golangci-lint/commit/87b6bf17) build(deps): bump github.com/golangci/plugin-module-register from 0.1.0 to 0.1.1 ([#4549](https://togithub.com/golangci/golangci-lint/issues/4549)) - [`921d535`](https://togithub.com/golangci/golangci-lint/commit/921d5357) build(deps): bump github.com/pelletier/go-toml/v2 from 2.1.1 to 2.2.0 ([#4548](https://togithub.com/golangci/golangci-lint/issues/4548)) - [`cd890db`](https://togithub.com/golangci/golangci-lint/commit/cd890db2) fix: filter invalid issues before other processors ([#4552](https://togithub.com/golangci/golangci-lint/issues/4552)) ### [`v1.57.0`](https://togithub.com/golangci/golangci-lint/compare/v1.56.2...v1.57.0) [Compare Source](https://togithub.com/golangci/golangci-lint/compare/v1.56.2...v1.57.0) </details> <details> <summary>gruntwork-io/terragrunt (gruntwork-io/terragrunt)</summary> ### [`v0.55.20`](https://togithub.com/gruntwork-io/terragrunt/compare/v0.55.19...v0.55.20) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.55.19...v0.55.20) ### [`v0.55.19`](https://togithub.com/gruntwork-io/terragrunt/releases/tag/v0.55.19) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.55.18...v0.55.19) #### Updated CLI args, config attributes and blocks - `scaffold` #### Description - Fix grammar in feature text - Fix URL handling in the `scaffold` command - Updated gon version to 0.2.5 #### Related links - [https://github.com/gruntwork-io/terragrunt/pull/3010](https://togithub.com/gruntwork-io/terragrunt/pull/3010) - [https://github.com/gruntwork-io/terragrunt/pull/3005](https://togithub.com/gruntwork-io/terragrunt/pull/3005) **Full Changelog**: https://github.com/gruntwork-io/terragrunt/compare/v0.55.18...v0.55.19 ### [`v0.55.18`](https://togithub.com/gruntwork-io/terragrunt/releases/tag/v0.55.18) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.55.17...v0.55.18) #### Description - Updated github.com/cloudflare/circl from 1.3.3 to 1.3.7 - Updated github.com/go-jose/go-jose/v3 from 3.0.0 to 3.0.3 - Updated google.golang.org/protobuf from 1.32.0 to 1.33.0 - Updated nokogiri to 1.16.3 - Updates mini_portile2 from 2.4.0 to 2.8.5 #### Related links - [https://github.com/gruntwork-io/terragrunt/pull/2995](https://togithub.com/gruntwork-io/terragrunt/pull/2995) - [https://github.com/gruntwork-io/terragrunt/pull/2996](https://togithub.com/gruntwork-io/terragrunt/pull/2996) - [https://github.com/gruntwork-io/terragrunt/pull/2929](https://togithub.com/gruntwork-io/terragrunt/pull/2929) - [https://github.com/gruntwork-io/terragrunt/pull/3000](https://togithub.com/gruntwork-io/terragrunt/pull/3000) - [https://github.com/gruntwork-io/terragrunt/pull/3009](https://togithub.com/gruntwork-io/terragrunt/pull/3009) ### [`v0.55.17`](https://togithub.com/gruntwork-io/terragrunt/releases/tag/v0.55.17) [Compare Source](https://togithub.com/gruntwork-io/terragrunt/compare/v0.55.16...v0.55.17) #### Updated CLI args, config attributes and blocks - `terraform` #### Description - Added support for OpenTofu registry for shorthand TFR modules. #### Related links - [https://github.com/gruntwork-io/terragrunt/pull/2961](https://togithub.com/gruntwork-io/terragrunt/pull/2961) </details> <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.41.0`](https://togithub.com/jesseduffield/lazygit/releases/tag/v0.41.0) [Compare Source](https://togithub.com/jesseduffield/lazygit/compare/v0.40.2...pre-0.41) Hold on tight because this is a HUGE release! This release includes a whopping 595 commits from a period of over 7 months, from 40 different contributors. Thanks to everybody who made this possible, and apologies for taking so long to actually release it: we'll be more frequent in future! Special thanks to Stefan Haller who is behind many of this release's changes and who has been critical in getting this release across the line. I've made a video running through the big changes here: [<img src="https://github.com/jesseduffield/lazygit/assets/8456633/f9b47c5e-f8b2-4b41-8f51-bf06b01046e2">](https://youtu.be/\_REmkoIyPW0) #### What's Changed Here's some highlighted features: ##### Range select ![range-select](https://togithub.com/jesseduffield/lazygit/blob/assets/demo/interactive_rebase-compressed.gif?raw=true) You can now press 'v' to toggle range select in any list view, just like you already could in the staging view. You can also press shift+up/down to select a range. You can use range select to: - stage/discard a range of files - select multiple commits to fixup/squash/move outside an interactive rebase - select multiple commits to mark as fixup/squash/etc within an interactive rebase - select multiple commit files to discard or add to a custom patch (courtesy of [@afhoffman](https://togithub.com/afhoffman)) - select multiple commits to cherry-pick I have been waiting for this feature for a very long time and it's already made me way more productive. If I need to squash a range of commits I can now easily do it directly rather than needing to squash them one-by-one, or needing to manually start an interactive rebase first. Likewise, it's much easier to select a range of files and stage them than stage them one-by-one. This is a **Breaking change**: Unfortunately, the 'v' key clashes with the existing key for pasting commits (cherry-pick), so we've replaced that with shift+V and changed the commit copy key to shift+C. If you want the old keybindings back, you can do that like so: ```yml keybinding: universal: toggleRangeSelect: <something other than v> commits: cherryPickCopy: 'c' pasteCommits: 'v' ``` ##### Auto-wrap in commit editor The commit editor now automatically hard-wraps your content by default, so you no longer need to hit the enter key yourself when you approach the margin. You can disable/configure this in your config: ```yml git: commit: autoWrapCommitMessage: true autoWrapWidth: 72 ``` Thanks to [@stefanhaller](https://togithub.com/stefanhaller) for this feature. ##### Easier remote branch checkout Now when you go to checkout a remote branch, either via the `c` keybinding in the branches view or by pressing `space` on a remote branch, you'll be given the choice to checkout as a local branch or as a detached head (previously it would just check it out as a detached head which typically isn't what you want). This is a **Breaking change** in terms of muscle memory. Thanks to [@stefanhaller](https://togithub.com/stefanhaller) for this feature. ##### Easier start interactive rebase Previously, to start an interactive rebase, you would need to navigate to a base commit and press `e` on it. Now you can simply press `i` and regardless of which commit is selected, an interactive rebase will begin that includes all the commits on your branch (or if there are merge commits: all the commits up to first merge commit). The above demo for range select showcases this. ##### Easier squashing of `fixup!` commits In a similar vein to the above section, now when you press `shift+S`, you're given the choice of squashing all commits above the selected commit and squashing all commits on the branch, which is what you typically want. This is a **Breaking change** in terms of muscle memory. Thanks to [@stefanhaller](https://togithub.com/stefanhaller) for this feature. ##### View divergence from upstream branch If you press `u` on a local branch a menu appears which shows options relating to the branch's upstream. Now, the first option in that menu allows you to view the divergence from the upstream which shows commits to pull and commits to push Thanks to [@stefanhaller](https://togithub.com/stefanhaller) for this feature. ##### Find appropriate commit for fixup/amend This one is some serious voodoo: if somebody suggests changes in a PR review, you'll often apply the changes, then go hunting for the appropriate commit to fixup/amend. Now, from the files view you can press `ctrl+f` and if Lazygit can identify an appropriate commit with certainty, it will select that commit for you. Pretty cool! We've made the algorithm very strict so that you can always trust the result, but this means in circumstances where we can't know for sure which commit is appropriate (such as when your changes only include added lines), it's left to you to manually find the commit. We're keen to get lots of feedback on this feature to see where the sweet spot is. For more info see [the docs](https://togithub.com/jesseduffield/lazygit/blob/master/docs/Fixup_Commits.md#finding-the-commit-to-create-a-fixup-for) Thanks to [@stefanhaller](https://togithub.com/stefanhaller) for this feature. ##### Delete remote branches/tags Now when you press `d` on a local branch, remote branch, or tag, you're given the option to delete that branch/tag in the remote. Thanks to [@AzraelSec](https://togithub.com/AzraelSec) for this feature. ##### Add co-author to commit When you press `a` on a commit an option now appears to add a co-author (something GitHub can read). Thanks to [@omaussa](https://togithub.com/omaussa) for this feature. ##### Filter commits by author You can now filter commits by author via pressing `ctrl+s` in the commits view and selecting the option to filter by author. Thanks to [@Part22](https://togithub.com/Part22) for this feature. ##### Change branch sort order You can now change branch sort order by pressing `s` in the branches view (and remote branches view). By default local branches are sorted by 'recency' meaning how recently they were checked out, but you can now sort by head commit date and alphabetically. Thanks to [@hosaka](https://togithub.com/hosaka) for this feature. ##### Better bare repo support We have fixed a bunch of bugs relating to bare repos so if you had issues with them in the past it should work fine now. Thanks to [@jwhitley](https://togithub.com/jwhitley) for this feature. ##### Miscelleneous UI changes - Unstaged files are now shown in white, not red, which is easier on the eyes - Scrollbars are thinner (and, thus, cooler) - Keybindings menu now has section headers ([@stefanhaller](https://togithub.com/stefanhaller)) - Error toasts now appear for some errors (less intrusive than popups) ([@stefanhaller](https://togithub.com/stefanhaller)) - Search history is now retained ([@karimkhaleel](https://togithub.com/karimkhaleel)) - Git log is shown by default ([@stefanhaller](https://togithub.com/stefanhaller)) ##### More Breaking Changes 💥 - When you press 'g' to bring up the git reset menu, the 'mixed' option is now the first and default, rather than 'soft'. This is because 'mixed' is the most commonly used option. - Push/pull/fetch loading statuses are now shown against the branch rather than in a popup. This allows you to e.g. fetch multiple branches in parallel and see the status for each branch. - The git log graph in the commits view is now always shown by default (previously it was only shown when the view was maximised). If you find this too noisy, you can change it back via `ctrl+L` -> 'Show git graph' -> 'when maximised' - Filtering (e.g. when pressing '/') is less fuzzy by default; it only matches substrings now. Multiple substrings can be matched by separating them with spaces. If you want to revert to the old behavior, set the following in your config: ```yml gui: filterMode: 'fuzzy' ``` #### What's Changed ##### All Enhancements 🔥 - Add range selection ability on list contexts by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3207](https://togithub.com/jesseduffield/lazygit/pull/3207) - Allow deleting remote tags/branches from local tag/branch views by [@AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/2738](https://togithub.com/jesseduffield/lazygit/pull/2738) - Add command to show divergence from upstream by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2871](https://togithub.com/jesseduffield/lazygit/pull/2871) - Add 'Quick start interactive rebase' action by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3213](https://togithub.com/jesseduffield/lazygit/pull/3213) - Add command to open git difftool by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3156](https://togithub.com/jesseduffield/lazygit/pull/3156) - Support editing files in existing neovim instance by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/2916](https://togithub.com/jesseduffield/lazygit/pull/2916) - Show commit mark before showing extra info by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/2928](https://togithub.com/jesseduffield/lazygit/pull/2928) - Jump to middle of the view when selection leaves the visible area by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2915](https://togithub.com/jesseduffield/lazygit/pull/2915) - Add emacs-keybinds for word navigation by [@horriblename](https://togithub.com/horriblename) in [https://github.com/jesseduffield/lazygit/pull/2935](https://togithub.com/jesseduffield/lazygit/pull/2935) - Add `gui.scrollOffBehavior` config for scrolling list views by half-pages by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2939](https://togithub.com/jesseduffield/lazygit/pull/2939) - Switch to editor from commit message panel by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2881](https://togithub.com/jesseduffield/lazygit/pull/2881) - Select same commit again after pressing "e" to edit a commit by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2954](https://togithub.com/jesseduffield/lazygit/pull/2954) - Support custom keybindings for confirm discard by [@mskelton](https://togithub.com/mskelton) in [https://github.com/jesseduffield/lazygit/pull/2960](https://togithub.com/jesseduffield/lazygit/pull/2960) - Allow adding a port to webDomain part of services config by [@raidora](https://togithub.com/raidora) in [https://github.com/jesseduffield/lazygit/pull/2908](https://togithub.com/jesseduffield/lazygit/pull/2908) - Add icons for files with .mdx and .svelte file extensions by [@hrstmr](https://togithub.com/hrstmr) in [https://github.com/jesseduffield/lazygit/pull/2889](https://togithub.com/jesseduffield/lazygit/pull/2889) - Section headers in keybindings menu by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2911](https://togithub.com/jesseduffield/lazygit/pull/2911) - Check for staged files for "Amend commit" and "Create fixup commit" by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2970](https://togithub.com/jesseduffield/lazygit/pull/2970) - Add support for external diff commands (e.g. difftastic) by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2868](https://togithub.com/jesseduffield/lazygit/pull/2868) - Save diff context size in state.yml instead of config.yml by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2969](https://togithub.com/jesseduffield/lazygit/pull/2969) - Support to reset the current branch to a selected branch upstream by [@AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/2940](https://togithub.com/jesseduffield/lazygit/pull/2940) - Replace whitespace with '-' when renaming a branch by [@calthejuggler](https://togithub.com/calthejuggler) in [https://github.com/jesseduffield/lazygit/pull/2990](https://togithub.com/jesseduffield/lazygit/pull/2990) - Add jump-to-panel label config setting by [@MariaSolOs](https://togithub.com/MariaSolOs) in [https://github.com/jesseduffield/lazygit/pull/2993](https://togithub.com/jesseduffield/lazygit/pull/2993) - Add co-author to commits by [@omaussa](https://togithub.com/omaussa) in [https://github.com/jesseduffield/lazygit/pull/2912](https://togithub.com/jesseduffield/lazygit/pull/2912) - Change the default of the "gui.borders" config to "rounded" by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2998](https://togithub.com/jesseduffield/lazygit/pull/2998) - Add a DisabledReason mechanism for menu items and keybindings by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2992](https://togithub.com/jesseduffield/lazygit/pull/2992) - Allow cherry-picking commits during a rebase by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3013](https://togithub.com/jesseduffield/lazygit/pull/3013) - Add history for search view by [@karimkhaleel](https://togithub.com/karimkhaleel) in [https://github.com/jesseduffield/lazygit/pull/2877](https://togithub.com/jesseduffield/lazygit/pull/2877) - Replace loader panels with waiting status (pull/push/fetch) by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2973](https://togithub.com/jesseduffield/lazygit/pull/2973) - Add menu to rebase onto selected branch remote upstream by [@AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3020](https://togithub.com/jesseduffield/lazygit/pull/3020) - Add ability to force portrait mode by [@ldelossa](https://togithub.com/ldelossa) in [https://github.com/jesseduffield/lazygit/pull/3037](https://togithub.com/jesseduffield/lazygit/pull/3037) - Add Micro editor preset by [@kytta](https://togithub.com/kytta) in [https://github.com/jesseduffield/lazygit/pull/3049](https://togithub.com/jesseduffield/lazygit/pull/3049) - Show sync status in branches list by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3021](https://togithub.com/jesseduffield/lazygit/pull/3021) - Add 'lvim' editor preset for lunarvim by [@zottelsheep](https://togithub.com/zottelsheep) in [https://github.com/jesseduffield/lazygit/pull/3074](https://togithub.com/jesseduffield/lazygit/pull/3074) - Truncate branch names to make branch status always visible by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3075](https://togithub.com/jesseduffield/lazygit/pull/3075) - Color file icons by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3080](https://togithub.com/jesseduffield/lazygit/pull/3080) - Add UserConfig jsonschema generation script by [@karimkhaleel](https://togithub.com/karimkhaleel) in [https://github.com/jesseduffield/lazygit/pull/3039](https://togithub.com/jesseduffield/lazygit/pull/3039) - Add a copy-to-clipboard menu to the file view (with `diff` copy options) by [@AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3104](https://togithub.com/jesseduffield/lazygit/pull/3104) - Fix bottom line alignment by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3076](https://togithub.com/jesseduffield/lazygit/pull/3076) - Make move up/down blocking by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2966](https://togithub.com/jesseduffield/lazygit/pull/2966) - Add remote branch sorting menu by [@hosaka](https://togithub.com/hosaka) in [https://github.com/jesseduffield/lazygit/pull/3171](https://togithub.com/jesseduffield/lazygit/pull/3171) - Add age to stash entries by [@AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3174](https://togithub.com/jesseduffield/lazygit/pull/3174) - Add local branch sorting menu by [@hosaka](https://togithub.com/hosaka) in [https://github.com/jesseduffield/lazygit/pull/3182](https://togithub.com/jesseduffield/lazygit/pull/3182) - Show a friendly error message when starting lazygit from a non-existent cwd by [@simonwhitaker](https://togithub.com/simonwhitaker) in [https://github.com/jesseduffield/lazygit/pull/3192](https://togithub.com/jesseduffield/lazygit/pull/3192) - Replace copy commit SHA with copy commit subject on the y s keybind in the commits view by [@karimkhaleel](https://togithub.com/karimkhaleel) in [https://github.com/jesseduffield/lazygit/pull/3188](https://togithub.com/jesseduffield/lazygit/pull/3188) - Add config setting for splitting window vertically in half screen mode by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3133](https://togithub.com/jesseduffield/lazygit/pull/3133) - Add command to find base commit for creating a fixup by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3105](https://togithub.com/jesseduffield/lazygit/pull/3105) - Show Toast instead of error panel when invoking a disabled command by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3180](https://togithub.com/jesseduffield/lazygit/pull/3180) - Show file names in default colour by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3081](https://togithub.com/jesseduffield/lazygit/pull/3081) - Add config setting to suppress showing file icons by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3216](https://togithub.com/jesseduffield/lazygit/pull/3216) - Support range select for rebase actions by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3232](https://togithub.com/jesseduffield/lazygit/pull/3232) - Make range selections created with the mouse non-sticky by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3234](https://togithub.com/jesseduffield/lazygit/pull/3234) - Support range select for staging/discarding files by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3248](https://togithub.com/jesseduffield/lazygit/pull/3248) - Inline status for fetching remotes by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3238](https://togithub.com/jesseduffield/lazygit/pull/3238) - Add shortcuts for filtering files by status by [@mark2185](https://togithub.com/mark2185) in [https://github.com/jesseduffield/lazygit/pull/3137](https://togithub.com/jesseduffield/lazygit/pull/3137) - Keep same selection range when quick-starting an interactive rebase by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3247](https://togithub.com/jesseduffield/lazygit/pull/3247) - Add loads of tooltips by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3269](https://togithub.com/jesseduffield/lazygit/pull/3269) - Show better keybinding suggestions by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3203](https://togithub.com/jesseduffield/lazygit/pull/3203) - Support selecting file range in patch builder by [@afhoffman](https://togithub.com/afhoffman) in [https://github.com/jesseduffield/lazygit/pull/3259](https://togithub.com/jesseduffield/lazygit/pull/3259) - Add command to squash all fixups in the current branch by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3274](https://togithub.com/jesseduffield/lazygit/pull/3274) - Use slimmer scrollbars by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3283](https://togithub.com/jesseduffield/lazygit/pull/3283) - Clear cherry-picked commits after pasting by [@molejnik88](https://togithub.com/molejnik88) in [https://github.com/jesseduffield/lazygit/pull/3240](https://togithub.com/jesseduffield/lazygit/pull/3240) - Change default of git.log.showGraph to 'always' by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3314](https://togithub.com/jesseduffield/lazygit/pull/3314) - Support range select removing files from a commit by [@afhoffman](https://togithub.com/afhoffman) in [https://github.com/jesseduffield/lazygit/pull/3276](https://togithub.com/jesseduffield/lazygit/pull/3276) - Migrate git.log.showGraph and git.log.order to app state by [@hosaka](https://togithub.com/hosaka) in [https://github.com/jesseduffield/lazygit/pull/3197](https://togithub.com/jesseduffield/lazygit/pull/3197) - Change "git reset" default to --mixed by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3264](https://togithub.com/jesseduffield/lazygit/pull/3264) - Add author filtering to commit view by [@part22](https://togithub.com/part22) in [https://github.com/jesseduffield/lazygit/pull/3302](https://togithub.com/jesseduffield/lazygit/pull/3302) - Provide two helix presets, one for "helix" and one for "hx" by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3346](https://togithub.com/jesseduffield/lazygit/pull/3346) - Don't show branch head on rebase todos if the rebase.updateRefs config is on by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3340](https://togithub.com/jesseduffield/lazygit/pull/3340) - Show all submodules recursively by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3341](https://togithub.com/jesseduffield/lazygit/pull/3341) - Support setting a range of commits to "edit" outside of a rebase by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3370](https://togithub.com/jesseduffield/lazygit/pull/3370) - Adjust selection after squashing fixups by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3338](https://togithub.com/jesseduffield/lazygit/pull/3338) - Auto-wrap commit message while typing by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3173](https://togithub.com/jesseduffield/lazygit/pull/3173) - Add Co-Author support to new commits by [@2KAbhishek](https://togithub.com/2KAbhishek) in [https://github.com/jesseduffield/lazygit/pull/3097](https://togithub.com/jesseduffield/lazygit/pull/3097) - Show "breaking changes" message at startup by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3377](https://togithub.com/jesseduffield/lazygit/pull/3377) - Allow moving and deleting update-ref todos by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3391](https://togithub.com/jesseduffield/lazygit/pull/3391) - When checking out a remote branch by name, ask the user how by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3388](https://togithub.com/jesseduffield/lazygit/pull/3388) - Use substring filtering instead of fuzzy filtering by default by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3376](https://togithub.com/jesseduffield/lazygit/pull/3376) - Always prompt to return from subprocess if there was an error by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3410](https://togithub.com/jesseduffield/lazygit/pull/3410) - When adding a new remote, select it and fetch it by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3401](https://togithub.com/jesseduffield/lazygit/pull/3401) - Support editing multiple files at once using range selection by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3407](https://togithub.com/jesseduffield/lazygit/pull/3407) - Make it easy to create "amend!" commits by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3409](https://togithub.com/jesseduffield/lazygit/pull/3409) - Add config to truncate commit hashes when copying them to the clipboard by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3402](https://togithub.com/jesseduffield/lazygit/pull/3402) ##### Fixes 🔧 - Fix issue where explosion effect was out-of-view by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/2909](https://togithub.com/jesseduffield/lazygit/pull/2909) - Show dialogue when attempting to open info link fails by [@simonwhitaker](https://togithub.com/simonwhitaker) in [https://github.com/jesseduffield/lazygit/pull/2899](https://togithub.com/jesseduffield/lazygit/pull/2899) - Fix jumping to the correct line from the staging view by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2919](https://togithub.com/jesseduffield/lazygit/pull/2919) - Fix sha colors when rebasing by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2946](https://togithub.com/jesseduffield/lazygit/pull/2946) - Fix the commit graph display after selection jumps in commits view by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2943](https://togithub.com/jesseduffield/lazygit/pull/2943) - Handle trailing slash in worktree path by [@Krismix1](https://togithub.com/Krismix1) in [https://github.com/jesseduffield/lazygit/pull/2947](https://togithub.com/jesseduffield/lazygit/pull/2947) - Fix escape not cancelling filter mode, but closing the menu instead by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2977](https://togithub.com/jesseduffield/lazygit/pull/2977) - Use `Error` method to handle commits url copy from unknown service by [@AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3007](https://togithub.com/jesseduffield/lazygit/pull/3007) - Hide waiting status during credentials prompt by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3016](https://togithub.com/jesseduffield/lazygit/pull/3016) - Use upstream branch when opening pull requests by [@mark2185](https://togithub.com/mark2185) in [https://github.com/jesseduffield/lazygit/pull/2693](https://togithub.com/jesseduffield/lazygit/pull/2693) - Fix issue where active search inappropriately changed selected line by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3022](https://togithub.com/jesseduffield/lazygit/pull/3022) - Respect $GIT_WORK_TREE and $GIT_DIR env vars (fix [#3010](https://togithub.com/jesseduffield/lazygit/issues/3010)). by [@intrntbrn](https://togithub.com/intrntbrn) in [https://github.com/jesseduffield/lazygit/pull/3024](https://togithub.com/jesseduffield/lazygit/pull/3024) - Fix crash when trying to filter the list of remotes by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3059](https://togithub.com/jesseduffield/lazygit/pull/3059) - Re-apply filter when model changes by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3058](https://togithub.com/jesseduffield/lazygit/pull/3058) - Use a PTY when calling external diff command by [@AFutureD](https://togithub.com/AFutureD) in [https://github.com/jesseduffield/lazygit/pull/3120](https://togithub.com/jesseduffield/lazygit/pull/3120) - Re-enable 'Unset upstream' option when upstream branch is missing by [@mark2185](https://togithub.com/mark2185) in [https://github.com/jesseduffield/lazygit/pull/3086](https://togithub.com/jesseduffield/lazygit/pull/3086) - Fall back to WithWaitingStatus if item is not visible by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3083](https://togithub.com/jesseduffield/lazygit/pull/3083) - Fix checking out a tag when there is a branch with the same name by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3179](https://togithub.com/jesseduffield/lazygit/pull/3179) - Fix preserving the commit message when description contains blank lines by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3170](https://togithub.com/jesseduffield/lazygit/pull/3170) - Allow multiple fetch commands (or fetch and pull) to run concurrently by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3202](https://togithub.com/jesseduffield/lazygit/pull/3202) - Support insteadOf URL rewriting when opening URLs in browser by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3177](https://togithub.com/jesseduffield/lazygit/pull/3177) - Fix keybindings for characters involving AltGr on Windows by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3194](https://togithub.com/jesseduffield/lazygit/pull/3194) - Do not include keybindings from another view in keybindings menu by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3220](https://togithub.com/jesseduffield/lazygit/pull/3220) - Fix crash with short branch names by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3219](https://togithub.com/jesseduffield/lazygit/pull/3219) - Keep same branch selected when fetching a branch while sorted by date by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3186](https://togithub.com/jesseduffield/lazygit/pull/3186) - Use git rev-parse to obtain repository and worktree paths by [@jwhitley](https://togithub.com/jwhitley) in [https://github.com/jesseduffield/lazygit/pull/3183](https://togithub.com/jesseduffield/lazygit/pull/3183) - Pass absolute file paths to all editor commands by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3255](https://togithub.com/jesseduffield/lazygit/pull/3255) - Disallow cherry-picking merge commits by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3316](https://togithub.com/jesseduffield/lazygit/pull/3316) - Fix two problems related to update-ref rebase todo items by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3290](https://togithub.com/jesseduffield/lazygit/pull/3290) - Fix order of custom commands history by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3286](https://togithub.com/jesseduffield/lazygit/pull/3286) - Fix some problems with patches if `git diff` was customized with config (e.g. `external` or `noprefix`). by [@mricherzhagen](https://togithub.com/mricherzhagen) in [https://github.com/jesseduffield/lazygit/pull/3222](https://togithub.com/jesseduffield/lazygit/pull/3222) - Use $XDG_STATE_HOME for state.yml by [@horriblename](https://togithub.com/horriblename) in [https://github.com/jesseduffield/lazygit/pull/2936](https://togithub.com/jesseduffield/lazygit/pull/2936) - Fix display of Chinese characters on Windows by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3352](https://togithub.com/jesseduffield/lazygit/pull/3352) - Allow more than one argument in git.merging.args config by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3336](https://togithub.com/jesseduffield/lazygit/pull/3336) - Don't strike out reserved keys in menus by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3365](https://togithub.com/jesseduffield/lazygit/pull/3365) - Don't ask to force-push if the remote rejected updates by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3387](https://togithub.com/jesseduffield/lazygit/pull/3387) - Fix container detection by [@aritmos](https://togithub.com/aritmos) in [https://github.com/jesseduffield/lazygit/pull/3412](https://togithub.com/jesseduffield/lazygit/pull/3412) ##### Maintenance ⚙️ - Add Click() to GuiDriver by [@simonwhitaker](https://togithub.com/simonwhitaker) in [https://github.com/jesseduffield/lazygit/pull/2898](https://togithub.com/jesseduffield/lazygit/pull/2898) - Add Makefile by [@kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/2937](https://togithub.com/jesseduffield/lazygit/pull/2937) - fix GitHub Actions warnings by [@kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/2950](https://togithub.com/jesseduffield/lazygit/pull/2950) - Add instruction in PR template to start PRs with an imperative by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/2967](https://togithub.com/jesseduffield/lazygit/pull/2967) - Don't show toasts when running integration tests by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/2975](https://togithub.com/jesseduffield/lazygit/pull/2975) - Various debugging improvements by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3000](https://togithub.com/jesseduffield/lazygit/pull/3000) - Rename `test/results` to `test/_results` by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3012](https://togithub.com/jesseduffield/lazygit/pull/3012) - Support passing -race flag to integration tests by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3019](https://togithub.com/jesseduffield/lazygit/pull/3019) - Improve debugging of integration tests by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3029](https://togithub.com/jesseduffield/lazygit/pull/3029) - Use go:generate for cheatsheet by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3035](https://togithub.com/jesseduffield/lazygit/pull/3035) - Change Makefile to build non-optimized by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3028](https://togithub.com/jesseduffield/lazygit/pull/3028) - Update PR template to use go generate command by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3041](https://togithub.com/jesseduffield/lazygit/pull/3041) - Band-aid fix for submodule/reset.go test failure by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3047](https://togithub.com/jesseduffield/lazygit/pull/3047) - Remove redundant `len` check by [@Juneezee](https://togithub.com/Juneezee) in [https://github.com/jesseduffield/lazygit/pull/3051](https://togithub.com/jesseduffield/lazygit/pull/3051) - Add disabled compat for user config ([#2833](https://togithub.com/jesseduffield/lazygit/issues/2833)) by [@karimkhaleel](https://togithub.com/karimkhaleel) in [https://github.com/jesseduffield/lazygit/pull/3060](https://togithub.com/jesseduffield/lazygit/pull/3060) - Fix go.mod file by [@stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3118](https://togithub.com/jesseduffield/lazygit/pull/3118) - Capture test code coverage stats by [@jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3135](https://togithub.com/jesseduffield/lazygit/pull/3135) - fixed typo in test description by [@schuebel](https://togithub.com/schuebel) in [https://github.com/jesseduffield/lazygit/pull/3101](https://togithub.com/jesseduffield/lazygit/pull/3101) - Update cheatsheets by [@stefanhaller](https: </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://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/scottames/dots).  --------- 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>

stefanhaller added the enhancement New feature or request label Nov 5, 2023

Reinis reviewed Nov 7, 2023

View reviewed changes

stefanhaller force-pushed the find-base-commit-for-fixup branch from 496794c to c554ac9 Compare January 7, 2024 15:34

jesseduffield reviewed Jan 8, 2024

View reviewed changes

stefanhaller force-pushed the find-base-commit-for-fixup branch from c554ac9 to 092a40f Compare January 9, 2024 14:37

jesseduffield approved these changes Jan 9, 2024

View reviewed changes

stefanhaller added 2 commits January 10, 2024 09:11

Add command to find base commit for creating a fixup

8ca7841

stefanhaller force-pushed the find-base-commit-for-fixup branch from 092a40f to b35f877 Compare January 10, 2024 08:13

stefanhaller merged commit d294d51 into master Jan 10, 2024
17 checks passed

stefanhaller deleted the find-base-commit-for-fixup branch January 10, 2024 08:17

Add command to find base commit for creating a fixup #3105

Add command to find base commit for creating a fixup #3105

Conversation

stefanhaller commented Nov 5, 2023

stefanhaller commented Nov 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesseduffield commented Nov 23, 2023

stefanhaller commented Nov 23, 2023

jesseduffield commented Nov 27, 2023

stefanhaller commented Nov 27, 2023

stefanhaller commented Nov 27, 2023

jesseduffield commented Nov 27, 2023

jesseduffield commented Dec 1, 2023

stefanhaller commented Jan 7, 2024

codacy-production bot commented Jan 7, 2024 • edited Loading

Coverage summary from Codacy

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesseduffield Jan 9, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesseduffield Jan 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesseduffield left a comment

Choose a reason for hiding this comment

stefanhaller commented Jan 9, 2024

stefanhaller commented Jan 9, 2024

jesseduffield commented Jan 9, 2024

jesseduffield left a comment

Choose a reason for hiding this comment

stefanhaller commented Jan 10, 2024

codacy-production bot commented Jan 7, 2024 •

edited

Loading

jesseduffield Jan 9, 2024 •

edited

Loading

jesseduffield Jan 8, 2024 •

edited

Loading