.github/workflows/check-required-label.yml

@@ -8,7 +8,7 @@ jobs:
   check-required-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@23e10fde7e062233401931a0eece796cd9bf3177 # v5
+      - uses: mheap/github-action-required-labels@0ac283b4e65c1fb28ce6079dea5546ceca98ccbe # v5
         with:
           mode: exactly
           count: 1

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v7
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
       - name: Test code
@@ -53,16 +53,8 @@ jobs:
           - 2.38.2 # first version that supports the rebase.updateRefs config
           - 2.44.0
           - latest # We rely on github to have the latest version installed on their VMs
-        race:
-          - false
-        # Additionally run the whole suite once under the race detector. Data
-        # races live in lazygit's own Go code rather than in git, so a single
-        # git version is enough; use the latest to skip the git-build steps.
-        include:
-          - git-version: latest
-            race: true
     runs-on: ubuntu-latest
-    name: "Integration Tests - git ${{matrix.git-version}}${{ matrix.race && ' (race)' || '' }}"
+    name: "Integration Tests - git ${{matrix.git-version}}"
     env:
       GOFLAGS: -mod=vendor
     steps:
@@ -93,30 +85,19 @@ jobs:
           path: ~/git-${{matrix.git-version}}
           key: ${{runner.os}}-git-${{matrix.git-version}}
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
       - name: Print git version
         run: git --version
       - name: Test code
         env:
-          # See https://go.dev/blog/integration-test-coverage. The race variant
+          # See https://go.dev/blog/integration-test-coverage
-          # skips coverage: it's redundant with the non-race latest job and
+          LAZYGIT_GOCOVERDIR: /tmp/code_coverage
-          # would only slow the -race build down further. Leaving the dir unset
-          # makes run_integration_tests.sh take its non-coverage path.
-          LAZYGIT_GOCOVERDIR: ${{ !matrix.race && '/tmp/code_coverage' || '' }}
-          # Only set for the race variant. The race detector needs cgo; it's on
-          # by default on the Linux runner, but we set it explicitly to be safe.
-          LAZYGIT_RACE_DETECTOR: ${{ matrix.race && '1' || '' }}
-          CGO_ENABLED: ${{ matrix.race && '1' || '' }}
-          # Append each test's duration to this file; run_integration_tests.sh
-          # prints the slowest at the end, to spot slow/anomalous tests.
-          LAZYGIT_TEST_TIMING: /tmp/test_timings.txt
         run: |
           mkdir -p /tmp/code_coverage
           ./scripts/run_integration_tests.sh
       - name: Upload code coverage artifacts
-        if: ${{ !matrix.race }}
         uses: actions/upload-artifact@v7
         with:
           name: coverage-integration-${{ matrix.git-version }}-${{ github.run_id }}
@@ -130,7 +111,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v7
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
       - name: Build linux binary
@@ -157,7 +138,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v7
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
       - name: Check Vendor Directory
@@ -183,7 +164,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v7
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
       - name: Check formatting
@@ -195,7 +176,7 @@ jobs:
         uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9
         with:
           # If you change this, make sure to also update scripts/golangci-lint-shim.sh
-          version: v2.12.2
+          version: v2.4.0
   upload-coverage:
     # List all jobs that produce coverage files
     needs: [unit-tests, integration-tests]
@@ -206,7 +187,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
 

.github/workflows/release.yml

@@ -160,7 +160,7 @@ jobs:
           git push origin "refs/tags/$NEW_TAG"
 
       - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
         with:
           go-version: 1.25.x
 

.github/workflows/sponsors.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Generate Sponsors 💖
-        uses: JamesIves/github-sponsors-readme-action@02650b8cd445fc16dfef73195f9c406dce041623 # v1.6.1
+        uses: JamesIves/github-sponsors-readme-action@2fd9142e765f755780202122261dc85e78459405 # v1.6.0
         with:
           token: ${{ secrets.SPONSORS_TOKEN }}
           file: "README.md"

.golangci.yml

@@ -99,6 +99,8 @@ linters:
     generated: lax
     presets:
       - comments
+      - common-false-positives
+      - legacy
       - std-error-handling
     paths:
       - vendor/

AGENTS.md

@@ -26,24 +26,6 @@ Windows box has only `just`).
   (most useful with `--sandbox` or `--slow`).
 - `just lint` — run golangci-lint.
 
-## Prefer gopls MCP tools for Go symbol questions
-
-When the gopls MCP tools are available in the session, prefer them over grep
-for type-aware questions about Go code: who calls a function or method
-(`go_symbol_references`), finding a symbol by fuzzy name (`go_search`), or
-inspecting a package's API (`go_package_api`). Method names in this codebase
-collide a lot (`draw`, `Show`, `Refresh` exist on several types), and grep
-needs manual filtering that gopls doesn't. This includes code under
-`vendor/`, which gopls resolves as part of the module build.
-
-Grep remains the right tool for strings, comments, config keys, non-Go
-files, and anything textual. Don't adopt the full workflow from
-`gopls mcp -instructions` (vulncheck on session start, `go_file_context`
-after every file read); that overhead isn't worth it here.
-
-If the tools aren't available in a session, fall back to grep silently —
-don't try to install, register, or start the server.
-
 ## When to commit
 
 Do not leave completed work uncommitted. Once a logical unit of work is done
@@ -66,9 +48,6 @@ while still being meaningful and self-contained.
   commits that leave the tree broken and rely on a follow-up to fix it.
 - **Every commit must be `gofumpt`-formatted.** Run `just format` before
   committing.
-- **Every commit must be lint-clean.** Run `just lint` before committing —
-  don't introduce a lint warning in one commit and rely on a later commit
-  (or the user) to clean it up.
 - **Commit messages explain _why_, not _what_.** The diff already shows what
   changed; the message should capture the motivation, the constraint, or the
   bug being fixed. If the reason is obvious from a one-line subject, no body
@@ -82,26 +61,11 @@ while still being meaningful and self-contained.
   excuse bundling it in. Before committing, review your diff and split out any
   hunk that is behavior-preserving (an extraction, a rename, a move) into a
   preceding commit, by staging hunks or resetting and recommitting in order.
-- **A preparatory refactor is a new commit only when it prepares something
-  new.** Before adding one, find the commit that introduced the code you are
-  about to restructure. If that commit is on this branch, the refactor is a
-  `fixup!` for it rather than a commit of its own: a branch must never contain
-  a commit whose code a later commit on the same branch tidies up. A prep
-  refactor earns a commit of its own only when the shape it corrects came from
-  before the branch. This holds across a branch stack too — if the commit that
-  introduced the code is in an earlier branch of the stack, the fixup belongs
-  there, and the branches above it get replayed. The one exception is when
-  fixing it there turns out to be unreasonably difficult; ask me what to do
-  rather than deciding to leave the repair at the tip.
 - **Do not use conventional commits** (no `feat:`/`fix:`/`chore:` prefixes).
   Match the plain English imperative style of the existing history.
 - **Wrap message body to 72 characters**. The subject is allowed to go up to 80
   characters, or even a little more if needed to convey a good single-line
   summary; the body should be wrapped at 72 exactly, no more, no less.
-- **End every commit message with the `Co-authored-by:` trailer** naming the
-  model that wrote it, exactly as your harness instructions spell it. Nothing
-  in `just check` catches a missing one, so it has to be part of writing the
-  message rather than something to notice afterwards.
 
 ## Iterate with `fixup!` commits
 
@@ -120,20 +84,6 @@ separate, reviewable commit that the user decides when to fold in. A bare
 `--amend` rewrites the commit on the spot and skips that checkpoint. Don't
 treat "I'm only touching the tip commit" as an exception.
 
-Always use `fixup!` or `amend!` commits, never amend changes directly, even if
-you naturally would because "the branch isn't pushed yet". The user always wants
-to review what you changed, so make this transparent; no exceptions.
-
-**When the tip is the wrong place for a fixup, insert it mid-branch.**
-Committing a fixup at the tip of the branch only works while the code it
-touches still looks the same there; once later commits have rewritten that
-code — or the target has since been split — the fixup won't apply, and
-rewriting the later commits to accommodate it defeats the point. Check out the
-target, make the change, `git commit --fixup=<target>`, then
-`git rebase --onto <the fixup> <target> <branch>` to replay the rest of the
-branch. The fixup stays a separate, reviewable commit; only its position
-changes.
-
 If the changes don't map cleanly onto existing commits — say they cut
 across several of them, or restructure something at a different layer
 than any existing commit naturally owns — stop and ask the user how to
@@ -207,16 +157,6 @@ genuine forks — the ones where a reasonable person might pick differently, or
 where you'd be trading away something the plan assumed (scope, UX, performance,
 reload behavior, …). When in doubt, surface it.
 
-This applies with equal force to unforeseen _discoveries_, not just to
-decisions you set out to make. If you find something the plan didn't account
-for — a latent bug, a race, a wrong assumption, a case that turns out
-unhandled — stop and raise it before designing or writing a fix, even when the
-fix seems obvious and even when it's "just correctness." Finding the problem is
-itself the fork: whether to fix it here or in a separate change, how generally
-to solve it, and whether it reshapes the current work are all calls for me to
-make with you. Don't quietly fold a self-directed fix for a newly-found problem
-into the branch and let me discover it in the diff.
-
 ## Prefer the cleaner design over the smaller diff
 
 When a task could be implemented either by tacking onto existing code or by
@@ -242,16 +182,6 @@ that changes the relevant test(s) or adds new ones to demonstrate the bug, then
 fix the bug in a follow-up commit. This gives reviewers (and `git bisect`) a
 clear before/after and proves the test actually exercises the broken code path.
 
-This applies only to defects that existed before the entire branch or branch
-stack. Never use the bug-demonstration pattern for a regression introduced by
-an earlier commit in the current stack. Fix or rewrite the commit that
-introduced the regression so that no commit in the final history contains it.
-Put the regression test in a preparatory commit before the introducing commit,
-so it guards that commit in the final history. If the test cannot pass before
-the feature exists, restructure the implementation or test seam until it can;
-if that would require a design tradeoff, stop and discuss it rather than adding
-a later demonstration/fix pair.
-
 Use the `EXPECTED` / `ACTUAL` pattern in the bug-demonstrating commit. The test
 asserts the current (wrong) behavior so it passes on the broken code, with the
 correct expectation preserved inline as a comment. The fix commit then swaps
@@ -294,11 +224,7 @@ If you find yourself reaching for a local variable so that both forms can be
 expressed against the same receiver, the structure isn't right yet — go back
 and fix it instead of papering over it with a binding.
 
-Use this pattern only where it makes sense; don't apply it by default. Only
+Use this pattern only where it makes sense; don't apply it by default.
-ever use it for bugs, never for added features or behavior changes that aren't
-bugfixes; it is useful to demonstrate how a bug existed before fixing it, but
-it is never useful to demonstrate how a feature didn't exist before implementing
-it.
 
 ## Unify duplicated logic before you change it
 
@@ -317,34 +243,6 @@ Follow this even when the need for the refactor is only discovered in the middle
 of working on the branch; suggest to the user to rewrite the history to move the
 refactor to an earlier commit (but don't do it without asking first).
 
-## Don't read model state right after a `Refresh`
-
-A `Refresh` (or `RefreshFromWorker`) does its git work on a worker and then
-*enqueues* the model update onto the UI thread. So when `Refresh` returns, the
-model is **not** updated yet — the write is still queued. Reading a field
-synchronously right after refreshing its scope reads the stale, pre-refresh
-value (and this is true even for SYNC refreshes):
-
-```go
-self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}})
-files := self.c.Model().Files // BUG: still the pre-refresh value
-```
-
-Put the read in `RefreshOptions.Then` instead — it's queued after the scope's
-model writes, so it sees the fresh value:
-
-```go
-self.c.Refresh(types.RefreshOptions{
-    Scope: []types.RefreshableView{types.FILES},
-    Then: func() error {
-        files := self.c.Model().Files // fresh
-        return nil
-    },
-})
-```
-
-`Then` is a `func() error` and works with any non-`ASYNC` mode.
-
 ## Integration test conventions
 
 Don't bind views to local variables. Always chain method calls directly from
@@ -419,32 +317,12 @@ Avoid phrasings like:
 - "cleaner than the previous approach"
 - "we used to ... but ..."
 - "after trying X, we found Y"
-- "X rather than Y", where Y is what the code did before the change
 
 The iteration story is sometimes worth preserving — but it belongs in the
 commit message, which is the durable record of *why this change was made*. The
 code comment should make sense to someone who has never seen any prior version
 and is just trying to understand the file as it currently exists.
 
-The tell is subtler than an explicit "we used to". A comment that justifies the
-code against an alternative — "run it on a worker rather than blocking the UI",
-"switch panels in `Then` rather than a moment earlier" — is history in disguise
-whenever that alternative is what the code did before the change. It reads as
-ordinary rationale, but the reader has no way to know the contrast is with a
-version that no longer exists.
-
-So the check to apply is: would you have written this comment if you were
-writing the file from scratch, with no diff in mind? If not, the sentence
-belongs in the commit message.
-
-## Don't justify routine call sites
-
-If the codebase calls a helper in twenty places without explanation, your
-twenty-first call site doesn't need one either. A comment there says "something
-here is unusual"; when nothing is, it's noise — and it invites exactly the kind
-of before/after justification the section above warns about. Look at the
-neighboring call sites before writing one: if they're bare, match them.
-
 ## Don't present "live with the bug" as an option
 
 When you're investigating a defect and laying out fix options for the user,
@@ -492,12 +370,3 @@ Never run `find` (or similar) from `/` or other paths outside the project. All
 third-party code we use is vendored under `vendor/`, so dependency sources are
 reachable from inside the working tree — search there instead of the host
 filesystem.
-
-## gocui is in-tree, not a dependency
-
-The `gocui` TUI library is a fork maintained directly in this repo under
-`pkg/gocui` — it's an ordinary package, not a Go module dependency. Don't look
-for it in `go.mod`/`go.sum` or the module cache (`$GOMODCACHE`); it isn't
-there. When you need to read or change gocui internals (the task manager, the
-event loop, worker/UI-thread dispatch, view rendering), edit `pkg/gocui`
-directly.

CONTRIBUTING.md

@@ -1,35 +1,273 @@
 # Contributing
 
-## The short version
+This project does not accept pull requests.
 
-This project does not accept pull requests. Don't bother making one, it won't be merged.
+In todays world of agentic coding I have decided that it no longer makes sense for me to look at incoming pull requests. As far as I can tell, the vast majority of these is AI-generated these days, which in itself is not necessarily a bad thing; however, there's no way for me to tell whether the person posting the PR actually understands anything about the code that is being contributed or not, and I don't feel like spending time and energy on finding out whether they do.
 
-However, there are other forms of contributions that are very welcome and encouraged; see below for what those are.
+Now you might ask why this even matters; coding agents are capable of producing amazingly high-quality code, so why is it important that the person opening the PR understands it, as long as the code works and tests are green? It does actually matter very much to me. AI generated code needs to be carefully reviewed and iterated on, and it is the contributor's job to do that, not mine. And I have no idea to what extent the contributor has done this, or whether they are even capable of it.
 
-## Why no PRs?
+Every PR needs work and iterations until it is mergeable, whether manually coded or AI generated (even very good ones do), and if I don't know whether the person posting the PR will act on my review feedback themselves or just pass it on to their coding agent (which I guess is the much more likely case today), then it doesn't make sense for me to work with them.
 
-There are two main reasons for this, and I want to be very honest about them:
+For this reason I will close incoming pull requests by default from now on, without comment. Sorry if this sounds hostile, but honestly I don't feel I have much of a choice if I want maintaining this project to still be enjoyable for me.
 
-- I am maintaining lazygit for fun, as a hobby in my free time (which is quite limited). I'd like to spend my free time on things that I enjoy doing. I enjoy working on lazygit's code and improving it myself; I don't enjoy reviewing PRs. It's that simple, really. Reviewing PRs takes a lot of time; time that I would rather spend on developing lazygit myself.
+With that said, if you are indeed serious about contributing a high-quality PR to lazygit, and you are familiar with go, and you have learned enough about lazygit's code base to tell whether your changes are good, then do raise an issue and explain what you are planning to do, and somehow make it plausible that your PR will be worth my time reviewing it. In such a case I might make an exception from the default rule.
-- Even if I had the time and inclination to review PRs, this has become quite difficult today: most PRs nowadays are AI-generated to some extent (often completely), which in itself is not necessarily a bad thing; I heavily use AI myself these days, and I get great results from it. However, agentic coding needs to be guided by humans so that the results are good, and for contributed PRs I can't tell to what extent the human contributor did this, or is even capable of it; and I don't want to do the work of guiding a contributor's coding agent. If I post PR review feedback and have to suspect that the contributor simply passes it on to their coding agent, then that is a work mode that doesn't make sense to me, and I would rather just drive my own agent to do the work.
 
-### Why it might still make sense to post a PR
+In the future I might also consider adopting a vouch system similar to [Ghostty's](https://github.com/ghostty-org/ghostty/blob/main/CONTRIBUTING.md#first-time-contributors), but right now I feel the effort needed to set this up and maintain is not justified given the rather low number of high-quality contributions I have seen in recent times.
 
-I can think of two such reasons:
+Even though we no longer accept pull requests, I find it important to emphasize that Lazygit is still a community project, and non-PR contributions are still very welcome. Do file issues for bug reports or feature requests, and help shape the future of lazygit by actively participating in discussing UX designs. Also, the localization system very much depends on everybody's help with translating texts (see https://crowdin.com/project/lazygit).
 
-- You implemented a lazygit improvement that you want to use yourself; in this case it could make sense to let others merge this change into their forks if they find it useful too. And if enough people say they want the feature, this can persuade me to add it, so putting it out there to give it visibility can be helpful.
+---
-- You posted an issue for a feature request, and have a prototype that implements it; it could be useful to publish the branch as a draft PR to better illustrate how the feature works.
 
-For this reason I usually don't close pull requests to give them more visibility. Just don't expect your PR to be merged.
+The remainder of this document is the old version from a time when contributing pull requests was still encouraged. Keeping it here in case I reconsider my policy in the future.
 
-## So how can I contribute then?
+## PR walkthrough
 
-There are other forms of contributions to a project besides source code that are very welcome and encouraged; for instance:
+[This video](https://www.youtube.com/watch?v=kNavnhzZHtk) walks through the process of adding a small feature to lazygit. If you have no idea where to start, watching that video is a good first step.
 
-- File issues for bugs that you find, and I'll do my best to take care of fixing them (if they are important enough).
+## Design principles
-- File feature requests for new functionality that you want to see in lazygit. I have a lot of ideas for future improvement myself, but I have also implemented a lot of feature ideas that weren't mine, and I'm grateful for those ideas. (Of course, there are also lots of feature requests that I don't implement, so don't be disappointed if I don't jump on yours.)
-- Help make other people's bug reports reproducible. Sometimes people report bugs that they have only seen once, and in such a case it can be helpful to come up with reproducible scenarios.
-- Help complete or improve the translation into other languages; join https://crowdin.com/project/lazygit for that.
-- Run a master build! This is probably the most valuable way to help me. Test the latest master not just by occasionally trying it, but by actually using it for your daily work; report any issues that you find. This will help prevent having to release hotfix updates for regressions that are only noticed by users updating to a new release.
 
-Importantly, if you file issues (whether bug reports or feature requests), stay around to answer questions and discuss your issue. There are few things that I find more annoying than spending time on responding to someone's issue (sometimes even making a PR that addresses it), and to then never hear from the OP again. So please set up your Github notifications so that you see when there's activity on your issue, and continue to participate.
+See [here](./VISION.md) for a set of design principles that we want to consider when building a feature or making a change.
+
+## Codebase guide
+
+[This doc](./docs/dev/Codebase_Guide.md) explains:
+
+- what the different packages in the codebase are for
+- where important files live
+- important concepts in the code
+- how the event loop works
+- other useful information
+
+## All code changes happen through Pull Requests
+
+Pull requests are the best way to propose changes to the codebase. We actively
+welcome your pull requests:
+
+1. Fork the repo and create your branch from `master`.
+2. If you've added code that should be tested, add tests.
+3. If you've added code that needs documentation, update the documentation.
+4. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+5. Issue that pull request!
+
+Please do not raise pull request from your fork's master branch: make a feature branch instead. Lazygit maintainers will sometimes push changes to your branch when reviewing a PR and we often can't do this if you use your master branch.
+
+If you've never written Go in your life, then join the club! Lazygit was the maintainer's first Go program, and most contributors have never used Go before. Go is widely considered an easy-to-learn language, so if you're looking for an open source project to gain dev experience, you've come to the right place.
+
+## Commit history
+
+We value a clean and useful commit history, so please take some time to organize your commits so that they make sense. Don't assume that they will be squashed on merge anyway; we don't do that here.
+
+In particular:
+
+- Refactorings and behavior changes should be in separate commits. There are very few exceptions where this is not possible, but in my experience they are very rare.
+- Strive for minimal commits; every change that is independent from other changes should be in a commit of its own (with a good commit message that explains why the change is made).
+- When you need to iterate over your implementation during review (e.g. because you discovered a bug, or a maintainer requested changes), don't just pile new commits on top. Use fixup commits to make your changes transparent while still maintaining a good commit history. If you don't know what that means, [here's a brief introduction](docs/Fixup_Commits.md).
+
+## A note about AI
+
+It has become common recently to throw an issue at a coding agent and submit whatever comes out of it as a PR. This is not appreciated here, and I will close PRs where I can tell this was the case, or where I even suspect it was the case.
+
+Some of these PRs may actually be good and useful, but many are not, and it's not a good use of my time as a maintainer to look at generated PRs to decide. This is the job of the PR's contributor, and if you don't speak enough go or can't be bothered to get familiar enough with lazygit's codebase to tell, then don't contribute the PR.
+
+## Running in a VSCode dev container
+
+If you want to spare yourself the hassle of setting up your dev environment yourself (i.e. installing Go, extensions, and extra tools), you can run the Lazygit code in a VSCode dev container like so:
+
+![image](https://user-images.githubusercontent.com/8456633/201500508-0d55f99f-5035-4a6f-a0f8-eaea5c003e5d.png)
+
+This requires that:
+
+- you have docker installed
+- you have the dev containers extension installed in VSCode
+
+See [here](https://code.visualstudio.com/docs/devcontainers/containers) for more info about dev containers.
+
+## Running in a Github Codespace
+
+If you want to start contributing to Lazygit with the click of a button, you can open the lazygit codebase in a Codespace. First fork the repo, then click to create a codespace:
+
+![image](https://user-images.githubusercontent.com/8456633/201500566-ffe9105d-6030-4cc7-a525-6570b0b413a2.png)
+
+To run lazygit from within the integrated terminal just go `go run main.go`
+
+This allows you to contribute to Lazygit without needing to install anything on your local machine. The Codespace has all the necessary tools and extensions pre-installed.
+
+## Using Nix for development
+
+If you use Nix, you can leverage the included flake to set up a complete development environment with all necessary dependencies:
+
+```sh
+nix develop
+```
+
+This will drop you into a development shell that includes:
+
+- Latest Go toolchain
+- golangci-lint for code linting
+- git and make
+
+You can also build and run lazygit using nix:
+
+```sh
+# Build lazygit
+nix build
+
+# Run lazygit directly
+nix run
+```
+
+The nix flake supports multiple architectures (x86_64-linux, aarch64-linux, x86_64-darwin, aarch64-darwin) and provides a consistent development environment across different systems.
+
+## Code of conduct
+
+Please note by participating in this project, you agree to abide by the [code of conduct].
+
+[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CODE-OF-CONDUCT.md
+
+## Any contributions you make will be under the MIT Software License
+
+In short, when you submit code changes, your submissions are understood to be
+under the same [MIT License](http://choosealicense.com/licenses/mit/) that
+covers the project. Feel free to contact the maintainers if that's a concern.
+
+## Report bugs using Github's [issues](https://github.com/jesseduffield/lazygit/issues)
+
+We use GitHub issues to track public bugs. Report a bug by [opening a new
+issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!
+
+## Go
+
+This project is written in Go. Go is an opinionated language with strict idioms, but some of those idioms are a little extreme. Some things we do differently:
+
+1. There is no shame in using `self` as a receiver name in a struct method. In fact we encourage it
+2. There is no shame in prefixing an interface with 'I' instead of suffixing with 'er' when there are several methods on the interface.
+3. If a struct implements an interface, we make it explicit with something like:
+
+```go
+var _ MyInterface = &MyStruct{}
+```
+
+This makes the intent clearer and means that if we fail to satisfy the interface we'll get an error in the file that needs fixing.
+
+### Code Formatting
+
+To check code formatting [gofumpt](https://pkg.go.dev/mvdan.cc/gofumpt#section-readme) (which is a bit stricter than [gofmt](https://pkg.go.dev/cmd/gofmt)) is used.
+VSCode will format the code correctly if you tell the Go extension to use `gofumpt` via your [`settings.json`](https://code.visualstudio.com/docs/getstarted/settings#_settingsjson)
+by setting [`formatting.gofumpt`](https://github.com/golang/tools/blob/master/gopls/doc/settings.md#gofumpt-bool) to `true`:
+
+```jsonc
+// .vscode/settings.json
+{
+  "gopls": {
+    "formatting.gofumpt": true
+  }
+}
+```
+
+To run gofumpt from your terminal go:
+
+```
+go install mvdan.cc/gofumpt@latest && gofumpt -l -w .
+```
+
+## Programming Font
+
+Lazygit supports [Nerd Fonts](https://www.nerdfonts.com) to render certain icons. Sometimes we use some of these icons verbatim in string literals in the code (mainly in tests), so you need to set your development environment to use a nerd font to see these.
+
+## Internationalisation
+
+Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package.
+
+### For developers adding new text
+
+If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `self.c.Tr.YourNewText`, etc).
+
+Note, we use 'Sentence case' for everything (so no 'Title Case' or 'whatever-it's-called-when-there's-no-capital-letters-case')
+
+### For translators
+
+Lazygit translations are managed through [Crowdin](https://crowdin.com/project/lazygit/). If you'd like to contribute translations:
+
+1. Join the Crowdin project at https://crowdin.com/project/lazygit/
+2. Select your target language and help translate missing strings
+3. The translation files in `pkg/i18n/translations/` are managed by the maintainers - please don't edit them directly
+
+For detailed information about the translation process, including how maintainers sync translations, see `pkg/i18n/translations/README.md`.
+
+## Debugging
+
+The easiest way to debug lazygit is to have two terminal tabs open at once: one for running lazygit (via `go run main.go -debug` in the project root) and one for viewing lazygit's logs (which can be done via `go run main.go --logs` or just `lazygit --logs`).
+
+From most places in the codebase you have access to a logger e.g. `gui.Log.Warn("blah")` or `self.c.Log.Warn("blah")`.
+
+If you find that the existing logs are too noisy, you can set the log level with e.g. `LOG_LEVEL=warn go run main.go -debug` and then only use `Warn` logs yourself.
+
+If you need to log from code in the vendor directory (e.g. the `gocui` package), you won't have access to the logger, but you can easily add logging support by setting the `LAZYGIT_LOG_PATH` environment variable and using `logs.Global.Warn("blah")`. This is a global logger that's only intended for development purposes.
+
+If you keep having to do some setup steps to reproduce an issue, read the Testing section below to see how to create an integration test by recording a lazygit session. It's pretty easy!
+
+### VSCode debugger
+
+If you want to trigger a debug session from VSCode, you can use the following snippet. Note that the `console` key is, at the time of writing, still an experimental feature.
+
+```jsonc
+// .vscode/launch.json
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "debug lazygit",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "main.go",
+      "args": ["--debug"],
+      "console": "externalTerminal" // <-- you need this to actually see the lazygit UI in a window while debugging
+    }
+  ]
+}
+```
+
+## Profiling
+
+If you want to investigate what's contributing to CPU or memory usage, see [this separate document](docs/dev/Profiling.md).
+
+## Testing
+
+Lazygit has two kinds of tests: unit tests and integration tests. Unit tests go in files that end in `_test.go`, and are written in Go. For integration tests, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
+
+## Updating Gocui
+
+Sometimes you will need to make a change in the gocui fork (https://github.com/jesseduffield/gocui). Gocui is the package responsible for rendering windows and handling user input. Here's the typical process to follow:
+
+1. Make the changes in gocui inside lazygit's vendor directory so it's easy to test against lazygit
+2. Copy the changes over to the actual gocui repo (clone it if you haven't already, and use the `awesome` branch, not `master`)
+3. Raise a PR on the gocui repo with your changes
+4. After that PR is merged, make a PR in lazygit bumping the gocui version. You can bump the version by running the following at the lazygit repo root:
+
+```sh
+./scripts/bump_gocui.sh
+```
+
+5. Raise a PR in lazygit with those changes
+
+## Updating Lazycore
+
+[Lazycore](https://github.com/jesseduffield/lazycore) is a repo containing shared functionality between lazygit and lazydocker. Sometimes you will need to make a change to that repo and import the changes into lazygit. Similar to updating Gocui, here's what you do:
+
+1. Make the changes in lazycore inside lazygit's vendor directory so it's easy to test against lazygit
+2. Copy the changes over to the actual lazycore repo (clone it if you haven't already, and use the `master` branch)
+3. Raise a PR on the lazycore repo with your changes
+4. After that PR is merged, make a PR in lazygit bumping the lazycore version. You can bump the version by running the following at the lazygit repo root:
+
+```sh
+./scripts/bump_lazycore.sh
+```
+
+Or if you're using VSCode, there is a bump lazycore task you can find by going `cmd+shift+p` and typing 'Run task'
+
+5. Raise a PR in lazygit with those changes
+
+## Improvements
+
+If you can think of any way to improve these docs let us know.

README.md

@@ -118,7 +118,7 @@ If you're a mere mortal like me and you're tired of hearing how powerful git is
   - [Changing Directory On Exit](#changing-directory-on-exit)
   - [Undo/Redo](#undoredo)
 - [Configuration](#configuration)
-  - [Custom Diff Renderers](#custom-diff-renderers)
+  - [Custom Pagers](#custom-pagers)
   - [Custom Commands](#custom-commands)
   - [Git flow support](#git-flow-support)
 - [Contributing](#contributing)
@@ -423,7 +423,6 @@ nix-shell -p lazygit
 # or with flakes enabled
 nix run nixpkgs#lazygit
 ```
-
 Or you can add lazygit to your `configuration.nix` using the `environment.systemPackages` option.
 More details can be found via NixOS search [page](https://search.nixos.org/).
 
@@ -432,7 +431,6 @@ More details can be found via NixOS search [page](https://search.nixos.org/).
 This repository includes a nix flake that provides the latest development version and additional development tools:
 
 **Run lazygit directly from the repository:**
-
 ```sh
 nix run github:jesseduffield/lazygit
 # or from a local clone
@@ -440,7 +438,6 @@ nix run .
 ```
 
 **Build lazygit from source:**
-
 ```sh
 nix build github:jesseduffield/lazygit
 # or from a local clone
@@ -449,7 +446,6 @@ nix build .
 
 **Development environment:**
 For contributors, the flake provides a development shell with Go toolchain, development tools, and dependencies:
-
 ```sh
 nix develop github:jesseduffield/lazygit
 # or from a local clone
@@ -457,14 +453,12 @@ nix develop
 ```
 
 The development shell includes:
-
 - Go toolchain
 - git and make
 - Proper environment variables for development
 
 **Using in other flakes:**
 The flake also provides an overlay for easy integration into other flake-based projects:
-
 ```nix
 {
   inputs.lazygit.url = "github:jesseduffield/lazygit";
@@ -590,9 +584,9 @@ See the [docs](/docs/Undoing.md)
 
 Check out the [configuration docs](docs/Config.md).
 
-### Custom Diff Renderers
+### Custom Pagers
 
-See the [docs](docs/Custom_DiffRenderers.md)
+See the [docs](docs/Custom_Pagers.md)
 
 ### Custom Commands
 

docs-master/Config.md

@@ -66,8 +66,8 @@ gui:
 
   # The number of spaces per tab; used for everything that's shown in the main
   # view, but probably mostly relevant for diffs.
-  # Note that when using a diff renderer, the renderer has its own tab width
+  # Note that when using a pager, the pager has its own tab width setting, so you
-  # setting, so you need to pass it separately in the renderer command.
+  # need to pass it separately in the pager command.
   tabWidth: 4
 
   # If true, capture mouse events.
@@ -336,13 +336,13 @@ gui:
   spinner:
     # The frames of the spinner animation.
     frames:
-      - ●∙∙
+      - '|'
-      - ∙●∙
+      - /
-      - ∙∙●
+      - '-'
-      - ∙●∙
+      - \
 
     # The "speed" of the spinner in milliseconds.
-    rate: 180
+    rate: 50
 
   # Status panel view.
   # One of 'dashboard' (default) | 'allBranchesLog'
@@ -360,39 +360,38 @@ gui:
 
 # Config relating to git
 git:
-  # Array of diff renderers. Each entry has the following format:
+  # Array of pagers. Each entry has the following format:
   #
-  #   # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff'
+  #   # A name for the pager, shown in the notification when cycling pagers.
-  #   # | 'rawGit'
+  #   # If not set, the name is derived from the first word of the pager
-  #   type: "stdinFilter"
+  #   # command (or of the external diff command).
-  #
-  #   # A name for the diff renderer, shown in the notification when cycling
-  #   # renderers. If not set, the name is derived from the first word of the
-  #   # renderer command.
   #   name: ""
   #
-  #   # Value of the --color arg in the git diff command. Only used for type
+  #   # Value of the --color arg in the git diff command. Some pagers want
-  #   # 'stdinFilter'. Some renderers want this to be set to 'always' and some
+  #   # this to be set to 'always' and some want it set to 'never'
-  #   # want it set to 'never'.
   #   colorArg: "always"
   #
-  #   # The command to use for rendering diffs. This is either a stdinFilter or
-  #   # an external diff command, depending on the type field; not applicable if
-  #   # the type is 'rawGit'.
   #   # e.g.
   #   # diff-so-fancy
   #   # delta --dark --paging=never
-  #   # ydiff -p cat
+  #   # ydiff -p cat -s --wrap --width={{columnWidth}}
-  #   # difft --color=always
+  #   pager: ""
-  #   command: ""
   #
-  #   # Extra arguments (array of strings) passed to the git command. Only
+  #   # e.g. 'difft --color=always'
-  #   # applicable if the type is 'rawGit'.
+  #   externalDiffCommand: ""
-  #   args: []
   #
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md
+  #   # If true, Lazygit will use git's `diff.external` config for paging.
+  #   # The advantage over `externalDiffCommand` is that this can be
+  #   # configured per file type in .gitattributes; see
+  #   # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
+  #   useExternalDiffGitConfig: false
+  #
+  # 'pager', 'externalDiffCommand', and 'useExternalDiffGitConfig' are mutually
+  # exclusive; set at most one per entry.
+  #
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
   # for more information.
-  diffRenderers: []
+  pagers: []
 
   # Config relating to committing
   commit:
@@ -715,8 +714,8 @@ keybinding:
     prevTab: '['
     nextScreenMode: +
     prevScreenMode: _
-    cycleDiffRenderers: '|'
+    cyclePagers: '|'
-    cycleDiffRenderersReverse: \
+    cyclePagersReverse: \
     undo: z
     redo: Z
     filteringMenu: <ctrl+s>

docs-master/Custom_DiffRenderers.md

@@ -1,84 +0,0 @@
-# Custom Diff Renderers
-
-Custom diff renderers are useful for showing a better rendering of a diff than git's builtin raw diff, and using one is strongly recommended (I personally prefer delta myself, but that's a matter of personal preference). There are three types of diff renderers that lazygit supports:
-
-- **stdin filters**, e.g. [delta](#delta) and [diff-so-fancy](#diff-so-fancy). They take git's raw output as stdin and produce something nicer on stdout, and they are hooked up using git's GIT_PAGER mechanism. (These used to be called "custom pagers" in earlier lazygit versions.)
-- **external diff programs**, e.g. difftastic; these are called using git's `--ext-diff` flag, and they take over diff generation from git completely rather than post-processing git's output.
-- **git's raw output using custom arguments**; mainly useful for `--color-words` (or `--word-diff` if you are color blind).
-
-Diff renderers are configured with the `diffRenderers` array in the `git` section of lazygit's config file; it is an array because you can have multiple entries that you can cycle through with the `|` key. This can be useful if you usually prefer a particular diff renderer, but want to use a different one for certain kinds of diffs.
-
-Fields that are shared by all renderer types:
-
-- **type** The type of diff renderer; choices are `stdinFilter`, `extDiff`, or `rawGit`. `stdinFilter` is the default, because it's the most common one; so you can omit this if you use delta.
-- **name** A name that is shown in the status bar toast when cycling renderers; defaults to the first word of the renderer command, but can be useful e.g. to distinguish "delta" from "delta side-by-side" if you have entries for both.
-
-Fields only for `stdinFilter`:
-
-- **command** The command line to use for `GIT_PAGER`.
-
-- **colorArg** whether you want the `--color=always` arg in your `git diff` command. Some diff renderers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most renderers need.
-
-Fields only for `extDiff`:
-
-- **command** The command line to use for the `diff.external` git config. If left empty, it uses the global value of git's `diff.external` config; this can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
-
-  You can include the `{{diffContext}}` template variable to pass lazygit's current diff context size (the value controlled by the `{`/`}` keybindings) to the diff tool.
-
-Fields only for `rawGit`:
-
-- **args** The additional arguments to use in the `git diff` or `git show` call (e.g. `--color-words`), as an array of strings.
-
-Here's an example for a multi-renderer setup:
-
-```yaml
-git:
-  diffRenderers:
-    - command: delta --dark --paging=never
-    - command: ydiff -p cat
-      colorArg: never
-    - type: extDiff
-      command: difft --color=always --context={{diffContext}}
-    - type: rawGit
-      args: [--color-words]
-      name: color-words
-    - type: rawGit # git's default diff
-      name: default
-```
-
-## Delta:
-
-```yaml
-git:
-  diffRenderers:
-    - command: delta --dark --paging=never
-```
-
-![](https://i.imgur.com/QJpQkF3.png)
-
-A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `command:` field to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor.
-
-Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons.
-
-## Diff-so-fancy
-
-```yaml
-git:
-  diffRenderers:
-    - command: diff-so-fancy
-```
-
-![](https://i.imgur.com/rjH1TpT.png)
-
-## ydiff
-
-```yaml
-gui:
-  sidePanelWidth: 0.2 # gives you more space to show things side-by-side
-git:
-  diffRenderers:
-    - colorArg: never
-      command: ydiff -p cat
-```
-
-![](https://i.imgur.com/vaa8z0H.png)

docs-master/Custom_Pagers.md

@@ -0,0 +1,92 @@
+# Custom Pagers
+
+Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `e` in the Status panel).
+
+Multiple pagers are supported; you can cycle through them with the `|` key. This can be useful if you usually prefer a particular pager, but want to use a different one for certain kinds of diffs.
+
+Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup (use an empty object `{}` for the default builtin diff display that doesn't use a pager):
+
+```yaml
+git:
+  pagers:
+    - pager: delta --dark --paging=never
+    - pager: ydiff -p cat -s --wrap --width={{columnWidth}}
+      colorArg: never
+    - externalDiffCommand: difft --color=always
+    - {} # default, no pager used
+```
+
+The `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most pagers need.
+
+## Delta:
+
+```yaml
+git:
+  pagers:
+    - pager: delta --dark --paging=never
+```
+
+![](https://i.imgur.com/QJpQkF3.png)
+
+A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `pager:` config to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor.
+
+Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons.
+
+## Diff-so-fancy
+
+```yaml
+git:
+  pagers:
+    - pager: diff-so-fancy
+```
+
+![](https://i.imgur.com/rjH1TpT.png)
+
+## ydiff
+
+```yaml
+gui:
+  sidePanelWidth: 0.2 # gives you more space to show things side-by-side
+git:
+  pagers:
+    - colorArg: never
+      pager: ydiff -p cat -s --wrap --width={{columnWidth}}
+```
+
+![](https://i.imgur.com/vaa8z0H.png)
+
+Be careful with this one, I think the homebrew and pip versions are behind master. I needed to directly download the ydiff script to get the no-pager functionality working.
+
+## Using external diff commands
+
+Some diff tools can't work as a simple pager like the ones above do, because they need access to the entire diff, so just post-processing git's diff is not enough for them. The most notable example is probably [difftastic](https://difftastic.wilfred.me.uk).
+
+These can be used in lazygit by using the `externalDiffCommand` config; in the case of difftastic, that could be
+
+```yaml
+git:
+  pagers:
+    - externalDiffCommand: difft --color=always
+```
+
+The `colorArg` option is not used in this case.
+
+You can add whatever extra arguments you prefer for your difftool; for instance
+
+```yaml
+git:
+  pagers:
+    - externalDiffCommand: difft --color=always --display=inline --syntax-highlight=off
+```
+
+Instead of setting this command in lazygit's `externalDiffCommand` config, you can also tell lazygit to use the external diff command that is configured in git itself (`diff.external`), by using
+
+```yaml
+git:
+  pagers:
+    - useExternalDiffGitConfig: true
+```
+
+This can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
+
+`pager`, `externalDiffCommand`, and `useExternalDiffGitConfig` are alternative ways of producing the diff, so a pager entry may use at most one of them.

docs-master/README.md

@@ -2,7 +2,7 @@
 
 * [Configuration](./Config.md).
 * [Custom Commands](./Custom_Command_Keybindings.md)
-* [Custom Diff Renderers](./Custom_DiffRenderers.md)
+* [Custom Pagers](./Custom_Pagers.md)
 * [Dev docs](./dev)
 * [Keybindings](./keybindings)
 * [Undo/Redo](./Undoing.md)

docs-master/Searching.md

@@ -4,14 +4,10 @@
 
 Depending on the currently focused view, hitting '/' will bring up a filter or search prompt. When filtering, the contents of the view will be filtered down to only those lines which match the query string. When searching, the contents of the view are not filtered, but matching lines are highlighted and you can iterate through matches with `n`/`N`.
 
-In the commits view we don't filter, but search; this is deliberate because you typically care about the commits that come before/after a matching commit.
+We intend to support filtering for the files view soon, but at the moment it uses searching. We intend to continue using search for the commits view because you typically care about the commits that come before/after a matching commit.
 
 If you would like both filtering and searching to be enabled on a given view, please raise an issue for this.
 
-## Menu filtering
-
-The keybindings (`?`) and recent repositories menus can be filtered simply by typing. The filter field appears at the bottom of the menu while you type; there is no need to press `/` or confirm the filter before navigating the results.
-
 ## Filtering files by status
 
 You can filter the files view to only show staged/unstaged files by pressing `<c-b>` in the files view.

docs-master/keybindings/Keybindings_en.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Refresh | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | Next screen mode (normal/half/fullscreen) |  |
 | `` _ `` | Prev screen mode |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Cancel |  |
 | `` ? `` | Open keybindings menu |  |
 | `` <ctrl+s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs-master/keybindings/Keybindings_ja.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 更新 | Gitの状態を更新します（`git status`、`git branch`などをバックグラウンドで実行してパネルの内容を更新します）。これは`git fetch`を実行しません。 |
 | `` + `` | 次の画面モード（通常/半分/全画面） |  |
 | `` _ `` | 前の画面モード |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | キャンセル |  |
 | `` ? `` | キーバインディングメニューを開く |  |
 | `` <ctrl+s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |

docs-master/keybindings/Keybindings_ko.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 새로고침 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | 다음 스크린 모드 (normal/half/fullscreen) |  |
 | `` _ `` | 이전 스크린 모드 |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 취소 |  |
 | `` ? `` | 매뉴 열기 |  |
 | `` <ctrl+s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs-master/keybindings/Keybindings_nl.md

@@ -9,31 +9,31 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+r> `` | Wissel naar een recente repo |  |
 | `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel |  |
 | `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel |  |
-| `` @ `` | Commandolog opties weergeven | Bekijk commandolog opties, bijv. commandolog tonen/verbergen en focus. |
+| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
 | `` P `` | Push | Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
 | `` p `` | Pull | Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
 | `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
 | `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
 | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
 | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` : `` | Voer shellcommando uit | Bring up a prompt where you can enter a shell command to execute. |
+| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. |
 | `` <ctrl+p> `` | Bekijk aangepaste patch opties |  |
 | `` m `` | Bekijk merge/rebase opties | Toon abort/continue/skip opties voor huidige merge/rebase. |
 | `` R `` | Verversen | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | Volgende scherm modus (normaal/half/groot) |  |
 | `` _ `` | Vorige scherm modus |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Annuleren |  |
 | `` ? `` | Open menu |  |
 | `` <ctrl+s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
 | `` W, <ctrl+e> `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
 | `` q, <ctrl+c> `` | Afsluiten |  |
 | `` <ctrl+z> `` | Pauzeer de applicatie |  |
-| `` <ctrl+w> `` | Witruimte weergeven in-/uitschakelen | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
+| `` <ctrl+w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
 | `` <alt+shift+c> `` | Verander config bestand | Open bestand in externe editor. |
 | `` z `` | Ongedaan maken (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` Z `` | Redo (via reflog) (experimenteel) | Het reflog wordt gebruikt om te bepalen welk git commando moet worden gebruikt om het laatste git commando te herhalen. Wijzigingen aan de working tree worden niet meegenomen, alleen command's zijn kandidaten. |
+| `` Z `` | Redo (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
 
 ## Lijstpaneel navigatie
 
@@ -161,25 +161,25 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
 | `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
 | `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. |
-| `` r `` | Hernoem commit | Herschrijf de commit message van de geselecteerde commit. |
+| `` r `` | Hernoem commit | Reword the selected commit's message. |
 | `` R `` | Hernoem commit met editor |  |
 | `` d `` | Verwijder commit | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Bewerken (start interactieve rebase) | Wijzig commit |
+| `` e `` | Edit (start interactive rebase) | Wijzig commit |
-| `` i `` | Start interactieve rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.<br>If you would instead like to start an interactive rebase from the selected commit, press `e`. |
+| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.<br>If you would instead like to start an interactive rebase from the selected commit, press `e`. |
 | `` p `` | Pick | Kies commit (wanneer midden in rebase) |
 | `` F `` | Creëer fixup commit | Creëer fixup commit |
 | `` S `` | Apply fixup commits | Squash bovenstaande commits |
 | `` <ctrl+j>, <alt+down> `` | Verplaats commit 1 naar beneden |  |
 | `` <ctrl+k>, <alt+up> `` | Verplaats commit 1 naar boven |  |
 | `` V `` | Plak commits (cherry-pick) |  |
-| `` B `` | Markeer als basiscommit voor rebase | Selecteer een basiscommit voor de volgende rebase. Als je rebased op een branch worden alleen commits boven de basiscommit meegenomen. Hiervoor wordt het `git rebase --onto` commando gebruikt. |
+| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
 | `` A `` | Amend | Wijzig commit met staged veranderingen |
 | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Maak een revert commit voor de geselecteerde commit, die de wijzigingen in deze commit terugdraait. |
+| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | Tag commit | Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving. |
+| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <ctrl+l> `` | Log opties weergeven | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
+| `` <ctrl+l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
 | `` G `` | Open pull request in browser |  |
-| `` <space> `` | Uitchecken | Check de geselecteerde branch uit als een detached HEAD. |
+| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser |  |
 | `` n `` | Creëer nieuwe branch van commit |  |
@@ -241,7 +241,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` v `` | Toggle drag selecteer |  |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` o `` | Open bestand | Open bestand in standaardapplicatie. |
 | `` e `` | Verander bestand | Open bestand in externe editor. |
@@ -255,7 +255,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | Uitchecken | Check de geselecteerde branch uit als een detached HEAD. |
+| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser |  |
 | `` n `` | Creëer nieuwe branch van commit |  |
@@ -280,7 +280,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` w `` | New worktree |  |
 | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. |
-| `` d `` | Verwijderen | Verwijder de remote branch van de remote. |
+| `` d `` | Verwijderen | Delete the remote branch from the remote. |
 | `` u `` | Instellen als upstream | Stel in als upstream van uitgecheckte branch |
 | `` s `` | Sort order |  |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
@@ -295,7 +295,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <enter> `` | Bekijk branches |  |
 | `` n `` | Voeg een nieuwe remote toe |  |
-| `` d `` | Verwijderen | Verwijder de geselecteerde remote. Locale branches die een branch tracken van de remote worden niet aangepast. |
+| `` d `` | Verwijderen | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | Edit | Wijzig remote |
 | `` f `` | Fetch | Fetch remote |
 | `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
@@ -316,7 +316,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` v `` | Toggle drag selecteer |  |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
 | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
@@ -361,7 +361,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | Uitchecken | Check de geselecteerde branch uit als een detached HEAD. |
+| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser |  |
 | `` n `` | Creëer nieuwe branch van commit |  |
@@ -396,10 +396,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Copy tag to clipboard |  |
 | `` <space> `` | Uitchecken | Geselecteerde tag uitchecken als detached HEAD. |
-| `` n `` | Creëer tag | Maak een nieuwe tag die naar de huidige commit wijst. Je wordt gevraagd om een tag naam en optionele beschrijving. |
+| `` n `` | Creëer tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
 | `` w `` | New worktree |  |
 | `` d `` | Verwijderen | View delete options for local/remote tag. |
-| `` P `` | Tag pushen | Push de geselecteerde tag naar een remote. Je krijgt de optie een remote te selecteren. |
+| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
 | `` 0 `` | Focus main view |  |

docs-master/keybindings/Keybindings_pl.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Odśwież | Odśwież stan git (tj. uruchom `git status`, `git branch`, itp. w tle, aby zaktualizować zawartość paneli). To nie uruchamia `git fetch`. |
 | `` + `` | Następny tryb ekranu (normalny/półpełny/pełnoekranowy) |  |
 | `` _ `` | Poprzedni tryb ekranu |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Anuluj |  |
 | `` ? `` | Otwórz menu przypisań klawiszy |  |
 | `` <ctrl+s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |

docs-master/keybindings/Keybindings_pt.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Atualizar | Atualize o estado do git (ou seja, execute `git status`, `git branch`, etc em segundo plano para atualizar o conteúdo de painéis). Isso não executa `git fetch`. |
 | `` + `` | Modo de tela seguinte (normal/metade/tela cheia) |  |
 | `` _ `` | Modo de tela anterior |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Cancelar |  |
 | `` ? `` | Abrir o menu de atalhos do teclado |  |
 | `` <ctrl+s> `` | Ver opções de filtro | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs-master/keybindings/Keybindings_ru.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Обновить | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) |  |
 | `` _ `` | Предыдущий режим экрана |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Отменить |  |
 | `` ? `` | Открыть меню |  |
 | `` <ctrl+s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs-master/keybindings/Keybindings_zh-CN.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 刷新 | 刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。 |
 | `` + `` | 下一屏模式(正常/半屏/全屏) |  |
 | `` _ `` | 上一屏模式 |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |

docs-master/keybindings/Keybindings_zh-TW.md

@@ -9,28 +9,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+r> `` | 切換到最近使用的版本庫 |  |
 | `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | 向上捲動主面板 |  |
 | `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | 向下捲動主面板 |  |
-| `` @ `` | 開啟命令記錄選單 | 檢視命令日誌的選項，例如顯示/隱藏命令日誌以及聚焦命令日誌。 |
+| `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. |
 | `` P `` | 推送 | 推送到遠端。如果沒有設定遠端，會開啟設定視窗。 |
 | `` p `` | 拉取 | 從遠端同步當前分支。如果沒有設定遠端，會開啟設定視窗。 |
-| `` ) `` | 提高重新命名相似度閾值 | 提高將刪除和新增對視為重新命名所需的相似度閾值。<br><br>預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 |
+| `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` ( `` | 降低重新命名相似度閾值 | 降低將刪除和新增對視為重新命名所需的相似度閾值。<br><br>預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 |
+| `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | 增加差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
+| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | Increase the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | 減少差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
+| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | Decrease the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` : `` | 執行 Shell 命令 | 調出可輸入shell命令執行的提示符。 |
+| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. |
 | `` <ctrl+p> `` | 檢視自訂補丁選項 |  |
-| `` m `` | 查看合併/變基選項 | 檢視目前合併或變基的中止、繼續、跳過選項。 |
+| `` m `` | 查看合併/變基選項 | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | 重新整理 | 重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。 |
+| `` R `` | 重新整理 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） |  |
 | `` _ `` | 上一個螢幕模式 |  |
-| `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 開啟選單 |  |
-| `` <ctrl+s> `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 |
+| `` <ctrl+s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W, <ctrl+e> `` | 開啟差異比較選單 | 檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。 |
+| `` W, <ctrl+e> `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
 | `` q, <ctrl+c> `` | 結束 |  |
-| `` <ctrl+z> `` | 掛起應用程式 |  |
+| `` <ctrl+z> `` | Suspend the application |  |
-| `` <ctrl+w> `` | 切換是否在差異檢視中顯示空格變更 | 切換是否在差異檢視中顯示空白字元更改。<br><br>預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。 |
+| `` <ctrl+w> `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
 | `` <alt+shift+c> `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 |
 | `` Z `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 |
@@ -44,14 +44,21 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <, <home> `` | 捲動到頂部 |  |
 | `` >, <end> `` | 捲動到底部 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` <shift+down> `` | 向下擴充套件選擇範圍 |  |
+| `` <shift+down> `` | Range select down |  |
-| `` <shift+up> `` | 向上擴充套件選擇範圍 |  |
+| `` <shift+up> `` | Range select up |  |
 | `` / `` | 搜尋 |  |
 | `` H `` | 向左捲動 |  |
 | `` L `` | 向右捲動 |  |
 | `` ] `` | 下一個索引標籤 |  |
 | `` [ `` | 上一個索引標籤 |  |
 
+## Input prompt
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 確認 |  |
+| `` <esc> `` | 關閉/取消 |  |
+
 ## 主面板 (補丁生成)
 
 | Key | Action | Info |
@@ -59,12 +66,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  |
-| `` d `` | 從提交中移除行 | 從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。 |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
 | `` <esc> `` | 退出自訂補丁建立器 |  |
 | `` / `` | 搜尋 |  |
 
@@ -74,8 +81,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下捲動 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上捲動 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` <esc> `` | 退出回到側邊面板 |  |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |
 
 ## 主面板（合併）
@@ -83,15 +90,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | 挑選程式碼片段 |  |
-| `` b `` | 選取兩個區塊 |  |
+| `` b `` | Pick both hunks |  |
 | `` <up>, k `` | 選擇上一段 |  |
 | `` <down>, j `` | 選擇下一段 |  |
 | `` <left>, h `` | 選擇上一個衝突 |  |
 | `` <right>, l `` | 選擇下一個衝突 |  |
-| `` z `` | 復原 | 撤消上次合併衝突解決。 |
+| `` z `` | 復原 | Undo last merge conflict resolution. |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
-| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | 返回檔案面板 |  |
 
 ## 主面板（預存）
@@ -101,19 +108,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
 | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
-| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
+| `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <esc> `` | 返回檔案面板 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
+| `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
 | `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` <ctrl+f> `` | Find base commit for fixup | 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: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 搜尋 |  |
 
 ## 功能表
@@ -128,19 +135,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` * `` | 選擇目前分支的提交 |  |
+| `` * `` | Select commits of current branch |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |
 
@@ -149,12 +156,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製子模組名稱到剪貼簿 |  |
-| `` <enter> `` | 進入 | 進入子模組 |
+| `` <enter> `` | Enter | 進入子模組 |
-| `` d `` | 刪除 | 刪除選定的子模組及其相應的目錄。 |
+| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | 更新 | 更新子模組 |
+| `` u `` | Update | 更新子模組 |
 | `` n `` | 新增子模組 |  |
 | `` e `` | 更新子模組 URL |  |
-| `` i `` | 初始化 | 初始化子模組 |
+| `` i `` | Initialize | 初始化子模組 |
 | `` b `` | 查看批量子模組選項 |  |
 | `` / `` | 搜尋 |  |
 
@@ -162,27 +169,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` n `` | 新建工作樹 |  |
+| `` n `` | New worktree |  |
-| `` <space> `` | 切換 | 切換到選中的工作樹。 |
+| `` <space> `` | Switch | Switch to the selected worktree. |
 | `` o `` | 在編輯器中開啟 |  |
-| `` d `` | 刪除 | 刪除選定的工作樹。這將刪除工作樹的目錄以及 .git 目錄中有關工作樹的後設資料。 |
+| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
 | `` / `` | 搜尋 |  |
 
 ## 提交
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
 | `` <ctrl+r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` b `` | 查看二分選項 |  |
-| `` s `` | 壓縮 (Squash) | 將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。 |
+| `` s `` | 壓縮 (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | 修復 (Fixup) | 將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。 |
+| `` f `` | 修復 (Fixup) | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` c `` | 設定修復提交資訊 | 設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。 |
+| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. |
 | `` r `` | 改寫提交 | 改寫選中的提交訊息 |
 | `` R `` | 使用編輯器改寫提交 |  |
-| `` d `` | 刪除提交 | 刪除選中的提交。這將透過變基從分支中刪除該提交，如果該提交修改的內容依賴於後續的提交，則需要解決合併衝突。 |
+| `` d `` | 刪除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
 | `` e `` | 編輯(開始互動變基) | 編輯提交 |
-| `` i `` | 開始互動變基 | 為分支上的提交啟動互動式變基。這將包括從 HEAD 提交到第一個合併提交或主分支提交的所有提交。<br>如果您想從所選提交啟動互動式變基，請按 `e`。 |
+| `` i `` | 開始互動變基 | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.<br>If you would instead like to start an interactive rebase from the selected commit, press `e`. |
 | `` p `` | 挑選 | 挑選提交 (於變基過程中) |
 | `` F `` | 建立修復提交 | 為此提交建立修復提交 |
 | `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ |
@@ -191,22 +198,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` V `` | 貼上提交 (揀選) |  |
 | `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 |
 | `` A `` | 修改 | 使用已預存的更改修正提交 |
-| `` a `` | 設定/重設提交作者 | 設定或重置提交的作者，或新增其他作者。 |
+| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. |
-| `` t `` | 還原 | 為所選提交建立還原提交，這會反向應用所選提交的更改。 |
+| `` t `` | 還原 | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | 打標籤到提交 | 建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。 |
+| `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <ctrl+l> `` | 開啟記錄選單 | 檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。 |
+| `` <ctrl+l> `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
+| `` G `` | Open pull request in browser |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` * `` | 選擇目前分支的提交 |  |
+| `` * `` | Select commits of current branch |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |
 
@@ -224,30 +231,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | 複製檔案名稱到剪貼簿 |  |
 | `` y `` | 複製到剪貼簿 |  |
 | `` c `` | 檢出 | 檢出檔案 |
-| `` d `` | 捨棄 | 放棄對此檔案的提交變更。 |
+| `` d `` | 捨棄 | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯 | 使用外部編輯器開啟 |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` <space> `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
+| `` <space> `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
+| `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 |
+| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
+| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
+| `` - `` | Collapse all files | Collapse all directories in the files tree |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
+| `` = `` | Expand all files | Expand all directories in the file tree |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |
 
 ## 收藏 (Stash)
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <space> `` | 套用 | 將貯藏項應用到您的工作目錄。 |
+| `` <space> `` | 套用 | Apply the stash entry to your working directory. |
-| `` g `` | 還原 | 將儲存項應用到工作目錄並刪除儲存項。 |
+| `` g `` | 還原 | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | 捨棄 | 從貯藏列表中刪除該貯藏項。 |
+| `` d `` | 捨棄 | Remove the stash entry from the stash list. |
-| `` n `` | 新分支 | 從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。 |
+| `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
 | `` r `` | 重新命名收藏 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |
 
@@ -255,19 +262,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` * `` | 選擇目前分支的提交 |  |
+| `` * `` | Select commits of current branch |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
 
@@ -279,18 +286,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` i `` | 顯示 git-flow 選項 |  |
 | `` <space> `` | 檢出 | 檢出選定的項目。 |
 | `` n `` | 新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
 | `` o `` | 建立拉取請求 |  |
 | `` O `` | 建立拉取請求選項 |  |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
+| `` G `` | Open pull request in browser |  |
 | `` <ctrl+y> `` | 複製拉取請求的 URL 到剪貼板 |  |
-| `` c `` | 根據名稱檢出 | 按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。 |
+| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. |
-| `` - `` | 簽出上一個分支 |  |
+| `` - `` | Checkout previous branch |  |
-| `` F `` | 強制檢出 | 強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。 |
+| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | 刪除 | 檢視本地/遠端分支的刪除選項。 |
+| `` d `` | 刪除 | View delete options for local/remote branch. |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` f `` | 從上游快進此分支 | 從遠端快進所選的分支 |
 | `` T `` | 建立標籤 |  |
 | `` s `` | 排序規則 |  |
@@ -298,7 +305,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 重新命名分支 |  |
 | `` u `` | 檢視遠端設定 | 檢視有關遠端分支的設定（例如重設至遠端） |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
 
@@ -306,15 +313,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製標籤到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy tag to clipboard |  |
-| `` <space> `` | 檢出 | 檢出選擇的標籤作為分離的HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected tag as a detached HEAD. |
-| `` n `` | 建立標籤 | 基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。 |
+| `` n `` | 建立標籤 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` d `` | 刪除 | 檢視本機／遠端標籤的刪除選項。 |
+| `` d `` | 刪除 | View delete options for local/remote tag. |
-| `` P `` | 推送標籤 | 推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。 |
+| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | 重設 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
 
@@ -323,40 +330,40 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製檔案名稱到剪貼簿 |  |
-| `` <space> `` | 切換預存 | 切換所選檔案的暫存狀態。 |
+| `` <space> `` | 切換預存 | Toggle staged for selected file. |
 | `` <ctrl+b> `` | 篩選檔案 (預存/未預存) |  |
 | `` y `` | 複製到剪貼簿 |  |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
 | `` A `` | 修改上次提交 |  |
 | `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` <ctrl+f> `` | Find base commit for fixup | 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: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` e `` | 編輯 | 使用外部編輯器開啟 |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` i `` | 忽略或排除檔案 |  |
 | `` r `` | 重新整理檔案 |  |
-| `` s `` | 收藏 | 貯藏所有變更.若要使用其他貯藏變體,請使用檢視貯藏選項快捷鍵。 |
+| `` s `` | 收藏 | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | 檢視收藏選項 | 檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。 |
+| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | 全部預存/取消預存 | 切換工作區中所有檔案的已暫存/未暫存狀態。 |
+| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | 如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。 |
+| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
 | `` d `` | 捨棄 | 檢視選中變動進行捨棄復原 |
 | `` g `` | 檢視遠端重設選項 |  |
-| `` D `` | 重設 | 檢視工作樹的重置選項（例如：清除工作樹）。 |
+| `` D `` | 重設 | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
+| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` f `` | 擷取 | 同步遠端異動 |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
+| `` - `` | Collapse all files | Collapse all directories in the files tree |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
+| `` = `` | Expand all files | Expand all directories in the file tree |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |
 
 ## 次要
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` <esc> `` | 退出回到側邊面板 |  |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |
 
 ## 狀態
@@ -366,9 +373,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` u `` | 檢查更新 |  |
 | `` <enter> `` | 切換到最近使用的版本庫 |  |
-| `` a `` | 顯示/迴圈所有分支日誌 |  |
+| `` a `` | Show/cycle all branch logs |  |
-| `` A `` | 顯示/迴圈所有分支日誌（反向） |  |
+| `` A `` | Show/cycle all branch logs (reverse) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 
 ## 確認面板
 
@@ -378,23 +385,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <esc> `` | 關閉/取消 |  |
 | `` <ctrl+o> `` | 複製到剪貼簿 |  |
 
-## 輸入提示
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 確認 |  |
-| `` <esc> `` | 關閉/取消 |  |
-
 ## 遠端
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <enter> `` | 檢視分支 |  |
+| `` <enter> `` | View branches |  |
 | `` n `` | 新增遠端 |  |
-| `` d `` | 刪除 | 刪除選中的遠端。從遠端跟蹤遠端分支的任何本地分支都不會受到影響。 |
+| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | 編輯 | 編輯遠端 |
 | `` f `` | 擷取 | 擷取遠端 |
-| `` F `` | 新增復刻遠端倉庫 | 透過替換 origin URL 中的所有者來快速新增復刻遠端倉庫，並可選擇從新遠端倉庫檢出分支。 |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` / `` | 搜尋 |  |
 
 ## 遠端分支
@@ -402,16 +402,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製分支名稱到剪貼簿 |  |
-| `` <space> `` | 檢出 | 基於目前選中的遠端分支檢出一個新的本地分支，或者將遠端分支作分離的HEAD。 |
+| `` <space> `` | 檢出 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | 新分支 |  |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | 刪除 | 從遠端刪除遠端分支。 |
+| `` d `` | 刪除 | Delete the remote branch from the remote. |
 | `` u `` | 設置為遠端 | 將此分支設為當前分支之遠端 |
 | `` s `` | 排序規則 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |

docs/Config.md

@@ -66,8 +66,8 @@ gui:
 
   # The number of spaces per tab; used for everything that's shown in the main
   # view, but probably mostly relevant for diffs.
-  # Note that when using a diff renderer, the renderer has its own tab width
+  # Note that when using a pager, the pager has its own tab width setting, so you
-  # setting, so you need to pass it separately in the renderer command.
+  # need to pass it separately in the pager command.
   tabWidth: 4
 
   # If true, capture mouse events.
@@ -336,13 +336,13 @@ gui:
   spinner:
     # The frames of the spinner animation.
     frames:
-      - ●∙∙
+      - '|'
-      - ∙●∙
+      - /
-      - ∙∙●
+      - '-'
-      - ∙●∙
+      - \
 
     # The "speed" of the spinner in milliseconds.
-    rate: 180
+    rate: 50
 
   # Status panel view.
   # One of 'dashboard' (default) | 'allBranchesLog'
@@ -360,39 +360,38 @@ gui:
 
 # Config relating to git
 git:
-  # Array of diff renderers. Each entry has the following format:
+  # Array of pagers. Each entry has the following format:
   #
-  #   # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff'
+  #   # A name for the pager, shown in the notification when cycling pagers.
-  #   # | 'rawGit'
+  #   # If not set, the name is derived from the first word of the pager
-  #   type: "stdinFilter"
+  #   # command (or of the external diff command).
-  #
-  #   # A name for the diff renderer, shown in the notification when cycling
-  #   # renderers. If not set, the name is derived from the first word of the
-  #   # renderer command.
   #   name: ""
   #
-  #   # Value of the --color arg in the git diff command. Only used for type
+  #   # Value of the --color arg in the git diff command. Some pagers want
-  #   # 'stdinFilter'. Some renderers want this to be set to 'always' and some
+  #   # this to be set to 'always' and some want it set to 'never'
-  #   # want it set to 'never'.
   #   colorArg: "always"
   #
-  #   # The command to use for rendering diffs. This is either a stdinFilter or
-  #   # an external diff command, depending on the type field; not applicable if
-  #   # the type is 'rawGit'.
   #   # e.g.
   #   # diff-so-fancy
   #   # delta --dark --paging=never
-  #   # ydiff -p cat
+  #   # ydiff -p cat -s --wrap --width={{columnWidth}}
-  #   # difft --color=always
+  #   pager: ""
-  #   command: ""
   #
-  #   # Extra arguments (array of strings) passed to the git command. Only
+  #   # e.g. 'difft --color=always'
-  #   # applicable if the type is 'rawGit'.
+  #   externalDiffCommand: ""
-  #   args: []
   #
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md
+  #   # If true, Lazygit will use git's `diff.external` config for paging.
+  #   # The advantage over `externalDiffCommand` is that this can be
+  #   # configured per file type in .gitattributes; see
+  #   # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
+  #   useExternalDiffGitConfig: false
+  #
+  # 'pager', 'externalDiffCommand', and 'useExternalDiffGitConfig' are mutually
+  # exclusive; set at most one per entry.
+  #
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
   # for more information.
-  diffRenderers: []
+  pagers: []
 
   # Config relating to committing
   commit:
@@ -715,8 +714,8 @@ keybinding:
     prevTab: '['
     nextScreenMode: +
     prevScreenMode: _
-    cycleDiffRenderers: '|'
+    cyclePagers: '|'
-    cycleDiffRenderersReverse: \
+    cyclePagersReverse: \
     undo: z
     redo: Z
     filteringMenu: <ctrl+s>

docs/Custom_DiffRenderers.md

@@ -1,84 +0,0 @@
-# Custom Diff Renderers
-
-Custom diff renderers are useful for showing a better rendering of a diff than git's builtin raw diff, and using one is strongly recommended (I personally prefer delta myself, but that's a matter of personal preference). There are three types of diff renderers that lazygit supports:
-
-- **stdin filters**, e.g. [delta](#delta) and [diff-so-fancy](#diff-so-fancy). They take git's raw output as stdin and produce something nicer on stdout, and they are hooked up using git's GIT_PAGER mechanism. (These used to be called "custom pagers" in earlier lazygit versions.)
-- **external diff programs**, e.g. difftastic; these are called using git's `--ext-diff` flag, and they take over diff generation from git completely rather than post-processing git's output.
-- **git's raw output using custom arguments**; mainly useful for `--color-words` (or `--word-diff` if you are color blind).
-
-Diff renderers are configured with the `diffRenderers` array in the `git` section of lazygit's config file; it is an array because you can have multiple entries that you can cycle through with the `|` key. This can be useful if you usually prefer a particular diff renderer, but want to use a different one for certain kinds of diffs.
-
-Fields that are shared by all renderer types:
-
-- **type** The type of diff renderer; choices are `stdinFilter`, `extDiff`, or `rawGit`. `stdinFilter` is the default, because it's the most common one; so you can omit this if you use delta.
-- **name** A name that is shown in the status bar toast when cycling renderers; defaults to the first word of the renderer command, but can be useful e.g. to distinguish "delta" from "delta side-by-side" if you have entries for both.
-
-Fields only for `stdinFilter`:
-
-- **command** The command line to use for `GIT_PAGER`.
-
-- **colorArg** whether you want the `--color=always` arg in your `git diff` command. Some diff renderers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most renderers need.
-
-Fields only for `extDiff`:
-
-- **command** The command line to use for the `diff.external` git config. If left empty, it uses the global value of git's `diff.external` config; this can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
-
-  You can include the `{{diffContext}}` template variable to pass lazygit's current diff context size (the value controlled by the `{`/`}` keybindings) to the diff tool.
-
-Fields only for `rawGit`:
-
-- **args** The additional arguments to use in the `git diff` or `git show` call (e.g. `--color-words`), as an array of strings.
-
-Here's an example for a multi-renderer setup:
-
-```yaml
-git:
-  diffRenderers:
-    - command: delta --dark --paging=never
-    - command: ydiff -p cat
-      colorArg: never
-    - type: extDiff
-      command: difft --color=always --context={{diffContext}}
-    - type: rawGit
-      args: [--color-words]
-      name: color-words
-    - type: rawGit # git's default diff
-      name: default
-```
-
-## Delta:
-
-```yaml
-git:
-  diffRenderers:
-    - command: delta --dark --paging=never
-```
-
-![](https://i.imgur.com/QJpQkF3.png)
-
-A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `command:` field to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor.
-
-Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons.
-
-## Diff-so-fancy
-
-```yaml
-git:
-  diffRenderers:
-    - command: diff-so-fancy
-```
-
-![](https://i.imgur.com/rjH1TpT.png)
-
-## ydiff
-
-```yaml
-gui:
-  sidePanelWidth: 0.2 # gives you more space to show things side-by-side
-git:
-  diffRenderers:
-    - colorArg: never
-      command: ydiff -p cat
-```
-
-![](https://i.imgur.com/vaa8z0H.png)

docs/Custom_Pagers.md

@@ -0,0 +1,92 @@
+# Custom Pagers
+
+Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `e` in the Status panel).
+
+Multiple pagers are supported; you can cycle through them with the `|` key. This can be useful if you usually prefer a particular pager, but want to use a different one for certain kinds of diffs.
+
+Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup (use an empty object `{}` for the default builtin diff display that doesn't use a pager):
+
+```yaml
+git:
+  pagers:
+    - pager: delta --dark --paging=never
+    - pager: ydiff -p cat -s --wrap --width={{columnWidth}}
+      colorArg: never
+    - externalDiffCommand: difft --color=always
+    - {} # default, no pager used
+```
+
+The `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most pagers need.
+
+## Delta:
+
+```yaml
+git:
+  pagers:
+    - pager: delta --dark --paging=never
+```
+
+![](https://i.imgur.com/QJpQkF3.png)
+
+A cool feature of delta is --hyperlinks, which renders clickable links for the line numbers in the left margin, and lazygit supports these. To use them, set the `pager:` config to `delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"`; this allows you to click on an underlined line number in the diff to jump right to that same line in your editor.
+
+Note that delta's `--navigate` option doesn't work in lazygit, for technical reasons.
+
+## Diff-so-fancy
+
+```yaml
+git:
+  pagers:
+    - pager: diff-so-fancy
+```
+
+![](https://i.imgur.com/rjH1TpT.png)
+
+## ydiff
+
+```yaml
+gui:
+  sidePanelWidth: 0.2 # gives you more space to show things side-by-side
+git:
+  pagers:
+    - colorArg: never
+      pager: ydiff -p cat -s --wrap --width={{columnWidth}}
+```
+
+![](https://i.imgur.com/vaa8z0H.png)
+
+Be careful with this one, I think the homebrew and pip versions are behind master. I needed to directly download the ydiff script to get the no-pager functionality working.
+
+## Using external diff commands
+
+Some diff tools can't work as a simple pager like the ones above do, because they need access to the entire diff, so just post-processing git's diff is not enough for them. The most notable example is probably [difftastic](https://difftastic.wilfred.me.uk).
+
+These can be used in lazygit by using the `externalDiffCommand` config; in the case of difftastic, that could be
+
+```yaml
+git:
+  pagers:
+    - externalDiffCommand: difft --color=always
+```
+
+The `colorArg` option is not used in this case.
+
+You can add whatever extra arguments you prefer for your difftool; for instance
+
+```yaml
+git:
+  pagers:
+    - externalDiffCommand: difft --color=always --display=inline --syntax-highlight=off
+```
+
+Instead of setting this command in lazygit's `externalDiffCommand` config, you can also tell lazygit to use the external diff command that is configured in git itself (`diff.external`), by using
+
+```yaml
+git:
+  pagers:
+    - useExternalDiffGitConfig: true
+```
+
+This can be useful if you also want to use it for diffs on the command line, and it also has the advantage that you can configure it per file type in `.gitattributes`; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
+
+`pager`, `externalDiffCommand`, and `useExternalDiffGitConfig` are alternative ways of producing the diff, so a pager entry may use at most one of them.

docs/README.md

@@ -2,7 +2,7 @@
 
 * [Configuration](./Config.md).
 * [Custom Commands](./Custom_Command_Keybindings.md)
-* [Custom Diff Renderers](./Custom_DiffRenderers.md)
+* [Custom Pagers](./Custom_Pagers.md)
 * [Dev docs](./dev)
 * [Keybindings](./keybindings)
 * [Undo/Redo](./Undoing.md)

docs/Searching.md

@@ -4,14 +4,10 @@
 
 Depending on the currently focused view, hitting '/' will bring up a filter or search prompt. When filtering, the contents of the view will be filtered down to only those lines which match the query string. When searching, the contents of the view are not filtered, but matching lines are highlighted and you can iterate through matches with `n`/`N`.
 
-In the commits view we don't filter, but search; this is deliberate because you typically care about the commits that come before/after a matching commit.
+We intend to support filtering for the files view soon, but at the moment it uses searching. We intend to continue using search for the commits view because you typically care about the commits that come before/after a matching commit.
 
 If you would like both filtering and searching to be enabled on a given view, please raise an issue for this.
 
-## Menu filtering
-
-The keybindings (`?`) and recent repositories menus can be filtered simply by typing. The filter field appears at the bottom of the menu while you type; there is no need to press `/` or confirm the filter before navigating the results.
-
 ## Filtering files by status
 
 You can filter the files view to only show staged/unstaged files by pressing `<c-b>` in the files view.

docs/keybindings/Keybindings_en.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Refresh | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | Next screen mode (normal/half/fullscreen) |  |
 | `` _ `` | Prev screen mode |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Cancel |  |
 | `` ? `` | Open keybindings menu |  |
 | `` <ctrl+s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs/keybindings/Keybindings_ja.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 更新 | Gitの状態を更新します（`git status`、`git branch`などをバックグラウンドで実行してパネルの内容を更新します）。これは`git fetch`を実行しません。 |
 | `` + `` | 次の画面モード（通常/半分/全画面） |  |
 | `` _ `` | 前の画面モード |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | キャンセル |  |
 | `` ? `` | キーバインディングメニューを開く |  |
 | `` <ctrl+s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |

docs/keybindings/Keybindings_ko.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 새로고침 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | 다음 스크린 모드 (normal/half/fullscreen) |  |
 | `` _ `` | 이전 스크린 모드 |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 취소 |  |
 | `` ? `` | 매뉴 열기 |  |
 | `` <ctrl+s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs/keybindings/Keybindings_nl.md

@@ -9,31 +9,31 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+r> `` | Wissel naar een recente repo |  |
 | `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel |  |
 | `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel |  |
-| `` @ `` | Commandolog opties weergeven | Bekijk commandolog opties, bijv. commandolog tonen/verbergen en focus. |
+| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
 | `` P `` | Push | Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
 | `` p `` | Pull | Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
 | `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
 | `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
 | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
 | `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` : `` | Voer shellcommando uit | Bring up a prompt where you can enter a shell command to execute. |
+| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. |
 | `` <ctrl+p> `` | Bekijk aangepaste patch opties |  |
 | `` m `` | Bekijk merge/rebase opties | Toon abort/continue/skip opties voor huidige merge/rebase. |
 | `` R `` | Verversen | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | Volgende scherm modus (normaal/half/groot) |  |
 | `` _ `` | Vorige scherm modus |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Annuleren |  |
 | `` ? `` | Open menu |  |
 | `` <ctrl+s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
 | `` W, <ctrl+e> `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
 | `` q, <ctrl+c> `` | Afsluiten |  |
 | `` <ctrl+z> `` | Pauzeer de applicatie |  |
-| `` <ctrl+w> `` | Witruimte weergeven in-/uitschakelen | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
+| `` <ctrl+w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
 | `` <alt+shift+c> `` | Verander config bestand | Open bestand in externe editor. |
 | `` z `` | Ongedaan maken (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
-| `` Z `` | Redo (via reflog) (experimenteel) | Het reflog wordt gebruikt om te bepalen welk git commando moet worden gebruikt om het laatste git commando te herhalen. Wijzigingen aan de working tree worden niet meegenomen, alleen command's zijn kandidaten. |
+| `` Z `` | Redo (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
 
 ## Lijstpaneel navigatie
 
@@ -161,25 +161,25 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
 | `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
 | `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. |
-| `` r `` | Hernoem commit | Herschrijf de commit message van de geselecteerde commit. |
+| `` r `` | Hernoem commit | Reword the selected commit's message. |
 | `` R `` | Hernoem commit met editor |  |
 | `` d `` | Verwijder commit | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
-| `` e `` | Bewerken (start interactieve rebase) | Wijzig commit |
+| `` e `` | Edit (start interactive rebase) | Wijzig commit |
-| `` i `` | Start interactieve rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.<br>If you would instead like to start an interactive rebase from the selected commit, press `e`. |
+| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.<br>If you would instead like to start an interactive rebase from the selected commit, press `e`. |
 | `` p `` | Pick | Kies commit (wanneer midden in rebase) |
 | `` F `` | Creëer fixup commit | Creëer fixup commit |
 | `` S `` | Apply fixup commits | Squash bovenstaande commits |
 | `` <ctrl+j>, <alt+down> `` | Verplaats commit 1 naar beneden |  |
 | `` <ctrl+k>, <alt+up> `` | Verplaats commit 1 naar boven |  |
 | `` V `` | Plak commits (cherry-pick) |  |
-| `` B `` | Markeer als basiscommit voor rebase | Selecteer een basiscommit voor de volgende rebase. Als je rebased op een branch worden alleen commits boven de basiscommit meegenomen. Hiervoor wordt het `git rebase --onto` commando gebruikt. |
+| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
 | `` A `` | Amend | Wijzig commit met staged veranderingen |
 | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
-| `` t `` | Revert | Maak een revert commit voor de geselecteerde commit, die de wijzigingen in deze commit terugdraait. |
+| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | Tag commit | Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving. |
+| `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <ctrl+l> `` | Log opties weergeven | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
+| `` <ctrl+l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
 | `` G `` | Open pull request in browser |  |
-| `` <space> `` | Uitchecken | Check de geselecteerde branch uit als een detached HEAD. |
+| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser |  |
 | `` n `` | Creëer nieuwe branch van commit |  |
@@ -241,7 +241,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` v `` | Toggle drag selecteer |  |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` o `` | Open bestand | Open bestand in standaardapplicatie. |
 | `` e `` | Verander bestand | Open bestand in externe editor. |
@@ -255,7 +255,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | Uitchecken | Check de geselecteerde branch uit als een detached HEAD. |
+| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser |  |
 | `` n `` | Creëer nieuwe branch van commit |  |
@@ -280,7 +280,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` w `` | New worktree |  |
 | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. |
-| `` d `` | Verwijderen | Verwijder de remote branch van de remote. |
+| `` d `` | Verwijderen | Delete the remote branch from the remote. |
 | `` u `` | Instellen als upstream | Stel in als upstream van uitgecheckte branch |
 | `` s `` | Sort order |  |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
@@ -295,7 +295,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <enter> `` | Bekijk branches |  |
 | `` n `` | Voeg een nieuwe remote toe |  |
-| `` d `` | Verwijderen | Verwijder de geselecteerde remote. Locale branches die een branch tracken van de remote worden niet aangepast. |
+| `` d `` | Verwijderen | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | Edit | Wijzig remote |
 | `` f `` | Fetch | Fetch remote |
 | `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
@@ -316,7 +316,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` v `` | Toggle drag selecteer |  |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | Copy selected text to clipboard |  |
 | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
 | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
@@ -361,7 +361,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | Uitchecken | Check de geselecteerde branch uit als een detached HEAD. |
+| `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser |  |
 | `` n `` | Creëer nieuwe branch van commit |  |
@@ -396,10 +396,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Copy tag to clipboard |  |
 | `` <space> `` | Uitchecken | Geselecteerde tag uitchecken als detached HEAD. |
-| `` n `` | Creëer tag | Maak een nieuwe tag die naar de huidige commit wijst. Je wordt gevraagd om een tag naam en optionele beschrijving. |
+| `` n `` | Creëer tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
 | `` w `` | New worktree |  |
 | `` d `` | Verwijderen | View delete options for local/remote tag. |
-| `` P `` | Tag pushen | Push de geselecteerde tag naar een remote. Je krijgt de optie een remote te selecteren. |
+| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
 | `` 0 `` | Focus main view |  |

docs/keybindings/Keybindings_pl.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Odśwież | Odśwież stan git (tj. uruchom `git status`, `git branch`, itp. w tle, aby zaktualizować zawartość paneli). To nie uruchamia `git fetch`. |
 | `` + `` | Następny tryb ekranu (normalny/półpełny/pełnoekranowy) |  |
 | `` _ `` | Poprzedni tryb ekranu |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Anuluj |  |
 | `` ? `` | Otwórz menu przypisań klawiszy |  |
 | `` <ctrl+s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |

docs/keybindings/Keybindings_pt.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Atualizar | Atualize o estado do git (ou seja, execute `git status`, `git branch`, etc em segundo plano para atualizar o conteúdo de painéis). Isso não executa `git fetch`. |
 | `` + `` | Modo de tela seguinte (normal/metade/tela cheia) |  |
 | `` _ `` | Modo de tela anterior |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Cancelar |  |
 | `` ? `` | Abrir o menu de atalhos do teclado |  |
 | `` <ctrl+s> `` | Ver opções de filtro | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs/keybindings/Keybindings_ru.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | Обновить | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) |  |
 | `` _ `` | Предыдущий режим экрана |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | Отменить |  |
 | `` ? `` | Открыть меню |  |
 | `` <ctrl+s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |

docs/keybindings/Keybindings_zh-CN.md

@@ -22,8 +22,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 刷新 | 刷新Git状态（即在后台运行`git status`、`git branch`等命令以更新面板内容）。此操作不会执行`git fetch`。 |
 | `` + `` | 下一屏模式(正常/半屏/全屏) |  |
 | `` _ `` | 上一屏模式 |  |
-| `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
+| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
-| `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |

docs/keybindings/Keybindings_zh-TW.md

@@ -9,28 +9,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+r> `` | 切換到最近使用的版本庫 |  |
 | `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | 向上捲動主面板 |  |
 | `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | 向下捲動主面板 |  |
-| `` @ `` | 開啟命令記錄選單 | 檢視命令日誌的選項，例如顯示/隱藏命令日誌以及聚焦命令日誌。 |
+| `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. |
 | `` P `` | 推送 | 推送到遠端。如果沒有設定遠端，會開啟設定視窗。 |
 | `` p `` | 拉取 | 從遠端同步當前分支。如果沒有設定遠端，會開啟設定視窗。 |
-| `` ) `` | 提高重新命名相似度閾值 | 提高將刪除和新增對視為重新命名所需的相似度閾值。<br><br>預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 |
+| `` ) `` | Increase rename similarity threshold | Increase the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` ( `` | 降低重新命名相似度閾值 | 降低將刪除和新增對視為重新命名所需的相似度閾值。<br><br>預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 |
+| `` ( `` | Decrease rename similarity threshold | Decrease the similarity threshold for a deletion and addition pair to be treated as a rename.<br><br>The default can be changed in the config file with the key 'git.renameSimilarityThreshold'. |
-| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | 增加差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
+| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | Increase the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | 減少差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
+| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | Decrease the amount of the context shown around changes in the diff view.<br><br>The default can be changed in the config file with the key 'git.diffContextSize'. |
-| `` : `` | 執行 Shell 命令 | 調出可輸入shell命令執行的提示符。 |
+| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. |
 | `` <ctrl+p> `` | 檢視自訂補丁選項 |  |
-| `` m `` | 查看合併/變基選項 | 檢視目前合併或變基的中止、繼續、跳過選項。 |
+| `` m `` | 查看合併/變基選項 | View options to abort/continue/skip the current merge/rebase. |
-| `` R `` | 重新整理 | 重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。 |
+| `` R `` | 重新整理 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
 | `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） |  |
 | `` _ `` | 上一個螢幕模式 |  |
-| `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 |
+| `` \| `` | Cycle pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 開啟選單 |  |
-| `` <ctrl+s> `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 |
+| `` <ctrl+s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
-| `` W, <ctrl+e> `` | 開啟差異比較選單 | 檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。 |
+| `` W, <ctrl+e> `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
 | `` q, <ctrl+c> `` | 結束 |  |
-| `` <ctrl+z> `` | 掛起應用程式 |  |
+| `` <ctrl+z> `` | Suspend the application |  |
-| `` <ctrl+w> `` | 切換是否在差異檢視中顯示空格變更 | 切換是否在差異檢視中顯示空白字元更改。<br><br>預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。 |
+| `` <ctrl+w> `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
 | `` <alt+shift+c> `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 |
 | `` Z `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 |
@@ -44,14 +44,21 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <, <home> `` | 捲動到頂部 |  |
 | `` >, <end> `` | 捲動到底部 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` <shift+down> `` | 向下擴充套件選擇範圍 |  |
+| `` <shift+down> `` | Range select down |  |
-| `` <shift+up> `` | 向上擴充套件選擇範圍 |  |
+| `` <shift+up> `` | Range select up |  |
 | `` / `` | 搜尋 |  |
 | `` H `` | 向左捲動 |  |
 | `` L `` | 向右捲動 |  |
 | `` ] `` | 下一個索引標籤 |  |
 | `` [ `` | 上一個索引標籤 |  |
 
+## Input prompt
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 確認 |  |
+| `` <esc> `` | 關閉/取消 |  |
+
 ## 主面板 (補丁生成)
 
 | Key | Action | Info |
@@ -59,12 +66,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  |
-| `` d `` | 從提交中移除行 | 從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。 |
+| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
 | `` <esc> `` | 退出自訂補丁建立器 |  |
 | `` / `` | 搜尋 |  |
 
@@ -74,8 +81,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下捲動 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上捲動 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` <esc> `` | 退出回到側邊面板 |  |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |
 
 ## 主面板（合併）
@@ -83,15 +90,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | 挑選程式碼片段 |  |
-| `` b `` | 選取兩個區塊 |  |
+| `` b `` | Pick both hunks |  |
 | `` <up>, k `` | 選擇上一段 |  |
 | `` <down>, j `` | 選擇下一段 |  |
 | `` <left>, h `` | 選擇上一個衝突 |  |
 | `` <right>, l `` | 選擇下一個衝突 |  |
-| `` z `` | 復原 | 撤消上次合併衝突解決。 |
+| `` z `` | 復原 | Undo last merge conflict resolution. |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
-| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | 返回檔案面板 |  |
 
 ## 主面板（預存）
@@ -101,19 +108,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
 | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
-| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
+| `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <esc> `` | 返回檔案面板 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
+| `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
 | `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` <ctrl+f> `` | Find base commit for fixup | 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: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 搜尋 |  |
 
 ## 功能表
@@ -128,19 +135,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` * `` | 選擇目前分支的提交 |  |
+| `` * `` | Select commits of current branch |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |
 
@@ -149,12 +156,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製子模組名稱到剪貼簿 |  |
-| `` <enter> `` | 進入 | 進入子模組 |
+| `` <enter> `` | Enter | 進入子模組 |
-| `` d `` | 刪除 | 刪除選定的子模組及其相應的目錄。 |
+| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
-| `` u `` | 更新 | 更新子模組 |
+| `` u `` | Update | 更新子模組 |
 | `` n `` | 新增子模組 |  |
 | `` e `` | 更新子模組 URL |  |
-| `` i `` | 初始化 | 初始化子模組 |
+| `` i `` | Initialize | 初始化子模組 |
 | `` b `` | 查看批量子模組選項 |  |
 | `` / `` | 搜尋 |  |
 
@@ -162,27 +169,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` n `` | 新建工作樹 |  |
+| `` n `` | New worktree |  |
-| `` <space> `` | 切換 | 切換到選中的工作樹。 |
+| `` <space> `` | Switch | Switch to the selected worktree. |
 | `` o `` | 在編輯器中開啟 |  |
-| `` d `` | 刪除 | 刪除選定的工作樹。這將刪除工作樹的目錄以及 .git 目錄中有關工作樹的後設資料。 |
+| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
 | `` / `` | 搜尋 |  |
 
 ## 提交
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
 | `` <ctrl+r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` b `` | 查看二分選項 |  |
-| `` s `` | 壓縮 (Squash) | 將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。 |
+| `` s `` | 壓縮 (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | 修復 (Fixup) | 將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。 |
+| `` f `` | 修復 (Fixup) | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
-| `` c `` | 設定修復提交資訊 | 設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。 |
+| `` c `` | Set fixup message | Set the message option for the fixup commit. The -C option means to use this commit's message instead of the target commit's message. |
 | `` r `` | 改寫提交 | 改寫選中的提交訊息 |
 | `` R `` | 使用編輯器改寫提交 |  |
-| `` d `` | 刪除提交 | 刪除選中的提交。這將透過變基從分支中刪除該提交，如果該提交修改的內容依賴於後續的提交，則需要解決合併衝突。 |
+| `` d `` | 刪除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
 | `` e `` | 編輯(開始互動變基) | 編輯提交 |
-| `` i `` | 開始互動變基 | 為分支上的提交啟動互動式變基。這將包括從 HEAD 提交到第一個合併提交或主分支提交的所有提交。<br>如果您想從所選提交啟動互動式變基，請按 `e`。 |
+| `` i `` | 開始互動變基 | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.<br>If you would instead like to start an interactive rebase from the selected commit, press `e`. |
 | `` p `` | 挑選 | 挑選提交 (於變基過程中) |
 | `` F `` | 建立修復提交 | 為此提交建立修復提交 |
 | `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ |
@@ -191,22 +198,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` V `` | 貼上提交 (揀選) |  |
 | `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 |
 | `` A `` | 修改 | 使用已預存的更改修正提交 |
-| `` a `` | 設定/重設提交作者 | 設定或重置提交的作者，或新增其他作者。 |
+| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. |
-| `` t `` | 還原 | 為所選提交建立還原提交，這會反向應用所選提交的更改。 |
+| `` t `` | 還原 | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
-| `` T `` | 打標籤到提交 | 建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。 |
+| `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
-| `` <ctrl+l> `` | 開啟記錄選單 | 檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。 |
+| `` <ctrl+l> `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
+| `` G `` | Open pull request in browser |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` * `` | 選擇目前分支的提交 |  |
+| `` * `` | Select commits of current branch |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |
 
@@ -224,30 +231,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | 複製檔案名稱到剪貼簿 |  |
 | `` y `` | 複製到剪貼簿 |  |
 | `` c `` | 檢出 | 檢出檔案 |
-| `` d `` | 捨棄 | 放棄對此檔案的提交變更。 |
+| `` d `` | 捨棄 | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯 | 使用外部編輯器開啟 |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` <space> `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
+| `` <space> `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
+| `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 |
+| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
+| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
+| `` - `` | Collapse all files | Collapse all directories in the files tree |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
+| `` = `` | Expand all files | Expand all directories in the file tree |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |
 
 ## 收藏 (Stash)
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <space> `` | 套用 | 將貯藏項應用到您的工作目錄。 |
+| `` <space> `` | 套用 | Apply the stash entry to your working directory. |
-| `` g `` | 還原 | 將儲存項應用到工作目錄並刪除儲存項。 |
+| `` g `` | 還原 | Apply the stash entry to your working directory and remove the stash entry. |
-| `` d `` | 捨棄 | 從貯藏列表中刪除該貯藏項。 |
+| `` d `` | 捨棄 | Remove the stash entry from the stash list. |
-| `` n `` | 新分支 | 從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。 |
+| `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
 | `` r `` | 重新命名收藏 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |
 
@@ -255,19 +262,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` * `` | 選擇目前分支的提交 |  |
+| `` * `` | Select commits of current branch |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
 
@@ -279,18 +286,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` i `` | 顯示 git-flow 選項 |  |
 | `` <space> `` | 檢出 | 檢出選定的項目。 |
 | `` n `` | 新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
+| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
 | `` o `` | 建立拉取請求 |  |
 | `` O `` | 建立拉取請求選項 |  |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
+| `` G `` | Open pull request in browser |  |
 | `` <ctrl+y> `` | 複製拉取請求的 URL 到剪貼板 |  |
-| `` c `` | 根據名稱檢出 | 按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。 |
+| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. |
-| `` - `` | 簽出上一個分支 |  |
+| `` - `` | Checkout previous branch |  |
-| `` F `` | 強制檢出 | 強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。 |
+| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | 刪除 | 檢視本地/遠端分支的刪除選項。 |
+| `` d `` | 刪除 | View delete options for local/remote branch. |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` f `` | 從上游快進此分支 | 從遠端快進所選的分支 |
 | `` T `` | 建立標籤 |  |
 | `` s `` | 排序規則 |  |
@@ -298,7 +305,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` R `` | 重新命名分支 |  |
 | `` u `` | 檢視遠端設定 | 檢視有關遠端分支的設定（例如重設至遠端） |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
 
@@ -306,15 +313,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製標籤到剪貼簿 |  |
+| `` <ctrl+o> `` | Copy tag to clipboard |  |
-| `` <space> `` | 檢出 | 檢出選擇的標籤作為分離的HEAD。 |
+| `` <space> `` | 檢出 | Checkout the selected tag as a detached HEAD. |
-| `` n `` | 建立標籤 | 基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。 |
+| `` n `` | 建立標籤 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` d `` | 刪除 | 檢視本機／遠端標籤的刪除選項。 |
+| `` d `` | 刪除 | View delete options for local/remote tag. |
-| `` P `` | 推送標籤 | 推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。 |
+| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
-| `` g `` | 重設 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
 
@@ -323,40 +330,40 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製檔案名稱到剪貼簿 |  |
-| `` <space> `` | 切換預存 | 切換所選檔案的暫存狀態。 |
+| `` <space> `` | 切換預存 | Toggle staged for selected file. |
 | `` <ctrl+b> `` | 篩選檔案 (預存/未預存) |  |
 | `` y `` | 複製到剪貼簿 |  |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
 | `` A `` | 修改上次提交 |  |
 | `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` <ctrl+f> `` | Find base commit for fixup | 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: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` e `` | 編輯 | 使用外部編輯器開啟 |
 | `` o `` | 開啟檔案 | 使用預設軟體開啟 |
 | `` i `` | 忽略或排除檔案 |  |
 | `` r `` | 重新整理檔案 |  |
-| `` s `` | 收藏 | 貯藏所有變更.若要使用其他貯藏變體,請使用檢視貯藏選項快捷鍵。 |
+| `` s `` | 收藏 | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
-| `` S `` | 檢視收藏選項 | 檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。 |
+| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). |
-| `` a `` | 全部預存/取消預存 | 切換工作區中所有檔案的已暫存/未暫存狀態。 |
+| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | 如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。 |
+| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
 | `` d `` | 捨棄 | 檢視選中變動進行捨棄復原 |
 | `` g `` | 檢視遠端重設選項 |  |
-| `` D `` | 重設 | 檢視工作樹的重置選項（例如：清除工作樹）。 |
+| `` D `` | 重設 | View reset options for working tree (e.g. nuking the working tree). |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
+| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` f `` | 擷取 | 同步遠端異動 |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
+| `` - `` | Collapse all files | Collapse all directories in the files tree |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
+| `` = `` | Expand all files | Expand all directories in the file tree |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |
 
 ## 次要
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
-| `` <esc> `` | 退出回到側邊面板 |  |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |
 
 ## 狀態
@@ -366,9 +373,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` u `` | 檢查更新 |  |
 | `` <enter> `` | 切換到最近使用的版本庫 |  |
-| `` a `` | 顯示/迴圈所有分支日誌 |  |
+| `` a `` | Show/cycle all branch logs |  |
-| `` A `` | 顯示/迴圈所有分支日誌（反向） |  |
+| `` A `` | Show/cycle all branch logs (reverse) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 
 ## 確認面板
 
@@ -378,23 +385,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <esc> `` | 關閉/取消 |  |
 | `` <ctrl+o> `` | 複製到剪貼簿 |  |
 
-## 輸入提示
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <enter> `` | 確認 |  |
-| `` <esc> `` | 關閉/取消 |  |
-
 ## 遠端
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <enter> `` | 檢視分支 |  |
+| `` <enter> `` | View branches |  |
 | `` n `` | 新增遠端 |  |
-| `` d `` | 刪除 | 刪除選中的遠端。從遠端跟蹤遠端分支的任何本地分支都不會受到影響。 |
+| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
 | `` e `` | 編輯 | 編輯遠端 |
 | `` f `` | 擷取 | 擷取遠端 |
-| `` F `` | 新增復刻遠端倉庫 | 透過替換 origin URL 中的所有者來快速新增復刻遠端倉庫，並可選擇從新遠端倉庫檢出分支。 |
+| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
 | `` / `` | 搜尋 |  |
 
 ## 遠端分支
@@ -402,16 +402,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製分支名稱到剪貼簿 |  |
-| `` <space> `` | 檢出 | 基於目前選中的遠端分支檢出一個新的本地分支，或者將遠端分支作分離的HEAD。 |
+| `` <space> `` | 檢出 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | 新分支 |  |
-| `` w `` | 新建工作樹 |  |
+| `` w `` | New worktree |  |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
-| `` d `` | 刪除 | 從遠端刪除遠端分支。 |
+| `` d `` | 刪除 | Delete the remote branch from the remote. |
 | `` u `` | 設置為遠端 | 將此分支設為當前分支之遠端 |
 | `` s `` | 排序規則 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |

flake.lock

@@ -7,7 +7,7 @@
         "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "revCount": 69,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69"
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -19,11 +19,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1785627969,
+        "lastModified": 1759362264,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
         "type": "github"
       },
       "original": {
@@ -34,11 +34,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785828668,
+        "lastModified": 1759831965,
-        "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=",
+        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb",
+        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1785031560,
+        "lastModified": 1754788789,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
         "type": "github"
       },
       "original": {
@@ -65,11 +65,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1770107345,
+        "lastModified": 1754340878,
-        "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
+        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
+        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1785360170,
+        "lastModified": 1758728421,
-        "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=",
+        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0",
+        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
         "type": "github"
       },
       "original": {

flake.nix

@@ -101,7 +101,6 @@
               # Development tools
               git
               gnumake
-              just
             ];
 
             # Environment variables for development
@@ -109,8 +108,8 @@
           };
 
           treefmt = {
-            programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt.compiler;
+            programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt-rfc-style.compiler;
-            programs.nixfmt.package = pkgs.nixfmt;
+            programs.nixfmt.package = pkgs.nixfmt-rfc-style;
             programs.gofmt.enable = true;
           };
 

go.mod

@@ -5,9 +5,6 @@ go 1.25.0
 // This is necessary to ignore test files when executing gofumpt.
 ignore ./test
 
-// Likewise for worktrees that are nested in the main tree.
-ignore ./.worktrees
-
 require (
 	dario.cat/mergo v1.0.2
 	github.com/adrg/xdg v0.5.3
@@ -16,7 +13,7 @@ require (
 	github.com/cli/go-gh/v2 v2.13.0
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 	github.com/creack/pty v1.1.24
-	github.com/gdamore/tcell/v3 v3.4.2
+	github.com/gdamore/tcell/v3 v3.4.0
 	github.com/go-errors/errors v1.5.1
 	github.com/gookit/color v1.6.1
 	github.com/integrii/flaggy v1.8.0
@@ -24,25 +21,24 @@ require (
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/karimkhaleel/jsonschema v0.0.0-20231001195015-d933f0d94ea3
-	github.com/kyokomi/emoji/v2 v2.2.14
+	github.com/kyokomi/emoji/v2 v2.2.13
-	github.com/lucasb-eyer/go-colorful v1.4.1
+	github.com/lucasb-eyer/go-colorful v1.4.0
 	github.com/mgutz/str v1.2.0
 	github.com/mitchellh/go-ps v1.0.0
-	github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe
 	github.com/rivo/uniseg v0.4.7
 	github.com/sahilm/fuzzy v0.1.3
 	github.com/samber/lo v1.53.0
 	github.com/sanity-io/litter v1.5.8
 	github.com/sasha-s/go-deadlock v0.3.9
-	github.com/sirupsen/logrus v1.10.2
+	github.com/sirupsen/logrus v1.9.4
 	github.com/spf13/afero v1.15.0
 	github.com/spkg/bom v1.0.1
 	github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304
-	github.com/stretchr/testify v1.12.1
+	github.com/stretchr/testify v1.11.1
-	github.com/xo/terminfo v1.0.0
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sync v0.22.0
+	golang.org/x/sync v0.21.0
-	golang.org/x/sys v0.47.0
+	golang.org/x/sys v0.46.0
 	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -53,9 +49,11 @@ require (
 	github.com/cli/safeexec v1.0.1 // indirect
 	github.com/clipperhouse/displaywidth v0.11.0 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/gdamore/encoding v1.0.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/hpcloud/tail v1.0.0 // indirect
 	github.com/invopop/jsonschema v0.10.0 // indirect
 	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
@@ -64,16 +62,18 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/onsi/ginkgo v1.10.3 // indirect
 	github.com/onsi/gomega v1.34.1 // indirect
+	github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
-	go.yaml.in/yaml/v3 v3.0.5 // indirect
+	golang.org/x/mod v0.35.0 // indirect
-	golang.org/x/mod v0.38.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
-	golang.org/x/term v0.45.0 // indirect
+	golang.org/x/term v0.43.0 // indirect
-	golang.org/x/text v0.41.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
-	golang.org/x/tools v0.48.0 // indirect
+	golang.org/x/tools v0.44.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
-	mvdan.cc/gofumpt v0.11.0 // indirect
+	mvdan.cc/gofumpt v0.9.2 // indirect
 )
 
 tool mvdan.cc/gofumpt

go.sum

@@ -25,20 +25,22 @@ github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.7.1-0.20180516100307-2d684516a886/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v3 v3.4.2 h1:gGW+6z2Bz5Wl2mNwFlm9+eRmg2JQrWcKjSkL1LRfpNU=
+github.com/gdamore/tcell/v3 v3.4.0 h1:VUym1HQZiYodA5PGQrqLxF7QwqQndcAUwQD7G7XUy5E=
-github.com/gdamore/tcell/v3 v3.4.2/go.mod h1:Oe5U3S3jm3NzypswDNUhe+LUnF5CoFq2b4sepD++QHo=
+github.com/gdamore/tcell/v3 v3.4.0/go.mod h1:fjKxNiIFwbzTxDU+i+AAMz+xPOgXVaZq5tbShsKseHc=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-quicktest/qt v1.102.0 h1:HSQxCeh5YZH3EL3W39ixjtyaEhcWSXQHtHnMBzSs474=
+github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
-github.com/go-quicktest/qt v1.102.0/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI=
+github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0=
@@ -71,10 +73,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/kyokomi/emoji/v2 v2.2.14 h1:YOF6VL52613M0Qr9v4puJDD9QQPmyyjXedDDlrGzH80=
+github.com/kyokomi/emoji/v2 v2.2.13 h1:GhTfQa67venUUvmleTNFnb+bi7S3aocF7ZCXU9fSO7U=
-github.com/kyokomi/emoji/v2 v2.2.14/go.mod h1:1AnYl9IgmJZXKd5m1PEijyyUw85SqYsuAr8lpU/s+9s=
+github.com/kyokomi/emoji/v2 v2.2.13/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
-github.com/lucasb-eyer/go-colorful v1.4.1 h1:1EO+WB73+EH8EVbzlrG3KLAfEypQWVHIBqlTf+2hNss=
+github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
-github.com/lucasb-eyer/go-colorful v1.4.1/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -98,11 +100,12 @@ github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeD
 github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe h1:vHpqOnPlnkba8iSxU4j/CvDSS9J4+F4473esQsYLGoE=
 github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.15.0 h1:D0RCU5rMAp+SpgkiNdrjfJ+LX4J1M32V2NeCY7EJ6hc=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sahilm/fuzzy v0.1.3 h1:juByESSS32nVD81vr6tHmKmA/8zde7gE+x5CLxrzXPU=
 github.com/sahilm/fuzzy v0.1.3/go.mod h1:au6//VbVSqu6DFrkL2CfjlJ5iURpNCPeE+1GwY3XsT8=
 github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM=
@@ -111,8 +114,8 @@ github.com/sanity-io/litter v1.5.8 h1:uM/2lKrWdGbRXDrIq08Lh9XtVYoeGtcQxk9rtQ7+rY
 github.com/sanity-io/litter v1.5.8/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U=
 github.com/sasha-s/go-deadlock v0.3.9 h1:fiaT9rB7g5sr5ddNZvlwheclN9IP86eFW9WgqlEQV+w=
 github.com/sasha-s/go-deadlock v0.3.9/go.mod h1:KuZj51ZFmx42q/mPaYbRk0P1xcwe697zsJKE03vD4/Y=
-github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo=
+github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
-github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=
+github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
 github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spkg/bom v1.0.1 h1:tl8kQ2sufL/wDEJa9me1jnQYEpDB7LqYGNkwCVR5GLs=
@@ -122,35 +125,33 @@ github.com/stefanhaller/git-todo-parser v0.0.7-0.20250905083220-c50528f08304/go.
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/urfave/cli v1.20.1-0.20180226030253-8e01ec4cd3e2/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-github.com/xo/terminfo v1.0.0 h1:2ZpYzqWzyyytjk3TP6aJVDhkMAkc99/1xKQdA3TDTBY=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
-github.com/xo/terminfo v1.0.0/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
-go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
+golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
+golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
-golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
-golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20170407050850-f3918c30c5c2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -162,26 +163,26 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
+golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
+golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
+golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
-golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
+golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -195,5 +196,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-mvdan.cc/gofumpt v0.11.0 h1:0H01XB95PnN2QgCSR9ELdZyTlJqNZ7181B0BTMh5VZc=
+mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4=
-mvdan.cc/gofumpt v0.11.0/go.mod h1:BeT5wCsOJt6J9zT2MZIOGszjUHzFkn1/l9g6xAzqsXo=
+mvdan.cc/gofumpt v0.9.2/go.mod h1:iB7Hn+ai8lPvofHd9ZFGVg2GOr8sBUw1QUWjNbmIL/s=

justfile

@@ -40,7 +40,7 @@ lint:
     ./scripts/gofumpt-check.sh
     ./scripts/golangci-lint-shim.sh run
 
-e2e-test-command := "go test -timeout 30m pkg/integration/clients/*.go"
+e2e-test-command := "go test pkg/integration/clients/*.go"
 
 # Run integration tests headlessly: no args runs all tests, a test name (or path) runs just that one. Use e2e-cli for a visible UI.
 e2e *args:

pkg/app/daemon/daemon.go

@@ -263,14 +263,12 @@ func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error {
 }
 
 type MoveTodosUpInstruction struct {
-	Hashes   []string
+	Hashes []string
-	Distance int
 }
 
-func NewMoveTodosUpInstruction(hashes []string, distance int) Instruction {
+func NewMoveTodosUpInstruction(hashes []string) Instruction {
 	return &MoveTodosUpInstruction{
-		Hashes:   hashes,
+		Hashes: hashes,
-		Distance: distance,
 	}
 }
 
@@ -290,19 +288,17 @@ func (self *MoveTodosUpInstruction) run(common *common.Common) error {
 	})
 
 	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveTodos(path, todosToMove, false, -self.Distance, getCommentChar())
+		return utils.MoveTodosUp(path, todosToMove, false, getCommentChar())
 	})
 }
 
 type MoveTodosDownInstruction struct {
-	Hashes   []string
+	Hashes []string
-	Distance int
 }
 
-func NewMoveTodosDownInstruction(hashes []string, distance int) Instruction {
+func NewMoveTodosDownInstruction(hashes []string) Instruction {
 	return &MoveTodosDownInstruction{
-		Hashes:   hashes,
+		Hashes: hashes,
-		Distance: distance,
 	}
 }
 
@@ -322,7 +318,7 @@ func (self *MoveTodosDownInstruction) run(common *common.Common) error {
 	})
 
 	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveTodos(path, todosToMove, false, self.Distance, getCommentChar())
+		return utils.MoveTodosDown(path, todosToMove, false, getCommentChar())
 	})
 }
 

pkg/app/errors.go

@@ -16,7 +16,7 @@ type errorMapping struct {
 func knownError(tr *i18n.TranslationSet, err error) (string, bool) {
 	errorMessage := err.Error()
 
-	knownErrorMessages := []string{minGitVersionErrorMessage(tr), tr.BareRepoNotSupported}
+	knownErrorMessages := []string{minGitVersionErrorMessage(tr)}
 
 	if lo.Contains(knownErrorMessages, errorMessage) {
 		return errorMessage, true

pkg/cheatsheet/generate.go

@@ -19,12 +19,12 @@ import (
 	"strings"
 
 	"github.com/jesseduffield/generics/maps"
+	"github.com/jesseduffield/lazycore/pkg/utils"
 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )
 
@@ -49,7 +49,7 @@ func CommandToRun() string {
 }
 
 func GetKeybindingsDir() string {
-	return utils.MustFindLazygitRootDirectory() + "/docs-master/keybindings"
+	return utils.GetLazyRootDirectory() + "/docs-master/keybindings"
 }
 
 func generateAtDir(cheatsheetDir string) {
@@ -196,7 +196,7 @@ func getHeader(binding *types.Binding, tr *i18n.TranslationSet) header {
 
 func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) string {
 	var content strings.Builder
-	fmt.Fprintf(&content, "# Lazygit %s\n", tr.Keybindings)
+	content.WriteString(fmt.Sprintf("# Lazygit %s\n", tr.Keybindings))
 
 	for _, section := range bindingSections {
 		content.WriteString(formatTitle(section.title))

pkg/commands/git.go

@@ -11,7 +11,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/env"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
@@ -61,42 +60,25 @@ func NewGitCommand(
 	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
-	diffRendererConfigManager *config.DiffRendererConfigManager,
+	pagerConfig *config.PagerConfig,
 ) (*GitCommand, error) {
 	repoPaths, err := git_commands.GetRepoPaths(osCommand.Cmd, version)
 	if err != nil {
 		return nil, errors.Errorf("Error getting repo paths: %v", err)
 	}
 
-	// A bare repo has no worktree for us to work in. Callers that can offer the
-	// user something better (app.setupRepo) check for this first; getting here
-	// means nobody could, e.g. because --git-dir was pointed at a bare repo.
-	if repoPaths.IsBareRepo() {
-		return nil, errors.New(cmn.Tr.BareRepoNotSupported)
-	}
-
 	err = os.Chdir(repoPaths.WorktreePath())
 	if err != nil {
 		return nil, utils.WrapError(err)
 	}
 
-	// Everything we run through the command builder gets told where the repo is
-	// by the builder itself, but subprocesses don't go through it: user-defined
-	// custom commands, an editor, and the lazygit we re-enter as git's sequence
-	// editor during a rebase. Put it in the process env for those.
-	env.SetGitLocationEnvVars(repoPaths.GitLocationEnvVars())
-
-	// Pin the config reads to the repo directory like all other git commands
-	// (see NewGitCmdObjBuilder); the config commands run outside that builder.
-	gitConfig.SetDir(repoPaths.WorktreePath())
-
 	return NewGitCommandAux(
 		cmn,
 		version,
 		osCommand,
 		gitConfig,
 		repoPaths,
-		diffRendererConfigManager,
+		pagerConfig,
 	), nil
 }
 
@@ -106,9 +88,9 @@ func NewGitCommandAux(
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
 	repoPaths *git_commands.RepoPaths,
-	diffRendererConfigManager *config.DiffRendererConfigManager,
+	pagerConfig *config.PagerConfig,
 ) *GitCommand {
-	cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd, repoPaths.WorktreePath(), repoPaths.GitLocationEnvVars())
+	cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd)
 
 	// here we're doing a bunch of dependency injection for each of our commands structs.
 	// This is admittedly messy, but allows us to test each command struct in isolation,
@@ -117,7 +99,7 @@ func NewGitCommandAux(
 	// common ones are: cmn, osCommand, dotGitDir, configCommands
 	configCommands := git_commands.NewConfigCommands(cmn, gitConfig)
 
-	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, configCommands, diffRendererConfigManager)
+	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, configCommands, pagerConfig)
 
 	fileLoader := git_commands.NewFileLoader(gitCommon, cmd, configCommands)
 	statusCommands := git_commands.NewStatusCommands(gitCommon)

pkg/commands/git_cmd_obj_builder.go

@@ -11,22 +11,6 @@ import (
 
 type gitCmdObjBuilder struct {
 	innerBuilder *oscommands.CmdObjBuilder
-
-	// The directory of the repo (or worktree) this builder was created for;
-	// every command we produce runs there, regardless of the process's current
-	// working directory. The two are the same until the user switches to
-	// another repo: lazygit chdirs on a switch, but work still in flight for
-	// the previous repo (e.g. a background refresh spawning commands through
-	// the old builder) must keep running its commands against the repo it
-	// started in, not whichever one the process has since moved to.
-	repoDir string
-
-	// The env vars every command we produce gets: the optional-locks one below,
-	// plus the repo's git location if it has one (see
-	// RepoPaths.GitLocationEnvVars). Those are in the process env too, but for
-	// the same reason as repoDir we don't rely on that: the process env belongs
-	// to whichever repo lazygit has since switched to.
-	envVars []string
 }
 
 var _ oscommands.ICmdObjBuilder = &gitCmdObjBuilder{}
@@ -37,7 +21,7 @@ var _ oscommands.ICmdObjBuilder = &gitCmdObjBuilder{}
 // only the foreground files refresh) opt back in via CmdObj.RemoveEnvVar.
 var defaultEnvVar = git_commands.OptionalLocksEnvVar + "=0"
 
-func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuilder, repoDir string, gitLocationEnvVars []string) *gitCmdObjBuilder {
+func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuilder) *gitCmdObjBuilder {
 	// the price of having a convenient interface where we can say .New(...).Run() is that our builder now depends on our runner, so when we want to wrap the default builder/runner in new functionality we need to jump through some hoops. We could avoid the use of a decorator function here by just exporting the runner field on the default builder but that would be misleading because we don't want anybody using that to run commands (i.e. we want there to be a single API used across the codebase)
 	updatedBuilder := innerBuilder.CloneWithNewRunner(func(runner oscommands.ICmdObjRunner) oscommands.ICmdObjRunner {
 		return &gitCmdObjRunner{
@@ -49,17 +33,15 @@ func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuild
 
 	return &gitCmdObjBuilder{
 		innerBuilder: updatedBuilder,
-		repoDir:      repoDir,
-		envVars:      append([]string{defaultEnvVar}, gitLocationEnvVars...),
 	}
 }
 
 func (self *gitCmdObjBuilder) New(args []string) *oscommands.CmdObj {
-	return self.innerBuilder.New(args).AddEnvVars(self.envVars...).SetWd(self.repoDir)
+	return self.innerBuilder.New(args).AddEnvVars(defaultEnvVar)
 }
 
 func (self *gitCmdObjBuilder) NewShell(cmdStr string, shellFunctionsFile string) *oscommands.CmdObj {
-	return self.innerBuilder.NewShell(cmdStr, shellFunctionsFile).AddEnvVars(self.envVars...).SetWd(self.repoDir)
+	return self.innerBuilder.NewShell(cmdStr, shellFunctionsFile).AddEnvVars(defaultEnvVar)
 }
 
 func (self *gitCmdObjBuilder) Quote(str string) string {

pkg/commands/git_cmd_obj_builder_test.go

@@ -17,45 +17,8 @@ func TestGitCmdObjBuilderDisablesOptionalLocksByDefault(t *testing.T) {
 	builder := NewGitCmdObjBuilder(
 		utils.NewDummyLog(),
 		oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
-		"/path/to/repo",
-		nil,
 	)
 
 	assert.Contains(t, builder.New([]string{"git", "status"}).GetEnvVars(), git_commands.OptionalLocksEnvVar+"=0")
 	assert.Contains(t, builder.NewShell("git status", "").GetEnvVars(), git_commands.OptionalLocksEnvVar+"=0")
 }
-
-// Every command the builder produces runs in the directory of the repo the
-// builder was created for, not in the process's current directory: lazygit
-// chdirs when switching repos, and commands built for the previous repo after
-// that (e.g. by a background refresh still in flight) must keep addressing the
-// repo they were built for.
-func TestGitCmdObjBuilderPinsCommandsToRepoDir(t *testing.T) {
-	builder := NewGitCmdObjBuilder(
-		utils.NewDummyLog(),
-		oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
-		"/path/to/repo",
-		nil,
-	)
-
-	assert.Equal(t, "/path/to/repo", builder.New([]string{"git", "status"}).GetCmd().Dir)
-	assert.Equal(t, "/path/to/repo", builder.NewShell("git status", "").GetCmd().Dir)
-}
-
-// A repo whose git dir isn't in its worktree can't be found by running a
-// command there, so the builder has to tell every command where it is; see
-// RepoPaths.GitLocationEnvVars. The process env says the same thing, but only
-// for the repo lazygit is in right now, which isn't necessarily this one.
-func TestGitCmdObjBuilderPinsCommandsToGitLocation(t *testing.T) {
-	builder := NewGitCmdObjBuilder(
-		utils.NewDummyLog(),
-		oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
-		"/path/to/worktree",
-		[]string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"},
-	)
-
-	assert.Subset(t, builder.New([]string{"git", "status"}).GetEnvVars(),
-		[]string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"})
-	assert.Subset(t, builder.NewShell("git status", "").GetEnvVars(),
-		[]string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"})
-}

pkg/commands/git_commands/blame.go

@@ -29,5 +29,5 @@ func (self *BlameCommands) BlameLineRange(filename string, commit string, firstL
 		Arg("--").
 		Arg(filename)
 
-	return self.cmd.New(cmdArgs.ToArgv()).DontLog().RunWithOutput()
+	return self.cmd.New(cmdArgs.ToArgv()).RunWithOutput()
 }

pkg/commands/git_commands/commit.go

@@ -241,15 +241,23 @@ func (self *CommitCommands) AmendHeadCmdObj() *oscommands.CmdObj {
 }
 
 func (self *CommitCommands) ShowCmdObj(hash string, filterPaths []string) *oscommands.CmdObj {
+	contextSize := self.UserConfig().Git.DiffContextSize
+
+	extDiffCmd := self.pagerConfig.GetExternalDiffCommand()
+	useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig()
 	cmdArgs := NewGitCmd("show").
 		Config("diff.noprefix=false").
-		AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), true).
+		ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd).
+		ArgIfElse(extDiffCmd != "" || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
-		Arg("--color=" + self.diffRendererConfigManager.GetColorArg()).
+		Arg("--color="+self.pagerConfig.GetColorArg()).
+		Arg(fmt.Sprintf("--unified=%d", contextSize)).
 		Arg("--stat").
 		Arg("--decorate").
 		Arg("-p").
 		Arg(hash).
+		ArgIf(self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)).
 		Arg("--").
 		Arg(filterPaths...).
 		Dir(self.repoPaths.worktreePath).

pkg/commands/git_commands/commit_loader.go

@@ -174,7 +174,7 @@ func (self *CommitLoader) MergeRebasingCommits(hashPool *utils.StringPool, commi
 	}
 
 	if workingTreeState.Rebasing {
-		rebasingCommits, err := self.getHydratedRebasingCommits(hashPool, commits, addConflictedRebasingCommit)
+		rebasingCommits, err := self.getHydratedRebasingCommits(hashPool, addConflictedRebasingCommit)
 		if err != nil {
 			return nil, err
 		}
@@ -251,8 +251,8 @@ func (self *CommitLoader) extractCommitFromLine(hashPool *utils.StringPool, line
 	})
 }
 
-func (self *CommitLoader) getHydratedRebasingCommits(hashPool *utils.StringPool, existingCommits []*models.Commit, addConflictingCommit bool) ([]*models.Commit, error) {
+func (self *CommitLoader) getHydratedRebasingCommits(hashPool *utils.StringPool, addConflictingCommit bool) ([]*models.Commit, error) {
-	return self.getHydratedTodoCommits(hashPool, self.getRebasingCommits(hashPool, addConflictingCommit), existingCommits, false)
+	return self.getHydratedTodoCommits(hashPool, self.getRebasingCommits(hashPool, addConflictingCommit), false)
 }
 
 func (self *CommitLoader) getHydratedSequencerCommits(hashPool *utils.StringPool, workingTreeState models.WorkingTreeState) ([]*models.Commit, error) {
@@ -271,56 +271,39 @@ func (self *CommitLoader) getHydratedSequencerCommits(hashPool *utils.StringPool
 		}
 	}
 
-	return self.getHydratedTodoCommits(hashPool, commits, nil, true)
+	return self.getHydratedTodoCommits(hashPool, commits, true)
 }
 
-func (self *CommitLoader) getHydratedTodoCommits(
+func (self *CommitLoader) getHydratedTodoCommits(hashPool *utils.StringPool, todoCommits []*models.Commit, todoFileHasShortHashes bool) ([]*models.Commit, error) {
-	hashPool *utils.StringPool,
-	todoCommits []*models.Commit,
-	existingCommits []*models.Commit,
-	todoFileHasShortHashes bool,
-) ([]*models.Commit, error) {
 	if len(todoCommits) == 0 {
 		return nil, nil
 	}
 
-	// A refresh of only the rebasing todos should reuse the already loaded todos to avoid
+	commitHashes := lo.FilterMap(todoCommits, func(commit *models.Commit, _ int) (string, bool) {
-	// unnecessary git show calls.
+		return commit.Hash(), commit.Hash() != ""
-	fullCommits := map[string]*models.Commit{}
-	for _, commit := range existingCommits {
-		if commit.IsTODO() && commit.Hash() != "" {
-			// Make a copy of the commit; that's necessary to avoid mutating the original commit
-			// when we later reuse it in the loop at the end of this function.
-			fullCommits[commit.Hash()] = lo.ToPtr(*commit)
-		}
-	}
-
-	commitHashesToFetch := lo.FilterMap(todoCommits, func(commit *models.Commit, _ int) (string, bool) {
-		return commit.Hash(), commit.Hash() != "" && fullCommits[commit.Hash()] == nil
 	})
 
-	if len(commitHashesToFetch) > 0 {
+	// note that we're not filtering these as we do non-rebasing commits just because
-		// note that we're not filtering these as we do non-rebasing commits just because
+	// I suspect that will cause some damage
-		// I suspect that will cause some damage
+	cmdObj := self.cmd.New(
-		cmdObj := self.cmd.New(
+		NewGitCmd("show").
-			NewGitCmd("show").
+			Config("log.showSignature=false").
-				Config("log.showSignature=false").
+			Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
-				Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
+			Arg(commitHashes...).
-				Arg(commitHashesToFetch...).
+			ToArgv(),
-				ToArgv(),
+	).DontLog()
-		).DontLog()
 
-		err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
+	fullCommits := map[string]*models.Commit{}
-			if line == "" || line[0] != '+' {
+	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
-				return false, nil
+		if line == "" || line[0] != '+' {
-			}
-			commit := self.extractCommitFromLine(hashPool, line[1:], false)
-			fullCommits[commit.Hash()] = commit
 			return false, nil
-		})
-		if err != nil {
-			return nil, err
 		}
+		commit := self.extractCommitFromLine(hashPool, line[1:], false)
+		fullCommits[commit.Hash()] = commit
+		return false, nil
+	})
+	if err != nil {
+		return nil, err
 	}
 
 	findFullCommit := lo.Ternary(todoFileHasShortHashes,

pkg/commands/git_commands/commit_loader_test.go

@@ -538,110 +538,6 @@ func TestCommitLoader_getConflictedCommitImpl(t *testing.T) {
 	}
 }
 
-func TestCommitLoaderGetHydratedTodoCommitsReusesExistingCommit(t *testing.T) {
-	hashPool := &utils.StringPool{}
-	runner := oscommands.NewFakeRunner(t)
-	loader := &CommitLoader{
-		cmd: oscommands.NewDummyCmdObjBuilder(runner),
-	}
-	existingCommit := models.NewCommit(hashPool, models.NewCommitOpts{
-		Hash:          "0123456789012345678901234567890123456789",
-		Name:          "hydrated subject",
-		AuthorName:    "Jane Doe",
-		AuthorEmail:   "jane@example.com",
-		UnixTimestamp: 1234,
-		Parents:       []string{"1123456789012345678901234567890123456789"},
-		Status:        models.StatusRebasing,
-		Action:        todo.Pick,
-	})
-	refreshedTodo := models.NewCommit(hashPool, models.NewCommitOpts{
-		Hash:       existingCommit.Hash(),
-		Name:       "subject from the todo file",
-		Status:     models.StatusConflicted,
-		Action:     todo.Fixup,
-		ActionFlag: "-C",
-	})
-
-	commits, err := loader.getHydratedTodoCommits(
-		hashPool,
-		[]*models.Commit{refreshedTodo},
-		[]*models.Commit{existingCommit},
-		false,
-	)
-
-	assert.NoError(t, err)
-	assert.Equal(t, []*models.Commit{
-		models.NewCommit(hashPool, models.NewCommitOpts{
-			Hash:          existingCommit.Hash(),
-			Name:          "hydrated subject",
-			AuthorName:    "Jane Doe",
-			AuthorEmail:   "jane@example.com",
-			UnixTimestamp: 1234,
-			Parents:       []string{"1123456789012345678901234567890123456789"},
-			Status:        models.StatusConflicted,
-			Action:        todo.Fixup,
-			ActionFlag:    "-C",
-		}),
-	}, commits)
-	assert.Equal(t, todo.Pick, existingCommit.Action)
-	assert.Equal(t, models.StatusRebasing, existingCommit.Status)
-	runner.CheckForMissingCalls()
-}
-
-func TestCommitLoaderGetHydratedTodoCommitsLoadsMissingCommit(t *testing.T) {
-	hashPool := &utils.StringPool{}
-	existingHash := "0123456789012345678901234567890123456789"
-	missingHash := "2123456789012345678901234567890123456789"
-	missingCommitOutput := strings.ReplaceAll(
-		`+2123456789012345678901234567890123456789|1235|John Doe|john@example.com||>|tag: new|new subject`,
-		"|",
-		"\x00",
-	)
-	runner := oscommands.NewFakeRunner(t).ExpectGitArgs(
-		[]string{
-			"-c", "log.showSignature=false", "show", "--no-patch", "--oneline", "--abbrev=20",
-			prettyFormat, missingHash,
-		},
-		missingCommitOutput,
-		nil,
-	)
-	loader := &CommitLoader{
-		cmd: oscommands.NewDummyCmdObjBuilder(runner),
-	}
-	existingCommit := models.NewCommit(hashPool, models.NewCommitOpts{
-		Hash:   existingHash,
-		Name:   "existing subject",
-		Status: models.StatusRebasing,
-		Action: todo.Pick,
-	})
-	refreshedTodos := []*models.Commit{
-		models.NewCommit(hashPool, models.NewCommitOpts{
-			Hash:   existingHash,
-			Status: models.StatusRebasing,
-			Action: todo.Pick,
-		}),
-		models.NewCommit(hashPool, models.NewCommitOpts{
-			Hash:   missingHash,
-			Status: models.StatusRebasing,
-			Action: todo.Edit,
-		}),
-	}
-
-	commits, err := loader.getHydratedTodoCommits(
-		hashPool,
-		refreshedTodos,
-		[]*models.Commit{existingCommit},
-		false,
-	)
-
-	assert.NoError(t, err)
-	assert.Len(t, commits, 2)
-	assert.Equal(t, "existing subject", commits[0].Name)
-	assert.Equal(t, "new subject", commits[1].Name)
-	assert.Equal(t, todo.Edit, commits[1].Action)
-	runner.CheckForMissingCalls()
-}
-
 func TestCommitLoader_setCommitStatuses(t *testing.T) {
 	type scenario struct {
 		testName           string

pkg/commands/git_commands/commit_test.go

@@ -255,7 +255,7 @@ func TestCommitShowCmdObj(t *testing.T) {
 		contextSize         uint64
 		similarityThreshold int
 		ignoreWhitespace    bool
-		diffRendererConfig  *config.DiffRendererConfig
+		pagerConfig         *config.PagingConfig
 		expected            []string
 	}
 
@@ -266,8 +266,8 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  nil,
+			pagerConfig:         nil,
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"},
 		},
 		{
 			testName:            "Default case with filter path",
@@ -275,8 +275,8 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  nil,
+			pagerConfig:         nil,
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--", "file.txt"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--", "file.txt"},
 		},
 		{
 			testName:            "Show diff with custom context size",
@@ -284,8 +284,8 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         77,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  nil,
+			pagerConfig:         nil,
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=77", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"},
 		},
 		{
 			testName:            "Show diff with custom similarity threshold",
@@ -293,8 +293,8 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 33,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  nil,
+			pagerConfig:         nil,
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=3", "--find-renames=33%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=33%", "--"},
 		},
 		{
 			testName:            "Show diff, ignoring whitespace",
@@ -302,8 +302,8 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         77,
 			similarityThreshold: 50,
 			ignoreWhitespace:    true,
-			diffRendererConfig:  nil,
+			pagerConfig:         nil,
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--unified=77", "--ignore-all-space", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--ignore-all-space", "--find-renames=50%", "--"},
 		},
 		{
 			testName:            "Show diff with external diff command",
@@ -311,8 +311,8 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  &config.DiffRendererConfig{Type: "extDiff", Command: "difft --color=always"},
+			pagerConfig:         &config.PagingConfig{ExternalDiffCommand: "difft --color=always"},
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "-c", "diff.noprefix=false", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "-c", "diff.noprefix=false", "show", "--ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"},
 		},
 		{
 			testName:            "Show diff using git's external diff config",
@@ -320,16 +320,16 @@ func TestCommitShowCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  &config.DiffRendererConfig{Type: "extDiff"},
+			pagerConfig:         &config.PagingConfig{UseExternalDiffGitConfig: true},
-			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--stat", "--decorate", "-p", "1234567890", "--"},
+			expected:            []string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "show", "--ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--find-renames=50%", "--"},
 		},
 	}
 
 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
-			if s.diffRendererConfig != nil {
+			if s.pagerConfig != nil {
-				userConfig.Git.DiffRenderers = []config.DiffRendererConfig{*s.diffRendererConfig}
+				userConfig.Git.Pagers = []config.PagingConfig{*s.pagerConfig}
 			}
 			userConfig.Git.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
 			userConfig.Git.DiffContextSize = s.contextSize

pkg/commands/git_commands/common.go

@@ -8,12 +8,12 @@ import (
 
 type GitCommon struct {
 	*common.Common
-	version                   *GitVersion
+	version     *GitVersion
-	cmd                       oscommands.ICmdObjBuilder
+	cmd         oscommands.ICmdObjBuilder
-	os                        *oscommands.OSCommand
+	os          *oscommands.OSCommand
-	repoPaths                 *RepoPaths
+	repoPaths   *RepoPaths
-	config                    *ConfigCommands
+	config      *ConfigCommands
-	diffRendererConfigManager *config.DiffRendererConfigManager
+	pagerConfig *config.PagerConfig
 }
 
 func NewGitCommon(
@@ -23,15 +23,15 @@ func NewGitCommon(
 	osCommand *oscommands.OSCommand,
 	repoPaths *RepoPaths,
 	config *ConfigCommands,
-	diffRendererConfigManager *config.DiffRendererConfigManager,
+	pagerConfig *config.PagerConfig,
 ) *GitCommon {
 	return &GitCommon{
-		Common:                    cmn,
+		Common:      cmn,
-		version:                   version,
+		version:     version,
-		cmd:                       cmd,
+		cmd:         cmd,
-		os:                        osCommand,
+		os:          osCommand,
-		repoPaths:                 repoPaths,
+		repoPaths:   repoPaths,
-		config:                    config,
+		config:      config,
-		diffRendererConfigManager: diffRendererConfigManager,
+		pagerConfig: pagerConfig,
 	}
 }

pkg/commands/git_commands/deps_test.go

@@ -62,7 +62,7 @@ func buildGitCommon(deps commonDeps) *GitCommon {
 		gitCommon.Common.SetUserConfig(config.GetDefaultConfig())
 	}
 
-	gitCommon.diffRendererConfigManager = config.NewDiffRendererConfigManager(func() *config.UserConfig {
+	gitCommon.pagerConfig = config.NewPagerConfig(func() *config.UserConfig {
 		return gitCommon.Common.UserConfig()
 	})
 

pkg/commands/git_commands/diff.go

@@ -17,14 +17,22 @@ func NewDiffCommands(gitCommon *GitCommon) *DiffCommands {
 }
 
 // This is for generating diffs to be shown in the UI (e.g. rendering a range
-// diff to the main view). It uses a custom diff renderer if one is configured.
+// diff to the main view). It uses a custom pager if one is configured.
 func (self *DiffCommands) DiffCmdObj(diffArgs []string) *oscommands.CmdObj {
+	extDiffCmd := self.pagerConfig.GetExternalDiffCommand()
+	useExtDiff := extDiffCmd != ""
+	useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig()
+	ignoreWhitespace := self.UserConfig().Git.IgnoreWhitespaceInDiffView
+
 	return self.cmd.New(
 		NewGitCmd("diff").
 			Config("diff.noprefix=false").
-			AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), true).
+			ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
+			ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 			Arg("--submodule").
-			Arg(fmt.Sprintf("--color=%s", self.diffRendererConfigManager.GetColorArg())).
+			Arg(fmt.Sprintf("--color=%s", self.pagerConfig.GetColorArg())).
+			ArgIf(ignoreWhitespace, "--ignore-all-space").
+			Arg(fmt.Sprintf("--unified=%d", self.UserConfig().Git.DiffContextSize)).
 			Arg(diffArgs...).
 			Dir(self.repoPaths.worktreePath).
 			ToArgv(),
@@ -32,8 +40,8 @@ func (self *DiffCommands) DiffCmdObj(diffArgs []string) *oscommands.CmdObj {
 }
 
 // This is a basic generic diff command that can be used for any diff operation
-// (e.g. copying a diff to the clipboard). It will not use a custom diff renderer,
+// (e.g. copying a diff to the clipboard). It will not use a custom pager, and
-// and does not use user configs such as ignore whitespace.
+// does not use user configs such as ignore whitespace.
 // If you want to diff specific refs (one or two), you need to add them yourself
 // in additionalArgs; it is recommended to also pass `--` after that. If you
 // want to restrict the diff to specific paths, pass them in additionalArgs

pkg/commands/git_commands/file.go

@@ -2,7 +2,6 @@ package git_commands
 
 import (
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -94,7 +93,7 @@ func (self *FileCommands) guessDefaultEditor() string {
 		// At this point, it might be more than just the name of the editor;
 		// e.g. it might be "code -w" or "vim -u myvim.rc". So assume that
 		// everything up to the first space is the editor name.
-		editor = filepath.Base(strings.Split(editor, " ")[0])
+		editor = strings.Split(editor, " ")[0]
 	}
 
 	return editor

pkg/commands/git_commands/file_loader.go

@@ -2,12 +2,12 @@ package git_commands
 
 import (
 	"fmt"
+	"path/filepath"
 	"strconv"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/samber/lo"
 )
 
 type FileLoaderConfig interface {
@@ -88,66 +88,27 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File
 		files = append(files, file)
 	}
 
-	self.setConflictMarkerSizes(files)
+	// Go through the files to see if any of these files are actually worktrees
-
+	// so that we can render them correctly
-	return files
+	worktreePaths := linkedWortkreePaths(self.Fs, self.repoPaths.RepoGitDirPath())
-}
+	for _, file := range files {
-
+		for _, worktreePath := range worktreePaths {
-// Looks up how long the conflict markers in the conflicted files are. We ask
+			absFilePath, err := filepath.Abs(file.Path)
-// git for all of them at once, because spawning a process per file would be
+			if err != nil {
-// painfully slow when hundreds of files are conflicted (especially on Windows).
+				self.Log.Error(err)
-func (self *FileLoader) setConflictMarkerSizes(files []*models.File) {
+				continue
-	conflictedFiles := lo.Filter(files, func(file *models.File, _ int) bool {
+			}
-		return file.HasInlineMergeConflicts
+			if absFilePath == worktreePath {
-	})
+				file.IsWorktree = true
-	if len(conflictedFiles) == 0 {
+				// `git status` renders this worktree as a folder with a trailing slash but we'll represent it as a singular worktree
-		return
+				// If we include the slash, it will be rendered as a folder with a null file inside.
-	}
+				file.Path = strings.TrimSuffix(file.Path, "/")
-
+				break
-	paths := lo.Map(conflictedFiles, func(file *models.File, _ int) string {
+			}
-		return file.Path
-	})
-
-	markerSizes, err := self.getConflictMarkerSizes(paths)
-	if err != nil {
-		self.Log.Error(err)
-		return
-	}
-
-	for _, file := range conflictedFiles {
-		file.ConflictMarkerSize = markerSizes[file.Path]
-	}
-}
-
-func (self *FileLoader) getConflictMarkerSizes(paths []string) (map[string]int, error) {
-	cmdArgs := NewGitCmd("check-attr").
-		Arg("-z").
-		Arg("--stdin").
-		Arg("conflict-marker-size").
-		ToArgv()
-
-	// -z makes git both read the paths and write its output NUL-separated, so
-	// that paths containing newlines don't throw us off.
-	output, _, err := self.cmd.New(cmdArgs).
-		SetStdin(strings.Join(paths, "\x00")).
-		DontLog().
-		RunWithOutputs()
-	if err != nil {
-		return nil, err
-	}
-
-	markerSizes := map[string]int{}
-	fields := strings.Split(output, "\x00")
-	// Each path yields a path/attribute/value triple; the value is either a
-	// number or something like "unspecified", in which case we leave the marker
-	// size at 0 to say that git's default applies.
-	for i := 0; i+2 < len(fields); i += 3 {
-		if markerSize, err := strconv.Atoi(fields[i+2]); err == nil && markerSize > 0 {
-			markerSizes[fields[i]] = markerSize
 		}
 	}
 
-	return markerSizes, nil
+	return files
 }
 
 type FileDiff struct {

pkg/commands/git_commands/file_loader_test.go

@@ -37,10 +37,6 @@ func TestFileGetStatusFiles(t *testing.T) {
 				ExpectGitArgs([]string{"diff", "--numstat", "-z", "HEAD"},
 					"4\t1\tfile1.txt\x001\t0\tfile2.txt\x002\t2\tfile3.txt\x000\t2\tfile4.txt\x002\t2\tfile5.txt",
 					nil,
-				).
-				ExpectGitArgs([]string{"check-attr", "-z", "--stdin", "conflict-marker-size"},
-					"file5.txt\x00conflict-marker-size\x00unspecified\x00",
-					nil,
 				),
 			showNumstatInFilesView: true,
 			expectedFiles: []*models.File{
@@ -116,58 +112,6 @@ func TestFileGetStatusFiles(t *testing.T) {
 				},
 			},
 		},
-		{
-			testName:            "Conflicted files with a conflict-marker-size attribute",
-			similarityThreshold: 50,
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z", "--find-renames=50%"},
-					"UU file1.txt\x00UU file2.txt\x00UU file3.txt\x00 M file4.txt",
-					nil,
-				).
-				ExpectGitArgs([]string{"check-attr", "-z", "--stdin", "conflict-marker-size"},
-					"file1.txt\x00conflict-marker-size\x0032\x00"+
-						"file2.txt\x00conflict-marker-size\x00unspecified\x00"+
-						"file3.txt\x00conflict-marker-size\x00nonsense\x00",
-					nil,
-				),
-			expectedFiles: []*models.File{
-				{
-					Path:                    "file1.txt",
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					HasMergeConflicts:       true,
-					HasInlineMergeConflicts: true,
-					ConflictMarkerSize:      32,
-					DisplayString:           "UU file1.txt",
-					ShortStatus:             "UU",
-				},
-				{
-					Path:                    "file2.txt",
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					HasMergeConflicts:       true,
-					HasInlineMergeConflicts: true,
-					DisplayString:           "UU file2.txt",
-					ShortStatus:             "UU",
-				},
-				{
-					Path:                    "file3.txt",
-					HasUnstagedChanges:      true,
-					Tracked:                 true,
-					HasMergeConflicts:       true,
-					HasInlineMergeConflicts: true,
-					DisplayString:           "UU file3.txt",
-					ShortStatus:             "UU",
-				},
-				{
-					Path:               "file4.txt",
-					HasUnstagedChanges: true,
-					Tracked:            true,
-					DisplayString:      " M file4.txt",
-					ShortStatus:        " M",
-				},
-			},
-		},
 		{
 			testName:            "File with new line char",
 			similarityThreshold: 50,

pkg/commands/git_commands/file_test.go

@@ -203,17 +203,6 @@ func TestGuessDefaultEditor(t *testing.T) {
 			},
 			expectedResult: "bbedit",
 		},
-		{
-			gitConfigMockResponses: nil,
-			getenv: func(env string) string {
-				if env == "EDITOR" {
-					return "/usr/bin/nvim"
-				}
-
-				return ""
-			},
-			expectedResult: "nvim",
-		},
 	}
 
 	for _, s := range scenarios {

pkg/commands/git_commands/git_command_builder.go

@@ -1,12 +1,9 @@
 package git_commands
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/env"
 )
 
 // OptionalLocksEnvVar is the name of the environment variable that tells git
@@ -19,15 +16,6 @@ import (
 // that opts back in is the foreground files refresh; see FileLoader.gitStatus.
 const OptionalLocksEnvVar = "GIT_OPTIONAL_LOCKS"
 
-// forOtherRepo prepares a command that operates on a repo other than the one
-// we have open — a submodule, or another worktree. GIT_DIR and GIT_WORK_TREE
-// say where our repo is, and every command we run inherits them, so a command
-// pointed at a different repo would be resolved against ours instead: `git -C
-// <submodule> log` would silently log the superproject's commits.
-func forOtherRepo(cmdObj *oscommands.CmdObj) *oscommands.CmdObj {
-	return cmdObj.RemoveEnvVar(env.GitDirEnvVar).RemoveEnvVar(env.GitWorkTreeEnvVar)
-}
-
 // convenience struct for building git commands. Especially useful when
 // including conditional args
 type GitCommandBuilder struct {
@@ -123,20 +111,6 @@ func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommand
 	return self
 }
 
-func (self *GitCommandBuilder) AddCommonDiffArgs(diffRendererConfigManager *config.DiffRendererConfigManager, userConfig *config.UserConfig, forUI bool) *GitCommandBuilder {
-	contextSize := userConfig.Git.DiffContextSize
-	extDiffCmd := diffRendererConfigManager.GetExternalDiffCommand(contextSize)
-	useExtDiff := forUI && diffRendererConfigManager.GetDiffRendererType() == config.DiffRendererType_ExtDiff
-
-	return self.
-		ConfigIf(forUI && extDiffCmd != "", "diff.external="+extDiffCmd).
-		ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
-		Arg(fmt.Sprintf("--unified=%d", contextSize)).
-		ArgIf(forUI && userConfig.Git.IgnoreWhitespaceInDiffView, "--ignore-all-space").
-		Arg(fmt.Sprintf("--find-renames=%d%%", userConfig.Git.RenameSimilarityThreshold)).
-		ArgIf(forUI, diffRendererConfigManager.GetRawGitArgs()...)
-}
-
 func (self *GitCommandBuilder) ToArgv() []string {
 	return append([]string{"git"}, self.args...)
 }

pkg/commands/git_commands/github.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
-	"os/exec"
 	"regexp"
 	"strings"
 	"time"
@@ -87,25 +85,12 @@ type PullRequestNode struct {
 	HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"`
 	State               string                `json:"state"`
 	IsDraft             bool                  `json:"isDraft"`
-	HeadRef             GithubRef             `json:"headRef"`
 }
 
 type GithubRepositoryOwner struct {
 	Login string `json:"login"`
 }
 
-type GithubRef struct {
-	Target GithubGitObject `json:"target"`
-}
-
-type GithubGitObject struct {
-	StatusCheckRollup GithubStatusCheckRollup `json:"statusCheckRollup"`
-}
-
-type GithubStatusCheckRollup struct {
-	State string `json:"state"`
-}
-
 type graphQLRequest struct {
 	Query     string            `json:"query"`
 	Variables map[string]string `json:"variables"`
@@ -136,15 +121,6 @@ func fetchPullRequestsQuery(branches []string, owner string, repo string) (strin
           number
           url
           isDraft
-          headRef {
-            target {
-              ... on Commit {
-                statusCheckRollup {
-                  state
-                }
-              }
-            }
-          }
           headRepositoryOwner {
             login
           }
@@ -162,51 +138,9 @@ func fetchPullRequestsQuery(branches []string, owner string, repo string) (strin
 	return queryString, variables
 }
 
-// GetAuthToken returns the token to authenticate against the given host with,
-// or an empty string if there is none.
-//
-// The token has to come from gh itself rather than from an in-process lookup
-// with go-gh: that reads gh's config file once per process and answers from
-// that snapshot ever after, whereas gh rewrites the file whenever the active
-// account changes, and keeps the active account's token either there or in the
-// system keyring. Under a long-running lazygit the snapshot therefore drifts
-// out of date, leaving us with a token for an account that is no longer active,
-// or with no token at all.
 func (self *GitHubCommands) GetAuthToken(host string) string {
-	ghExe := ghExecutable()
+	token, _ := auth.TokenForHost(host)
-	if ghExe == "" {
+	return token
-		// Without gh installed, the environment variables and config file that
-		// gh would have consulted are still worth a look.
-		token, _ := auth.TokenFromEnvOrConfig(host)
-		return token
-	}
-
-	cmdArgs := []string{ghExe, "auth", "token", "--hostname", host}
-	output, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs()
-	if err != nil {
-		// Not being logged in to this host is a normal state rather than
-		// something to report; the runner logs gh's stderr for the rest.
-		return ""
-	}
-
-	return strings.TrimSpace(output)
-}
-
-// ghExecutable returns the path of the gh binary, or an empty string if it
-// isn't installed.
-func ghExecutable() string {
-	if ghExe := os.Getenv("GH_PATH"); ghExe != "" {
-		return ghExe
-	}
-
-	// A gh found in the current directory rather than on PATH comes back as
-	// exec.ErrDot, which we treat as not having found one at all.
-	ghExe, err := exec.LookPath("gh")
-	if err != nil {
-		return ""
-	}
-
-	return ghExe
 }
 
 // FetchRecentPRs fetches recent pull requests using GraphQL. serviceInfo
@@ -276,10 +210,7 @@ func (self *GitHubCommands) fetchRecentPRsAux(endpoint string, repoOwner string,
 	req.Header.Set("Authorization", "token "+token)
 	req.Header.Set("Content-Type", "application/json")
 
-	// Bound the request so that a dead or extremely slow network can't leave
+	client := &http.Client{}
-	// the pull-request refresh in flight for minutes. The data is auxiliary,
-	// so giving up and retrying on the next refresh beats waiting.
-	client := &http.Client{Timeout: 10 * time.Second}
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -297,12 +228,9 @@ func (self *GitHubCommands) fetchRecentPRsAux(endpoint string, repoOwner string,
 		return nil, err
 	}
 
-	return parsePullRequestsResponse(respBytes)
-}
-
-func parsePullRequestsResponse(respBytes []byte) ([]*models.GithubPullRequest, error) {
 	var result Response
-	if err := json.Unmarshal(respBytes, &result); err != nil {
+	err = json.Unmarshal(respBytes, &result)
+	if err != nil {
 		return nil, err
 	}
 
@@ -315,7 +243,6 @@ func parsePullRequestsResponse(respBytes []byte) ([]*models.GithubPullRequest, e
 				Number:      node.Number,
 				Title:       node.Title,
 				State:       lo.Ternary(node.IsDraft && node.State != "CLOSED", "DRAFT", node.State),
-				ChecksState: node.HeadRef.Target.StatusCheckRollup.State,
 				Url:         node.Url,
 				HeadRepositoryOwner: models.GithubRepositoryOwner{
 					Login: node.HeadRepositoryOwner.Login,

pkg/commands/git_commands/github_test.go

@@ -76,104 +76,6 @@ func TestGraphQLEndpoint(t *testing.T) {
 	}
 }
 
-func TestFetchPullRequestsQueryFetchesOnlyAggregateCheckState(t *testing.T) {
-	query, variables := fetchPullRequestsQuery([]string{"feature"}, "owner", "repo")
-
-	assert.Contains(t, query, "headRef {")
-	assert.Contains(t, query, "... on Commit {")
-	assert.Contains(t, query, "statusCheckRollup {")
-	assert.NotContains(t, query, "contexts")
-	assert.Equal(t, map[string]string{
-		"owner":   "owner",
-		"repo":    "repo",
-		"branch1": "feature",
-	}, variables)
-}
-
-func TestParsePullRequestsResponse(t *testing.T) {
-	t.Run("flattens aliases and normalizes drafts", func(t *testing.T) {
-		response := []byte(`{
-  "data": {
-    "repository": {
-      "a1": {
-        "edges": [
-          {
-            "node": {
-              "title": "Add feature",
-              "headRefName": "feature",
-              "number": 42,
-              "url": "https://github.com/jesseduffield/lazygit/pull/42",
-              "headRepositoryOwner": {"login": "contributor"},
-              "state": "OPEN",
-              "isDraft": false,
-              "headRef": {
-                "target": {
-                  "statusCheckRollup": {"state": "SUCCESS"}
-                }
-              }
-            }
-          }
-        ]
-      },
-      "a2": {
-        "edges": [
-          {
-            "node": {
-              "title": "Draft feature",
-              "headRefName": "draft-feature",
-              "number": 43,
-              "url": "https://github.com/jesseduffield/lazygit/pull/43",
-              "headRepositoryOwner": {"login": "contributor"},
-              "state": "OPEN",
-              "isDraft": true,
-              "headRef": null
-            }
-          }
-        ]
-      }
-    }
-  }
-}`)
-
-		prs, err := parsePullRequestsResponse(response)
-
-		assert.NoError(t, err)
-		assert.ElementsMatch(t, []*models.GithubPullRequest{
-			{
-				HeadRefName:         "feature",
-				Number:              42,
-				Title:               "Add feature",
-				State:               "OPEN",
-				ChecksState:         "SUCCESS",
-				Url:                 "https://github.com/jesseduffield/lazygit/pull/42",
-				HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"},
-			},
-			{
-				HeadRefName:         "draft-feature",
-				Number:              43,
-				Title:               "Draft feature",
-				State:               "DRAFT",
-				Url:                 "https://github.com/jesseduffield/lazygit/pull/43",
-				HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "contributor"},
-			},
-		}, prs)
-	})
-
-	t.Run("returns an empty slice for an empty result", func(t *testing.T) {
-		prs, err := parsePullRequestsResponse([]byte(`{"data":{"repository":{}}}`))
-
-		assert.NoError(t, err)
-		assert.Empty(t, prs)
-	})
-
-	t.Run("rejects malformed JSON", func(t *testing.T) {
-		prs, err := parsePullRequestsResponse([]byte(`{"data":`))
-
-		assert.Error(t, err)
-		assert.Nil(t, prs)
-	})
-}
-
 func TestGenerateGithubPullRequestMap(t *testing.T) {
 	cases := []struct {
 		name     string
@@ -197,7 +99,6 @@ func TestGenerateGithubPullRequestMap(t *testing.T) {
 					Number:              42,
 					Title:               "Add feature",
 					State:               "OPEN",
-					ChecksState:         "PENDING",
 					Url:                 "https://github.com/jesseduffield/lazygit/pull/42",
 					HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"},
 				},
@@ -221,7 +122,6 @@ func TestGenerateGithubPullRequestMap(t *testing.T) {
 					Number:              42,
 					Title:               "Add feature",
 					State:               "OPEN",
-					ChecksState:         "PENDING",
 					Url:                 "https://github.com/jesseduffield/lazygit/pull/42",
 					HeadRepositoryOwner: models.GithubRepositoryOwner{Login: "jesseduffield"},
 				},

pkg/commands/git_commands/rebase.go

@@ -112,30 +112,29 @@ func (self *RebaseCommands) GenericAmend(commits []*models.Commit, start, end in
 }
 
 func (self *RebaseCommands) MoveCommitsDown(commits []*models.Commit, startIdx int, endIdx int) error {
-	return self.MoveCommits(commits, startIdx, endIdx, 1)
+	baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+2)
-}
-
-func (self *RebaseCommands) MoveCommitsUp(commits []*models.Commit, startIdx int, endIdx int) error {
-	return self.MoveCommits(commits, startIdx, endIdx, -1)
-}
-
-func (self *RebaseCommands) MoveCommits(commits []*models.Commit, startIdx int, endIdx int, offset int) error {
-	baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+max(offset, 0)+1)
 
 	hashes := lo.Map(commits[startIdx:endIdx+1], func(commit *models.Commit, _ int) string {
 		return commit.Hash()
 	})
 
-	var instruction daemon.Instruction
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
-	if offset > 0 {
+		baseHashOrRoot: baseHashOrRoot,
-		instruction = daemon.NewMoveTodosDownInstruction(hashes, offset)
+		instruction:    daemon.NewMoveTodosDownInstruction(hashes),
-	} else {
+		overrideEditor: true,
-		instruction = daemon.NewMoveTodosUpInstruction(hashes, -offset)
+	}).Run()
-	}
+}
+
+func (self *RebaseCommands) MoveCommitsUp(commits []*models.Commit, startIdx int, endIdx int) error {
+	baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+1)
+
+	hashes := lo.Map(commits[startIdx:endIdx+1], func(commit *models.Commit, _ int) string {
+		return commit.Hash()
+	})
 
 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
 		baseHashOrRoot: baseHashOrRoot,
-		instruction:    instruction,
+		instruction:    daemon.NewMoveTodosUpInstruction(hashes),
 		overrideEditor: true,
 	}).Run()
 }
@@ -370,20 +369,21 @@ func (self *RebaseCommands) DeleteUpdateRefTodos(commits []*models.Commit) error
 }
 
 func (self *RebaseCommands) MoveTodosDown(commits []*models.Commit) error {
-	return self.MoveTodos(commits, 1)
-}
-
-func (self *RebaseCommands) MoveTodosUp(commits []*models.Commit) error {
-	return self.MoveTodos(commits, -1)
-}
-
-func (self *RebaseCommands) MoveTodos(commits []*models.Commit, offset int) error {
 	fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo")
 	todosToMove := lo.Map(commits, func(commit *models.Commit, _ int) utils.Todo {
 		return todoFromCommit(commit)
 	})
 
-	return utils.MoveTodos(fileName, todosToMove, true, offset, self.config.GetCoreCommentChar())
+	return utils.MoveTodosDown(fileName, todosToMove, true, self.config.GetCoreCommentChar())
+}
+
+func (self *RebaseCommands) MoveTodosUp(commits []*models.Commit) error {
+	fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo")
+	todosToMove := lo.Map(commits, func(commit *models.Commit, _ int) utils.Todo {
+		return todoFromCommit(commit)
+	})
+
+	return utils.MoveTodosUp(fileName, todosToMove, true, self.config.GetCoreCommentChar())
 }
 
 // SquashAllAboveFixupCommits squashes all fixup! commits above the given one

pkg/commands/git_commands/repo_paths.go

@@ -1,14 +1,15 @@
 package git_commands
 
 import (
+	ioFs "io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/env"
 	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/spf13/afero"
 )
 
 type RepoPaths struct {
@@ -18,12 +19,10 @@ type RepoPaths struct {
 	repoGitDirPath     string
 	repoName           string
 	isBareRepo         bool
-	gitLocationEnvVars []string
 }
 
 // Path to the current worktree. If we're in the main worktree, this will
-// be the same as RepoPath(). It is empty for a bare repo, which has no
+// be the same as RepoPath()
-// worktree at all.
 func (self *RepoPaths) WorktreePath() string {
 	return self.worktreePath
 }
@@ -54,33 +53,10 @@ func (self *RepoPaths) RepoName() string {
 	return self.repoName
 }
 
-// Whether we found no worktree, so that there is nothing for lazygit to show.
-// Note that this isn't quite git's core.bare: a repo that calls itself non-bare
-// but whose worktree we couldn't find counts as bare for us too. Concretely,
-// this is true when we're in
-//
-//   - a genuinely bare repo;
-//   - the git dir of a linked worktree (.git/worktrees/x), whose worktree is
-//     recorded but not somewhere we look;
-//   - a repo that keeps its worktree somewhere only GIT_WORK_TREE knows, such
-//     as a vcsh-style dotfiles repo that hasn't been given core.worktree.
-//
-// The .git dir of an ordinary repo is not one of them: GetRepoPathsForDir
-// notices the worktree holding it and hands back that repo instead.
 func (self *RepoPaths) IsBareRepo() bool {
 	return self.isBareRepo
 }
 
-// The environment that tells git where this repo is, as "NAME=value" entries.
-// It is empty for the vast majority of repos, which git finds for itself by
-// looking for a .git in the directory a command runs in. It is only non-empty
-// when that doesn't work — when the git dir lives somewhere else entirely,
-// because of core.worktree or --work-tree — and then every command addressing
-// the repo has to carry it.
-func (self *RepoPaths) GitLocationEnvVars() []string {
-	return self.gitLocationEnvVars
-}
-
 // Returns the repo paths for a typical repo
 func MockRepoPaths(currentPath string) *RepoPaths {
 	return &RepoPaths{
@@ -108,76 +84,26 @@ func GetRepoPathsForDir(
 	dir string,
 	cmd oscommands.ICmdObjBuilder,
 ) (*RepoPaths, error) {
-	repoPaths, err := repoPathsForDir(dir, cmd)
+	gitDirOutput, err := callGitRevParseWithDir(cmd, dir, "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree")
-	if err != nil || !repoPaths.IsBareRepo() {
-		return repoPaths, err
-	}
-
-	// We're in a git dir rather than in a working tree, which usually just means
-	// somebody ran lazygit in the .git of an ordinary repo. git's convention is
-	// that a git dir called .git belongs to the directory holding it, so look
-	// there: if that is a working tree, it is the repo we were asked about, and
-	// there's no reason to make the user go up a directory and try again.
-	//
-	// The git dirs that aren't called .git keep the paths we have. A linked
-	// worktree's (.git/worktrees/x) and a submodule's (.git/modules/x) do have a
-	// working tree, but only the directory holding a .git tells us where, so we
-	// would be guessing. A bare repo's has none to find.
-	if filepath.Base(repoPaths.WorktreeGitDirPath()) != ".git" {
-		return repoPaths, nil
-	}
-
-	pathsFromWorkTree, err := repoPathsForDir(filepath.Dir(repoPaths.WorktreeGitDirPath()), cmd)
-	if err != nil || pathsFromWorkTree.IsBareRepo() {
-		return repoPaths, nil
-	}
-	return pathsFromWorkTree, nil
-}
-
-// repoPathsForDir asks git about the repo at dir, and reports a bare repo when
-// there is no working tree there. Unlike GetRepoPathsForDir it never looks
-// anywhere but dir, which is what keeps that one from going round in circles.
-func repoPathsForDir(
-	dir string,
-	cmd oscommands.ICmdObjBuilder,
-) (*RepoPaths, error) {
-	gitDirOutput, err := callGitRevParseWithDir(cmd, dir, "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree")
 	if err != nil {
-		// --show-toplevel is the only one of these that needs a work tree, and
+		return nil, err
-		// git makes it fatal when there isn't one. So this may just mean we're in
-		// a repo that has no work tree.
-		return getBareRepoPathsForDir(dir, cmd, err)
 	}
 
 	gitDirResults := strings.Split(utils.NormalizeLinefeeds(gitDirOutput), "\n")
 	worktreePath := gitDirResults[0]
 	worktreeGitDirPath := gitDirResults[1]
 	repoGitDirPath := gitDirResults[2]
+	isBareRepo := gitDirResults[3] == "true"
 
-	// A worktree that has the repo's common git dir to itself is the repo's main
+	// If we're in a submodule, --show-superproject-working-tree will return
-	// worktree, so it is the repoPath. That holds for a submodule as well: its
+	// a value, meaning gitDirResults will be length 5. In that case
-	// git dir lives under the superproject's .git/modules, but it is still the
+	// return the worktree path as the repoPath. Otherwise we're in a
-	// submodule's own common dir.
+	// normal repo or a worktree so return the parent of the git common
-	isMainWorktree := worktreeGitDirPath == repoGitDirPath
+	// dir (repoGitDirPath)
+	isSubmodule := len(gitDirResults) == 5
 
-	// If we're in a submodule, --show-superproject-working-tree will return a
-	// value, meaning gitDirResults will be length 4. That only tells us anything
-	// new for a linked worktree of a submodule, which isMainWorktree misses.
-	isSubmodule := len(gitDirResults) == 4
-
-	// Otherwise we're in a linked worktree, and the repoPath is the repo's main
-	// worktree. git won't tell us where that is: `git worktree list` reports it
-	// as the common git dir with a trailing "/.git" removed, which is this same
-	// derivation. So take the directory holding the common git dir. That is the
-	// main worktree of an ordinary repo, and of a bare one it is the directory
-	// its worktrees live in. It is not the main worktree of a repo that moved
-	// that elsewhere with core.worktree; there we end up naming the git dir's
-	// directory, which means that the repo name we display in the status panel
-	// isn't correct, and we start looking for .lazygit.yml in the wrong place.
-	// Both of those are not severe enough to justify the extra git call to get
-	// the real main worktree, so we accept this for this rather niche use case.
 	var repoPath string
-	if isMainWorktree || isSubmodule {
+	if isSubmodule {
 		repoPath = worktreePath
 	} else {
 		repoPath = filepath.Dir(repoGitDirPath)
@@ -190,113 +116,62 @@ func repoPathsForDir(
 		repoPath:           repoPath,
 		repoGitDirPath:     repoGitDirPath,
 		repoName:           repoName,
-		isBareRepo:         false,
+		isBareRepo:         isBareRepo,
-		gitLocationEnvVars: gitLocationEnvVars(cmd, worktreePath, worktreeGitDirPath),
 	}, nil
 }
 
-// gitLocationEnvVars works out whether git can find the repo by itself when a
-// command runs in its worktree, and if it can't, returns the environment that
-// tells git where it is. See RepoPaths.GitLocationEnvVars.
-func gitLocationEnvVars(
-	cmd oscommands.ICmdObjBuilder,
-	worktreePath string,
-	worktreeGitDirPath string,
-) []string {
-	// The ordinary repo, where the git dir sits in the worktree. Both paths are
-	// git's own answers from the same invocation, so they are spelled alike and
-	// comparing them is safe.
-	if worktreeGitDirPath == filepath.Join(worktreePath, ".git") {
-		return nil
-	}
-
-	// A linked worktree or a submodule instead has a .git file naming its git
-	// dir, and git follows that just as happily. We could read the file, but the
-	// path in it may well name the same directory differently than git did
-	// above, so ask git to resolve it — from the worktree and nothing else.
-	discoveredGitDirPath, err := callGitRevParseInOtherRepo(cmd, worktreePath, "--absolute-git-dir")
-	if err == nil && discoveredGitDirPath == worktreeGitDirPath {
-		return nil
-	}
-
-	return []string{
-		env.GitDirEnvVar + "=" + worktreeGitDirPath,
-		env.GitWorkTreeEnvVar + "=" + worktreePath,
-	}
-}
-
-// getBareRepoPathsForDir is the fallback for when we couldn't ask git for the
-// work tree. Everything but --show-toplevel works fine without one, so if the
-// remaining queries succeed we are in a bare repo, and we return what we know
-// about it with an empty worktreePath. If they fail too we simply aren't in a
-// repo, and the caller's original error says so better than ours would.
-func getBareRepoPathsForDir(
-	dir string,
-	cmd oscommands.ICmdObjBuilder,
-	errWithWorktree error,
-) (*RepoPaths, error) {
-	output, err := callGitRevParseWithDir(cmd, dir, "--absolute-git-dir", "--git-common-dir")
-	if err != nil {
-		return nil, errWithWorktree
-	}
-
-	results := strings.Split(utils.NormalizeLinefeeds(output), "\n")
-	repoGitDirPath := results[1]
-	// A bare repo has no worktree, and so no repo path in the sense the caller
-	// with a worktree means. It doesn't matter much what we say here, because
-	// nobody reads it: whoever is handed a bare repo either offers to open a
-	// recent one instead (app.setupRepo) or is turned away by NewGitCommand. The
-	// directory holding the git dir is the nearest thing there is to a repo
-	// path.
-	repoPath := filepath.Dir(repoGitDirPath)
-
-	return &RepoPaths{
-		worktreePath:       "",
-		worktreeGitDirPath: results[0],
-		repoPath:           repoPath,
-		repoGitDirPath:     repoGitDirPath,
-		repoName:           filepath.Base(repoPath),
-		isBareRepo:         true,
-	}, nil
-}
-
-// Asks git about the repo at dir. This is how we find our own repo, so it has
-// to be answered the way git itself would answer it there, GIT_DIR and
-// GIT_WORK_TREE included.
 func callGitRevParseWithDir(
 	cmd oscommands.ICmdObjBuilder,
 	dir string,
 	gitRevArgs ...string,
 ) (string, error) {
-	return runGitRevParse(newGitRevParseCmd(cmd, dir, gitRevArgs...))
-}
-
-// Asks git about a repo that isn't the one we have open; see forOtherRepo.
-func callGitRevParseInOtherRepo(
-	cmd oscommands.ICmdObjBuilder,
-	dir string,
-	gitRevArgs ...string,
-) (string, error) {
-	return runGitRevParse(forOtherRepo(newGitRevParseCmd(cmd, dir, gitRevArgs...)))
-}
-
-func newGitRevParseCmd(
-	cmd oscommands.ICmdObjBuilder,
-	dir string,
-	gitRevArgs ...string,
-) *oscommands.CmdObj {
 	gitRevParse := NewGitCmd("rev-parse").Arg("--path-format=absolute").Arg(gitRevArgs...)
 	if dir != "" {
 		gitRevParse.Dir(dir)
 	}
 
-	return cmd.New(gitRevParse.ToArgv()).DontLog()
+	gitCmd := cmd.New(gitRevParse.ToArgv()).DontLog()
-}
-
-func runGitRevParse(gitCmd *oscommands.CmdObj) (string, error) {
 	res, err := gitCmd.RunWithOutput()
 	if err != nil {
 		return "", errors.Errorf("'%s' failed: %v", gitCmd.ToString(), err)
 	}
 	return strings.TrimSpace(res), nil
 }
+
+// Returns the paths of linked worktrees
+func linkedWortkreePaths(fs afero.Fs, repoGitDirPath string) []string {
+	result := []string{}
+	// For each directory in this path we're going to cat the `gitdir` file and append its contents to our result
+	// That file points us to the `.git` file in the worktree.
+	worktreeGitDirsPath := filepath.Join(repoGitDirPath, "worktrees")
+
+	// ensure the directory exists
+	_, err := fs.Stat(worktreeGitDirsPath)
+	if err != nil {
+		return result
+	}
+
+	_ = afero.Walk(fs, worktreeGitDirsPath, func(currPath string, info ioFs.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if !info.IsDir() {
+			return nil
+		}
+
+		gitDirPath := filepath.Join(currPath, "gitdir")
+		gitDirBytes, err := afero.ReadFile(fs, gitDirPath)
+		if err != nil {
+			// ignoring error
+			return nil
+		}
+		trimmedGitDir := strings.TrimSpace(string(gitDirBytes))
+		// removing the .git part
+		worktreeDir := filepath.Dir(trimmedGitDir)
+		result = append(result, worktreeDir)
+		return nil
+	})
+
+	return result
+}

pkg/commands/git_commands/repo_paths_test.go

@@ -38,6 +38,8 @@ func TestGetRepoPaths(t *testing.T) {
 					`C:\path\to\repo\.git`,
 					// --git-common-dir
 					`C:\path\to\repo\.git`,
+					// --is-bare-repository
+					"false",
 					// --show-superproject-working-tree
 				}, []string{
 					// --show-toplevel
@@ -46,10 +48,12 @@ func TestGetRepoPaths(t *testing.T) {
 					"/path/to/repo/.git",
 					// --git-common-dir
 					"/path/to/repo/.git",
+					// --is-bare-repository
+					"false",
 					// --show-superproject-working-tree
 				})
 				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
+					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"),
 					strings.Join(mockOutput, "\n"),
 					nil)
 			},
@@ -72,144 +76,50 @@ func TestGetRepoPaths(t *testing.T) {
 			Err: nil,
 		},
 		{
-			// git refuses to answer --show-toplevel when there's no work tree, so
-			// we have to ask a second time without it.
 			Name: "bare repo",
 			BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) {
-				runner.ExpectGitArgs(
+				// setup for main worktree
-					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
-					"",
-					errors.New("fatal: this operation must be run in a work tree"))
-
-				mockOutput := lo.Ternary(runtime.GOOS == "windows", []string{
-					// --git-dir
-					`C:\path\to\project\bare.git`,
-					// --git-common-dir
-					`C:\path\to\project\bare.git`,
-				}, []string{
-					// --git-dir
-					"/path/to/project/bare.git",
-					// --git-common-dir
-					"/path/to/project/bare.git",
-				})
-				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--absolute-git-dir", "--git-common-dir"),
-					strings.Join(mockOutput, "\n"),
-					nil)
-			},
-			Path: "/path/to/project",
-			Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{
-				worktreePath:       "",
-				worktreeGitDirPath: `C:\path\to\project\bare.git`,
-				repoPath:           `C:\path\to\project`,
-				repoGitDirPath:     `C:\path\to\project\bare.git`,
-				repoName:           `project`,
-				isBareRepo:         true,
-			}, &RepoPaths{
-				worktreePath:       "",
-				worktreeGitDirPath: "/path/to/project/bare.git",
-				repoPath:           "/path/to/project",
-				repoGitDirPath:     "/path/to/project/bare.git",
-				repoName:           "project",
-				isBareRepo:         true,
-			}),
-			Err: nil,
-		},
-		{
-			// Standing in the .git dir of an ordinary repo: git refuses to name a
-			// work tree, but the directory holding the .git is one, so we open the
-			// repo from there.
-			Name: "in a repo's .git dir",
-			BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) {
-				gitDir := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo\.git`, "/path/to/repo/.git")
-				worktree := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo`, "/path/to/repo")
-
-				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
-					"",
-					errors.New("fatal: this operation must be run in a work tree"))
-				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--absolute-git-dir", "--git-common-dir"),
-					strings.Join([]string{gitDir, gitDir}, "\n"),
-					nil)
-
-				// asking again from the directory holding the .git
-				runner.ExpectGitArgs(
-					append(append([]string{"-C", worktree}, getRevParseArgs()...), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
-					strings.Join([]string{worktree, gitDir, gitDir}, "\n"),
-					nil)
-			},
-			Path: "/path/to/repo/.git",
-			Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{
-				worktreePath:       `C:\path\to\repo`,
-				worktreeGitDirPath: `C:\path\to\repo\.git`,
-				repoPath:           `C:\path\to\repo`,
-				repoGitDirPath:     `C:\path\to\repo\.git`,
-				repoName:           `repo`,
-				isBareRepo:         false,
-			}, &RepoPaths{
-				worktreePath:       "/path/to/repo",
-				worktreeGitDirPath: "/path/to/repo/.git",
-				repoPath:           "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				repoName:           "repo",
-				isBareRepo:         false,
-			}),
-			Err: nil,
-		},
-		{
-			// A repo whose work tree lives somewhere else entirely, as set up by
-			// core.worktree or by --work-tree. We're in the main worktree, but the
-			// git dir is not inside it.
-			Name: "repo with a separate work tree",
-			BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) {
 				mockOutput := lo.Ternary(runtime.GOOS == "windows", []string{
 					// --show-toplevel
-					`C:\path\to\worktree`,
+					`C:\path\to\repo`,
 					// --git-dir
-					`C:\path\to\repo\.git`,
+					`C:\path\to\bare_repo\bare.git`,
 					// --git-common-dir
-					`C:\path\to\repo\.git`,
+					`C:\path\to\bare_repo\bare.git`,
+					// --is-bare-repository
+					`true`,
 					// --show-superproject-working-tree
 				}, []string{
 					// --show-toplevel
-					"/path/to/worktree",
+					"/path/to/repo",
 					// --git-dir
-					"/path/to/repo/.git",
+					"/path/to/bare_repo/bare.git",
 					// --git-common-dir
-					"/path/to/repo/.git",
+					"/path/to/bare_repo/bare.git",
+					// --is-bare-repository
+					"true",
 					// --show-superproject-working-tree
 				})
 				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
+					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"),
 					strings.Join(mockOutput, "\n"),
 					nil)
-
-				// asking git to find the repo from the work tree gets us nowhere,
-				// because there is no .git there
-				worktree := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\worktree`, "/path/to/worktree")
-				runner.ExpectGitArgs(
-					append([]string{"-C", worktree}, append(getRevParseArgs(), "--absolute-git-dir")...),
-					"",
-					errors.New("fatal: not a git repository (or any of the parent directories): .git"))
 			},
 			Path: "/path/to/repo",
 			Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{
-				worktreePath:       `C:\path\to\worktree`,
+				worktreePath:       `C:\path\to\repo`,
-				worktreeGitDirPath: `C:\path\to\repo\.git`,
+				worktreeGitDirPath: `C:\path\to\bare_repo\bare.git`,
-				repoPath:           `C:\path\to\worktree`,
+				repoPath:           `C:\path\to\bare_repo`,
-				repoGitDirPath:     `C:\path\to\repo\.git`,
+				repoGitDirPath:     `C:\path\to\bare_repo\bare.git`,
-				repoName:           `worktree`,
+				repoName:           `bare_repo`,
-				isBareRepo:         false,
+				isBareRepo:         true,
-				gitLocationEnvVars: []string{`GIT_DIR=C:\path\to\repo\.git`, `GIT_WORK_TREE=C:\path\to\worktree`},
 			}, &RepoPaths{
-				worktreePath:       "/path/to/worktree",
+				worktreePath:       "/path/to/repo",
-				worktreeGitDirPath: "/path/to/repo/.git",
+				worktreeGitDirPath: "/path/to/bare_repo/bare.git",
-				repoPath:           "/path/to/worktree",
+				repoPath:           "/path/to/bare_repo",
-				repoGitDirPath:     "/path/to/repo/.git",
+				repoGitDirPath:     "/path/to/bare_repo/bare.git",
-				repoName:           "worktree",
+				repoName:           "bare_repo",
-				isBareRepo:         false,
+				isBareRepo:         true,
-				gitLocationEnvVars: []string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"},
 			}),
 			Err: nil,
 		},
@@ -223,6 +133,8 @@ func TestGetRepoPaths(t *testing.T) {
 					`C:\path\to\repo\.git\modules\submodule1`,
 					// --git-common-dir
 					`C:\path\to\repo\.git\modules\submodule1`,
+					// --is-bare-repository
+					`false`,
 					// --show-superproject-working-tree
 					`C:\path\to\repo`,
 				}, []string{
@@ -232,22 +144,15 @@ func TestGetRepoPaths(t *testing.T) {
 					"/path/to/repo/.git/modules/submodule1",
 					// --git-common-dir
 					"/path/to/repo/.git/modules/submodule1",
+					// --is-bare-repository
+					"false",
 					// --show-superproject-working-tree
 					"/path/to/repo",
 				})
 				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
+					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"),
 					strings.Join(mockOutput, "\n"),
 					nil)
-
-				// git finds the submodule's git dir from its work tree, via the
-				// .git file there
-				worktree := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo\submodule1`, "/path/to/repo/submodule1")
-				gitDir := lo.Ternary(runtime.GOOS == "windows", `C:\path\to\repo\.git\modules\submodule1`, "/path/to/repo/.git/modules/submodule1")
-				runner.ExpectGitArgs(
-					append([]string{"-C", worktree}, append(getRevParseArgs(), "--absolute-git-dir")...),
-					gitDir,
-					nil)
 			},
 			Path: "/path/to/repo/submodule1",
 			Expected: lo.Ternary(runtime.GOOS == "windows", &RepoPaths{
@@ -271,12 +176,7 @@ func TestGetRepoPaths(t *testing.T) {
 			Name: "git rev-parse returns an error",
 			BeforeFunc: func(runner *oscommands.FakeCmdObjRunner, getRevParseArgs argFn) {
 				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--show-superproject-working-tree"),
+					append(getRevParseArgs(), "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree"),
-					"",
-					errors.New("fatal: invalid gitfile format: /path/to/repo/worktree2/.git"))
-				// we're not in a repo at all, so asking about a bare one fails too
-				runner.ExpectGitArgs(
-					append(getRevParseArgs(), "--absolute-git-dir", "--git-common-dir"),
 					"",
 					errors.New("fatal: invalid gitfile format: /path/to/repo/worktree2/.git"))
 			},
@@ -284,7 +184,7 @@ func TestGetRepoPaths(t *testing.T) {
 			Expected: nil,
 			Err: func(getRevParseArgs argFn) error {
 				args := strings.Join(getRevParseArgs(), " ")
-				return fmt.Errorf("'git %v --show-toplevel --absolute-git-dir --git-common-dir --show-superproject-working-tree' failed: fatal: invalid gitfile format: /path/to/repo/worktree2/.git", args)
+				return fmt.Errorf("'git %v --show-toplevel --absolute-git-dir --git-common-dir --is-bare-repository --show-superproject-working-tree' failed: fatal: invalid gitfile format: /path/to/repo/worktree2/.git", args)
 			},
 		},
 	}

pkg/commands/git_commands/stash.go

@@ -81,13 +81,20 @@ func (self *StashCommands) Hash(index int) (string, error) {
 }
 
 func (self *StashCommands) ShowStashEntryCmdObj(index int) *oscommands.CmdObj {
+	extDiffCmd := self.pagerConfig.GetExternalDiffCommand()
+	useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig()
+
 	// "-u" is the same as "--include-untracked", but the latter fails in older git versions for some reason
 	cmdArgs := NewGitCmd("stash").Arg("show").
-		AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), true).
 		Arg("-p").
 		Arg("--stat").
 		Arg("-u").
-		Arg(fmt.Sprintf("--color=%s", self.diffRendererConfigManager.GetColorArg())).
+		ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd).
+		ArgIfElse(extDiffCmd != "" || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
+		Arg(fmt.Sprintf("--color=%s", self.pagerConfig.GetColorArg())).
+		Arg(fmt.Sprintf("--unified=%d", self.UserConfig().Git.DiffContextSize)).
+		ArgIf(self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)).
 		Arg(fmt.Sprintf("refs/stash@{%d}", index)).
 		Dir(self.repoPaths.worktreePath).
 		ToArgv()

pkg/commands/git_commands/stash_test.go

@@ -103,7 +103,7 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 		contextSize         uint64
 		similarityThreshold int
 		ignoreWhitespace    bool
-		diffRendererConfig  *config.DiffRendererConfig
+		pagerConfig         *config.PagingConfig
 		expected            []string
 	}
 
@@ -114,7 +114,7 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=3", "--find-renames=50%", "refs/stash@{5}"},
 		},
 		{
 			testName:            "Show diff with custom context size",
@@ -122,7 +122,7 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			contextSize:         77,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=77", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=77", "--find-renames=50%", "refs/stash@{5}"},
 		},
 		{
 			testName:            "Show diff with custom similarity threshold",
@@ -130,7 +130,7 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 33,
 			ignoreWhitespace:    false,
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=3", "--find-renames=33%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=3", "--find-renames=33%", "refs/stash@{5}"},
 		},
 		{
 			testName:            "Show diff with external diff command",
@@ -138,8 +138,8 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  &config.DiffRendererConfig{Type: "extDiff", Command: "difft --color=always"},
+			pagerConfig:         &config.PagingConfig{ExternalDiffCommand: "difft --color=always"},
-			expected:            []string{"git", "-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "stash", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			expected:            []string{"git", "-C", "/path/to/worktree", "-c", "diff.external=difft --color=always", "stash", "show", "-p", "--stat", "-u", "--ext-diff", "--color=always", "--unified=3", "--find-renames=50%", "refs/stash@{5}"},
 		},
 		{
 			testName:            "Show diff using git's external diff config",
@@ -147,16 +147,16 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    false,
-			diffRendererConfig:  &config.DiffRendererConfig{Type: "extDiff"},
+			pagerConfig:         &config.PagingConfig{UseExternalDiffGitConfig: true},
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--ext-diff", "--color=always", "--unified=3", "--find-renames=50%", "refs/stash@{5}"},
 		},
 		{
-			testName:            "Ignore whitespace",
+			testName:            "Default case",
 			index:               5,
 			contextSize:         3,
 			similarityThreshold: 50,
 			ignoreWhitespace:    true,
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--no-ext-diff", "--unified=3", "--ignore-all-space", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "-p", "--stat", "-u", "--no-ext-diff", "--color=always", "--unified=3", "--ignore-all-space", "--find-renames=50%", "refs/stash@{5}"},
 		},
 	}
 
@@ -166,8 +166,8 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			userConfig.Git.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
 			userConfig.Git.DiffContextSize = s.contextSize
 			userConfig.Git.RenameSimilarityThreshold = s.similarityThreshold
-			if s.diffRendererConfig != nil {
+			if s.pagerConfig != nil {
-				userConfig.Git.DiffRenderers = []config.DiffRendererConfig{*s.diffRendererConfig}
+				userConfig.Git.Pagers = []config.PagingConfig{*s.pagerConfig}
 			}
 			repoPaths := RepoPaths{
 				worktreePath: "/path/to/worktree",

pkg/commands/git_commands/submodule.go

@@ -28,15 +28,10 @@ func NewSubmoduleCommands(gitCommon *GitCommon) *SubmoduleCommands {
 }
 
 func (self *SubmoduleCommands) GetConfigs(parentModule *models.SubmoduleConfig) ([]*models.SubmoduleConfig, error) {
-	// Resolve the path against the repo this commands object was created for
+	gitModulesPath := ".gitmodules"
-	// rather than the process working directory, so that a read from a
-	// still-running refresh keeps addressing that repo after the user
-	// switched to another one.
-	dir := self.repoPaths.WorktreePath()
 	if parentModule != nil {
-		dir = filepath.Join(dir, parentModule.FullPath())
+		gitModulesPath = filepath.Join(parentModule.FullPath(), gitModulesPath)
 	}
-	gitModulesPath := filepath.Join(dir, ".gitmodules")
 	file, err := os.Open(gitModulesPath)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -157,7 +152,7 @@ func (self *SubmoduleCommands) GetCommitSummary(path string, sha string) (string
 		Config("log.showsignature=false").
 		ToArgv()
 
-	summary, err := forOtherRepo(self.cmd.New(cmdArgs)).DontLog().RunWithOutput()
+	summary, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
 	return strings.TrimSpace(summary), err
 }
 
@@ -167,7 +162,7 @@ func (self *SubmoduleCommands) GetCommitSummary(path string, sha string) (string
 // caller then stages the submodule to record the resolution.
 func (self *SubmoduleCommands) CheckoutConflictCommit(path string, sha string) error {
 	cmdArgs := NewGitCmd("checkout").Dir(path).Arg(sha).ToArgv()
-	return forOtherRepo(self.cmd.New(cmdArgs)).Run()
+	return self.cmd.New(cmdArgs).Run()
 }
 
 // ConflictSideLog returns a oneline log, run inside the submodule, of the commits
@@ -179,13 +174,13 @@ func (self *SubmoduleCommands) ConflictSideLog(path string, side string, otherSi
 		Arg("--oneline", "--color=always", otherSide+".."+side).
 		ToArgv()
 
-	return forOtherRepo(self.cmd.New(cmdArgs)).DontLog().RunWithOutput()
+	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
 }
 
 func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 	// if the path does not exist then it hasn't yet been initialized so we'll swallow the error
 	// because the intention here is to have no dirty worktree state
-	if _, err := os.Stat(filepath.Join(self.repoPaths.WorktreePath(), submodule.FullPath())); os.IsNotExist(err) {
+	if _, err := os.Stat(submodule.Path); os.IsNotExist(err) {
 		self.Log.Infof("submodule path %s does not exist, returning", submodule.FullPath())
 		return nil
 	}
@@ -195,15 +190,20 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 		Arg("--include-untracked").
 		ToArgv()
 
-	return forOtherRepo(self.cmd.New(cmdArgs)).Run()
+	return self.cmd.New(cmdArgs).Run()
 }
 
 func (self *SubmoduleCommands) Reset(submodule *models.SubmoduleConfig) error {
+	parentDir := ""
+	if submodule.ParentModule != nil {
+		parentDir = submodule.ParentModule.FullPath()
+	}
 	cmdArgs := NewGitCmd("submodule").
 		Arg("update", "--init", "--force", "--", submodule.Path).
+		DirIf(parentDir != "", parentDir).
 		ToArgv()
 
-	return self.runInParentModule(submodule, self.cmd.New(cmdArgs))
+	return self.cmd.New(cmdArgs).Run()
 }
 
 func (self *SubmoduleCommands) UpdateAll() error {
@@ -213,58 +213,51 @@ func (self *SubmoduleCommands) UpdateAll() error {
 	return self.cmd.New(cmdArgs).Run()
 }
 
-// runInParentModule runs the given command in the submodule's parent module's
-// directory when the submodule is nested: its path arguments (and the
-// .gitmodules file the config commands touch) are relative to the parent
-// module. The directory is set on the command itself rather than by
-// temporarily chdir-ing the process there, which would leak the parent
-// module's directory into whatever other commands run concurrently (e.g. a
-// background refresh's).
-//
-// That directory is relative, so it resolves against the process working
-// directory rather than against the repo directory the command builder
-// otherwise pins commands to. Only foreground commands the user issued end up
-// here, and lazygit won't switch repos while one of those is in flight, so the
-// two are the same directory; don't call this from background work, where they
-// need not be.
-func (self *SubmoduleCommands) runInParentModule(submodule *models.SubmoduleConfig, cmdObj *oscommands.CmdObj) error {
-	if submodule.ParentModule != nil {
-		forOtherRepo(cmdObj.SetWd(submodule.ParentModule.FullPath()))
-	}
-	return cmdObj.Run()
-}
-
 func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 	// based on https://gist.github.com/myusuf3/7f645819ded92bda6677
 
-	if err := self.runInParentModule(submodule, self.cmd.New(
+	if submodule.ParentModule != nil {
+		wd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		err = os.Chdir(submodule.ParentModule.FullPath())
+		if err != nil {
+			return err
+		}
+
+		defer func() { _ = os.Chdir(wd) }()
+	}
+
+	if err := self.cmd.New(
 		NewGitCmd("submodule").
 			Arg("deinit", "--force", "--", submodule.Path).ToArgv(),
-	)); err != nil {
+	).Run(); err != nil {
 		if !strings.Contains(err.Error(), "did not match any file(s) known to git") {
 			return err
 		}
 
-		if err := self.runInParentModule(submodule, self.cmd.New(
+		if err := self.cmd.New(
 			NewGitCmd("config").
 				Arg("--file", ".gitmodules", "--remove-section", "submodule."+submodule.Path).
 				ToArgv(),
-		)); err != nil {
+		).Run(); err != nil {
 			return err
 		}
 
-		if err := self.runInParentModule(submodule, self.cmd.New(
+		if err := self.cmd.New(
 			NewGitCmd("config").
 				Arg("--remove-section", "submodule."+submodule.Path).
 				ToArgv(),
-		)); err != nil {
+		).Run(); err != nil {
 			return err
 		}
 	}
 
-	if err := self.runInParentModule(submodule, self.cmd.New(
+	if err := self.cmd.New(
 		NewGitCmd("rm").Arg("--force", "-r", submodule.Path).ToArgv(),
-	)); err != nil {
+	).Run(); err != nil {
 		// if the directory isn't there then that's fine
 		self.Log.Error(err)
 	}
@@ -289,6 +282,20 @@ func (self *SubmoduleCommands) Add(name string, path string, url string) error {
 }
 
 func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newUrl string) error {
+	if submodule.ParentModule != nil {
+		wd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		err = os.Chdir(submodule.ParentModule.FullPath())
+		if err != nil {
+			return err
+		}
+
+		defer func() { _ = os.Chdir(wd) }()
+	}
+
 	setUrlCmdStr := NewGitCmd("config").
 		Arg(
 			"--file", ".gitmodules", "submodule."+submodule.Name+".url", newUrl,
@@ -296,14 +303,14 @@ func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newU
 		ToArgv()
 
 	// the set-url command is only for later git versions so we're doing it manually here
-	if err := self.runInParentModule(submodule, self.cmd.New(setUrlCmdStr)); err != nil {
+	if err := self.cmd.New(setUrlCmdStr).Run(); err != nil {
 		return err
 	}
 
 	syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", submodule.Path).
 		ToArgv()
 
-	if err := self.runInParentModule(submodule, self.cmd.New(syncCmdStr)); err != nil {
+	if err := self.cmd.New(syncCmdStr).Run(); err != nil {
 		return err
 	}
 

pkg/commands/git_commands/submodule_test.go

@@ -1,13 +1,10 @@
 package git_commands
 
 import (
-	"strings"
 	"testing"
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -83,27 +80,6 @@ func TestSubmoduleCheckoutConflictCommit(t *testing.T) {
 	runner.CheckForMissingCalls()
 }
 
-// A command that runs inside a submodule mustn't inherit the GIT_DIR and
-// GIT_WORK_TREE that say where the superproject is; git would answer it from
-// there instead, and the answer would look perfectly plausible.
-func TestSubmoduleCommandDoesntUseOurGitLocation(t *testing.T) {
-	t.Setenv(env.GitDirEnvVar, "/path/to/repo/.git")
-	t.Setenv(env.GitWorkTreeEnvVar, "/path/to/repo")
-
-	runner := oscommands.NewFakeRunner(t).
-		ExpectFunc("has neither GIT_DIR nor GIT_WORK_TREE", func(cmdObj *oscommands.CmdObj) bool {
-			return lo.NoneBy(cmdObj.GetEnvVars(), func(envVar string) bool {
-				return strings.HasPrefix(envVar, env.GitDirEnvVar+"=") ||
-					strings.HasPrefix(envVar, env.GitWorkTreeEnvVar+"=")
-			})
-		}, "bbbbbbb the subject\n", nil)
-	instance := buildSubmoduleCommands(commonDeps{runner: runner})
-
-	_, err := instance.GetCommitSummary("mysub", "bbbbbbb")
-	assert.NoError(t, err)
-	runner.CheckForMissingCalls()
-}
-
 func TestSubmoduleConflictSideLog(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).
 		ExpectGitArgs([]string{"-C", "mysub", "log", "--oneline", "--color=always", "ccccccc..bbbbbbb"}, "bbbbbbb left\n", nil)

pkg/commands/git_commands/tag.go

@@ -43,7 +43,7 @@ func (self *TagCommands) HasTag(tagName string) bool {
 		Arg("refs/tags/" + tagName).
 		ToArgv()
 
-	return self.cmd.New(cmdArgs).DontLog().Run() == nil
+	return self.cmd.New(cmdArgs).Run() == nil
 }
 
 func (self *TagCommands) LocalDelete(tagName string) error {
@@ -74,7 +74,7 @@ func (self *TagCommands) ShowAnnotationInfo(tagName string) (string, error) {
 		Arg("refs/tags/" + tagName).
 		ToArgv()
 
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return self.cmd.New(cmdArgs).RunWithOutput()
 }
 
 func (self *TagCommands) IsTagAnnotated(tagName string) (bool, error) {
@@ -83,6 +83,6 @@ func (self *TagCommands) IsTagAnnotated(tagName string) (bool, error) {
 		Arg("refs/tags/" + tagName).
 		ToArgv()
 
-	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	output, err := self.cmd.New(cmdArgs).RunWithOutput()
 	return strings.TrimSpace(output) == "tag", err
 }

pkg/commands/git_commands/working_tree.go

@@ -385,31 +385,45 @@ func (self *WorkingTreeCommands) Exclude(filename string) error {
 // WorktreeFileDiff returns the diff of a file
 func (self *WorkingTreeCommands) WorktreeFileDiff(file *models.File, plain bool, cached bool) string {
 	// for now we assume an error means the file was deleted
-	s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached, file.Names()).RunWithOutput()
+	s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached, nil).RunWithOutput()
 	return s
 }
 
-// WorktreeFileDiffCmdObj returns a command object for diffing the given paths
+// WorktreeFileDiffCmdObj returns a command object for diffing a file or directory
-// in the working tree. node is the item they belong to; all it decides is
+// in the working tree. When pathOverrides is non-empty, those paths are used instead of
-// whether git has to compare against /dev/null, which is the case for a file
+// the node's path (used to diff only filtered/visible files within a directory).
-// that isn't in the index yet.
+func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool, pathOverrides []string) *oscommands.CmdObj {
-func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool, paths []string) *oscommands.CmdObj {
+	colorArg := self.pagerConfig.GetColorArg()
-	colorArg := self.diffRendererConfigManager.GetColorArg()
 	if plain {
 		colorArg = "never"
 	}
 
+	contextSize := self.UserConfig().Git.DiffContextSize
+	prevPath := node.GetPreviousPath()
 	noIndex := !node.GetIsTracked() && !node.GetHasStagedChanges() && !cached && node.GetIsFile()
+	extDiffCmd := self.pagerConfig.GetExternalDiffCommand()
+	useExtDiff := extDiffCmd != "" && !plain
+	useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() && !plain
+
+	paths := pathOverrides
+	if len(paths) == 0 {
+		paths = []string{node.GetPath()}
+	}
 
 	cmdArgs := NewGitCmd("diff").
-		AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), !plain).
+		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
+		ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
+		Arg(fmt.Sprintf("--unified=%d", contextSize)).
 		Arg(fmt.Sprintf("--color=%s", colorArg)).
+		ArgIf(!plain && self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)).
 		ArgIf(cached, "--cached").
 		ArgIf(noIndex, "--no-index").
 		Arg("--").
 		ArgIf(noIndex, "/dev/null").
 		Arg(paths...).
+		ArgIf(prevPath != "", prevPath).
 		Dir(self.repoPaths.worktreePath).
 		ToArgv()
 
@@ -429,19 +443,29 @@ func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bo
 }
 
 func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reverse bool, fileNames []string, plain bool) *oscommands.CmdObj {
-	colorArg := self.diffRendererConfigManager.GetColorArg()
+	contextSize := self.UserConfig().Git.DiffContextSize
+
+	colorArg := self.pagerConfig.GetColorArg()
 	if plain {
 		colorArg = "never"
 	}
 
+	extDiffCmd := self.pagerConfig.GetExternalDiffCommand()
+	useExtDiff := extDiffCmd != "" && !plain
+	useExtDiffGitConfig := self.pagerConfig.GetUseExternalDiffGitConfig() && !plain
+
 	cmdArgs := NewGitCmd("diff").
 		Config("diff.noprefix=false").
-		AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), !plain).
+		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
+		ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
+		Arg(fmt.Sprintf("--unified=%d", contextSize)).
+		Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)).
 		Arg(fmt.Sprintf("--color=%s", colorArg)).
 		Arg(from).
 		Arg(to).
 		ArgIf(reverse, "-R").
+		ArgIf(!plain && self.UserConfig().Git.IgnoreWhitespaceInDiffView, "--ignore-all-space").
 		Arg("--").
 		Arg(fileNames...).
 		Dir(self.repoPaths.worktreePath).

pkg/commands/git_commands/working_tree_test.go

@@ -221,7 +221,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "cached",
@@ -236,7 +236,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--cached", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=50%", "--cached", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "plain",
@@ -251,7 +251,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=never", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=never", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "File not tracked and file has no staged changes",
@@ -266,7 +266,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "--no-index", "--", "/dev/null", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=50%", "--no-index", "--", "/dev/null", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "Default case (ignore whitespace)",
@@ -281,7 +281,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 50,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--ignore-all-space", "--find-renames=50%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--ignore-all-space", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "Show diff with custom context size",
@@ -296,7 +296,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         17,
 			similarityThreshold: 50,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=17", "--find-renames=50%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=17", "--color=always", "--find-renames=50%", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "Show diff with custom similarity threshold",
@@ -311,7 +311,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			contextSize:         3,
 			similarityThreshold: 33,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--unified=3", "--find-renames=33%", "--submodule", "--color=always", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--find-renames=33%", "--", "test.txt"}, expectedResult, nil),
 		},
 	}
 
@@ -360,7 +360,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Show diff with custom context size",
@@ -372,7 +372,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      123,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=123", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=123", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Default case (ignore whitespace)",
@@ -384,7 +384,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: true,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=3", "--ignore-all-space", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Renamed file passes both paths so the rename is detected",
@@ -397,7 +397,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--unified=3", "--find-renames=50%", "--submodule", "--color=always", "1234567890", "0987654321", "--", "new.txt", "old.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--", "new.txt", "old.txt"}, expectedResult, nil),
 		},
 	}
 

pkg/commands/git_commands/worktree.go

@@ -51,7 +51,7 @@ func (self *WorktreeCommands) Delete(worktreePath string, force bool) error {
 func (self *WorktreeCommands) Detach(worktreePath string) error {
 	cmdArgs := NewGitCmd("checkout").Arg("--detach").GitDir(filepath.Join(worktreePath, ".git")).ToArgv()
 
-	return forOtherRepo(self.cmd.New(cmdArgs)).Run()
+	return self.cmd.New(cmdArgs).Run()
 }
 
 func WorktreeForBranch(branch *models.Branch, worktrees []*models.Worktree) (*models.Worktree, bool) {

pkg/commands/git_commands/worktree_loader.go

@@ -22,6 +22,9 @@ func NewWorktreeLoader(gitCommon *GitCommon) *WorktreeLoader {
 }
 
 func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
+	currentRepoPath := self.repoPaths.RepoPath()
+	worktreePath := self.repoPaths.WorktreePath()
+
 	cmdArgs := NewGitCmd("worktree").Arg("list", "--porcelain").ToArgv()
 	worktreesOutput, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
 	if err != nil {
@@ -51,13 +54,17 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 
 		if strings.HasPrefix(splitLine, "worktree ") {
 			path := strings.SplitN(splitLine, " ", 2)[1]
+			isMain := path == currentRepoPath
+			isCurrent := path == worktreePath
+			isPathMissing := self.pathExists(path)
 
 			current = &models.Worktree{
-				IsPathMissing: self.pathExists(path),
+				IsMain:        isMain,
+				IsCurrent:     isCurrent,
+				IsPathMissing: isPathMissing,
 				Path:          path,
 				// we defer populating GitDir until a loop below so that
-				// we can parallelize the calls to git rev-parse, and
+				// we can parallelize the calls to git rev-parse
-				// IsMain/IsCurrent because they are derived from GitDir
 				GitDir: "",
 			}
 		} else if strings.HasPrefix(splitLine, "HEAD ") {
@@ -77,7 +84,7 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 			if worktree.IsPathMissing {
 				return
 			}
-			gitDir, err := callGitRevParseInOtherRepo(self.cmd, worktree.Path, "--absolute-git-dir")
+			gitDir, err := callGitRevParseWithDir(self.cmd, worktree.Path, "--absolute-git-dir")
 			if err != nil {
 				self.Log.Warnf("Could not find git dir for worktree %s: %v", worktree.Path, err)
 				return
@@ -88,23 +95,6 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 	}
 	wg.Wait()
 
-	// Identify the current and the main worktree by their git dir rather than by
-	// their path: `git worktree list` reports the main worktree as the common
-	// git dir with a trailing "/.git" removed, which is the working tree only
-	// when the git dir sits inside it. In a submodule, a bare repo or a repo
-	// using core.worktree it doesn't, and comparing paths then matches nothing.
-	// A worktree whose directory is gone has no git dir to compare, so there we
-	// have nothing better than its path.
-	for _, worktree := range worktrees {
-		if worktree.GitDir != "" {
-			worktree.IsCurrent = worktree.GitDir == self.repoPaths.WorktreeGitDirPath()
-			worktree.IsMain = worktree.GitDir == self.repoPaths.RepoGitDirPath()
-		} else {
-			worktree.IsCurrent = worktree.Path == self.repoPaths.WorktreePath()
-			worktree.IsMain = worktree.Path == self.repoPaths.RepoPath()
-		}
-	}
-
 	names := getUniqueNamesFromPaths(lo.Map(worktrees, func(worktree *models.Worktree, _ int) string {
 		return worktree.Path
 	}))

pkg/commands/git_commands/worktree_loader_test.go

@@ -23,10 +23,8 @@ func TestGetWorktrees(t *testing.T) {
 		{
 			testName: "Single worktree (main)",
 			repoPaths: &RepoPaths{
-				repoPath:           "/path/to/repo",
+				repoPath:     "/path/to/repo",
-				worktreePath:       "/path/to/repo",
+				worktreePath: "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				worktreeGitDirPath: "/path/to/repo/.git",
 			},
 			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) {
 				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
@@ -57,10 +55,8 @@ branch refs/heads/mybranch
 		{
 			testName: "Multiple worktrees (main + linked)",
 			repoPaths: &RepoPaths{
-				repoPath:           "/path/to/repo",
+				repoPath:     "/path/to/repo",
-				worktreePath:       "/path/to/repo",
+				worktreePath: "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				worktreeGitDirPath: "/path/to/repo/.git",
 			},
 			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) {
 				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
@@ -110,10 +106,8 @@ branch refs/heads/mybranch-worktree
 		{
 			testName: "Worktree missing path",
 			repoPaths: &RepoPaths{
-				repoPath:           "/path/to/repo",
+				repoPath:     "/path/to/repo",
-				worktreePath:       "/path/to/repo",
+				worktreePath: "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				worktreeGitDirPath: "/path/to/repo/.git",
 			},
 			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) {
 				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
@@ -142,10 +136,8 @@ branch refs/heads/missingbranch
 		{
 			testName: "In linked worktree",
 			repoPaths: &RepoPaths{
-				repoPath:           "/path/to/repo",
+				repoPath:     "/path/to/repo",
-				worktreePath:       "/path/to/repo-worktree",
+				worktreePath: "/path/to/repo-worktree",
-				repoGitDirPath:     "/path/to/repo/.git",
-				worktreeGitDirPath: "/path/to/repo/.git/worktrees/repo-worktree",
 			},
 			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) {
 				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
@@ -192,51 +184,11 @@ branch refs/heads/mybranch-worktree
 			},
 			expectedErr: "",
 		},
-		{
-			testName: "In a submodule",
-			repoPaths: &RepoPaths{
-				repoPath:           "/path/to/repo/mysubmodule",
-				worktreePath:       "/path/to/repo/mysubmodule",
-				repoGitDirPath:     "/path/to/repo/.git/modules/mysubmodule",
-				worktreeGitDirPath: "/path/to/repo/.git/modules/mysubmodule",
-			},
-			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) {
-				// A submodule's git dir doesn't live inside its working tree, and
-				// `git worktree list` reports the git dir rather than the working
-				// tree it belongs to.
-				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},
-					`worktree /path/to/repo/.git/modules/mysubmodule
-HEAD d85cc9d281fa6ae1665c68365fc70e75e82a042d
-branch refs/heads/mybranch
-`,
-					nil)
-
-				gitArgs := append(append([]string{"-C", "/path/to/repo/.git/modules/mysubmodule"}, getRevParseArgs()...), "--absolute-git-dir")
-				runner.ExpectGitArgs(gitArgs, "/path/to/repo/.git/modules/mysubmodule", nil)
-
-				_ = fs.MkdirAll("/path/to/repo/.git/modules/mysubmodule", 0o755)
-			},
-			expectedWorktrees: []*models.Worktree{
-				{
-					IsMain:        true,
-					IsCurrent:     true,
-					Path:          "/path/to/repo/.git/modules/mysubmodule",
-					IsPathMissing: false,
-					GitDir:        "/path/to/repo/.git/modules/mysubmodule",
-					Branch:        "mybranch",
-					Head:          "d85cc9d281fa6ae1665c68365fc70e75e82a042d",
-					Name:          "mysubmodule",
-				},
-			},
-			expectedErr: "",
-		},
 		{
 			testName: "Detached HEAD worktree",
 			repoPaths: &RepoPaths{
-				repoPath:           "/path/to/repo",
+				repoPath:     "/path/to/repo",
-				worktreePath:       "/path/to/repo",
+				worktreePath: "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				worktreeGitDirPath: "/path/to/repo/.git",
 			},
 			before: func(runner *oscommands.FakeCmdObjRunner, fs afero.Fs, getRevParseArgs argFn) {
 				runner.ExpectGitArgs([]string{"worktree", "list", "--porcelain"},

pkg/commands/git_config/cached_git_config.go

@@ -16,19 +16,11 @@ type IGitConfig interface {
 	// this is for when you want to pass 'mykey' and check if the result is truthy
 	GetBool(string) bool
 
-	// SetDir pins the config commands to the given repo directory, so that
-	// they keep reading that repo's local config even if the process working
-	// directory changes later (i.e. the user switches repos while this
-	// instance is still in use by in-flight work). Called once, before the
-	// first read.
-	SetDir(string)
-
 	DropCache()
 }
 
 type CachedGitConfig struct {
 	cache           map[string]string
-	dir             string
 	runGitConfigCmd func(*exec.Cmd) (string, error)
 	log             *logrus.Entry
 	mutex           sync.Mutex
@@ -47,13 +39,6 @@ func NewCachedGitConfig(runGitConfigCmd func(*exec.Cmd) (string, error), log *lo
 	}
 }
 
-func (self *CachedGitConfig) SetDir(dir string) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	self.dir = dir
-}
-
 func (self *CachedGitConfig) Get(key string) string {
 	self.mutex.Lock()
 	defer self.mutex.Unlock()
@@ -84,7 +69,6 @@ func (self *CachedGitConfig) GetGeneral(args string) string {
 
 func (self *CachedGitConfig) getGeneralAux(args string) string {
 	cmd := getGitConfigGeneralCmd(args)
-	cmd.Dir = self.dir
 	value, err := self.runGitConfigCmd(cmd)
 	if err != nil {
 		self.log.Debugf("Error getting git config value for args: %s. Error: %v", args, err.Error())
@@ -95,7 +79,6 @@ func (self *CachedGitConfig) getGeneralAux(args string) string {
 
 func (self *CachedGitConfig) getAux(key string) string {
 	cmd := getGitConfigCmd(key)
-	cmd.Dir = self.dir
 	value, err := self.runGitConfigCmd(cmd)
 	if err != nil {
 		self.log.Debugf("Error getting git config value for key: %s. Error: %v", key, err.Error())

pkg/commands/git_config/cached_git_config_test.go

@@ -116,20 +116,3 @@ func TestGet(t *testing.T) {
 	assert.Equal(t, "blah", result)
 	assert.Equal(t, 1, count)
 }
-
-// The config commands run in the directory set by SetDir rather than in the
-// process's current directory: lazygit chdirs when switching repos, and config
-// reads issued for the previous repo after that must keep addressing the repo
-// they were created for.
-func TestSetDirPinsCommandsToDirectory(t *testing.T) {
-	real := NewCachedGitConfig(
-		func(cmd *exec.Cmd) (string, error) {
-			assert.Equal(t, "/path/to/repo", cmd.Dir)
-			return "blah", nil
-		},
-		utils.NewDummyLog(),
-	)
-	real.SetDir("/path/to/repo")
-	real.Get("commit.gpgsign")
-	real.GetGeneral("--local --get-regexp foo")
-}

pkg/commands/git_config/fake_git_config.go

@@ -28,8 +28,5 @@ func (self *FakeGitConfig) GetBool(key string) bool {
 	return isTruthy(self.Get(key))
 }
 
-func (self *FakeGitConfig) SetDir(dir string) {
-}
-
 func (self *FakeGitConfig) DropCache() {
 }

pkg/commands/models/file.go

@@ -18,14 +18,10 @@ type File struct {
 	Deleted                 bool
 	HasMergeConflicts       bool
 	HasInlineMergeConflicts bool
-	// How long the conflict markers in this file are, taken from its
+	DisplayString           string
-	// conflict-marker-size gitattribute; 0 if it doesn't have that attribute. We
+	ShortStatus             string // e.g. 'AD', ' A', 'M ', '??'
-	// only look this up for files that have inline merge conflicts.
+	LinesDeleted            int
-	ConflictMarkerSize int
+	LinesAdded              int
-	DisplayString      string
-	ShortStatus        string // e.g. 'AD', ' A', 'M ', '??'
-	LinesDeleted       int
-	LinesAdded         int
 
 	// If true, this must be a worktree folder
 	IsWorktree bool

pkg/commands/models/github.go

@@ -5,7 +5,6 @@ type GithubPullRequest struct {
 	Number              int                   `json:"number"`
 	Title               string                `json:"title"`
 	State               string                `json:"state"` // "MERGED", "OPEN", "CLOSED", "DRAFT"
-	ChecksState         string                `json:"checksState"`
 	Url                 string                `json:"url"`
 	HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"`
 }

pkg/commands/oscommands/cmd_obj_runner.go

@@ -227,7 +227,9 @@ type cmdHandler struct {
 
 func (self *cmdObjRunner) runAndStream(cmdObj *CmdObj) error {
 	return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) {
-		_, _ = io.Copy(cmdWriter, handler.stdoutPipe)
+		go func() {
+			_, _ = io.Copy(cmdWriter, handler.stdoutPipe)
+		}()
 	})
 }
 
@@ -242,10 +244,6 @@ func (self *cmdObjRunner) runAndStreamAux(
 	} else {
 		cmdWriter = self.guiIO.newCmdWriterFn()
 	}
-	// The command's stdout and stderr are streamed to cmdWriter concurrently
-	// from separate goroutines (stderr via the MultiWriter below, stdout via
-	// onRun), so it must be safe for concurrent writes.
-	cmdWriter = &synchronizedWriter{writer: cmdWriter}
 
 	if cmdObj.ShouldLog() {
 		self.logCmdObj(cmdObj)
@@ -278,29 +276,10 @@ func (self *cmdObjRunner) runAndStreamAux(
 
 	t := time.Now()
 
-	// Stream the command's output on a goroutine while it runs, but keep a
+	onRun(handler, cmdWriter)
-	// handle on it: the buffers it fills (stdout, and combinedOutput when
-	// output is suppressed) must not be read below until it has finished.
-	streamingDone := make(chan struct{})
-	go utils.Safe(func() {
-		defer close(streamingDone)
-		onRun(handler, cmdWriter)
-	})
 
 	err = handler.wait()
 
-	// The command has exited; wait for the streaming goroutine to drain the
-	// last of its output before reading those buffers. A pty reader reaches
-	// EOF on its own now the process is gone, but the non-pty pipe never does,
-	// so close it to unblock the reader — the pipe is synchronous, so all
-	// output has already been read by now and nothing is lost.
-	if !cmdObj.ShouldUsePty() {
-		if closeErr := handler.close(); closeErr != nil {
-			self.log.Error(closeErr)
-		}
-	}
-	<-streamingDone
-
 	self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t))
 
 	if err != nil {
@@ -375,7 +354,10 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest(
 
 	return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) {
 		tr := io.TeeReader(handler.stdoutPipe, cmdWriter)
-		self.processOutput(tr, handler.stdinPipe, promptUserForCredential, handler.close, cmdObj)
+
+		go utils.Safe(func() {
+			self.processOutput(tr, handler.stdinPipe, promptUserForCredential, handler.close, cmdObj)
+		})
 	})
 }
 
@@ -469,20 +451,6 @@ func (self *cmdObjRunner) getCheckForCredentialRequestFunc() func([]byte) (Crede
 	}
 }
 
-// synchronizedWriter serializes writes to its underlying writer so that it can
-// be written from multiple goroutines at once (see runAndStreamAux, which
-// streams a command's stdout and stderr to one writer from two goroutines).
-type synchronizedWriter struct {
-	mutex  deadlock.Mutex
-	writer io.Writer
-}
-
-func (self *synchronizedWriter) Write(p []byte) (int, error) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	return self.writer.Write(p)
-}
-
 type Buffer struct {
 	b bytes.Buffer
 	m deadlock.Mutex
@@ -514,11 +482,8 @@ func (self *cmdObjRunner) getCmdHandlerNonPty(cmd *exec.Cmd) (*cmdHandler, error
 	return &cmdHandler{
 		stdoutPipe: stdoutReader,
 		stdinPipe:  buf,
-		// Closing the read end makes a blocked read on it return, which is how
+		close:      func() error { return nil },
-		// runAndStreamAux unblocks and joins the streaming goroutine once the
+		wait:       cmd.Wait,
-		// command has finished (the pipe delivers no EOF of its own).
-		close: func() error { return stdoutReader.Close() },
-		wait:  cmd.Wait,
 	}, nil
 }
 

pkg/commands/oscommands/os.go

@@ -1,12 +1,12 @@
 package oscommands
 
 import (
-	"bytes"
 	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"sync"
 
 	"github.com/go-errors/errors"
 	"github.com/samber/lo"
@@ -228,47 +228,37 @@ func (c *OSCommand) PipeCommands(cmdObjs ...*CmdObj) error {
 	// keeping this here in case I adapt this code for some other purpose in the future
 	// cmds[len(cmds)-1].Stdout = os.Stdout
 
-	stderrs := make([]bytes.Buffer, len(cmds))
-	for i := range cmds {
-		cmds[i].Stderr = &stderrs[i]
-	}
-
-	// Start every command before waiting for any of them: waiting for a command
-	// closes our end of the pipe that feeds the next one, and a command that
-	// hasn't been started by then would inherit a closed stdin.
-	started := 0
-	var startErr error
-	for _, cmd := range cmds {
-		if err := cmd.Start(); err != nil {
-			startErr = err
-			break
-		}
-
-		started++
-	}
-
 	finalErrors := []string{}
 
-	if startErr != nil {
+	wg := sync.WaitGroup{}
-		c.Log.Error(startErr)
+	wg.Add(len(cmds))
-		finalErrors = append(finalErrors, startErr.Error())
 
-		// Without the rest of the pipeline to drain them, the commands we did
+	for _, cmd := range cmds {
-		// start could block forever writing to a full pipe.
+		go utils.Safe(func() {
-		for _, cmd := range cmds[:started] {
+			stderr, err := cmd.StderrPipe()
-			_ = cmd.Process.Kill()
+			if err != nil {
-		}
+				c.Log.Error(err)
+			}
+
+			if err := cmd.Start(); err != nil {
+				c.Log.Error(err)
+			}
+
+			if b, err := io.ReadAll(stderr); err == nil {
+				if len(b) > 0 {
+					finalErrors = append(finalErrors, string(b))
+				}
+			}
+
+			if err := cmd.Wait(); err != nil {
+				c.Log.Error(err)
+			}
+
+			wg.Done()
+		})
 	}
 
-	for i, cmd := range cmds[:started] {
+	wg.Wait()
-		if err := cmd.Wait(); err != nil {
-			c.Log.Error(err)
-		}
-
-		if stderrs[i].Len() > 0 {
-			finalErrors = append(finalErrors, stderrs[i].String())
-		}
-	}
 
 	if len(finalErrors) > 0 {
 		return errors.New(strings.Join(finalErrors, "\n"))

pkg/commands/oscommands/pty_unix.go

@@ -32,9 +32,3 @@ func StartPty(cmd *exec.Cmd, cols, rows uint16) (StartedPty, error) {
 		Wait:    cmd.Wait,
 	}, nil
 }
-
-// TerminateLivePtys is a no-op on Unix: stopping a pty task signals the
-// child (SIGTERM, plus SIGHUP to the foreground process group when the
-// master closes), and the processes clean themselves up without lazygit
-// having to wait for them.
-func TerminateLivePtys() {}

pkg/commands/oscommands/pty_windows.go

@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"strings"
 	"sync"
-	"time"
 	"unsafe"
 
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -14,14 +12,7 @@ import (
 )
 
 type winPty struct {
-	hpc windows.Handle
+	hpc     windows.Handle
-	// job holds the child and every descendant it spawns; terminating it
-	// kills whatever is left of the process tree (see Close).
-	job windows.Handle
-	// conhost is a handle to the conhost.exe serving this pty, or 0 if it
-	// couldn't be identified. Held so that the teardown in Close can reap
-	// it on Windows builds whose conhost fails to run down on its own.
-	conhost windows.Handle
 	inWrite *os.File
 	outRead *os.File
 
@@ -45,16 +36,7 @@ func (p *winPty) Resize(cols, rows uint16) error {
 		// there is nothing left to resize.
 		return nil
 	}
-	return windows.ResizePseudoConsole(p.hpc, clampPtySize(cols, rows))
+	return windows.ResizePseudoConsole(p.hpc, windows.Coord{X: int16(cols), Y: int16(rows)})
-}
-
-// clampPtySize clamps a requested pty size to the minimum that ConPTY
-// accepts: CreatePseudoConsole and ResizePseudoConsole reject zero
-// dimensions with E_INVALIDARG, but callers legitimately request them — the
-// pty is sized after the main view, which is zero-sized while hidden, e.g.
-// in full-screen mode with a side panel focused.
-func clampPtySize(cols, rows uint16) windows.Coord {
-	return windows.Coord{X: int16(max(cols, 1)), Y: int16(max(rows, 1))}
 }
 
 // closeHpc closes the pseudoconsole exactly once. Safe to call from multiple
@@ -73,46 +55,6 @@ func (p *winPty) closeHpc() {
 	windows.ClosePseudoConsole(p.hpc)
 }
 
-// How long Close waits for the conhost to run itself down after its clients
-// are gone, before concluding that it never will (see Close) and reaping it.
-const conhostExitTimeout = time.Second
-
-var (
-	// ptyTeardowns counts the in-flight teardown goroutines spawned by
-	// Close; TerminateLivePtys waits for them when lazygit exits.
-	ptyTeardowns sync.WaitGroup
-	// ptyQuit is closed by TerminateLivePtys. In-flight teardowns skip the
-	// conhost rundown wait once it is closed: the conhost serves nothing
-	// once its clients are gone, and the exit must not stall for its sake.
-	ptyQuit     = make(chan struct{})
-	ptyQuitOnce sync.Once
-)
-
-// TerminateLivePtys synchronously terminates the process trees and console
-// hosts of all ptys whose teardown hasn't finished yet. Call it when lazygit
-// is about to exit: the asynchronous teardowns in Close won't get to finish
-// (the conhost rundown wait outlives the process), and while
-// KILL_ON_JOB_CLOSE reaps the clients when the job handles are closed at
-// process death, nothing would reap the conhosts on the Windows builds that
-// need it (see Close). A long diff on screen keeps its git process running
-// the whole time it is shown, so quitting with such a teardown in flight is
-// the rule, not the exception.
-func TerminateLivePtys() {
-	ptyQuitOnce.Do(func() { close(ptyQuit) })
-
-	done := make(chan struct{})
-	go utils.Safe(func() {
-		ptyTeardowns.Wait()
-		close(done)
-	})
-	select {
-	case <-done:
-	case <-time.After(2 * time.Second):
-		// Don't hold up the exit any longer; the job handles' rundown
-		// still covers the clients.
-	}
-}
-
 // Close tears the pty down without waiting for it: the teardown runs on a
 // background goroutine and Close returns immediately.
 //
@@ -120,11 +62,11 @@ func TerminateLivePtys() {
 // Windows 11 24H2 it waits for the console host to exit, and since closing
 // only delivers CTRL_CLOSE_EVENT to the attached client without terminating
 // it, a client that keeps running (git still computing an expensive diff, a
-// diff renderer waiting for input) keeps the host — and with it
+// pager waiting for input) keeps the host — and with it ClosePseudoConsole —
-// ClosePseudoConsole — alive arbitrarily long. Close is called while holding
+// alive arbitrarily long. Close is called while holding the global PtyMutex
-// the global PtyMutex and while the task's onDone once is executing, where
+// and while the task's onDone once is executing, where blocking wedges every
-// blocking wedges every subsequent task for the view (and with it the UI), so
+// subsequent task for the view (and with it the UI), so none of this may
-// none of this may happen on the caller's thread.
+// happen on the caller's thread.
 //
 // Within the teardown, the pipe ends must be closed before the
 // pseudoconsole, and without holding p.mu: closing the pseudoconsole flushes
@@ -132,65 +74,11 @@ func TerminateLivePtys() {
 // nobody is reading anymore, so that flush can only complete once the pipe
 // is broken. The background waiter's closeHpc may already be wedged in such
 // a flush while holding p.mu; closing the pipes is what unblocks it.
-//
-// Closing the pseudoconsole delivers CTRL_CLOSE_EVENT only to the clients
-// attached to it at that moment. A child that is stopped right after being
-// spawned is still starting up and not attached yet, so the event misses it
-// and it survives, running its command to completion as an orphan — and
-// keeping its console host alive with it (#5879); the same holds for
-// grandchildren spawned while the console is going down, and for clients
-// that ignore the event (the Windows flavor of #5675). The job kill reaps
-// all of those. There is no point in delaying it: the close event is not a
-// graceful signal worth waiting on — git and the common diff tools leave it
-// to the default handler, which calls ExitProcess at whatever instruction
-// the process happens to execute — so clients that got the event are
-// already dying. Killing at an arbitrary point cannot leak a stale
-// index.lock, because pty-rendered commands don't take that lock (see
-// withPtyGitConfig in pkg/gui/pty.go).
-//
-// The pseudoconsole close gets its own goroutine because the kill must not
-// wait for it: on builds where ClosePseudoConsole blocks until the console
-// host exits (pre-24H2), the host keeps running as long as a surviving
-// client does, and that client only goes away through the job kill —
-// sequencing the kill after a blocking close would thus deadlock in
-// exactly the case the kill exists for.
-//
-// After the kill, the conhost serving the pty is reaped as well if it
-// doesn't exit by itself: a healthy conhost runs down once the reference
-// handle is closed and its clients are gone, but conhost builds before
-// Windows 11 24H2 fail to complete the rundown when a client attached
-// after the close event was delivered and was then killed — the fate of
-// exactly the clients the job kill is for — and such a conhost sits
-// around forever, serving nothing (#5879). The reap is inert on healthy
-// builds: the wait succeeds and only the handle is closed.
-//
-// When lazygit is quitting, the conhost rundown wait is skipped; see
-// TerminateLivePtys.
 func (p *winPty) Close() error {
-	ptyTeardowns.Add(1)
 	go utils.Safe(func() {
-		defer ptyTeardowns.Done()
-
 		p.inWrite.Close()
 		p.outRead.Close()
-		go utils.Safe(p.closeHpc)
+		p.closeHpc()
-
-		_ = windows.TerminateJobObject(p.job, 1)
-		_ = windows.CloseHandle(p.job)
-
-		if p.conhost != 0 {
-			timeout := conhostExitTimeout
-			select {
-			case <-ptyQuit:
-				timeout = 0
-			default:
-			}
-			event, err := windows.WaitForSingleObject(p.conhost, uint32(timeout/time.Millisecond))
-			if err != nil || event != windows.WAIT_OBJECT_0 {
-				_ = windows.TerminateProcess(p.conhost, 1)
-			}
-			_ = windows.CloseHandle(p.conhost)
-		}
 	})
 	return nil
 }
@@ -204,8 +92,7 @@ func (p *winPty) Close() error {
 // slave closes on child exit, but ConPTY keeps the pipe alive until we call
 // ClosePseudoConsole explicitly. Without doing that on child exit, the
 // scanner in pkg/tasks.NewCmdTask would block forever on the next read and
-// the render would never reach its end of input, so the new content would
+// the post-content view never gets cleared (FlushStaleCells never fires).
-// never be swapped in.
 func startWaiter(proc *os.Process, p *winPty) func() error {
 	done := make(chan struct{})
 	var waitErr error
@@ -227,52 +114,6 @@ func startWaiter(proc *os.Process, p *winPty) func() error {
 	}
 }
 
-// conhostScanMu serializes CreatePseudoConsole and the child-process scans
-// around it, so that two concurrently starting ptys can't make each other's
-// "which conhost is new" diff ambiguous.
-var conhostScanMu sync.Mutex
-
-// conhostChildren returns the pids of all conhost.exe processes that are
-// direct children of this process. Errors just yield a smaller (possibly
-// empty) set; the caller treats identification as best-effort.
-func conhostChildren() map[uint32]bool {
-	pids := map[uint32]bool{}
-	snap, err := windows.CreateToolhelp32Snapshot(windows.TH32CS_SNAPPROCESS, 0)
-	if err != nil {
-		return pids
-	}
-	defer func() { _ = windows.CloseHandle(snap) }()
-	me := uint32(os.Getpid())
-	var pe windows.ProcessEntry32
-	pe.Size = uint32(unsafe.Sizeof(pe))
-	for err := windows.Process32First(snap, &pe); err == nil; err = windows.Process32Next(snap, &pe) {
-		if pe.ParentProcessID == me && strings.EqualFold(windows.UTF16ToString(pe.ExeFile[:]), "conhost.exe") {
-			pids[pe.ProcessID] = true
-		}
-	}
-	return pids
-}
-
-// openNewConhostChild returns a handle to the single conhost child that
-// appeared since the before scan, or 0 if there isn't exactly one candidate
-// or it can't be opened.
-func openNewConhostChild(before map[uint32]bool) windows.Handle {
-	var found []uint32
-	for pid := range conhostChildren() {
-		if !before[pid] {
-			found = append(found, pid)
-		}
-	}
-	if len(found) != 1 {
-		return 0
-	}
-	h, err := windows.OpenProcess(windows.SYNCHRONIZE|windows.PROCESS_TERMINATE, false, found[0])
-	if err != nil {
-		return 0
-	}
-	return h
-}
-
 func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) {
 	// Two pipes: one for the child's stdin (we never write to it, but ConPTY
 	// needs a handle), one for the child's stdout/stderr multiplexed through
@@ -298,24 +139,9 @@ func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) {
 
 	// CreatePseudoConsole dupes the handles it needs internally; we release
 	// our references to the child-side ends immediately after.
-	//
+	var hpc windows.Handle
-	// It also spawns the conhost.exe serving the console session, as a
+	size := windows.Coord{X: int16(cols), Y: int16(rows)}
-	// direct child of this process. The teardown in Close needs a handle to
+	if err = windows.CreatePseudoConsole(size, inRead, outWrite, 0, &hpc); err != nil {
-	// that conhost (see there), but Windows offers no way to obtain one
-	// from the HPCON, so identify it by diffing our conhost children around
-	// the call. Open a real handle right away so that pid reuse can't later
-	// misdirect the teardown's reap. If identification fails, the handle
-	// stays 0 and the teardown skips the reap.
-	var hpc, conhost windows.Handle
-	size := clampPtySize(cols, rows)
-	conhostScanMu.Lock()
-	conhostsBefore := conhostChildren()
-	err = windows.CreatePseudoConsole(size, inRead, outWrite, 0, &hpc)
-	if err == nil {
-		conhost = openNewConhostChild(conhostsBefore)
-	}
-	conhostScanMu.Unlock()
-	if err != nil {
 		_ = windows.CloseHandle(inRead)
 		_ = windows.CloseHandle(outWrite)
 		return StartedPty{}, fmt.Errorf("CreatePseudoConsole: %w", err)
@@ -325,40 +151,9 @@ func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) {
 	defer func() {
 		if err != nil {
 			windows.ClosePseudoConsole(hpc)
-			if conhost != 0 {
-				_ = windows.CloseHandle(conhost)
-			}
 		}
 	}()
 
-	// The child goes into a job object so that the teardown in Close can
-	// terminate the whole process tree. KILL_ON_JOB_CLOSE makes the OS do
-	// that when the last handle to the job is closed, which doubles as a
-	// safety net: if lazygit exits without running the teardown, the handle
-	// is closed for it and the tree is reaped.
-	job, err := windows.CreateJobObject(nil, nil)
-	if err != nil {
-		return StartedPty{}, fmt.Errorf("CreateJobObject: %w", err)
-	}
-	defer func() {
-		if err != nil {
-			// Kills the child on error paths where it was already assigned
-			// to the job; plain handle cleanup before that.
-			_ = windows.CloseHandle(job)
-		}
-	}()
-	limits := windows.JOBOBJECT_EXTENDED_LIMIT_INFORMATION{
-		BasicLimitInformation: windows.JOBOBJECT_BASIC_LIMIT_INFORMATION{
-			LimitFlags: windows.JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
-		},
-	}
-	if _, err = windows.SetInformationJobObject(
-		job, windows.JobObjectExtendedLimitInformation,
-		uintptr(unsafe.Pointer(&limits)), uint32(unsafe.Sizeof(limits)),
-	); err != nil {
-		return StartedPty{}, fmt.Errorf("SetInformationJobObject: %w", err)
-	}
-
 	// Attach the pseudoconsole to the child via a process attribute list.
 	attrList, err := windows.NewProcThreadAttributeList(1)
 	if err != nil {
@@ -417,7 +212,7 @@ func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) {
 		nil, // process security
 		nil, // thread security
 		false,
-		windows.EXTENDED_STARTUPINFO_PRESENT|windows.CREATE_UNICODE_ENVIRONMENT|windows.CREATE_SUSPENDED,
+		windows.EXTENDED_STARTUPINFO_PRESENT|windows.CREATE_UNICODE_ENVIRONMENT,
 		envPtr,
 		dirPtr,
 		&si.StartupInfo,
@@ -426,22 +221,6 @@ func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) {
 	if err != nil {
 		return StartedPty{}, fmt.Errorf("CreateProcess: %w", err)
 	}
-
-	// The child was created suspended so that it can be assigned to the job
-	// before it runs its first instruction; that way every descendant it
-	// ever spawns is in the job from the start.
-	if err = windows.AssignProcessToJobObject(job, pi.Process); err != nil {
-		// Not in the job yet, so the deferred job-handle close can't reap it.
-		_ = windows.TerminateProcess(pi.Process, 1)
-		_ = windows.CloseHandle(pi.Thread)
-		_ = windows.CloseHandle(pi.Process)
-		return StartedPty{}, fmt.Errorf("AssignProcessToJobObject: %w", err)
-	}
-	if _, err = windows.ResumeThread(pi.Thread); err != nil {
-		_ = windows.CloseHandle(pi.Thread)
-		_ = windows.CloseHandle(pi.Process)
-		return StartedPty{}, fmt.Errorf("ResumeThread: %w", err)
-	}
 	_ = windows.CloseHandle(pi.Thread)
 
 	// Re-open the process by PID to get an *os.Process to wait on. Do this
@@ -457,8 +236,6 @@ func StartPty(cmd *exec.Cmd, cols, rows uint16) (sp StartedPty, err error) {
 
 	wp := &winPty{
 		hpc:     hpc,
-		job:     job,
-		conhost: conhost,
 		inWrite: os.NewFile(uintptr(inWrite), "conpty-in"),
 		outRead: os.NewFile(uintptr(outRead), "conpty-out"),
 	}

pkg/commands/oscommands/pty_windows_test.go

@@ -1,105 +0,0 @@
-package oscommands
-
-import (
-	"os/exec"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// The requested size can legitimately be zero: the pty inherits the main
-// view's dimensions, and that view is zero-sized while hidden, e.g. in
-// full-screen mode with a side panel focused.
-func TestStartPtyWithZeroSize(t *testing.T) {
-	// The command deliberately produces no output: go test runs with
-	// redirected std handles, which CreateProcess duplicates into the child
-	// in place of handles to the attached pseudoconsole, so command output
-	// would bypass the pty and pollute the test log.
-	sp, err := StartPty(exec.Command("cmd", "/c", "exit 0"), 0, 0)
-	assert.NoError(t, err)
-
-	if err == nil {
-		_ = sp.Wait()
-		_ = sp.Pty.Close()
-	}
-}
-
-// StartPty must identify the conhost.exe that CreatePseudoConsole spawned to
-// serve the pty: the teardown in Close reaps it on Windows builds whose
-// conhost fails to run down on its own, and a failed identification silently
-// degrades to not reaping. If this fails, the child-scan in
-// openNewConhostChild no longer matches how Windows hosts pseudoconsoles.
-func TestStartPtyIdentifiesConhost(t *testing.T) {
-	sp, err := StartPty(exec.Command("cmd", "/c", "exit 0"), 80, 24)
-	assert.NoError(t, err)
-	if err != nil {
-		return
-	}
-
-	assert.NotZero(t, sp.Pty.(*winPty).conhost)
-
-	_ = sp.Wait()
-	_ = sp.Pty.Close()
-}
-
-// TerminateLivePtys must reap a still-running pty synchronously: it runs
-// when lazygit is about to exit, where the asynchronous teardown would not
-// get to finish. Note that it switches the package's pty teardowns into
-// quit mode for the remainder of the test binary's lifetime; that's fine
-// for the other tests here, which must hold in either mode (quit mode only
-// shortens the teardown's conhost rundown wait).
-func TestTerminateLivePtysReapsRunningPty(t *testing.T) {
-	// The output redirect is there for the reason described in
-	// TestStartPtyWithZeroSize.
-	sp, err := StartPty(exec.Command("cmd", "/c", "ping -n 30 127.0.0.1 >nul"), 80, 24)
-	assert.NoError(t, err)
-	if err != nil {
-		return
-	}
-
-	_ = sp.Pty.Close()
-	TerminateLivePtys()
-
-	// The teardown has completed as part of TerminateLivePtys, so the child
-	// must be gone already; the timeout is generosity, not a grace period.
-	exited := make(chan struct{})
-	go func() {
-		_ = sp.Wait()
-		close(exited)
-	}()
-	select {
-	case <-exited:
-	case <-time.After(time.Second):
-		t.Fatal("child process was not terminated by TerminateLivePtys")
-	}
-}
-
-// Closing the pty must terminate the process tree it was running, even when
-// it is closed so soon after starting that the child hasn't attached to the
-// pseudoconsole yet: such a child misses the CTRL_CLOSE_EVENT that the close
-// delivers to attached clients, and only the job-object kill reaps it.
-// Without the kill, cmd and its ping child keep running for ~30 seconds and
-// the Wait here times out.
-func TestClosePtyTerminatesChildProcessTree(t *testing.T) {
-	// The output redirect is there for the reason described in
-	// TestStartPtyWithZeroSize.
-	sp, err := StartPty(exec.Command("cmd", "/c", "ping -n 30 127.0.0.1 >nul"), 80, 24)
-	assert.NoError(t, err)
-	if err != nil {
-		return
-	}
-
-	_ = sp.Pty.Close()
-
-	exited := make(chan struct{})
-	go func() {
-		_ = sp.Wait()
-		close(exited)
-	}()
-	select {
-	case <-exited:
-	case <-time.After(5 * time.Second):
-		t.Fatal("child process was not terminated by closing the pty")
-	}
-}

pkg/commands/patch/hunk.go

@@ -44,8 +44,7 @@ func (self *Hunk) lineCount() int {
 
 // Returns all lines in the hunk, including the header line
 func (self *Hunk) allLines() []*PatchLine {
-	lines := make([]*PatchLine, 1, 1+len(self.bodyLines))
+	lines := []*PatchLine{{Content: self.formatHeaderLine(), Kind: HUNK_HEADER}}
-	lines[0] = &PatchLine{Content: self.formatHeaderLine(), Kind: HUNK_HEADER}
 	lines = append(lines, self.bodyLines...)
 	return lines
 }

pkg/commands/patch/patch_builder.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/jesseduffield/generics/maps"
 	"github.com/samber/lo"
-	"github.com/sasha-s/go-deadlock"
 	"github.com/sirupsen/logrus"
 )
 
@@ -51,13 +50,6 @@ type PatchBuilder struct {
 	fileInfoMap map[string]*fileInfo
 	Log         *logrus.Entry
 
-	// mutex guards the fields that a git worker can mutate (via Reset, at the
-	// end of a patch-consuming operation) while the UI thread reads them to
-	// render — chiefly To and the fileInfoMap pointer. The map's *entries* are
-	// only ever touched on the UI thread, so we only hold the lock long enough
-	// to read or swap the fields, never across the git I/O in getFileInfo.
-	mutex deadlock.Mutex
-
 	// loadFileDiff loads the diff of a file, for a given to (typically a commit hash)
 	loadFileDiff loadFileDiffFunc
 }
@@ -70,9 +62,6 @@ func NewPatchBuilder(log *logrus.Entry, loadFileDiff loadFileDiffFunc) *PatchBui
 }
 
 func (p *PatchBuilder) Start(from, to string, reverse bool, canRebase bool) {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
 	p.To = to
 	p.From = from
 	p.reverse = reverse
@@ -80,21 +69,10 @@ func (p *PatchBuilder) Start(from, to string, reverse bool, canRebase bool) {
 	p.fileInfoMap = map[string]*fileInfo{}
 }
 
-// snapshotFileInfoMap returns the current fileInfoMap under the lock. The map's
-// entries are only mutated on the UI thread, so callers can read the returned
-// map without holding the lock; the lock only serializes the pointer swap that
-// Reset/Start do (potentially from a git worker) against these reads.
-func (p *PatchBuilder) snapshotFileInfoMap() map[string]*fileInfo {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
-	return p.fileInfoMap
-}
-
 func (p *PatchBuilder) PatchToApply(reverse bool, turnAddedFilesIntoDiffAgainstEmptyFile bool) string {
 	var patch strings.Builder
 
-	for filename, info := range p.snapshotFileInfoMap() {
+	for filename, info := range p.fileInfoMap {
 		if info.mode == UNSELECTED {
 			continue
 		}
@@ -152,17 +130,12 @@ func (p *PatchBuilder) RemoveFile(filename string, previousPath string) error {
 }
 
 func (p *PatchBuilder) getFileInfo(filename string, previousPath string) (*fileInfo, error) {
-	p.mutex.Lock()
+	info, ok := p.fileInfoMap[filename]
-	fileInfoMap := p.fileInfoMap
-	from, to, reverse := p.From, p.To, p.reverse
-	p.mutex.Unlock()
-
-	info, ok := fileInfoMap[filename]
 	if ok {
 		return info, nil
 	}
 
-	diff, err := p.loadFileDiff(from, to, reverse, filename, previousPath, true)
+	diff, err := p.loadFileDiff(p.From, p.To, p.reverse, filename, previousPath, true)
 	if err != nil {
 		return nil, err
 	}
@@ -172,7 +145,7 @@ func (p *PatchBuilder) getFileInfo(filename string, previousPath string) (*fileI
 		previousPath: previousPath,
 	}
 
-	fileInfoMap[filename] = info
+	p.fileInfoMap[filename] = info
 
 	return info, nil
 }
@@ -247,16 +220,14 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {
 }
 
 func (p *PatchBuilder) renderEachFilePatch(plain bool) []string {
-	fileInfoMap := p.snapshotFileInfoMap()
-
 	// sort files by name then iterate through and render each patch
-	filenames := maps.Keys(fileInfoMap)
+	filenames := maps.Keys(p.fileInfoMap)
 
 	sort.Strings(filenames)
 	patches := lo.Map(filenames, func(filename string, _ int) string {
 		return p.RenderPatchForFile(RenderPatchForFileOpts{
 			Filename:                               filename,
-			PreviousPath:                           fileInfoMap[filename].previousPath,
+			PreviousPath:                           p.fileInfoMap[filename].previousPath,
 			Plain:                                  plain,
 			Reverse:                                false,
 			TurnAddedFilesIntoDiffAgainstEmptyFile: true,
@@ -274,16 +245,11 @@ func (p *PatchBuilder) RenderAggregatedPatch(plain bool) string {
 }
 
 func (p *PatchBuilder) GetFileStatus(filename string, parent string) PatchStatus {
-	p.mutex.Lock()
+	if parent != p.To {
-	to := p.To
-	fileInfoMap := p.fileInfoMap
-	p.mutex.Unlock()
-
-	if parent != to {
 		return UNSELECTED
 	}
 
-	info, ok := fileInfoMap[filename]
+	info, ok := p.fileInfoMap[filename]
 	if !ok {
 		return UNSELECTED
 	}
@@ -301,22 +267,16 @@ func (p *PatchBuilder) GetFileIncLineIndices(filename string, previousPath strin
 
 // clears the patch
 func (p *PatchBuilder) Reset() {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
 	p.To = ""
 	p.fileInfoMap = map[string]*fileInfo{}
 }
 
 func (p *PatchBuilder) Active() bool {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
 	return p.To != ""
 }
 
 func (p *PatchBuilder) IsEmpty() bool {
-	for _, fileInfo := range p.snapshotFileInfoMap() {
+	for _, fileInfo := range p.fileInfoMap {
 		if fileInfo.mode == WHOLE || (fileInfo.mode == PART && len(fileInfo.includedLineIndices) > 0) {
 			return false
 		}
@@ -327,12 +287,9 @@ func (p *PatchBuilder) IsEmpty() bool {
 
 // if any of these things change we'll need to reset and start a new patch
 func (p *PatchBuilder) NewPatchRequired(from string, to string, reverse bool) bool {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
 	return from != p.From || to != p.To || reverse != p.reverse
 }
 
 func (p *PatchBuilder) AllFilesInPatch() []string {
-	return lo.Keys(p.snapshotFileInfoMap())
+	return lo.Keys(p.fileInfoMap)
 }

pkg/config/app_config.go

@@ -21,18 +21,17 @@ import (
 
 // AppConfig contains the base configuration fields required for lazygit.
 type AppConfig struct {
-	debug                  bool   `long:"debug" env:"DEBUG" default:"false"`
+	debug                 bool   `long:"debug" env:"DEBUG" default:"false"`
-	version                string `long:"version" env:"VERSION" default:"unversioned"`
+	version               string `long:"version" env:"VERSION" default:"unversioned"`
-	buildDate              string `long:"build-date" env:"BUILD_DATE"`
+	buildDate             string `long:"build-date" env:"BUILD_DATE"`
-	name                   string `long:"name" env:"NAME" default:"lazygit"`
+	name                  string `long:"name" env:"NAME" default:"lazygit"`
-	buildSource            string `long:"build-source" env:"BUILD_SOURCE" default:""`
+	buildSource           string `long:"build-source" env:"BUILD_SOURCE" default:""`
-	userConfig             *UserConfig
+	userConfig            *UserConfig
-	globalUserConfigFiles  []*ConfigFile
+	globalUserConfigFiles []*ConfigFile
-	userConfigFiles        []*ConfigFile
+	userConfigFiles       []*ConfigFile
-	userConfigDir          string
+	userConfigDir         string
-	tempDir                string
+	tempDir               string
-	appState               *AppState
+	appState              *AppState
-	githubPullRequestCache *githubPullRequestCache
 }
 
 type AppConfigurer interface {
@@ -52,8 +51,6 @@ type AppConfigurer interface {
 
 	GetAppState() *AppState
 	SaveAppState() error
-	GetCachedGithubPullRequests(repoPath string) ([]CachedPullRequest, error)
-	SaveCachedGithubPullRequests(repoPath string, pullRequests []CachedPullRequest) error
 }
 
 type ConfigFilePolicy int
@@ -110,21 +107,19 @@ func NewAppConfig(
 	if err != nil {
 		return nil, err
 	}
-	githubPullRequestCache := loadGithubPullRequestCache()
 
 	appConfig := &AppConfig{
-		name:                   name,
+		name:                  name,
-		version:                version,
+		version:               version,
-		buildDate:              date,
+		buildDate:             date,
-		debug:                  debuggingFlag,
+		debug:                 debuggingFlag,
-		buildSource:            buildSource,
+		buildSource:           buildSource,
-		userConfig:             userConfig,
+		userConfig:            userConfig,
-		globalUserConfigFiles:  configFiles,
+		globalUserConfigFiles: configFiles,
-		userConfigFiles:        configFiles,
+		userConfigFiles:       configFiles,
-		userConfigDir:          configDir,
+		userConfigDir:         configDir,
-		tempDir:                tempDir,
+		tempDir:               tempDir,
-		appState:               appState,
+		appState:              appState,
-		githubPullRequestCache: githubPullRequestCache,
 	}
 
 	return appConfig, nil
@@ -293,8 +288,6 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([]
 	}{
 		{[]string{"gui", "skipUnstageLineWarning"}, "skipDiscardChangeWarning"},
 		{[]string{"keybinding", "universal", "executeCustomCommand"}, "executeShellCommand"},
-		{[]string{"keybinding", "universal", "cyclePagers"}, "cycleDiffRenderers"},
-		{[]string{"keybinding", "universal", "cyclePagersReverse"}, "cycleDiffRenderersReverse"},
 		{[]string{"gui", "windowSize"}, "screenMode"},
 		{[]string{"keybinding", "files", "openMergeTool"}, "openMergeOptions"},
 	}
@@ -354,12 +347,7 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([]
 		return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err)
 	}
 
-	err = migratePaging(&rootNode, changes)
+	err = migratePagers(&rootNode, changes)
-	if err != nil {
-		return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err)
-	}
-
-	err = migratePagersToDiffRenderers(&rootNode, changes)
 	if err != nil {
 		return nil, false, fmt.Errorf("Couldn't migrate config file at `%s`: %w", path, err)
 	}
@@ -524,9 +512,7 @@ func migrateAllBranchesLogCmd(rootNode *yaml.Node, changes *ChangesSet) error {
 	})
 }
 
-// Migrate the single 'paging' node to an array of 'pagers'. This is not the final structure, we
+func migratePagers(rootNode *yaml.Node, changes *ChangesSet) error {
-// migrate it to diffRenderers from there in a separate step below.
-func migratePaging(rootNode *yaml.Node, changes *ChangesSet) error {
 	return yaml_utils.TransformNode(rootNode, []string{"git"}, func(gitNode *yaml.Node) error {
 		pagingKeyNode, pagingValueNode := yaml_utils.LookupKey(gitNode, "paging")
 		if pagingKeyNode == nil || pagingValueNode.Kind != yaml.MappingNode {
@@ -535,11 +521,10 @@ func migratePaging(rootNode *yaml.Node, changes *ChangesSet) error {
 		}
 
 		pagersKeyNode, _ := yaml_utils.LookupKey(gitNode, "pagers")
-		diffRenderersKeyNode, _ := yaml_utils.LookupKey(gitNode, "diffRenderers")
+		if pagersKeyNode != nil {
-		if pagersKeyNode != nil || diffRenderersKeyNode != nil {
+			// Conversely, if there *is* already a "pagers" array, we also have nothing to do.
-			// Conversely, if there is already a newer array config, we also have nothing to do.
+			// This covers the case where the user keeps both the "paging" section and the "pagers"
-			// This covers the case where the user keeps both formats for the sake of easier testing
+			// array for the sake of easier testing of old versions.
-			// of old versions.
 			return nil
 		}
 
@@ -547,7 +532,6 @@ func migratePaging(rootNode *yaml.Node, changes *ChangesSet) error {
 		pagingContentCopy := pagingValueNode.Content
 		pagingValueNode.Kind = yaml.SequenceNode
 		pagingValueNode.Tag = "!!seq"
-		pagingValueNode.Style &^= yaml.FlowStyle
 		pagingValueNode.Content = []*yaml.Node{{
 			Kind:    yaml.MappingNode,
 			Content: pagingContentCopy,
@@ -559,90 +543,6 @@ func migratePaging(rootNode *yaml.Node, changes *ChangesSet) error {
 	})
 }
 
-func migratePagersToDiffRenderers(rootNode *yaml.Node, changes *ChangesSet) error {
-	return yaml_utils.TransformNode(rootNode, []string{"git"}, func(gitNode *yaml.Node) error {
-		pagersKeyNode, pagersValueNode := yaml_utils.LookupKey(gitNode, "pagers")
-		if pagersKeyNode == nil || pagersValueNode.Kind != yaml.SequenceNode {
-			// If there's no "pagers" section (or it's not a sequence), there's nothing to do
-			return nil
-		}
-
-		diffRenderersKeyNode, _ := yaml_utils.LookupKey(gitNode, "diffRenderers")
-		if diffRenderersKeyNode != nil {
-			// Conversely, if there *is* already a "diffRenderers" array, we also have nothing to do.
-			// This covers the case where the user keeps both the "pagers" and the "diffRenderers"
-			// arrays for the sake of easier testing of old versions.
-			return nil
-		}
-
-		pagersKeyNode.Value = "diffRenderers"
-		changes.Add("Renamed git.pagers to git.diffRenderers")
-
-		for _, diffRendererNode := range pagersValueNode.Content {
-			if diffRendererNode.Kind != yaml.MappingNode {
-				continue
-			}
-
-			pagerKeyNode, pagerValueNode := yaml_utils.LookupKey(diffRendererNode, "pager")
-			externalDiffCommandKeyNode, externalDiffCommandValueNode := yaml_utils.LookupKey(diffRendererNode, "externalDiffCommand")
-			useExternalDiffGitConfigKeyNode, useExternalDiffGitConfigValueNode := yaml_utils.LookupKey(diffRendererNode, "useExternalDiffGitConfig")
-
-			hasPager := hasNonNullScalarValue(pagerValueNode)
-			hasExternalDiffCommand := hasNonNullScalarValue(externalDiffCommandValueNode)
-			useExternalDiffGitConfig := yamlBoolValue(useExternalDiffGitConfigValueNode)
-
-			if hasPager {
-				pagerKeyNode.Value = "command"
-				changes.Add("Renamed 'pager' to 'command' in git pager")
-			} else if hasExternalDiffCommand {
-				externalDiffCommandKeyNode.Value = "command"
-				yaml_utils.AddStringKey(diffRendererNode, "type", "extDiff")
-				changes.Add("Changed 'externalDiffCommand' to 'command' with 'type: extDiff' in git pager")
-			} else if useExternalDiffGitConfig {
-				yaml_utils.RemoveKey(diffRendererNode, "useExternalDiffGitConfig")
-				yaml_utils.AddStringKey(diffRendererNode, "type", "extDiff")
-				changes.Add("Changed 'useExternalDiffGitConfig: true' to 'type: extDiff' in git pager")
-			} else {
-				yaml_utils.AddStringKey(diffRendererNode, "type", "rawGit")
-				diffRendererNode.Style &^= yaml.FlowStyle
-				changes.Add("Changed git pager without a command to 'type: rawGit'")
-			}
-
-			if pagerKeyNode != nil && !hasPager {
-				yaml_utils.RemoveKey(diffRendererNode, "pager")
-				changes.Add("Removed empty 'pager' from git pager")
-			}
-			if externalDiffCommandKeyNode != nil && !hasExternalDiffCommand {
-				yaml_utils.RemoveKey(diffRendererNode, "externalDiffCommand")
-				changes.Add("Removed empty 'externalDiffCommand' from git pager")
-			}
-			if useExternalDiffGitConfigKeyNode != nil && !useExternalDiffGitConfig {
-				yaml_utils.RemoveKey(diffRendererNode, "useExternalDiffGitConfig")
-				if useExternalDiffGitConfigValueNode.Tag == "!!null" {
-					changes.Add("Removed empty 'useExternalDiffGitConfig' from git pager")
-				} else {
-					changes.Add("Removed 'useExternalDiffGitConfig: false' from git pager")
-				}
-			}
-		}
-
-		return nil
-	})
-}
-
-func hasNonNullScalarValue(node *yaml.Node) bool {
-	return node != nil && node.Kind == yaml.ScalarNode && node.Tag != "!!null" && node.Value != ""
-}
-
-func yamlBoolValue(node *yaml.Node) bool {
-	if node == nil {
-		return false
-	}
-
-	var value bool
-	return node.Decode(&value) == nil && value
-}
-
 func (c *AppConfig) GetDebug() bool {
 	return c.debug
 }
@@ -671,20 +571,6 @@ func (c *AppConfig) GetAppState() *AppState {
 	return c.appState
 }
 
-func (c *AppConfig) GetCachedGithubPullRequests(repoPath string) ([]CachedPullRequest, error) {
-	if c.githubPullRequestCache == nil {
-		return nil, nil
-	}
-	return c.githubPullRequestCache.get(repoPath), c.githubPullRequestCache.takeLoadError()
-}
-
-func (c *AppConfig) SaveCachedGithubPullRequests(repoPath string, pullRequests []CachedPullRequest) error {
-	if c.githubPullRequestCache == nil {
-		return nil
-	}
-	return c.githubPullRequestCache.save(repoPath, pullRequests)
-}
-
 func (c *AppConfig) GetUserConfigPaths() []string {
 	return lo.FilterMap(c.userConfigFiles, func(f *ConfigFile, _ int) (string, bool) {
 		return f.Path, f.exists
@@ -856,10 +742,27 @@ type AppState struct {
 	ShellCommandsHistory []string `yaml:"customcommandshistory"`
 
 	HideCommandLog bool
+
+	// Cache of GitHub pull requests per repo path, so that PR info can be
+	// shown instantly on startup before the async refresh completes.
+	GithubPullRequests map[string][]CachedPullRequest `yaml:"githubPullRequests"`
+}
+
+// CachedPullRequest stores the essential fields of a GitHub pull request
+// for persisting in the app state cache.
+type CachedPullRequest struct {
+	HeadRefName         string `yaml:"headRefName"`
+	Number              int    `yaml:"number"`
+	Title               string `yaml:"title"`
+	State               string `yaml:"state"`
+	Url                 string `yaml:"url"`
+	HeadRepositoryOwner string `yaml:"headRepositoryOwner"`
 }
 
 func getDefaultAppState() *AppState {
-	return &AppState{}
+	return &AppState{
+		GithubPullRequests: make(map[string][]CachedPullRequest),
+	}
 }
 
 func LogPath() (string, error) {

pkg/config/app_config_test.go

@@ -83,28 +83,24 @@ func TestMigrationOfRenamedKeys(t *testing.T) {
 		},
 		{
 			name: "Rename several",
-			input: "gui:\n" +
+			input: `gui:
-				"  windowSize: half\n" +
+  windowSize: half
-				"  skipUnstageLineWarning: true\n" +
+  skipUnstageLineWarning: true
-				"keybinding:\n" +
+keybinding:
-				"  universal:\n" +
+  universal:
-				"    executeCustomCommand: a\n" +
+    executeCustomCommand: a
-				"    cyclePagers: b\n" +
+`,
-				"    cyclePagersReverse: c\n",
+			expected: `gui:
-			expected: "gui:\n" +
+  screenMode: half
-				"  screenMode: half\n" +
+  skipDiscardChangeWarning: true
-				"  skipDiscardChangeWarning: true\n" +
+keybinding:
-				"keybinding:\n" +
+  universal:
-				"  universal:\n" +
+    executeShellCommand: a
-				"    executeShellCommand: a\n" +
+`,
-				"    cycleDiffRenderers: b\n" +
-				"    cycleDiffRenderersReverse: c\n",
 			expectedDidChange: true,
 			expectedChanges: []string{
 				"Renamed 'gui.skipUnstageLineWarning' to 'skipDiscardChangeWarning'",
 				"Renamed 'keybinding.universal.executeCustomCommand' to 'executeShellCommand'",
-				"Renamed 'keybinding.universal.cyclePagers' to 'cycleDiffRenderers'",
-				"Renamed 'keybinding.universal.cyclePagersReverse' to 'cycleDiffRenderersReverse'",
 				"Renamed 'gui.windowSize' to 'screenMode'",
 			},
 		},
@@ -474,6 +470,629 @@ func TestCustomCommandsOutputMigration(t *testing.T) {
 	}
 }
 
+var largeConfiguration = []byte(`
+# Config relating to the Lazygit UI
+gui:
+  # The number of lines you scroll by when scrolling the main window
+  scrollHeight: 2
+
+  # If true, allow scrolling past the bottom of the content in the main window
+  scrollPastBottom: true
+
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#scroll-off-margin
+  scrollOffMargin: 2
+
+  # One of: 'margin' (default) | 'jump'
+  scrollOffBehavior: margin
+
+  # The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.
+  # Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.
+  tabWidth: 4
+
+  # If true, capture mouse events.
+  # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
+  mouseEvents: true
+
+  # If true, do not show a warning when amending a commit.
+  skipAmendWarning: false
+
+  # If true, do not show a warning when discarding changes in the staging view.
+  skipDiscardChangeWarning: false
+
+  # If true, do not show warning when applying/popping the stash
+  skipStashWarning: false
+
+  # If true, do not show a warning when attempting to commit without any staged files; instead stage all unstaged files.
+  skipNoStagedFilesWarning: false
+
+  # If true, do not show a warning when rewording a commit via an external editor
+  skipRewordInEditorWarning: false
+
+  # Fraction of the total screen width to use for the left side section. You may want to pick a small number (e.g. 0.2) if you're using a narrow screen, so that you can see more of the main section.
+  # Number from 0 to 1.0.
+  sidePanelWidth: 0.3333
+
+  # If true, increase the height of the focused side window; creating an accordion effect.
+  expandFocusedSidePanel: false
+
+  # The weight of the expanded side panel, relative to the other panels. 2 means
+  # twice as tall as the other panels. Only relevant if expandFocusedSidePanel is true.
+  expandedSidePanelWeight: 2
+
+  # Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split.
+  # Options are:
+  # - 'horizontal': split the window horizontally
+  # - 'vertical': split the window vertically
+  # - 'flexible': (default) split the window horizontally if the window is wide enough, otherwise split vertically
+  mainPanelSplitMode: flexible
+
+  # How the window is split when in half screen mode (i.e. after hitting '+' once).
+  # Possible values:
+  # - 'left': split the window horizontally (side panel on the left, main view on the right)
+  # - 'top': split the window vertically (side panel on top, main view below)
+  enlargedSideViewLocation: left
+
+  # If true, wrap lines in the staging view to the width of the view. This
+  # makes it much easier to work with diffs that have long lines, e.g.
+  # paragraphs of markdown text.
+  wrapLinesInStagingView: true
+
+  # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
+  language: auto
+
+  # Format used when displaying time e.g. commit time.
+  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
+  timeFormat: 02 Jan 06
+
+  # Format used when displaying time if the time is less than 24 hours ago.
+  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
+  shortTimeFormat: 3:04PM
+
+  # Config relating to colors and styles.
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes
+  theme:
+    # Border color of focused window
+    activeBorderColor:
+      - green
+      - bold
+
+    # Border color of non-focused windows
+    inactiveBorderColor:
+      - default
+
+    # Border color of focused window when searching in that window
+    searchingActiveBorderColor:
+      - cyan
+      - bold
+
+    # Color of keybindings help text in the bottom line
+    optionsTextColor:
+      - blue
+
+    # Background color of selected line.
+    # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
+    selectedLineBgColor:
+      - blue
+
+    # Background color of selected line when view doesn't have focus.
+    inactiveViewSelectedLineBgColor:
+      - bold
+
+    # Foreground color of copied commit
+    cherryPickedCommitFgColor:
+      - blue
+
+    # Background color of copied commit
+    cherryPickedCommitBgColor:
+      - cyan
+
+    # Foreground color of marked base commit (for rebase)
+    markedBaseCommitFgColor:
+      - blue
+
+    # Background color of marked base commit (for rebase)
+    markedBaseCommitBgColor:
+      - yellow
+
+    # Color for file with unstaged changes
+    unstagedChangesColor:
+      - red
+
+    # Default text color
+    defaultFgColor:
+      - default
+
+  # Config relating to the commit length indicator
+  commitLength:
+    # If true, show an indicator of commit message length
+    show: true
+
+  # If true, show the '5 of 20' footer at the bottom of list views
+  showListFooter: true
+
+  # If true, display the files in the file views as a tree. If false, display the files as a flat list.
+  # This can be toggled from within Lazygit with the '' key, but that will not change the default.
+  showFileTree: true
+
+  # If true, show the number of lines changed per file in the Files view
+  showNumstatInFilesView: false
+
+  # If true, show a random tip in the command log when Lazygit starts
+  showRandomTip: true
+
+  # If true, show the command log
+  showCommandLog: true
+
+  # If true, show the bottom line that contains keybinding info and useful buttons. If false, this line will be hidden except to display a loader for an in-progress action.
+  showBottomLine: true
+
+  # If true, show jump-to-window keybindings in window titles.
+  showPanelJumps: true
+
+  # Deprecated: use nerdFontsVersion instead
+  showIcons: false
+
+  # Nerd fonts version to use.
+  # One of: '2' | '3' | empty string (default)
+  # If empty, do not show icons.
+  nerdFontsVersion: ""
+
+  # If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
+  showFileIcons: true
+
+  # Length of author name in (non-expanded) commits view. 2 means show initials only.
+  commitAuthorShortLength: 2
+
+  # Length of author name in expanded commits view. 2 means show initials only.
+  commitAuthorLongLength: 17
+
+  # Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
+  commitHashLength: 8
+
+  # If true, show commit hashes alongside branch names in the branches view.
+  showBranchCommitHash: false
+
+  # Whether to show the divergence from the base branch in the branches view.
+  # One of: 'none' | 'onlyArrow'  | 'arrowAndNumber'
+  showDivergenceFromBaseBranch: none
+
+  # Height of the command log view
+  commandLogSize: 8
+
+  # Whether to split the main window when viewing file changes.
+  # One of: 'auto' | 'always'
+  # If 'auto', only split the main window when a file has both staged and unstaged changes
+  splitDiff: auto
+
+  # Default size for focused window. Can be changed from within Lazygit with '+' and '_' (but this won't change the default).
+  # One of: 'normal' (default) | 'half' | 'full'
+  screenMode: normal
+
+  # Window border style.
+  # One of 'rounded' (default) | 'single' | 'double' | 'hidden' | 'bold'
+  border: rounded
+
+  # If true, show a seriously epic explosion animation when nuking the working tree.
+  animateExplosion: true
+
+  # Whether to stack UI components on top of each other.
+  # One of 'auto' (default) | 'always' | 'never'
+  portraitMode: auto
+
+  # How things are filtered when typing '/'.
+  # One of 'substring' (default) | 'fuzzy'
+  filterMode: substring
+
+  # Config relating to the spinner.
+  spinner:
+    # The frames of the spinner animation.
+    frames:
+      - '|'
+      - /
+      - '-'
+      - \
+
+    # The "speed" of the spinner in milliseconds.
+    rate: 50
+
+  # Status panel view.
+  # One of 'dashboard' (default) | 'allBranchesLog'
+  statusPanelView: dashboard
+
+  # If true, jump to the Files panel after popping a stash
+  switchToFilesAfterStashPop: true
+
+  # If true, jump to the Files panel after applying a stash
+  switchToFilesAfterStashApply: true
+
+  # If true, when using the panel jump keys (default 1 through 5) and target panel is already active, go to next tab instead
+  switchTabsWithPanelJumpKeys: false
+
+# Config relating to git
+git:
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
+  paging:
+    # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
+    colorArg: always
+
+    # e.g.
+    # diff-so-fancy
+    # delta --dark --paging=never
+    # ydiff -p cat -s --wrap --width={{columnWidth}}
+    pager: ""
+
+    useConfig: false
+
+    # e.g. 'difft --color=always'
+    externalDiffCommand: ""
+
+  # Config relating to committing
+  commit:
+    # If true, pass '--signoff' flag when committing
+    signOff: false
+
+    # Automatic WYSIWYG wrapping of the commit message as you type
+    autoWrapCommitMessage: true
+
+    # If autoWrapCommitMessage is true, the width to wrap to
+    autoWrapWidth: 72
+
+  # Config relating to merging
+  merging:
+    # If true, run merges in a subprocess so that if a commit message is required, Lazygit will not hang
+    # Only applicable to unix users.
+    manualCommit: false
+
+    # Extra args passed to , e.g. --no-ff
+    args: ""
+
+    # The commit message to use for a squash merge commit. Can contain "{{selectedRef}}" and "{{currentBranch}}" placeholders.
+    squashMergeMessage: Squash merge {{selectedRef}} into {{currentBranch}}
+
+  # list of branches that are considered 'main' branches, used when displaying commits
+  mainBranches:
+    - master
+    - main
+
+  # Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP'
+  skipHookPrefix: WIP
+
+  # If true, periodically fetch from remote
+  autoFetch: true
+
+  # If true, periodically refresh files and submodules
+  autoRefresh: true
+
+  # If true, poll the repo periodically for external ref changes (commits,
+  # branch updates, checkouts made outside lazygit) and refresh when one
+  # is detected. Independent of autoRefresh, which only governs the files
+  # panel.
+  autoDetectExternalChanges: true
+
+  # If true, pass the --all arg to git fetch
+  fetchAll: true
+
+  # If true, lazygit will automatically stage files that used to have merge
+  # conflicts but no longer do; and it will also ask you if you want to
+  # continue a merge or rebase if you've resolved all conflicts. If false, it
+  # won't do either of these things.
+  autoStageResolvedConflicts: true
+
+  # Command used when displaying the current branch git log in the main window
+  branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
+
+  # Command used to display git log of all branches in the main window.
+  # Deprecated: Use allBranchesLogCmds instead.
+  allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
+
+  # If true, do not spawn a separate process when using GPG
+  overrideGpg: false
+
+  # If true, do not allow force pushes
+  disableForcePushing: false
+
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-branch-name-prefix
+  branchPrefix: ""
+
+  # If true, parse emoji strings in commit messages e.g. render :rocket: as 🚀
+  # (This should really be under 'gui', not 'git')
+  parseEmoji: false
+
+  # Config for showing the log in the commits view
+  log:
+    # One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'
+    # 'topo-order' makes it easier to read the git log graph, but commits may not
+    # appear chronologically. See https://git-scm.com/docs/
+    #
+    # Deprecated: Configure this with Log menu -> Commit sort order (<c-l> in the commits window by default).
+    order: topo-order
+
+    # This determines whether the git graph is rendered in the commits panel
+    # One of 'always' | 'never' | 'when-maximised'
+    #
+    # Deprecated: Configure this with Log menu -> Show git graph (<c-l> in the commits window by default).
+    showGraph: always
+
+    # displays the whole git graph by default in the commits view (equivalent to passing the --all argument to git log)
+    showWholeGraph: false
+
+  # When copying commit hashes to the clipboard, truncate them to this
+  # length. Set to 40 to disable truncation.
+  truncateCopiedCommitHashesTo: 12
+
+# Periodic update checks
+update:
+  # One of: 'prompt' (default) | 'background' | 'never'
+  method: prompt
+
+  # Period in days between update checks
+  days: 14
+
+# Background refreshes
+refresher:
+  # File/submodule refresh interval in seconds.
+  # Auto-refresh can be disabled via option 'git.autoRefresh'.
+  refreshInterval: 10
+
+  # Re-fetch interval in seconds.
+  # Auto-fetch can be disabled via option 'git.autoFetch'.
+  fetchInterval: 60
+
+  # Interval in seconds at which lazygit polls for external ref changes
+  # (commits, branch updates, checkouts made outside lazygit).
+  # Detection can be disabled via option 'git.autoDetectExternalChanges'.
+  externalChangeCheckInterval: 2
+
+# If true, show a confirmation popup before quitting Lazygit
+confirmOnQuit: false
+
+# If true, exit Lazygit when the user presses escape in a context where there is nothing to cancel/close
+quitOnTopLevelReturn: false
+
+# Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc
+os:
+  # Command for editing a file. Should contain "{{filename}}".
+  edit: ""
+
+  # Command for editing a file at a given line number. Should contain
+  # "{{filename}}", and may optionally contain "{{line}}".
+  editAtLine: ""
+
+  # Same as EditAtLine, except that the command needs to wait until the
+  # window is closed.
+  editAtLineAndWait: ""
+
+  # Whether lazygit suspends until an edit process returns
+  editInTerminal: false
+
+  # For opening a directory in an editor
+  openDirInEditor: ""
+
+  # A built-in preset that sets all of the above settings. Supported presets
+  # are defined in the getPreset function in editor_presets.go.
+  editPreset: ""
+
+  # Command for opening a file, as if the file is double-clicked. Should
+  # contain "{{filename}}", but doesn't support "{{line}}".
+  open: ""
+
+  # Command for opening a link. Should contain "{{link}}".
+  openLink: ""
+
+  # EditCommand is the command for editing a file.
+  # Deprecated: use Edit instead. Note that semantics are different:
+  # EditCommand is just the command itself, whereas Edit contains a
+  # "{{filename}}" variable.
+  editCommand: ""
+
+  # EditCommandTemplate is the command template for editing a file
+  # Deprecated: use EditAtLine instead.
+  editCommandTemplate: ""
+
+  # OpenCommand is the command for opening a file
+  # Deprecated: use Open instead.
+  openCommand: ""
+
+  # OpenLinkCommand is the command for opening a link
+  # Deprecated: use OpenLink instead.
+  openLinkCommand: ""
+
+  # CopyToClipboardCmd is the command for copying to clipboard.
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
+  copyToClipboardCmd: ""
+
+  # ReadFromClipboardCmd is the command for reading the clipboard.
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
+  readFromClipboardCmd: ""
+
+# If true, don't display introductory popups upon opening Lazygit.
+disableStartupPopups: false
+
+# What to do when opening Lazygit outside of a git repo.
+# - 'prompt': (default) ask whether to initialize a new repo or open in the most recent repo
+# - 'create': initialize a new repo
+# - 'skip': open most recent repo
+# - 'quit': exit Lazygit
+notARepository: prompt
+
+# If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit.
+promptToReturnFromSubprocess: true
+
+# Keybindings
+keybinding:
+  universal:
+    quit: q
+    quit-alt1: <c-c>
+    return: <esc>
+    quitWithoutChangingDirectory: Q
+    togglePanel: <tab>
+    prevItem: <up>
+    nextItem: <down>
+    prevItem-alt: k
+    nextItem-alt: j
+    prevPage: ','
+    nextPage: .
+    scrollLeft: H
+    scrollRight: L
+    gotoTop: <
+    gotoBottom: '>'
+    toggleRangeSelect: v
+    rangeSelectDown: <s-down>
+    rangeSelectUp: <s-up>
+    prevBlock: <left>
+    nextBlock: <right>
+    prevBlock-alt: h
+    nextBlock-alt: l
+    nextBlock-alt2: <tab>
+    prevBlock-alt2: <backtab>
+    jumpToBlock:
+      - "1"
+      - "2"
+      - "3"
+      - "4"
+      - "5"
+    nextMatch: "n"
+    prevMatch: "N"
+    startSearch: /
+    optionMenu: <disabled>
+    optionMenu-alt1: '?'
+    select: <space>
+    goInto: <enter>
+    confirm: <enter>
+    confirmInEditor: <a-enter>
+    remove: d
+    new: "n"
+    edit: e
+    openFile: o
+    scrollUpMain: <pgup>
+    scrollDownMain: <pgdown>
+    scrollUpMain-alt1: K
+    scrollDownMain-alt1: J
+    scrollUpMain-alt2: <c-u>
+    scrollDownMain-alt2: <c-d>
+    executeShellCommand: ':'
+    createRebaseOptionsMenu: m
+
+    # 'Files' appended for legacy reasons
+    pushFiles: P
+
+    # 'Files' appended for legacy reasons
+    pullFiles: p
+    refresh: R
+    createPatchOptionsMenu: <c-p>
+    nextTab: ']'
+    prevTab: '['
+    nextScreenMode: +
+    prevScreenMode: _
+    undo: z
+    redo: Z
+    filteringMenu: <c-s>
+    diffingMenu: W
+    diffingMenu-alt: <c-e>
+    copyToClipboard: <c-o>
+    openRecentRepos: <c-r>
+    submitEditorText: <enter>
+    extrasMenu: '@'
+    toggleWhitespaceInDiffView: <c-w>
+    increaseContextInDiffView: '}'
+    decreaseContextInDiffView: '{'
+    increaseRenameSimilarityThreshold: )
+    decreaseRenameSimilarityThreshold: (
+    openDiffTool: <c-t>
+  status:
+    checkForUpdate: u
+    recentRepos: <enter>
+    allBranchesLogGraph: a
+  files:
+    commitChanges: c
+    commitChangesWithoutHook: w
+    amendLastCommit: A
+    commitChangesWithEditor: C
+    findBaseCommitForFixup: <c-f>
+    confirmDiscard: x
+    ignoreFile: i
+    refreshFiles: r
+    stashAllChanges: s
+    viewStashOptions: S
+    toggleStagedAll: a
+    viewResetOptions: D
+    fetch: f
+    openMergeOptions: M
+    openStatusFilter: <c-b>
+    copyFileInfoToClipboard: "y"
+    collapseAll: '-'
+    expandAll: =
+  branches:
+    createPullRequest: o
+    viewPullRequestOptions: O
+    copyPullRequestURL: <c-y>
+    checkoutBranchByName: c
+    forceCheckoutBranch: F
+    rebaseBranch: r
+    renameBranch: R
+    mergeIntoCurrentBranch: M
+    viewGitFlowOptions: i
+    fastForward: f
+    createTag: T
+    pushTag: P
+    setUpstream: u
+    fetchRemote: f
+    sortOrder: s
+  worktrees:
+    viewWorktreeOptions: w
+  commits:
+    squashDown: s
+    renameCommit: r
+    renameCommitWithEditor: R
+    viewResetOptions: g
+    markCommitAsFixup: f
+    createFixupCommit: F
+    squashAboveCommits: S
+    moveDownCommit: <c-j>
+    moveUpCommit: <c-k>
+    amendToCommit: A
+    resetCommitAuthor: a
+    pickCommit: p
+    revertCommit: t
+    cherryPickCopy: C
+    pasteCommits: V
+    markCommitAsBaseForRebase: B
+    tagCommit: T
+    checkoutCommit: <space>
+    resetCherryPick: <c-R>
+    copyCommitAttributeToClipboard: "y"
+    openLogMenu: <c-l>
+    openInBrowser: o
+    viewBisectOptions: b
+    startInteractiveRebase: i
+  amendAttribute:
+    resetAuthor: a
+    setAuthor: A
+    addCoAuthor: c
+  stash:
+    popStash: g
+    renameStash: r
+  commitFiles:
+    checkoutCommitFile: c
+  main:
+    toggleSelectHunk: a
+    pickBothHunks: b
+    editSelectHunk: E
+  submodules:
+    init: i
+    update: u
+    bulkMenu: b
+  commitMessage:
+    commitMenu: <c-o>
+`)
+
+func BenchmarkMigrationOnLargeConfiguration(b *testing.B) {
+	for b.Loop() {
+		changes := NewChangesSet()
+		_, _, _ = computeMigratedConfig("path doesn't matter", largeConfiguration, changes)
+	}
+}
+
 func TestAllBranchesLogCmdMigrations(t *testing.T) {
 	scenarios := []struct {
 		name              string
@@ -599,7 +1218,6 @@ func TestPagerMigration(t *testing.T) {
 		expectedDidChange bool
 		expectedChanges   []string
 	}{
-		// Migrate 'paging' to 'pagers' array
 		{
 			name:              "Incomplete Configuration Passes uneventfully",
 			input:             "git:",
@@ -608,203 +1226,68 @@ func TestPagerMigration(t *testing.T) {
 		},
 		{
 			name: "No paging section",
-			input: "git:\n" +
+			input: `git:
-				"  autoFetch: true\n",
+  autoFetch: true
-			expected: "git:\n" +
+`,
-				"  autoFetch: true\n",
+			expected: `git:
+  autoFetch: true
+`,
+			expectedDidChange: false,
+			expectedChanges:   []string{},
+		},
+		{
+			name: "Both paging and pagers exist",
+			input: `git:
+  paging:
+    pager: delta --dark --paging=never
+  pagers:
+    - diff: diff-so-fancy
+`,
+			expected: `git:
+  paging:
+    pager: delta --dark --paging=never
+  pagers:
+    - diff: diff-so-fancy
+`,
 			expectedDidChange: false,
 			expectedChanges:   []string{},
 		},
 		{
 			name: "paging is not an object",
-			input: "git:\n" +
+			input: `git:
-				"  paging: 5\n",
+  paging: 5
-			expected: "git:\n" +
+`,
-				"  paging: 5\n",
+			expected: `git:
+  paging: 5
+`,
 			expectedDidChange: false,
 			expectedChanges:   []string{},
 		},
 		{
-			name: "pagers is not an array",
+			name: "paging is moved to pagers array (keeping the order)",
-			input: "git:\n" +
+			input: `git:
-				"  pagers: 5\n",
+  paging:
-			expected: "git:\n" +
+    pager: delta --dark --paging=never
-				"  pagers: 5\n",
+  autoFetch: true
-			expectedDidChange: false,
+`,
-			expectedChanges:   []string{},
+			expected: `git:
-		},
+  pagers:
-		{
+    - pager: delta --dark --paging=never
-			name: "paging and pagers coexist",
+  autoFetch: true
-			input: "git:\n" +
+`,
-				"  paging:\n" +
-				"    pager: delta --dark --paging=never\n" +
-				"  pagers:\n" +
-				"    - pager: diff-so-fancy\n",
-			expected: "git:\n" +
-				"  paging:\n" +
-				"    pager: delta --dark --paging=never\n" +
-				"  diffRenderers:\n" +
-				"    - command: diff-so-fancy\n",
 			expectedDidChange: true,
-			expectedChanges: []string{
+			expectedChanges:   []string{"Moved git.paging object to git.pagers array"},
-				"Renamed git.pagers to git.diffRenderers",
-				"Renamed 'pager' to 'command' in git pager",
-			},
 		},
 		{
-			name: "paging and diffRenderers coexist",
+			name: "paging is moved to pagers array even if empty",
-			input: "git:\n" +
+			input: `git:
-				"  paging:\n" +
+  paging: {}
-				"    pager: delta --dark --paging=never\n" +
+`,
-				"  diffRenderers:\n" +
+			expected: `git:
-				"    - command: diff-so-fancy\n",
+  pagers: [{}]
-			expected: "git:\n" +
+`,
-				"  paging:\n" +
-				"    pager: delta --dark --paging=never\n" +
-				"  diffRenderers:\n" +
-				"    - command: diff-so-fancy\n",
-			expectedDidChange: false,
-			expectedChanges:   []string{},
-		},
-		{
-			name: "pagers and diffRenderers coexist",
-			input: "git:\n" +
-				"  pagers:\n" +
-				"    - pager: delta --dark --paging=never\n" +
-				"  diffRenderers:\n" +
-				"    - command: diff-so-fancy\n",
-			expected: "git:\n" +
-				"  pagers:\n" +
-				"    - pager: delta --dark --paging=never\n" +
-				"  diffRenderers:\n" +
-				"    - command: diff-so-fancy\n",
-			expectedDidChange: false,
-			expectedChanges:   []string{},
-		},
-		{
-			name: "paging is moved to diffRenderers array preserving fields and order",
-			input: "git:\n" +
-				"  paging:\n" +
-				"    name: delta\n" +
-				"    colorArg: never\n" +
-				"    pager: delta --dark --paging=never\n" +
-				"  autoFetch: true\n",
-			expected: "git:\n" +
-				"  diffRenderers:\n" +
-				"    - name: delta\n" +
-				"      colorArg: never\n" +
-				"      command: delta --dark --paging=never\n" +
-				"  autoFetch: true\n",
 			expectedDidChange: true,
-			expectedChanges: []string{
+			expectedChanges:   []string{"Moved git.paging object to git.pagers array"},
-				"Moved git.paging object to git.pagers array",
-				"Renamed git.pagers to git.diffRenderers",
-				"Renamed 'pager' to 'command' in git pager",
-			},
-		},
-		{
-			name: "paging is moved to diffRenderers array even if empty",
-			input: "git:\n" +
-				"  paging: {}\n",
-			expected: "git:\n" +
-				"  diffRenderers:\n" +
-				"    - type: rawGit\n",
-			expectedDidChange: true,
-			expectedChanges: []string{
-				"Moved git.paging object to git.pagers array",
-				"Renamed git.pagers to git.diffRenderers",
-				"Changed git pager without a command to 'type: rawGit'",
-			},
-		},
-
-		// Migrate 'pagers' array to 'diffRenderers' array
-		{
-			name: "empty pagers array is renamed",
-			input: "git:\n" +
-				"  pagers: []\n",
-			expected: "git:\n" +
-				"  diffRenderers: []\n",
-			expectedDidChange: true,
-			expectedChanges:   []string{"Renamed git.pagers to git.diffRenderers"},
-		},
-		{
-			name: "pagers array entries are adapted",
-			input: "git:\n" +
-				"  pagers:\n" +
-				"    - name: delta\n" +
-				"      colorArg: never\n" +
-				"      pager: delta --dark --paging=never\n" +
-				"    - name: difft\n" +
-				"      colorArg: never\n" +
-				"      externalDiffCommand: difft --color=always\n" +
-				"    - name: git-config\n" +
-				"      colorArg: never\n" +
-				"      useExternalDiffGitConfig: TRUE\n" +
-				"    - name: git\n" +
-				"      colorArg: never\n" +
-				"  autoFetch: true\n",
-			expected: "git:\n" +
-				"  diffRenderers:\n" +
-				"    - name: delta\n" +
-				"      colorArg: never\n" +
-				"      command: delta --dark --paging=never\n" +
-				"    - name: difft\n" +
-				"      colorArg: never\n" +
-				"      command: difft --color=always\n" +
-				"      type: extDiff\n" +
-				"    - name: git-config\n" +
-				"      colorArg: never\n" +
-				"      type: extDiff\n" +
-				"    - name: git\n" +
-				"      colorArg: never\n" +
-				"      type: rawGit\n" +
-				"  autoFetch: true\n",
-			expectedDidChange: true,
-			expectedChanges: []string{
-				"Renamed git.pagers to git.diffRenderers",
-				"Renamed 'pager' to 'command' in git pager",
-				"Changed 'externalDiffCommand' to 'command' with 'type: extDiff' in git pager",
-				"Changed 'useExternalDiffGitConfig: true' to 'type: extDiff' in git pager",
-				"Changed git pager without a command to 'type: rawGit'",
-			},
-		},
-		{
-			name: "zero-valued mechanism fields do not take precedence and are removed",
-			input: "git:\n" +
-				"  pagers:\n" +
-				"    - pager: delta --dark --paging=never\n" +
-				"      externalDiffCommand: null\n" +
-				"      useExternalDiffGitConfig: false\n" +
-				"    - pager: \"\"\n" +
-				"      externalDiffCommand: difft --color=always\n" +
-				"      useExternalDiffGitConfig: false\n" +
-				"    - pager: null\n" +
-				"      externalDiffCommand: \"\"\n" +
-				"      useExternalDiffGitConfig: YES\n" +
-				"    - pager: \"\"\n" +
-				"      externalDiffCommand:\n" +
-				"      useExternalDiffGitConfig: false\n" +
-				"    - useExternalDiffGitConfig: null\n",
-			expected: "git:\n" +
-				"  diffRenderers:\n" +
-				"    - command: delta --dark --paging=never\n" +
-				"    - command: difft --color=always\n" +
-				"      type: extDiff\n" +
-				"    - type: extDiff\n" +
-				"    - type: rawGit\n" +
-				"    - type: rawGit\n",
-			expectedDidChange: true,
-			expectedChanges: []string{
-				"Renamed git.pagers to git.diffRenderers",
-				"Renamed 'pager' to 'command' in git pager",
-				"Removed empty 'externalDiffCommand' from git pager",
-				"Removed 'useExternalDiffGitConfig: false' from git pager",
-				"Changed 'externalDiffCommand' to 'command' with 'type: extDiff' in git pager",
-				"Removed empty 'pager' from git pager",
-				"Changed 'useExternalDiffGitConfig: true' to 'type: extDiff' in git pager",
-				"Changed git pager without a command to 'type: rawGit'",
-				"Removed empty 'useExternalDiffGitConfig' from git pager",
-			},
 		},
 	}
 

pkg/config/diff_renderer_config_manager.go

@@ -1,159 +0,0 @@
-package config
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-type DiffRendererConfigManager struct {
-	getUserConfig     func() *UserConfig
-	diffRendererIndex int
-}
-
-type DiffRendererType int
-
-const (
-	DiffRendererType_StdinFilter DiffRendererType = iota
-	DiffRendererType_ExtDiff
-	DiffRendererType_RawGit
-)
-
-func NewDiffRendererConfigManager(getUserConfig func() *UserConfig) *DiffRendererConfigManager {
-	return &DiffRendererConfigManager{getUserConfig: getUserConfig}
-}
-
-func (self *DiffRendererConfigManager) currentDiffRendererConfig() *DiffRendererConfig {
-	diffRenderers := self.getUserConfig().Git.DiffRenderers
-	if len(diffRenderers) == 0 {
-		return nil
-	}
-
-	// Guard against the diff renderer index being out of range, which can happen if the user
-	// has removed diff renderers from their config file while lazygit is running.
-	if self.diffRendererIndex >= len(diffRenderers) {
-		self.diffRendererIndex = 0
-	}
-
-	return &diffRenderers[self.diffRendererIndex]
-}
-
-func (self *DiffRendererConfig) getType() DiffRendererType {
-	switch self.Type {
-	case "stdinFilter", "":
-		return DiffRendererType_StdinFilter
-	case "extDiff":
-		return DiffRendererType_ExtDiff
-	case "rawGit":
-		return DiffRendererType_RawGit
-	}
-	panic("invalid diff renderer type: " + self.Type)
-}
-
-func (self *DiffRendererConfigManager) GetDiffRendererType() DiffRendererType {
-	currentDiffRendererConfig := self.currentDiffRendererConfig()
-	if currentDiffRendererConfig == nil {
-		return DiffRendererType_RawGit
-	}
-	return currentDiffRendererConfig.getType()
-}
-
-func (self *DiffRendererConfigManager) GetStdinFilterCommand(width int) string {
-	currentDiffRendererConfig := self.currentDiffRendererConfig()
-	if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_StdinFilter {
-		return ""
-	}
-
-	templateValues := map[string]string{
-		"columnWidth": strconv.Itoa(width/2 - 6),
-	}
-
-	commandTemplate := string(currentDiffRendererConfig.Command)
-	return utils.ResolvePlaceholderString(commandTemplate, templateValues)
-}
-
-func (self *DiffRendererConfigManager) GetColorArg() string {
-	currentDiffRendererConfig := self.currentDiffRendererConfig()
-	if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_StdinFilter {
-		return "always"
-	}
-
-	colorArg := currentDiffRendererConfig.ColorArg
-	if colorArg == "" {
-		return "always"
-	}
-	return colorArg
-}
-
-func (self *DiffRendererConfigManager) GetExternalDiffCommand(diffContext uint64) string {
-	currentDiffRendererConfig := self.currentDiffRendererConfig()
-	if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_ExtDiff {
-		return ""
-	}
-
-	templateValues := map[string]string{
-		"diffContext": strconv.Itoa(int(diffContext)),
-	}
-
-	return utils.ResolvePlaceholderString(string(currentDiffRendererConfig.Command), templateValues)
-}
-
-func (self *DiffRendererConfigManager) GetRawGitArgs() []string {
-	currentDiffRendererConfig := self.currentDiffRendererConfig()
-	if currentDiffRendererConfig == nil || currentDiffRendererConfig.getType() != DiffRendererType_RawGit {
-		return nil
-	}
-	return currentDiffRendererConfig.Args
-}
-
-func (self *DiffRendererConfigManager) CycleDiffRenderers() {
-	self.diffRendererIndex = (self.diffRendererIndex + 1) % len(self.getUserConfig().Git.DiffRenderers)
-}
-
-func (self *DiffRendererConfigManager) CycleDiffRenderersBackward() {
-	n := len(self.getUserConfig().Git.DiffRenderers)
-	self.diffRendererIndex = (self.diffRendererIndex - 1 + n) % n
-}
-
-func (self *DiffRendererConfigManager) CurrentDiffRendererIndex() (int, int) {
-	return self.diffRendererIndex, len(self.getUserConfig().Git.DiffRenderers)
-}
-
-// CurrentDiffRendererName returns a name for the current diff renderer, suitable for showing
-// to the user.
-func (self *DiffRendererConfigManager) CurrentDiffRendererName(tr *i18n.TranslationSet) string {
-	currentDiffRendererConfig := self.currentDiffRendererConfig()
-	if currentDiffRendererConfig == nil {
-		return tr.DefaultDiffRendererName
-	}
-
-	if name := currentDiffRendererConfig.displayName(); name != "" {
-		return name
-	}
-
-	if currentDiffRendererConfig.getType() == DiffRendererType_ExtDiff && currentDiffRendererConfig.Command == "" {
-		return tr.ExternalDiffDiffRendererName
-	}
-
-	return tr.DefaultDiffRendererName
-}
-
-func (self *DiffRendererConfig) displayName() string {
-	if self.Name != "" {
-		return self.Name
-	}
-	if self.getType() == DiffRendererType_RawGit && len(self.Args) > 0 {
-		return self.Args[0]
-	}
-	return firstWord(string(self.Command))
-}
-
-func firstWord(command string) string {
-	fields := strings.Fields(command)
-	if len(fields) == 0 {
-		return ""
-	}
-	return fields[0]
-}

pkg/config/diff_renderer_config_manager_test.go

@@ -1,96 +0,0 @@
-package config
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCurrentDiffRendererName(t *testing.T) {
-	tr := i18n.EnglishTranslationSet()
-
-	scenarios := []struct {
-		name               string
-		diffRendererConfig DiffRendererConfig
-		expected           string
-	}{
-		{
-			name:               "explicit name takes precedence over the command",
-			diffRendererConfig: DiffRendererConfig{Name: "delta side-by-side", Command: "delta --side-by-side"},
-			expected:           "delta side-by-side",
-		},
-		{
-			name:               "derived from the first word of the stdinFilter command",
-			diffRendererConfig: DiffRendererConfig{Command: "delta --side-by-side"},
-			expected:           "delta",
-		},
-		{
-			name:               "surrounding whitespace in the command is ignored",
-			diffRendererConfig: DiffRendererConfig{Command: "  diff-so-fancy  "},
-			expected:           "diff-so-fancy",
-		},
-		{
-			name:               "derived from the first word of the extDiff command",
-			diffRendererConfig: DiffRendererConfig{Type: "extDiff", Command: "difft --color=always"},
-			expected:           "difft",
-		},
-		{
-			name:               "no name can be derived for external diff",
-			diffRendererConfig: DiffRendererConfig{Type: "extDiff"},
-			expected:           tr.ExternalDiffDiffRendererName,
-		},
-		{
-			name:               "derived from first argument of rawGit args",
-			diffRendererConfig: DiffRendererConfig{Type: "rawGit", Args: []string{"--color-words"}},
-			expected:           "--color-words",
-		},
-		{
-			name:               "no name can be derived for raw diff",
-			diffRendererConfig: DiffRendererConfig{Type: "rawGit"},
-			expected:           tr.DefaultDiffRendererName,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			userConfig := &UserConfig{}
-			userConfig.Git.DiffRenderers = []DiffRendererConfig{s.diffRendererConfig}
-			config := NewDiffRendererConfigManager(func() *UserConfig { return userConfig })
-
-			assert.Equal(t, s.expected, config.CurrentDiffRendererName(tr))
-		})
-	}
-}
-
-func TestCurrentDiffRendererNameWithoutDiffRenderers(t *testing.T) {
-	config := NewDiffRendererConfigManager(func() *UserConfig { return &UserConfig{} })
-
-	tr := i18n.EnglishTranslationSet()
-	assert.Equal(t, tr.DefaultDiffRendererName, config.CurrentDiffRendererName(tr))
-}
-
-func TestCycleDiffRenderers(t *testing.T) {
-	userConfig := &UserConfig{}
-	userConfig.Git.DiffRenderers = []DiffRendererConfig{{Name: "a"}, {Name: "b"}, {Name: "c"}}
-	config := NewDiffRendererConfigManager(func() *UserConfig { return userConfig })
-
-	currentIndex := func() int {
-		index, _ := config.CurrentDiffRendererIndex()
-		return index
-	}
-
-	assert.Equal(t, 0, currentIndex())
-
-	config.CycleDiffRenderers()
-	assert.Equal(t, 1, currentIndex())
-	config.CycleDiffRenderers()
-	assert.Equal(t, 2, currentIndex())
-	config.CycleDiffRenderers()
-	assert.Equal(t, 0, currentIndex(), "cycling forward past the last diff renderer wraps to the first")
-
-	config.CycleDiffRenderersBackward()
-	assert.Equal(t, 2, currentIndex(), "cycling backward past the first diff renderer wraps to the last")
-	config.CycleDiffRenderersBackward()
-	assert.Equal(t, 1, currentIndex())
-}

pkg/config/dummies.go

@@ -9,12 +9,11 @@ func NewDummyAppConfig() *AppConfig {
 	userConfig := GetDefaultConfig()
 	userConfig.Keybinding.MergeLegacyAltKeybindings()
 	appConfig := &AppConfig{
-		name:                   "lazygit",
+		name:       "lazygit",
-		version:                "unversioned",
+		version:    "unversioned",
-		debug:                  false,
+		debug:      false,
-		userConfig:             userConfig,
+		userConfig: userConfig,
-		appState:               &AppState{},
+		appState:   &AppState{},
-		githubPullRequestCache: newGithubPullRequestCache(""),
 	}
 	_ = yaml.Unmarshal([]byte{}, appConfig.appState)
 	return appConfig

pkg/config/editor_presets.go

@@ -50,13 +50,13 @@ type editPreset struct {
 	suspend                   func() bool
 }
 
-func returnBool(a bool) func() bool { return func() bool { return a } }
+func returnBool(a bool) func() bool { return (func() bool { return a }) }
 
 // IF YOU ADD A PRESET TO THIS FUNCTION YOU MUST UPDATE THE `Supported presets` SECTION OF docs/Config.md
 func getPreset(shell string, osConfig *OSConfig, guessDefaultEditor func() string) *editPreset {
 	var nvimRemoteEditTemplate, nvimRemoteEditAtLineTemplate, nvimRemoteOpenDirInEditorTemplate string
 	// By default fish doesn't have SHELL variable set, but it does have FISH_VERSION since Nov 2012.
-	if strings.HasSuffix(shell, "fish") || (os.Getenv("FISH_VERSION") != "") {
+	if (strings.HasSuffix(shell, "fish")) || (os.Getenv("FISH_VERSION") != "") {
 		nvimRemoteEditTemplate = `begin; if test -z "$NVIM"; nvim -- {{filename}}; else; nvim --server "$NVIM" --remote-send "q"; nvim --server "$NVIM" --remote-tab {{filename}}; end; end`
 		nvimRemoteEditAtLineTemplate = `begin; if test -z "$NVIM"; nvim +{{line}} -- {{filename}}; else; nvim --server "$NVIM" --remote-send "q"; nvim --server "$NVIM" --remote-tab {{filename}}; nvim --server "$NVIM" --remote-send ":{{line}}<CR>"; end; end`
 		nvimRemoteOpenDirInEditorTemplate = `begin; if test -z "$NVIM"; nvim -- {{dir}}; else; nvim --server "$NVIM" --remote-send "q"; nvim --server "$NVIM" --remote-tab {{dir}}; end; end`

pkg/config/github_pull_request_cache.go

@@ -1,124 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-)
-
-const githubPullRequestsCacheFileName = "github_pull_requests.json"
-
-// CachedPullRequest stores the essential fields of a GitHub pull request.
-type CachedPullRequest struct {
-	HeadRefName         string `json:"headRefName"`
-	Number              int    `json:"number"`
-	Title               string `json:"title"`
-	State               string `json:"state"`
-	ChecksState         string `json:"checksState,omitempty"`
-	Url                 string `json:"url"`
-	HeadRepositoryOwner string `json:"headRepositoryOwner"`
-}
-
-type githubPullRequestCache struct {
-	mutex                  sync.Mutex
-	path                   string
-	pullRequestsByRepoPath map[string][]CachedPullRequest
-	loadErr                error
-}
-
-func loadGithubPullRequestCache() *githubPullRequestCache {
-	path, err := githubPullRequestCachePath()
-	if err != nil {
-		cache := newGithubPullRequestCache("")
-		cache.loadErr = err
-		return cache
-	}
-
-	cache := newGithubPullRequestCache(path)
-	cache.load()
-	return cache
-}
-
-func githubPullRequestCachePath() (string, error) {
-	path, err := stateFilePath(stateFileName)
-	if err != nil {
-		return "", err
-	}
-
-	return filepath.Join(filepath.Dir(path), githubPullRequestsCacheFileName), nil
-}
-
-func newGithubPullRequestCache(path string) *githubPullRequestCache {
-	return &githubPullRequestCache{
-		path:                   path,
-		pullRequestsByRepoPath: make(map[string][]CachedPullRequest),
-	}
-}
-
-func (c *githubPullRequestCache) load() {
-	if c.path == "" {
-		return
-	}
-
-	content, err := os.ReadFile(c.path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			c.loadErr = fmt.Errorf("reading GitHub pull request cache: %w", err)
-		}
-		return
-	}
-	if len(content) == 0 {
-		return
-	}
-
-	if err := json.Unmarshal(content, &c.pullRequestsByRepoPath); err != nil {
-		c.pullRequestsByRepoPath = make(map[string][]CachedPullRequest)
-		c.loadErr = fmt.Errorf("parsing GitHub pull request cache: %w", err)
-	} else if c.pullRequestsByRepoPath == nil {
-		c.pullRequestsByRepoPath = make(map[string][]CachedPullRequest)
-	}
-}
-
-func (c *githubPullRequestCache) get(repoPath string) []CachedPullRequest {
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	return append([]CachedPullRequest(nil), c.pullRequestsByRepoPath[repoPath]...)
-}
-
-// takeLoadError returns the error, if any, that occurred while loading the
-// cache from disk, clearing it so that it is reported only once.
-func (c *githubPullRequestCache) takeLoadError() error {
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	loadErr := c.loadErr
-	c.loadErr = nil
-	return loadErr
-}
-
-func (c *githubPullRequestCache) save(repoPath string, pullRequests []CachedPullRequest) error {
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	c.pullRequestsByRepoPath[repoPath] = append([]CachedPullRequest(nil), pullRequests...)
-	if c.path == "" {
-		return nil
-	}
-
-	content, err := json.MarshalIndent(c.pullRequestsByRepoPath, "", "  ")
-	if err != nil {
-		return err
-	}
-	content = append(content, '\n')
-
-	// Apparently when people have read-only permissions they prefer us to fail
-	// silently, so don't propagate permission errors.
-	if err := os.WriteFile(c.path, content, 0o644); err != nil && !os.IsPermission(err) {
-		return err
-	}
-
-	return nil
-}

pkg/config/github_pull_request_cache_test.go

@@ -1,141 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGithubPullRequestCachePath(t *testing.T) {
-	stateDir := t.TempDir()
-	t.Setenv("CONFIG_DIR", stateDir)
-
-	path, err := githubPullRequestCachePath()
-
-	assert.NoError(t, err)
-	assert.Equal(t, filepath.Join(stateDir, githubPullRequestsCacheFileName), path)
-}
-
-func TestGithubPullRequestCache(t *testing.T) {
-	path := filepath.Join(t.TempDir(), githubPullRequestsCacheFileName)
-	cache := newGithubPullRequestCache(path)
-	repoOnePullRequests := []CachedPullRequest{{
-		HeadRefName:         "first-branch",
-		Number:              1,
-		Title:               "First pull request",
-		State:               "OPEN",
-		Url:                 "https://github.com/owner/repo/pull/1",
-		HeadRepositoryOwner: "owner",
-	}}
-	repoTwoPullRequests := []CachedPullRequest{{
-		HeadRefName:         "second-branch",
-		Number:              2,
-		Title:               "Second pull request",
-		State:               "MERGED",
-		Url:                 "https://github.com/other/repo/pull/2",
-		HeadRepositoryOwner: "other",
-	}}
-
-	assert.NoError(t, cache.save("/repo/one", repoOnePullRequests))
-	assert.NoError(t, cache.save("/repo/two", repoTwoPullRequests))
-
-	content, err := os.ReadFile(path)
-	assert.NoError(t, err)
-	assert.Equal(t, `{
-  "/repo/one": [
-    {
-      "headRefName": "first-branch",
-      "number": 1,
-      "title": "First pull request",
-      "state": "OPEN",
-      "url": "https://github.com/owner/repo/pull/1",
-      "headRepositoryOwner": "owner"
-    }
-  ],
-  "/repo/two": [
-    {
-      "headRefName": "second-branch",
-      "number": 2,
-      "title": "Second pull request",
-      "state": "MERGED",
-      "url": "https://github.com/other/repo/pull/2",
-      "headRepositoryOwner": "other"
-    }
-  ]
-}
-`, string(content))
-
-	reloadedCache := newGithubPullRequestCache(path)
-	reloadedCache.load()
-	assert.Equal(t, repoOnePullRequests, reloadedCache.get("/repo/one"))
-	assert.Equal(t, repoTwoPullRequests, reloadedCache.get("/repo/two"))
-	assert.NoError(t, reloadedCache.takeLoadError())
-}
-
-func TestGithubPullRequestCacheIgnoresMalformedContent(t *testing.T) {
-	path := filepath.Join(t.TempDir(), githubPullRequestsCacheFileName)
-	assert.NoError(t, os.WriteFile(path, []byte("{"), 0o644))
-
-	cache := newGithubPullRequestCache(path)
-	cache.load()
-
-	assert.ErrorContains(t, cache.takeLoadError(), "parsing GitHub pull request cache")
-	assert.Empty(t, cache.get("/repo"))
-	assert.NoError(t, cache.save("/repo", []CachedPullRequest{{Number: 1}}))
-
-	reloadedCache := newGithubPullRequestCache(path)
-	reloadedCache.load()
-	assert.Equal(t, []CachedPullRequest{{Number: 1}}, reloadedCache.get("/repo"))
-	assert.NoError(t, reloadedCache.takeLoadError())
-}
-
-func TestGithubPullRequestCacheDoesNotModifyAppState(t *testing.T) {
-	stateDir := t.TempDir()
-	t.Setenv("CONFIG_DIR", stateDir)
-	statePath := filepath.Join(stateDir, stateFileName)
-	stateContent := []byte("recentrepos:\n  - /repo\n")
-	assert.NoError(t, os.WriteFile(statePath, stateContent, 0o644))
-
-	cache := loadGithubPullRequestCache()
-	assert.NoError(t, cache.save("/repo", []CachedPullRequest{{Number: 1}}))
-
-	actualStateContent, err := os.ReadFile(statePath)
-	assert.NoError(t, err)
-	assert.Equal(t, stateContent, actualStateContent)
-	_, err = os.Stat(filepath.Join(stateDir, githubPullRequestsCacheFileName))
-	assert.NoError(t, err)
-}
-
-func TestGithubPullRequestCacheSerializesConcurrentSaves(t *testing.T) {
-	path := filepath.Join(t.TempDir(), githubPullRequestsCacheFileName)
-	cache := newGithubPullRequestCache(path)
-	const repoCount = 20
-	var waitGroup sync.WaitGroup
-	errs := make(chan error, repoCount)
-
-	for index := range repoCount {
-		waitGroup.Add(1)
-		go func() {
-			defer waitGroup.Done()
-			repoPath := fmt.Sprintf("/repo/%d", index)
-			errs <- cache.save(repoPath, []CachedPullRequest{{Number: index}})
-		}()
-	}
-	waitGroup.Wait()
-	close(errs)
-	for err := range errs {
-		assert.NoError(t, err)
-	}
-
-	reloadedCache := newGithubPullRequestCache(path)
-	reloadedCache.load()
-	for index := range repoCount {
-		repoPath := fmt.Sprintf("/repo/%d", index)
-		assert.Equal(t, []CachedPullRequest{{Number: index}}, reloadedCache.get(repoPath))
-	}
-	assert.NoError(t, reloadedCache.takeLoadError())
-}

pkg/config/pager_config.go

@@ -0,0 +1,126 @@
+package config
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+type PagerConfig struct {
+	getUserConfig func() *UserConfig
+	pagerIndex    int
+}
+
+func NewPagerConfig(getUserConfig func() *UserConfig) *PagerConfig {
+	return &PagerConfig{getUserConfig: getUserConfig}
+}
+
+func (self *PagerConfig) currentPagerConfig() *PagingConfig {
+	pagers := self.getUserConfig().Git.Pagers
+	if len(pagers) == 0 {
+		return nil
+	}
+
+	// Guard against the pager index being out of range, which can happen if the user
+	// has removed pagers from their config file while lazygit is running.
+	if self.pagerIndex >= len(pagers) {
+		self.pagerIndex = 0
+	}
+
+	return &pagers[self.pagerIndex]
+}
+
+func (self *PagerConfig) GetPagerCommand(width int) string {
+	currentPagerConfig := self.currentPagerConfig()
+	if currentPagerConfig == nil {
+		return ""
+	}
+
+	templateValues := map[string]string{
+		"columnWidth": strconv.Itoa(width/2 - 6),
+	}
+
+	pagerTemplate := string(currentPagerConfig.Pager)
+	return utils.ResolvePlaceholderString(pagerTemplate, templateValues)
+}
+
+func (self *PagerConfig) GetColorArg() string {
+	currentPagerConfig := self.currentPagerConfig()
+	if currentPagerConfig == nil {
+		return "always"
+	}
+
+	colorArg := currentPagerConfig.ColorArg
+	if colorArg == "" {
+		return "always"
+	}
+	return colorArg
+}
+
+func (self *PagerConfig) GetExternalDiffCommand() string {
+	currentPagerConfig := self.currentPagerConfig()
+	if currentPagerConfig == nil {
+		return ""
+	}
+	return currentPagerConfig.ExternalDiffCommand
+}
+
+func (self *PagerConfig) GetUseExternalDiffGitConfig() bool {
+	currentPagerConfig := self.currentPagerConfig()
+	if currentPagerConfig == nil {
+		return false
+	}
+	return currentPagerConfig.UseExternalDiffGitConfig
+}
+
+func (self *PagerConfig) CyclePagers() {
+	self.pagerIndex = (self.pagerIndex + 1) % len(self.getUserConfig().Git.Pagers)
+}
+
+func (self *PagerConfig) CyclePagersBackward() {
+	n := len(self.getUserConfig().Git.Pagers)
+	self.pagerIndex = (self.pagerIndex - 1 + n) % n
+}
+
+func (self *PagerConfig) CurrentPagerIndex() (int, int) {
+	return self.pagerIndex, len(self.getUserConfig().Git.Pagers)
+}
+
+// CurrentPagerName returns a name for the current pager, suitable for showing
+// to the user. It returns an empty string if no name can be derived; callers
+// should substitute a localized fallback in that case.
+func (self *PagerConfig) CurrentPagerName() string {
+	currentPagerConfig := self.currentPagerConfig()
+	if currentPagerConfig == nil {
+		return ""
+	}
+	return currentPagerConfig.displayName()
+}
+
+// CurrentPagerUsesGitConfigDiff reports whether the current pager defers to
+// git's own external diff config. Such an entry has no name we can derive (the
+// actual command may even vary per file via .gitattributes), so callers show a
+// generic label rather than treating it like the default no-pager entry.
+func (self *PagerConfig) CurrentPagerUsesGitConfigDiff() bool {
+	currentPagerConfig := self.currentPagerConfig()
+	return currentPagerConfig != nil && currentPagerConfig.UseExternalDiffGitConfig
+}
+
+func (self *PagingConfig) displayName() string {
+	if self.Name != "" {
+		return self.Name
+	}
+	if word := firstWord(string(self.Pager)); word != "" {
+		return word
+	}
+	return firstWord(self.ExternalDiffCommand)
+}
+
+func firstWord(command string) string {
+	fields := strings.Fields(command)
+	if len(fields) == 0 {
+		return ""
+	}
+	return fields[0]
+}

pkg/config/pager_config_test.go

@@ -0,0 +1,82 @@
+package config
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCurrentPagerName(t *testing.T) {
+	scenarios := []struct {
+		name     string
+		pager    PagingConfig
+		expected string
+	}{
+		{
+			name:     "explicit name takes precedence over the command",
+			pager:    PagingConfig{Name: "delta side-by-side", Pager: "delta --side-by-side"},
+			expected: "delta side-by-side",
+		},
+		{
+			name:     "derived from the first word of the pager command",
+			pager:    PagingConfig{Pager: "delta --side-by-side"},
+			expected: "delta",
+		},
+		{
+			name:     "surrounding whitespace in the command is ignored",
+			pager:    PagingConfig{Pager: "  diff-so-fancy  "},
+			expected: "diff-so-fancy",
+		},
+		{
+			name:     "falls back to the external diff command when there is no pager",
+			pager:    PagingConfig{ExternalDiffCommand: "difft --color=always"},
+			expected: "difft",
+		},
+		{
+			name:     "no name can be derived",
+			pager:    PagingConfig{UseExternalDiffGitConfig: true},
+			expected: "",
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			userConfig := &UserConfig{}
+			userConfig.Git.Pagers = []PagingConfig{s.pager}
+			config := NewPagerConfig(func() *UserConfig { return userConfig })
+
+			assert.Equal(t, s.expected, config.CurrentPagerName())
+		})
+	}
+}
+
+func TestCurrentPagerNameWithoutPagers(t *testing.T) {
+	config := NewPagerConfig(func() *UserConfig { return &UserConfig{} })
+
+	assert.Equal(t, "", config.CurrentPagerName())
+}
+
+func TestCyclePagers(t *testing.T) {
+	userConfig := &UserConfig{}
+	userConfig.Git.Pagers = []PagingConfig{{Name: "a"}, {Name: "b"}, {Name: "c"}}
+	config := NewPagerConfig(func() *UserConfig { return userConfig })
+
+	currentIndex := func() int {
+		index, _ := config.CurrentPagerIndex()
+		return index
+	}
+
+	assert.Equal(t, 0, currentIndex())
+
+	config.CyclePagers()
+	assert.Equal(t, 1, currentIndex())
+	config.CyclePagers()
+	assert.Equal(t, 2, currentIndex())
+	config.CyclePagers()
+	assert.Equal(t, 0, currentIndex(), "cycling forward past the last pager wraps to the first")
+
+	config.CyclePagersBackward()
+	assert.Equal(t, 2, currentIndex(), "cycling backward past the first pager wraps to the last")
+	config.CyclePagersBackward()
+	assert.Equal(t, 1, currentIndex())
+}

pkg/config/user_config.go

@@ -87,7 +87,7 @@ type GuiConfig struct {
 	// One of: 'margin' (default) | 'jump'
 	ScrollOffBehavior string `yaml:"scrollOffBehavior"`
 	// The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.
-	// Note that when using a diff renderer, the renderer has its own tab width setting, so you need to pass it separately in the renderer command.
+	// Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.
 	TabWidth int `yaml:"tabWidth" jsonschema:"minimum=1"`
 	// If true, capture mouse events.
 	// When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
@@ -269,39 +269,37 @@ type SpinnerConfig struct {
 }
 
 type GitConfig struct {
-	// Array of diff renderers. Each entry has the following format:
+	// Array of pagers. Each entry has the following format:
-	// [dev] The following documentation is duplicated from the DiffRendererConfig struct below.
+	// [dev] The following documentation is duplicated from the PagingConfig struct below.
 	//
-	//   # The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff'
+	//   # A name for the pager, shown in the notification when cycling pagers.
-	//   # | 'rawGit'
+	//   # If not set, the name is derived from the first word of the pager
-	//   type: "stdinFilter"
+	//   # command (or of the external diff command).
-	//
-	//   # A name for the diff renderer, shown in the notification when cycling
-	//   # renderers. If not set, the name is derived from the first word of the
-	//   # renderer command.
 	//   name: ""
 	//
-	//   # Value of the --color arg in the git diff command. Only used for type
+	//   # Value of the --color arg in the git diff command. Some pagers want
-	//   # 'stdinFilter'. Some renderers want this to be set to 'always' and some
+	//   # this to be set to 'always' and some want it set to 'never'
-	//   # want it set to 'never'.
 	//   colorArg: "always"
 	//
-	//   # The command to use for rendering diffs. This is either a stdinFilter or
-	//   # an external diff command, depending on the type field; not applicable if
-	//   # the type is 'rawGit'.
 	//   # e.g.
 	//   # diff-so-fancy
 	//   # delta --dark --paging=never
-	//   # ydiff -p cat
+	//   # ydiff -p cat -s --wrap --width={{columnWidth}}
-	//   # difft --color=always
+	//   pager: ""
-	//   command: ""
 	//
-	//   # Extra arguments (array of strings) passed to the git command. Only
+	//   # e.g. 'difft --color=always'
-	//   # applicable if the type is 'rawGit'.
+	//   externalDiffCommand: ""
-	//   args: []
 	//
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_DiffRenderers.md for more information.
+	//   # If true, Lazygit will use git's `diff.external` config for paging.
-	DiffRenderers []DiffRendererConfig `yaml:"diffRenderers"`
+	//   # The advantage over `externalDiffCommand` is that this can be
+	//   # configured per file type in .gitattributes; see
+	//   # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
+	//   useExternalDiffGitConfig: false
+	//
+	// 'pager', 'externalDiffCommand', and 'useExternalDiffGitConfig' are mutually exclusive; set at most one per entry.
+	//
+	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md for more information.
+	Pagers []PagingConfig `yaml:"pagers"`
 	// Config relating to committing
 	Commit CommitConfig `yaml:"commit"`
 	// Config relating to merging
@@ -360,34 +358,31 @@ type GitConfig struct {
 	TruncateCopiedCommitHashesTo int `yaml:"truncateCopiedCommitHashesTo"`
 }
 
-type DiffRendererCommandType string
+type PagerType string
 
-func (DiffRendererCommandType) JSONSchemaExtend(schema *jsonschema.Schema) {
+func (PagerType) JSONSchemaExtend(schema *jsonschema.Schema) {
 	schema.Examples = []any{
 		"delta --dark --paging=never",
 		"diff-so-fancy",
-		"ydiff -p cat",
+		"ydiff -p cat -s --wrap --width={{columnWidth}}",
-		"difft --color=always",
 	}
 }
 
 // [dev] This documentation is duplicated in the GitConfig struct. If you make changes here, make them there too.
-type DiffRendererConfig struct {
+type PagingConfig struct {
-	// The type of diff renderer. One of: 'stdinFilter' (default) | 'extDiff' | 'rawGit'
+	// A name for the pager, shown in the notification when cycling pagers. If not set, the name is derived from the first word of the pager command (or of the external diff command).
-	Type string `yaml:"type" jsonschema:"enum=stdinFilter,enum=extDiff,enum=rawGit"`
-	// A name for the diff renderer, shown in the notification when cycling renderers. If not set, the name is derived from the first word of the renderer command.
 	Name string `yaml:"name"`
-	// Value of the --color arg in the git diff command. Only used for type 'stdinFilter'. Some renderers want this to be set to 'always' and some want it set to 'never'.
+	// Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
 	ColorArg string `yaml:"colorArg" jsonschema:"enum=always,enum=never"`
-	// The command to use for rendering diffs. This is either a stdinFilter or an external diff command, depending on the type field; not applicable if the type is 'rawGit'.
 	// e.g.
 	// diff-so-fancy
 	// delta --dark --paging=never
-	// ydiff -p cat
+	// ydiff -p cat -s --wrap --width={{columnWidth}}
-	// difft --color=always
+	Pager PagerType `yaml:"pager"`
-	Command DiffRendererCommandType `yaml:"command"`
+	// e.g. 'difft --color=always'
-	// Extra arguments (array of strings) passed to the git command. Only applicable if the type is 'rawGit'.
+	ExternalDiffCommand string `yaml:"externalDiffCommand"`
-	Args []string `yaml:"args"`
+	// If true, Lazygit will use git's `diff.external` config for paging. The advantage over `externalDiffCommand` is that this can be configured per file type in .gitattributes; see https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
+	UseExternalDiffGitConfig bool `yaml:"useExternalDiffGitConfig"`
 }
 
 type CommitConfig struct {
@@ -529,23 +524,23 @@ type KeybindingUniversalConfig struct {
 	// Deprecated: add the key to `scrollUpMain` instead.
 	ScrollUpMainAlt2 Keybinding `yaml:"scrollUpMain-alt2"`
 	// Deprecated: add the key to `scrollDownMain` instead.
-	ScrollDownMainAlt2        Keybinding `yaml:"scrollDownMain-alt2"`
+	ScrollDownMainAlt2      Keybinding `yaml:"scrollDownMain-alt2"`
-	ExecuteShellCommand       Keybinding `yaml:"executeShellCommand"`
+	ExecuteShellCommand     Keybinding `yaml:"executeShellCommand"`
-	CreateRebaseOptionsMenu   Keybinding `yaml:"createRebaseOptionsMenu"`
+	CreateRebaseOptionsMenu Keybinding `yaml:"createRebaseOptionsMenu"`
-	Push                      Keybinding `yaml:"pushFiles"` // 'Files' appended for legacy reasons
+	Push                    Keybinding `yaml:"pushFiles"` // 'Files' appended for legacy reasons
-	Pull                      Keybinding `yaml:"pullFiles"` // 'Files' appended for legacy reasons
+	Pull                    Keybinding `yaml:"pullFiles"` // 'Files' appended for legacy reasons
-	Refresh                   Keybinding `yaml:"refresh"`
+	Refresh                 Keybinding `yaml:"refresh"`
-	CreatePatchOptionsMenu    Keybinding `yaml:"createPatchOptionsMenu"`
+	CreatePatchOptionsMenu  Keybinding `yaml:"createPatchOptionsMenu"`
-	NextTab                   Keybinding `yaml:"nextTab"`
+	NextTab                 Keybinding `yaml:"nextTab"`
-	PrevTab                   Keybinding `yaml:"prevTab"`
+	PrevTab                 Keybinding `yaml:"prevTab"`
-	NextScreenMode            Keybinding `yaml:"nextScreenMode"`
+	NextScreenMode          Keybinding `yaml:"nextScreenMode"`
-	PrevScreenMode            Keybinding `yaml:"prevScreenMode"`
+	PrevScreenMode          Keybinding `yaml:"prevScreenMode"`
-	CycleDiffRenderers        Keybinding `yaml:"cycleDiffRenderers"`
+	CyclePagers             Keybinding `yaml:"cyclePagers"`
-	CycleDiffRenderersReverse Keybinding `yaml:"cycleDiffRenderersReverse"`
+	CyclePagersReverse      Keybinding `yaml:"cyclePagersReverse"`
-	Undo                      Keybinding `yaml:"undo"`
+	Undo                    Keybinding `yaml:"undo"`
-	Redo                      Keybinding `yaml:"redo"`
+	Redo                    Keybinding `yaml:"redo"`
-	FilteringMenu             Keybinding `yaml:"filteringMenu"`
+	FilteringMenu           Keybinding `yaml:"filteringMenu"`
-	DiffingMenu               Keybinding `yaml:"diffingMenu"`
+	DiffingMenu             Keybinding `yaml:"diffingMenu"`
 	// Deprecated: add the key to `diffingMenu` instead.
 	DiffingMenuAlt                    Keybinding `yaml:"diffingMenu-alt"`
 	CopyToClipboard                   Keybinding `yaml:"copyToClipboard"`
@@ -927,8 +922,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 			PortraitModeAutoMinHeight:           46,
 			FilterMode:                          "substring",
 			Spinner: SpinnerConfig{
-				Frames: []string{"●∙∙", "∙●∙", "∙∙●", "∙●∙"},
+				Frames: []string{"|", "/", "-", "\\"},
-				Rate:   180,
+				Rate:   50,
 			},
 			StatusPanelView:              "dashboard",
 			SwitchToFilesAfterStashPop:   true,
@@ -1060,8 +1055,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 				PrevTab:                           Keybinding{"["},
 				NextScreenMode:                    Keybinding{"+"},
 				PrevScreenMode:                    Keybinding{"_"},
-				CycleDiffRenderers:                Keybinding{"|"},
+				CyclePagers:                       Keybinding{"|"},
-				CycleDiffRenderersReverse:         Keybinding{"\\"},
+				CyclePagersReverse:                Keybinding{"\\"},
 				Undo:                              Keybinding{"z"},
 				Redo:                              Keybinding{"Z"},
 				FilteringMenu:                     Keybinding{"<ctrl+s>"},

pkg/config/user_config_validation.go

@@ -46,7 +46,7 @@ func (config *UserConfig) Validate() error {
 		[]string{"always", "never", "when-maximised"}); err != nil {
 		return err
 	}
-	if err := validateDiffRenderers(config.Git.DiffRenderers); err != nil {
+	if err := validatePagers(config.Git.Pagers); err != nil {
 		return err
 	}
 	if err := validateKeybindings(config.Keybinding); err != nil {
@@ -110,26 +110,25 @@ func validateSpinner(spinner SpinnerConfig) error {
 	return nil
 }
 
-func validateDiffRenderers(diffRenderers []DiffRendererConfig) error {
+// validatePagers rejects pager entries that combine more than one diff
-	for _, diffRenderer := range diffRenderers {
+// mechanism. A pager (GIT_PAGER) formats the diff that git produces, whereas
-		switch diffRenderer.Type {
+// externalDiffCommand and useExternalDiffGitConfig change how git produces the
-		case "stdinFilter", "":
+// diff in the first place; piping one through the other almost always yields
-			if diffRenderer.Command == "" {
+// garbled output, so we treat the three as mutually exclusive.
-				return errors.New("git.diffRenderers: 'command' must be specified for diff renderer type 'stdinFilter'.")
+func validatePagers(pagers []PagingConfig) error {
-			}
+	for i, pager := range pagers {
-			if len(diffRenderer.Args) > 0 {
+		count := 0
-				return errors.New("git.diffRenderers: 'args' cannot be used with diff renderer type 'stdinFilter'.")
+		if pager.Pager != "" {
-			}
+			count++
-		case "extDiff":
+		}
-			if len(diffRenderer.Args) > 0 {
+		if pager.ExternalDiffCommand != "" {
-				return errors.New("git.diffRenderers: 'args' cannot be used with diff renderer type 'extDiff'.")
+			count++
-			}
+		}
-		case "rawGit":
+		if pager.UseExternalDiffGitConfig {
-			if diffRenderer.Command != "" {
+			count++
-				return errors.New("git.diffRenderers: 'command' cannot be used with diff renderer type 'rawGit'.")
+		}
-			}
+		if count > 1 {
-		default:
+			return fmt.Errorf("git.pagers[%d]: at most one of 'pager', 'externalDiffCommand', and 'useExternalDiffGitConfig' may be set; they are mutually exclusive", i)
-			return fmt.Errorf("git.diffRenderers: unknown type '%s'. Allowed values: stdinFilter, extDiff, rawGit", diffRenderer.Type)
 		}
 	}
 	return nil
@@ -191,51 +190,6 @@ func validateCustomCommandKey(key Keybinding) error {
 	return nil
 }
 
-// ValidCustomCommandContexts lists the names a custom command's 'context' may
-// use. It mirrors context.AllContextKeys in the gui package, which this package
-// can't import; a test over there keeps the two in sync.
-var ValidCustomCommandContexts = []string{
-	"global",
-	"status",
-	"files",
-	"localBranches",
-	"remotes",
-	"worktrees",
-	"remoteBranches",
-	"tags",
-	"commits",
-	"reflogCommits",
-	"subCommits",
-	"commitFiles",
-	"stash",
-	"normal",
-	"normalSecondary",
-	"staging",
-	"stagingSecondary",
-	"patchBuilding",
-	"patchBuildingSecondary",
-	"mergeConflicts",
-	"menu",
-	"confirmation",
-	"prompt",
-	"search",
-	"commitMessage",
-	"submodules",
-	"suggestions",
-	"cmdLog",
-}
-
-func validateCustomCommandContext(context string) error {
-	for _, name := range strings.Split(context, ",") {
-		name = strings.TrimSpace(name)
-		if !slices.Contains(ValidCustomCommandContexts, name) {
-			return fmt.Errorf("Unknown context '%s' for custom command. Allowed values: %s",
-				name, strings.Join(ValidCustomCommandContexts, ", "))
-		}
-	}
-	return nil
-}
-
 func validateCustomCommands(customCommands []CustomCommand) error {
 	for _, customCommand := range customCommands {
 		if err := validateCustomCommandKey(customCommand.Key); err != nil {
@@ -261,15 +215,6 @@ func validateCustomCommands(customCommands []CustomCommand) error {
 				return err
 			}
 		} else {
-			// A command in a menu may leave the context out, in which case it is
-			// offered whatever is focused; a top-level one may not, but that is
-			// only noticed when the keybindings are built.
-			if customCommand.Context != "" {
-				if err := validateCustomCommandContext(customCommand.Context); err != nil {
-					return err
-				}
-			}
-
 			for _, prompt := range customCommand.Prompts {
 				if err := validateCustomCommandPrompt(prompt); err != nil {
 					return err

pkg/config/user_config_validation_test.go

@@ -225,43 +225,6 @@ func TestUserConfigValidate_enums(t *testing.T) {
 				{value: "invalid_value", valid: false},
 			},
 		},
-		{
-			name: "Custom command context",
-			setup: func(config *UserConfig, value string) {
-				config.CustomCommands = []CustomCommand{
-					{
-						Context: value,
-					},
-				}
-			},
-			testCases: []testCase{
-				{value: "", valid: true},
-				{value: "global", valid: true},
-				{value: "commits", valid: true},
-				{value: "commits, subCommits", valid: true},
-				{value: "commits,subCommits", valid: true},
-				{value: "invalid_value", valid: false},
-				{value: "commits, invalid_value", valid: false},
-			},
-		},
-		{
-			name: "Custom command context in a sub menu",
-			setup: func(config *UserConfig, value string) {
-				config.CustomCommands = []CustomCommand{
-					{
-						Key: Keybinding{"X"},
-						CommandMenu: []CustomCommand{
-							{Key: Keybinding{"1"}, Command: "echo 'hello'", Context: value},
-						},
-					},
-				}
-			},
-			testCases: []testCase{
-				{value: "", valid: true},
-				{value: "commits", valid: true},
-				{value: "invalid_value", valid: false},
-			},
-		},
 		{
 			name: "Custom command sub menu",
 			setup: func(config *UserConfig, _ string) {
@@ -398,30 +361,26 @@ func TestUserConfigValidate_sidePanels(t *testing.T) {
 	}
 }
 
-func TestUserConfigValidate_diffRenderers(t *testing.T) {
+func TestUserConfigValidate_pagers(t *testing.T) {
 	scenarios := []struct {
-		name         string
+		name  string
-		diffRenderer DiffRendererConfig
+		pager PagingConfig
-		valid        bool
+		valid bool
 	}{
-		{name: "stdinFilter with type default", diffRenderer: DiffRendererConfig{Command: "delta"}, valid: true},
+		{name: "empty", pager: PagingConfig{}, valid: true},
-		{name: "stdinFilter with explicit type", diffRenderer: DiffRendererConfig{Type: "stdinFilter", Command: "delta"}, valid: true},
+		{name: "pager only", pager: PagingConfig{Pager: "delta"}, valid: true},
-		{name: "stdinFilter with explicit type", diffRenderer: DiffRendererConfig{Type: "stdinFilter"}, valid: false},
+		{name: "external diff command only", pager: PagingConfig{ExternalDiffCommand: "difft"}, valid: true},
-		{name: "stdinFilter with type default without command", diffRenderer: DiffRendererConfig{}, valid: false},
+		{name: "git config external diff only", pager: PagingConfig{UseExternalDiffGitConfig: true}, valid: true},
-		{name: "stdinFilter with args", diffRenderer: DiffRendererConfig{Type: "stdinFilter", Command: "delta", Args: []string{"-x"}}, valid: false},
+		{name: "pager and external diff command", pager: PagingConfig{Pager: "delta", ExternalDiffCommand: "difft"}, valid: false},
-		{name: "external diff", diffRenderer: DiffRendererConfig{Type: "extDiff", Command: "difft"}, valid: true},
+		{name: "pager and git config external diff", pager: PagingConfig{Pager: "delta", UseExternalDiffGitConfig: true}, valid: false},
-		{name: "external diff without command", diffRenderer: DiffRendererConfig{Type: "extDiff"}, valid: true},
+		{name: "both external diff mechanisms", pager: PagingConfig{ExternalDiffCommand: "difft", UseExternalDiffGitConfig: true}, valid: false},
-		{name: "external diff with args", diffRenderer: DiffRendererConfig{Type: "extDiff", Command: "difft", Args: []string{"-x"}}, valid: false},
+		{name: "all three", pager: PagingConfig{Pager: "delta", ExternalDiffCommand: "difft", UseExternalDiffGitConfig: true}, valid: false},
-		{name: "raw git", diffRenderer: DiffRendererConfig{Type: "rawGit"}, valid: true},
-		{name: "raw git with args", diffRenderer: DiffRendererConfig{Type: "rawGit", Args: []string{"-x"}}, valid: true},
-		{name: "raw git with command", diffRenderer: DiffRendererConfig{Type: "rawGit", Command: "delta"}, valid: false},
-		{name: "unknown type", diffRenderer: DiffRendererConfig{Type: "unknown"}, valid: false},
 	}
 
 	for _, s := range scenarios {
 		t.Run(s.name, func(t *testing.T) {
 			config := GetDefaultConfig()
-			config.Git.DiffRenderers = []DiffRendererConfig{s.diffRenderer}
+			config.Git.Pagers = []PagingConfig{s.pager}
 			err := config.Validate()
 
 			if s.valid {