Show base branches as bare names in labels

ShortBranchName previously turned "refs/remotes/origin/main" into "origin/main", leaking the resolved-ref shape into UI labels that the user thinks of as plain "main" — the name they put in their mainBranches config. With the ambiguous-base label now potentially listing several branches ("pick: origin/main, origin/13"), the noise is even more pronounced. Strip the remote name along with the "refs/remotes/" prefix so the short name matches what the user configured. Rename the helper to BaseBranchDisplayName to make the constraint explicit at every call site: dropping the remote is a sensible choice only for base-branch display, not for refs in general. All current callers happen to be base-branch related, so the rename is just a scope-tightening. Existing integration test updated to expect the bare "master" form.
Signal ambiguity in the move-commits-to-new-branch label and prompt
2026-09-29 10:36:45 -04:00 · 2026-07-03 19:37:37 +02:00 · 2026-07-03 19:37:37 +02:00 · 2026-07-03 19:37:37 +02:00 · 2026-07-03 19:37:37 +02:00 · 2026-07-03 19:37:37 +02:00
902 changed files with 19926 additions and 60210 deletions
@@ -0,0 +1,7 @@
+[codespell]
+# Ref: https://github.com/codespell-project/codespell#using-a-config-file
+skip = .git*,go.sum,*.lock,.codespellrc,vendor,translations,Keybindings_*.md,./pkg/gocui
+check-hidden = true
+# camel-cased
+ignore-regex = (\b[A-Za-z][a-z]*[A-Z]\S+\b|\.edn\b|\S+…|\\nd\b)
+ignore-words-list = fomrat,inbetween
@@ -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
@@ -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
-          # skips coverage: it's redundant with the non-race latest job and
-          # 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
+          # See https://go.dev/blog/integration-test-coverage
+          LAZYGIT_GOCOVERDIR: /tmp/code_coverage
        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

@@ -0,0 +1,25 @@
+# Codespell configuration is within .codespellrc
+---
+name: Codespell
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+permissions:
+  contents: read
+
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+      - name: Annotate locations with typos
+        uses: codespell-project/codespell-problem-matcher@9ba2c57125d4908eade4308f32c4ff814c184633 # v1.2.0
+      - name: Codespell
+        uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2
@@ -13,15 +13,10 @@ on:
        description: 'Version bump type'
        type: choice
        required: true
-        default: 'minor (normal)'
+        default: 'patch'
        options:
-          - minor (normal)
-          - patch (hotfix)
-      branch:
-        description: 'Branch to release from'
-        type: string
-        required: true
-        default: 'master'
+          - minor
+          - patch
      ignore_blocks:
        description: 'Ignore blocking PRs/issues'
        type: boolean
@@ -54,13 +49,12 @@ jobs:
        uses: actions/checkout@v7
        with:
          repository: jesseduffield/lazygit
-          ref: ${{ inputs.branch }}
          token: ${{ secrets.LAZYGIT_RELEASE_PAT }}
          fetch-depth: 0

      - name: Get Latest Tag
        run: |
-          latest_tag=$(git describe --tags --abbrev=0 || echo "v0.0.0")
+          latest_tag=$(git describe --tags $(git rev-list --tags --max-count=1) || echo "v0.0.0")

          if ! [[ $latest_tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
            echo "Error: Tag format is invalid. Expected format: vX.X.X"
@@ -127,7 +121,7 @@ jobs:
          IFS='.' read -r major minor patch <<< "$LATEST_TAG"

          if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then
-            if [[ "$VERSION_BUMP" == "patch (hotfix)" ]]; then
+            if [[ "$VERSION_BUMP" == "patch" ]]; then
              patch=$((patch + 1))
            else
              minor=$((minor + 1))
@@ -157,10 +151,10 @@ jobs:
          git config user.name "github-actions[bot]"
          git config user.email "github-actions[bot]@users.noreply.github.com"
          git tag "$NEW_TAG" -a -m "Release $NEW_TAG"
-          git push origin "refs/tags/$NEW_TAG"
+          git push origin "$NEW_TAG"

      - name: Setup Go
-        uses: actions/setup-go@v7
+        uses: actions/setup-go@v6
        with:
          go-version: 1.25.x

@@ -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"
@@ -99,6 +99,8 @@ linters:
    generated: lax
    presets:
      - comments
+      - common-false-positives
+      - legacy
      - std-error-handling
    paths:
      - vendor/
@@ -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
@@ -63,14 +45,9 @@ Prefer a fine-grained commit history. Commits should be as small as possible
 while still being meaningful and self-contained.

 - **Every commit must compile and pass all tests.** No "WIP" commits, no
-  commits that leave the tree broken and rely on a follow-up to fix it. A
-  `fixup!` is not such a follow-up; see "Iterate with `fixup!` commits" for
-  what one may leave broken until it is folded in.
+  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
@@ -84,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

@@ -122,46 +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.
-
-**A fixup may leave commits before it broken until it is folded in.** If a
-`fixup!` on an early commit deletes something that a later commit still uses,
-the later commit doesn't build until its own `fixup!`, right behind it, catches
-up; the same goes for lint. That is expected. The rules above about every
-commit compiling, testing and linting clean describe the history _after_
-autosquash, and I fold fixups in soon after reviewing them. Never amend a
-commit directly, or edit the commits between two fixups, to keep every commit
-of the un-squashed history green. The reviewable fixup is worth more than a
-green intermediate state. Verify at each fixup instead, since the tree there
-is what the folded-in history will have at that point, and say in the handoff
-which commits stay broken until which fixup.
-
-**After a mid-stack fixup, check every branch tip above it, not just the stack
-tip.** A fixup that deletes or renames something rewrites every commit replayed
-above it, and a commit further up can hide the damage at the tip. A helper
-whose last caller the fixup deleted is flagged as unused by `just lint` at the
-tip of its own PR, but a later PR that calls it again makes the stack tip lint
-clean. Each PR is reviewed and merged on its own, so each PR branch tip has to
-be green on its own. After the replay, run `just build`, `just unit-test` and
-`just lint` at each branch tip from the insertion point up. If the fixup deleted
-or renamed a symbol, also build every replayed commit, for example with
-`git -c rebase.autosquash=false rebase -x 'go build ./...' <insertion point>`;
-unchanged commits are fast-forwarded, so their hashes stay, and the commits a
-fixup is expected to leave broken stop it, so `git rebase --continue` past
-those.
-
 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
@@ -208,7 +130,7 @@ looks messy. The whole point of a fixup is that the iteration stays
 **visible and reviewable**; squashing it away yourself destroys exactly the
 artifact it exists to create. Collapsing fixups into their targets is the
 user's action, taken once they've reviewed the iterations. Every mention of
-`--autosquash` in this section describes what the _user_ will eventually
+`--autosquash` in this section describes what the *user* will eventually
 run, never a step for you to perform. If you think the history is ready to
 collapse, say so and leave it to them.

@@ -235,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
@@ -270,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
@@ -322,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
-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.
+Use this pattern only where it makes sense; don't apply it by default.

 ## Unify duplicated logic before you change it

@@ -345,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
@@ -434,7 +304,7 @@ column. Applies only to `pkg/i18n/english.go`.

 ## Code comments are for future readers, not development history

-Comments in source code explain _why this code is shaped the way it is_. They
+Comments in source code explain *why this code is shaped the way it is*. They
 are not the place to narrate the path we took during development — what was
 tried first, what didn't work, what's "more reliable" or "cleaner" than some
 alternative. That framing is interesting in the moment, but it's noise to
@@ -447,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
+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,
@@ -503,7 +353,7 @@ So:
  struct, run `just generate` and include the regenerated
  `docs-master/Config.md` (and `schema-master/config.json`) in your commit.
 - Don't hard-wrap the doc comments on `userConfig` fields. This applies
-  _only_ to `userConfig`, because those comments are fed through the doc
+  *only* to `userConfig`, because those comments are fed through the doc
  generator; comments on every other struct follow the normal Go wrapping
  conventions. For `userConfig` fields, write each sentence (or paragraph)
  as a single unwrapped line, however long — the generator re-wraps them for
@@ -520,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.
@@ -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.
- 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.
+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.

-### 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).
- 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.
+## Design principles

-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.
@@ -1,142 +0,0 @@
-// author_colors_repo creates a git repository for checking that the colors
-// lazygit gives to authors are readable.
-//
-// If gui.authorColors names no color for an author, lazygit derives one from a
-// hash of their name. The authors of an ordinary repository rarely land near the
-// edges of the range that this color is picked from. Every commit in the
-// repository created here is by an author at one of those edges: the lowest or
-// highest lightness, combined with the lowest or highest saturation, at twelve
-// hues around the color wheel. The commit subject says which edge it is.
-//
-// Usage:
-//
-//	go run ./cmd/author_colors_repo <path>
-//
-// Then open the repository with lazygit in each terminal theme you want to check.
-package main
-
-import (
-	"fmt"
-	"log"
-	"math"
-	"os"
-	"os/exec"
-	"time"
-
-	"github.com/jesseduffield/lazygit/pkg/gui/presentation/authors"
-)
-
-type extreme int
-
-const (
-	lowest extreme = iota
-	highest
-)
-
-func (self extreme) String() string {
-	if self == lowest {
-		return "min"
-	}
-	return "max"
-}
-
-func (self extreme) matches(fraction float64) bool {
-	if self == lowest {
-		return fraction < 0.01
-	}
-	return fraction >= 0.99
-}
-
-const (
-	numHues = 12
-
-	// Small enough that the windows of neighbouring hues don't overlap
-	hueTolerance = 0.02
-)
-
-type commit struct {
-	author  string
-	subject string
-}
-
-func main() {
-	if len(os.Args) != 2 {
-		log.Fatalf("usage: %s <path>", os.Args[0])
-	}
-	path := os.Args[1]
-	if _, err := os.Stat(path); err == nil {
-		log.Fatalf("%s already exists", path)
-	}
-
-	extremes := []extreme{lowest, highest}
-	commits := make([]commit, 0, len(extremes)*len(extremes)*numHues)
-	for _, lightness := range extremes {
-		for _, saturation := range extremes {
-			for i := range numHues {
-				hue := float64(i) / numHues
-				author, actualHue := findAuthor(lightness, saturation, hue)
-				subject := fmt.Sprintf("lightness %s, saturation %s, hue %.0f°", lightness, saturation, actualHue*360)
-				commits = append(commits, commit{author: author, subject: subject})
-			}
-		}
-	}
-
-	if err := runGit("", nil, "init", "-q", path); err != nil {
-		log.Fatal(err)
-	}
-
-	// Commit in reverse, so that the commits panel lists them in the order above
-	startTime := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
-	for i := range commits {
-		c := commits[len(commits)-1-i]
-		date := fmt.Sprintf("%d +0000", startTime.Add(time.Duration(i)*time.Hour).Unix())
-		env := []string{
-			"GIT_AUTHOR_NAME=" + c.author,
-			"GIT_AUTHOR_EMAIL=author@example.com",
-			"GIT_AUTHOR_DATE=" + date,
-			"GIT_COMMITTER_NAME=" + c.author,
-			"GIT_COMMITTER_EMAIL=author@example.com",
-			"GIT_COMMITTER_DATE=" + date,
-		}
-		if err := runGit(path, env, "commit", "-q", "--allow-empty", "-m", c.subject); err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	fmt.Printf("Created %s with %d commits\n", path, len(commits))
-}
-
-// findAuthor returns the first name of the form "L<lightness> S<saturation> <n>"
-// whose color lies at the given extremes of lightness and saturation, and close
-// to the given hue. It also returns the hue that the name lands on.
-//
-// Every name of this form has the same initials, so the color is the only
-// thing that differs between authors in the commits panel.
-func findAuthor(lightness extreme, saturation extreme, hue float64) (string, float64) {
-	for n := 1; ; n++ {
-		name := fmt.Sprintf("L%s S%s %d", lightness, saturation, n)
-		h, s, l := authors.ColorPosition(name)
-		if lightness.matches(l) && saturation.matches(s) && hueDistance(h, hue) <= hueTolerance {
-			return name, h
-		}
-	}
-}
-
-// hueDistance is the distance between two hues on the color wheel, where each
-// hue is a fraction of a full turn.
-func hueDistance(a float64, b float64) float64 {
-	d := math.Abs(a - b)
-	return math.Min(d, 1-d)
-}
-
-func runGit(dir string, env []string, args ...string) error {
-	cmd := exec.Command("git", args...)
-	cmd.Dir = dir
-	// Keep the user's git config out of it, so that hooks, commit signing and
-	// the like don't apply, and every run creates the same commits
-	cmd.Env = append(os.Environ(), "GIT_CONFIG_GLOBAL="+os.DevNull, "GIT_CONFIG_NOSYSTEM=1")
-	cmd.Env = append(cmd.Env, env...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
-}
@@ -37,6 +37,12 @@ This is only meant as a reference for what config options exist, and what their
 ```yaml
 # Config relating to the Lazygit UI
 gui:
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color
+  authorColors: {}
+
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
+  branchColorPatterns: {}
+
  # Custom icons for filenames and file extensions
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-files-icon--color
  customIcons:
@@ -60,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
-  # 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: 4

  # If true, capture mouse events.
@@ -72,7 +78,7 @@ gui:
  # If true, do not show a warning when amending a commit.
  skipAmendWarning: false

-  # If true, do not show a warning when discarding changes from a focused diff.
+  # 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
@@ -142,13 +148,14 @@ gui:
  # - 'top': split the window vertically (side panel on top, main view below)
  enlargedSideViewLocation: left

-  # If true, wrap lines in focused diffs to the width of the view. This makes it
-  # much easier to work with diffs that have long lines, e.g. paragraphs of
+  # 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.
-  wrapLinesInDiffView: true
+  wrapLinesInStagingView: true

-  # If true, hunk selection mode will be enabled by default when focusing a diff.
-  useHunkModeInDiffView: true
+  # If true, hunk selection mode will be enabled by default when entering the
+  # staging view.
+  useHunkModeInStagingView: true

  # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko'
  # | 'ru' | 'pt'
@@ -162,14 +169,6 @@ gui:
  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
  shortTimeFormat: 3:04PM

-  # Whether the terminal has a dark or a light background. This decides whether
-  # 'darkTheme' or 'lightTheme' applies, and the colors of authors are picked to
-  # stand out against it.
-  # One of: 'auto' (default) | 'dark' | 'light'
-  # With 'auto', lazygit asks the terminal, and assumes a dark background if the
-  # terminal doesn't tell.
-  colorScheme: auto
-
  # Config relating to colors and styles.
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes
  theme:
@@ -180,7 +179,7 @@ gui:

    # Border color of non-focused windows
    inactiveBorderColor:
-      - dim
+      - default

    # Border color of focused window when searching in that window
    searchingActiveBorderColor:
@@ -191,22 +190,14 @@ gui:
    optionsTextColor:
      - blue

-    # Color and attributes of the text of the selected line. The attributes are
-    # added to those of the text, and a color replaces the colors of the text.
-    # Set it to 'default' to leave the text as it is, e.g. if you don't want the
-    # selected line in bold.
-    selectedLineFgColor:
-      - bold
-
    # Background color of selected line.
-    # Default: 'blue' if the terminal has a dark background, or a suitable RGB blue
-    # computed from the background color if it is light.
    # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
-    selectedLineBgColor: []
+    selectedLineBgColor:
+      - blue

    # Background color of selected line when view doesn't have focus.
-    # Default: a suitable RGB grey computed from the terminal's background color.
-    inactiveViewSelectedLineBgColor: []
+    inactiveViewSelectedLineBgColor:
+      - bold

    # Foreground color of copied commit
    cherryPickedCommitFgColor:
@@ -232,22 +223,6 @@ gui:
    defaultFgColor:
      - default

-    # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color
-    authorColors: {}
-
-    # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
-    branchColorPatterns: {}
-
-  # Colors and styles that override those in 'theme' when the terminal has a dark
-  # background. It has the same fields as 'theme'.
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#themes-for-dark-and-light-backgrounds
-  darkTheme: {}
-
-  # Colors and styles that override those in 'theme' when the terminal has a light
-  # background. It has the same fields as 'theme'.
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#themes-for-dark-and-light-backgrounds
-  lightTheme: {}
-
  # Config relating to the commit length indicator
  commitLength:
    # If true, show an indicator of commit message length
@@ -361,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'
@@ -385,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'
-  #   # | 'rawGit'
-  #   type: "stdinFilter"
-  #
-  #   # 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.
+  #   # 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).
  #   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: "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
-  #   # difft --color=always
-  #   command: ""
+  #   # ydiff -p cat -s --wrap --width={{columnWidth}}
+  #   pager: ""
  #
-  #   # Extra arguments (array of strings) passed to the git command. Only
-  #   # applicable if the type is 'rawGit'.
-  #   args: []
+  #   # e.g. 'difft --color=always'
+  #   externalDiffCommand: ""
  #
-  # 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:
@@ -445,7 +419,9 @@ git:
    squashMergeMessage: Squash merge {{selectedRef}} into {{currentBranch}}

  # list of branches that are considered 'main' branches, used when displaying
-  # commits
+  # commits and for determining each branch's base. Lazygit prompts when a branch
+  # could be based on more than one of these (typical when one is regularly merged
+  # into another).
  mainBranches:
    - master
    - main
@@ -468,9 +444,7 @@ git:
  # If not "none", lazygit will automatically fast-forward local branches to match
  # their upstream after fetching. Applies to branches that are not the currently
  # checked out branch, and only to those that are strictly behind their upstream
-  # (as opposed to diverged). A branch that is checked out in another worktree is
-  # fast-forwarded there, unless that worktree has changes to tracked files or is
-  # in the middle of a rebase or bisect.
+  # (as opposed to diverged).
  # Possible values: 'none' | 'onlyMainBranches' | 'allBranches'
  autoForwardBranches: onlyMainBranches

@@ -697,7 +671,6 @@ keybinding:
      - "4"
      - "5"
    focusMainView: "0"
-    jumpToFile: <ctrl+g>
    nextMatch: "n"
    prevMatch: "N"
    startSearch: /
@@ -743,8 +716,8 @@ keybinding:
    prevTab: '['
    nextScreenMode: +
    prevScreenMode: _
-    cycleDiffRenderers: '|'
-    cycleDiffRenderersReverse: \
+    cyclePagers: '|'
+    cyclePagersReverse: \
    undo: z
    redo: Z
    filteringMenu: <ctrl+s>
@@ -845,8 +818,6 @@ keybinding:
  main:
    prevHunk: [<left>, h]
    nextHunk: [<right>, l]
-    prevFile: "N"
-    nextFile: "n"
    toggleSelectHunk: a
    pickBothHunks: b
    editSelectHunk: E
@@ -937,9 +908,7 @@ It is used, for example, when pasting a commit message into the commit message p

 ## Configuring File Editing

-There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file when you invoke it from a focused diff.
-
-You can also open a line in your editor with the mouse: alt-click or shift-click it. Both modifiers do the same thing, because some terminals only support one or the other. The click leaves the focus and the selection where they are, so it works while you are reading a diff from another panel, or while a popup is open.
+There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file if you invoke it from the staging panel, for example.

 To tell lazygit which editor to use for the `e` command, the easiest way to do that is to provide an editPreset config, e.g.

@@ -1002,7 +971,7 @@ When the selected line gets close to the bottom of the window and you hit down-a

 That's the behavior when `gui.scrollOffBehavior` is set to "margin" (the default). If you set `gui.scrollOffBehavior` to "jump", then upon reaching the last line of a view and hitting down-arrow the view will scroll by half a page so that the selection ends up in the middle of the view. This may feel a little jarring because the cursor jumps around when continuously moving down, but it has the advantage that the view doesn't scroll as often.

-This setting applies both to all list views (e.g. commits and branches etc), and to focused diffs.
+This setting applies both to all list views (e.g. commits and branches etc), and to the staging view.

 ## Filtering

@@ -1031,7 +1000,6 @@ The available attributes are:

 - bold
 - default
- dim # faint text; not supported by every terminal
 - reverse # useful for high-contrast
 - underline
 - strikethrough
@@ -1056,61 +1024,28 @@ gui:
      - reverse
 ```

-The text of the selected line is bold by default. If you don't want that, set `selectedLineFgColor` to `default`:
-
-```yaml
-gui:
-  theme:
-    selectedLineFgColor:
-      - default
-```
-
-## Themes for dark and light backgrounds
-
-The colors in `gui.theme` apply whether your terminal has a dark or a light background. If you want different colors for the two, set them in `gui.darkTheme` or `gui.lightTheme`. These have the same fields as `gui.theme`, and a field that you set in them overrides the one in `gui.theme`:
-
-```yaml
-gui:
-  theme:
-    activeBorderColor:
-      - green
-      - bold
-  lightTheme:
-    activeBorderColor:
-      - blue
-      - bold
-```
-
-For `authorColors` and `branchColorPatterns`, each entry overrides the one with the same key in `gui.theme`, and the other entries of `gui.theme` still apply. Branch color patterns of `gui.darkTheme` or `gui.lightTheme` come before those of `gui.theme`.
-
-Lazygit asks the terminal whether its background is dark or light. If your terminal doesn't tell, lazygit assumes a dark background; set `gui.colorScheme` to `light` if yours is light.
-
 ## Custom Author Color

 Lazygit will assign a random color for every commit author in the commits pane by default.

-These colors are picked to be readable against the background of your terminal, and lazygit asks the terminal whether its background is dark or light. If your terminal doesn't tell, lazygit assumes a dark background; set `gui.colorScheme` to `light` if yours is light.
-
 You can customize the color in case you're not happy with the randomly assigned one:

 ```yaml
 gui:
-  theme:
-    authorColors:
-      'John Smith': 'red' # use red for John Smith
-      'Alan Smithee': '#00ff00' # use green for Alan Smithee
+  authorColors:
+    'John Smith': 'red' # use red for John Smith
+    'Alan Smithee': '#00ff00' # use green for Alan Smithee
 ```

 You can use wildcard to set a unified color in case your are lazy to customize the color for every author or you just want a single color for all/other authors:

 ```yaml
 gui:
-  theme:
-    authorColors:
-      # use red for John Smith
-      'John Smith': 'red'
-      # use blue for other authors
-      '*': '#0000ff'
+  authorColors:
+    # use red for John Smith
+    'John Smith': 'red'
+    # use blue for other authors
+    '*': '#0000ff'
 ```

 ## Custom Branch Color
@@ -1119,16 +1054,13 @@ You can customize the color of branches based on branch patterns (regular expres

 ```yaml
 gui:
-  theme:
-    branchColorPatterns:
-      '^docs/': '#11aaff' # use a light blue for branches beginning with 'docs/'
-      'ISSUE-\d+': '#ff5733' # use a bright orange for branches containing 'ISSUE-<some-number>'
+  branchColorPatterns:
+    '^docs/': '#11aaff' # use a light blue for branches beginning with 'docs/'
+    'ISSUE-\d+': '#ff5733' # use a bright orange for branches containing 'ISSUE-<some-number>'
 ```

 Note that the regular expressions are not implicitly anchored to the beginning/end of the branch name. If you want to do that, add leading `^` and/or trailing `$` as needed.

-If several patterns match a branch, the first one wins.
-
 ## Custom Files Icon & Color

 You can customize the icon and color of files based on filenames or extensions:
@@ -1,93 +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.
-
-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.
-
-The `command` of a `stdinFilter` or `extDiff` renderer is a [Go template](https://pkg.go.dev/text/template) with these variables:
-
- `{{width}}`: the width of the view that the diff is rendered into.
- `{{colorScheme}}`: `dark` or `light`, depending on whether the terminal has a dark or a light background. Lazygit asks the terminal about this; if yours doesn't tell, set `gui.colorScheme`.
- `{{columnWidth}}` (only for `stdinFilter`): the width of one side of a side-by-side rendering, e.g. for `ydiff -p cat -s -w {{columnWidth}}`.
- `{{diffContext}}` (only for `extDiff`): lazygit's current diff context size, the value controlled by the `{`/`}` keybindings.
-
-A variable can also be written with a leading dot, as in `{{.width}}`. The command can use template expressions too; for example, `delta --paging=never {{if gt .width 160}}--side-by-side{{end}}` shows the diff side by side only when there is room for it, or `delta --syntax-theme={{if eq .colorScheme "light"}}Github{{else}}Dracula{{end}}` picks a different syntax theme based on the background.
-
-Here's an example for a multi-renderer setup:
-
-```yaml
-git:
-  diffRenderers:
-    - command: delta --{{colorScheme}} --paging=never
-    - command: ydiff -p cat
-      colorArg: never
-    - type: extDiff
-      command: difft --color=always --background={{colorScheme}} --context={{diffContext}}
-    - type: rawGit
-      args: [--color-words]
-      name: color-words
-    - type: rawGit # git's default diff
-      name: default
-```
-
-## Delta:
-
-```yaml
-git:
-  diffRenderers:
-    - command: delta --{{colorScheme}} --paging=never
-```
-
-![](https://i.imgur.com/QJpQkF3.png)
-
-`--{{colorScheme}}` passes `--dark` or `--light` to delta, so that it matches the background of your terminal.
-
-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 --{{colorScheme}} --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)
@@ -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.
@@ -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)
@@ -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.
@@ -16,36 +16,3 @@ branches properly stacked onto it.
 Lazygit visualizes the individual branch heads in the stack by marking them with a
 cyan asterisk (or a cyan branch symbol if you are using [nerd
 fonts](Config.md#display-nerd-fonts-icons)).
-
-When you push the topmost branch of the stack with `P`, and the branches below
-it have commits that haven't been pushed yet, lazygit offers to push them along
-with it. After rebasing the stack this saves you from checking out and
-force-pushing every branch one by one; you are asked to confirm the force push
-once for all of them. Only branches that already have an upstream are included.
-Each of them is pushed to where `git push` would push it if it were checked out,
-so your push configuration applies to them as usual.
-
-When somebody else rebases the stack and force-pushes it, all your branches
-show up as diverged, for example `↓5↑3`, even though the commits they are ahead
-by are only the old versions of the ones that are now on the remote. Lazygit
-tells this apart from a branch that carries work of your own, and shows the
-divergence dimmed for such a branch. Pressing `f` on it resets it to its
-upstream instead of refusing, so you don't have to check the branch out and pull
-it. Lazygit only does this when every commit of the branch was on its remote
-branch at some point. It finds that out from the reflog of the remote-tracking
-branch. Reflogs are enabled by default, except in a bare repository; if you work
-in one with linked worktrees, set `core.logAllRefUpdates` to true there to make
-this work.
-
-`f` works on a [range selection](Range_Select.md) too, so you can select the
-whole stack and bring all of it back in sync at once. If any of the selected
-branches can't be updated, none of them is, so that you don't end up with half
-of the stack updated.
-
-Alternatively, check out the topmost branch of the stack and pull it with `p`.
-If branches below it can be updated this way, or are simply behind their
-upstream, lazygit offers to update them along with it. Lazygit decides this
-from the last fetch, so a branch whose changes on the remote haven't been
-fetched yet isn't offered; with auto-fetch turned off, pull a second time after
-the first pull has fetched them. Branches that are checked out in another
-worktree are left alone. The topmost branch itself is pulled as usual.
@@ -31,6 +31,7 @@
 * `pkg/gui/keybindings`: Contains code for mapping between keybindings and their labels
 * `pkg/gui/mergeconflicts`: Contains code relating to the handling of merge conflicts
 * `pkg/gui/modes`: Contains code relating to the state of different modes e.g. cherry picking mode, rebase mode.
+* `pkg/gui/patch_exploring`: Contains code relating to the state of patch-oriented views like the staging view.
 * `pkg/gui/popup`: Contains code that lets you easily raise popups
 * `pkg/gui/presentation`: Contains presentation code i.e. code concerned with rendering content inside views
 * `pkg/gui/services/custom_commands`: Contains code related to user-defined custom commands.
@@ -10,8 +10,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Scroll up main window |  |
 | `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Scroll down main window |  |
 | `` @ `` | 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 the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. If other branches are stacked below the current one and have commits to push, you are offered to push those too. |
-| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. If other branches are stacked below the current one and have changed on the remote, you are offered to update those too. |
+| `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
+| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
 | `` ) `` | 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'. |
@@ -22,9 +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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | 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. |
@@ -66,7 +65,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Enter file / Toggle directory collapsed | 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. |
 | `` ` `` | Toggle file tree view | 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 |
@@ -150,7 +149,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | View stash options | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Stage all | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Focus file diff / Collapse directory | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Stage lines / Collapse directory | 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 `` | Discard | View options for discarding changes to the selected file. |
 | `` g `` | View upstream reset options |  |
 | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
@@ -190,7 +189,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` d `` | Delete | View delete options for local/remote branch. |
 | `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
 | `` M `` | Merge | View options for merging the selected item into the current branch (regular merge, squash merge) |
-| `` f `` | Fast-forward | Fast-forward selected branch from its upstream. If the branch has diverged from its upstream because the upstream branch was rewritten, and it has no commits of its own, it is reset to its upstream instead. This needs reflogs to be enabled; a bare repository doesn't keep them by default (core.logAllRefUpdates). |
+| `` f `` | Fast-forward | Fast-forward selected branch from its upstream. |
 | `` T `` | New tag |  |
 | `` s `` | Sort order |  |
 | `` g `` | Reset |  |
@@ -223,21 +222,42 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Scroll down |  |
 | `` <mouse wheel up> (fn+down) `` | Scroll up |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | Toggle range select |  |
-| `` e `` | Edit file | Open file in external editor. |
-| `` <space> `` | Stage | Toggle selection staged / unstaged. |
-| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
+| `` / `` | Search the current view by text |  |
+
+## Main panel (patch building)
+
+| Key | Action | Info |
+|-----|--------|-------------|
 | `` <left>, h `` | Go to previous hunk |  |
 | `` <right>, l `` | Go to next hunk |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | Exit back to side panel |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` o `` | Open file | Open file in default application. |
+| `` e `` | Edit file | Open file in external editor. |
+| `` <space> `` | Toggle lines in patch |  |
+| `` 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> `` | Exit custom patch builder |  |
+| `` / `` | Search the current view by text |  |
+
+## Main panel (staging)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Go to previous hunk |  |
+| `` <right>, l `` | Go to next hunk |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <space> `` | Stage | Toggle selection staged / unstaged. |
+| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | Open file | Open file in default application. |
+| `` e `` | Edit file | Open file in external editor. |
+| `` <esc> `` | Return to files panel |  |
+| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
+| `` E `` | Edit hunk | Edit selected hunk in external editor. |
 | `` c `` | Commit | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |
 | `` C `` | Commit changes using git editor |  |
@@ -307,25 +327,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | Toggle range select |  |
-| `` e `` | Edit file | Open file in external editor. |
-| `` <space> `` | Stage | Toggle selection staged / unstaged. |
-| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | Go to previous hunk |  |
-| `` <right>, l `` | Go to next hunk |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Commit | Commit staged changes. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` C `` | Commit changes using git editor |  |
-| `` <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> |
 | `` / `` | Search the current view by text |  |

 ## Stash
@@ -22,9 +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. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |
@@ -115,7 +114,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` <space> `` | パッチに含めるファイルを切り替え | ファイルがカスタムパッチに含まれるかどうかを切り替えます。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 |
 | `` a `` | すべてのファイルを切り替え | コミットのすべてのファイルをカスタムパッチに追加/削除します。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | ファイルに入る / ディレクトリの折りたたみを切り替える | ファイルが選択されている場合、そのファイルに入ってカスタムパッチに個々の行を追加/削除できます。ディレクトリが選択されている場合、ディレクトリを切り替えます。 |
 | `` ` `` | ファイルツリービューを切り替え | ファイル表示をフラット表示とツリー表示で切り替えます。フラット表示はすべてのファイルパスを一覧で表示し、ツリー表示はディレクトリごとにファイルをグループ化します。<br><br>デフォルトは設定ファイル内の 'gui.showFileTree' キーで変更できます。 |
 | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます |
 | `` = `` | すべてのファイルを展開 | ファイルツリー内のすべてのディレクトリを展開します |
@@ -192,25 +191,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | 範囲選択を切り替え |  |
-| `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
-| `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
-| `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
-| `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 前のハンクに移動 |  |
-| `` <right>, l `` | 次のハンクに移動 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
 | `` <esc> `` | サイドパネルに戻る |  |
-| `` c `` | コミット | ステージされた変更をコミットします。 |
-| `` w `` | pre-commitフックなしで変更をコミット |  |
-| `` C `` | Gitエディタを使用して変更をコミット |  |
-| `` <ctrl+f> `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 現在のビューをテキストで検索 |  |

 ## タグ
@@ -262,6 +244,44 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 0 `` | メインビューにフォーカス |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

+## メインパネル（ステージング）
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 前のハンクに移動 |  |
+| `` <right>, l `` | 次のハンクに移動 |  |
+| `` v `` | 範囲選択を切り替え |  |
+| `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
+| `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
+| `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
+| `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 |
+| `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
+| `` <esc> `` | ファイルパネルに戻る |  |
+| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
+| `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
+| `` c `` | コミット | ステージされた変更をコミットします。 |
+| `` w `` | pre-commitフックなしで変更をコミット |  |
+| `` C `` | Gitエディタを使用して変更をコミット |  |
+| `` <ctrl+f> `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | 現在のビューをテキストで検索 |  |
+
+## メインパネル（パッチ作成）
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 前のハンクに移動 |  |
+| `` <right>, l `` | 次のハンクに移動 |  |
+| `` v `` | 範囲選択を切り替え |  |
+| `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
+| `` o `` | ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 |
+| `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
+| `` <space> `` | パッチ内の行を切り替え |  |
+| `` 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> `` | カスタムパッチビルダーを終了 |  |
+| `` / `` | 現在のビューをテキストで検索 |  |
+
 ## メインパネル（マージ中）

 | Key | Action | Info |
@@ -284,25 +304,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> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | 範囲選択を切り替え |  |
-| `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
-| `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
-| `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
-| `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 前のハンクに移動 |  |
-| `` <right>, l `` | 次のハンクに移動 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
 | `` <esc> `` | サイドパネルに戻る |  |
-| `` c `` | コミット | ステージされた変更をコミットします。 |
-| `` w `` | pre-commitフックなしで変更をコミット |  |
-| `` C `` | Gitエディタを使用して変更をコミット |  |
-| `` <ctrl+f> `` | フィックスアップのベースコミットを検索 | 現在の変更が基づいているコミットを見つけて、コミットの修正/フィックスアップを行います。これにより、ブランチのコミットを一つずつ確認して、どのコミットを修正/フィックスアップすべきかを調べる手間が省けます。詳細はドキュメントを参照: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 現在のビューをテキストで検索 |  |

 ## メニュー
@@ -10,8 +10,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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 `` | 푸시 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. If other branches are stacked below the current one and have commits to push, you are offered to push those too. |
-| `` p `` | 업데이트 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. If other branches are stacked below the current one and have changed on the remote, you are offered to update those too. |
+| `` P `` | 푸시 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
+| `` p `` | 업데이트 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
 | `` ) `` | 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'. |
 | `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | 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'. |
@@ -22,9 +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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -84,25 +83,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | 드래그 선택 전환 |  |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
-| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 이전 hunk를 선택 |  |
-| `` <right>, l `` | 다음 hunk를 선택 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
-| `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
-| `` <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> |
 | `` / `` | 검색 시작 |  |

 ## Stash
@@ -179,21 +161,42 @@ _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> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | 드래그 선택 전환 |  |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
-| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
+| `` / `` | 검색 시작 |  |
+
+## 메인 패널 (Patch Building)
+
+| Key | Action | Info |
+|-----|--------|-------------|
 | `` <left>, h `` | 이전 hunk를 선택 |  |
 | `` <right>, l `` | 다음 hunk를 선택 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | Exit back to side panel |  |
+| `` v `` | 드래그 선택 전환 |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
+| `` o `` | 파일 닫기 | Open file in default application. |
+| `` e `` | 파일 편집 | Open file in external editor. |
+| `` <space> `` | Line(s)을 패치에 추가/삭제 |  |
+| `` 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> `` | Exit custom patch builder |  |
+| `` / `` | 검색 시작 |  |
+
+## 메인 패널 (Staging)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 이전 hunk를 선택 |  |
+| `` <right>, l `` | 다음 hunk를 선택 |  |
+| `` v `` | 드래그 선택 전환 |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
+| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
+| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | 파일 닫기 | Open file in default application. |
+| `` e `` | 파일 편집 | Open file in external editor. |
+| `` <esc> `` | 파일 목록으로 돌아가기 |  |
+| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
+| `` E `` | Edit hunk | Edit selected hunk in external editor. |
 | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
 | `` w `` | Commit changes without pre-commit hook |  |
 | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
@@ -220,7 +223,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` d `` | 삭제 | View delete options for local/remote branch. |
 | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. |
 | `` M `` | 현재 브랜치에 병합 | View options for merging the selected item into the current branch (regular merge, squash merge) |
-| `` f `` | Fast-forward this branch from its upstream | Fast-forward selected branch from its upstream. If the branch has diverged from its upstream because the upstream branch was rewritten, and it has no commits of its own, it is reset to its upstream instead. This needs reflogs to be enabled; a bare repository doesn't keep them by default (core.logAllRefUpdates). |
+| `` f `` | Fast-forward this branch from its upstream | Fast-forward selected branch from its upstream. |
 | `` T `` | 태그를 생성 |  |
 | `` s `` | Sort order |  |
 | `` g `` | View reset options |  |
@@ -342,7 +345,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | 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. |
 | `` ` `` | 파일 트리뷰로 전환 | 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 |
@@ -392,7 +395,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Stash 옵션 보기 | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | 모든 변경을 Staged/unstaged으로 전환 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | 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 `` | View 'discard changes' options | View options for discarding changes to the selected file. |
 | `` g `` | View upstream reset options |  |
 | `` D `` | 초기화 | View reset options for working tree (e.g. nuking the working tree). |
@@ -9,32 +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. |
-| `` 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. |
+| `` @ `` | 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 the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
+| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
 | `` ) `` | 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. |
+| `` m `` | Bekijk merge/rebase opties | View options to abort/continue/skip the current 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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | 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'. |
-| `` <alt+shift+c> `` | Verander config bestand | Open bestand in externe editor. |
+| `` q, <ctrl+c> `` | Quit |  |
+| `` <ctrl+z> `` | Suspend the application |  |
+| `` <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 file in external 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

@@ -48,8 +47,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <shift+down> `` | Range select down |  |
 | `` <shift+up> `` | Range select up |  |
 | `` / `` | Start met zoeken |  |
-| `` H `` | Scroll naar links |  |
-| `` L `` | Scroll naar rechts |  |
+| `` H `` | Scroll left |  |
+| `` L `` | Scroll right |  |
 | `` ] `` | Volgende tabblad |  |
 | `` [ `` | Vorige tabblad |  |

@@ -59,30 +58,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer de bestandsnaam naar het klembord |  |
 | `` <space> `` | Toggle staged | Toggle staged for selected file. |
-| `` <ctrl+b> `` | Filter bestanden op status |  |
-| `` y `` | Kopieer naar klembord |  |
-| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
+| `` <ctrl+b> `` | Filter files by status |  |
+| `` y `` | Copy to clipboard |  |
+| `` c `` | Commit veranderingen | Commit staged changes. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
 | `` A `` | Wijzig laatste commit |  |
 | `` C `` | Commit veranderingen met de git editor |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open bestand in externe editor. |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
+| `` <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 `` | Edit | Open file in external editor. |
+| `` o `` | Open bestand | Open file in default application. |
 | `` i `` | Ignore or exclude file |  |
 | `` r `` | Refresh bestanden |  |
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Bekijk stash opties | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Toggle staged alle | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Stage individuele hunks/lijnen | 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 `` | Bekijk 'veranderingen ongedaan maken' opties | View options for discarding changes to the selected file. |
 | `` g `` | Bekijk upstream reset opties |  |
-| `` D `` | Resetten | View reset options for working tree (e.g. nuking the working tree). |
+| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
 | `` ` `` | Toggle bestandsboom weergave | 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> `` | Open externe diff applicatie (git difftool) |  |
-| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` f `` | Fetch | Fetch changes from remote. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
-| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit |
+| `` = `` | Expand all files | Expand all directories in the file tree |
 | `` 0 `` | Focus main view |  |
 | `` / `` | Filter the current view by text |  |

@@ -92,7 +91,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <enter> `` | Bevestig |  |
 | `` <esc> `` | Sluiten |  |
-| `` <ctrl+o> `` | Kopieer naar klembord |  |
+| `` <ctrl+o> `` | Copy to clipboard |  |

 ## Branches

@@ -100,27 +99,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer branch name naar klembord |  |
 | `` i `` | Laat git-flow opties zien |  |
-| `` <space> `` | Uitchecken | Geselecteerd item uitchecken. |
+| `` <space> `` | Uitchecken | Checkout selected item. |
 | `` n `` | Nieuwe branch |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
+| `` 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 `` | New worktree |  |
 | `` o `` | Maak een pull-request |  |
 | `` O `` | Bekijk opties voor pull-aanvraag |  |
 | `` G `` | Open pull request in browser |  |
 | `` <ctrl+y> `` | Kopieer de URL van het pull-verzoek naar het klembord |  |
 | `` c `` | Uitchecken bij naam | Checkout by name. In the input box you can enter '-' to switch to the previous branch. |
-| `` - `` | Vorige branch uitchecken |  |
+| `` - `` | Checkout previous branch |  |
 | `` F `` | Forceer checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Verwijderen | View delete options for local/remote branch. |
-| `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. |
+| `` d `` | Delete | View delete options for local/remote branch. |
+| `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
 | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) |
-| `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. If the branch has diverged from its upstream because the upstream branch was rewritten, and it has no commits of its own, it is reset to its upstream instead. This needs reflogs to be enabled; a bare repository doesn't keep them by default (core.logAllRefUpdates). |
+| `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. |
 | `` T `` | Creëer tag |  |
 | `` s `` | Sort order |  |
 | `` g `` | Bekijk reset opties |  |
 | `` R `` | Hernoem branch |  |
 | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
 | `` / `` | Filter the current view by text |  |
@@ -137,18 +136,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer de bestandsnaam naar het klembord |  |
-| `` y `` | Kopieer naar klembord |  |
+| `` y `` | Copy to clipboard |  |
 | `` c `` | Uitchecken | Bestand uitchecken |
 | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | Uitsluit deze commit zijn veranderingen aan dit bestand |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
-| `` e `` | Edit | Open bestand in externe editor. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` o `` | Open bestand | Open file in default application. |
+| `` e `` | Edit | Open file in external editor. |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | 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. |
 | `` ` `` | Toggle bestandsboom weergave | 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 |
-| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit |
+| `` = `` | Expand all files | Expand all directories in the file tree |
 | `` 0 `` | Focus main view |  |
 | `` / `` | Filter the current view by text |  |

@@ -162,33 +161,33 @@ _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 |
-| `` 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`. |
+| `` e `` | Edit (start interactive rebase) | Wijzig commit |
+| `` 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 `` | Tag commit | Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving. |
-| `` <ctrl+l> `` | Log opties weergeven | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
+| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
+| `` 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> `` | 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 |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
+| `` 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 `` | New worktree |  |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Kopieer commit (cherry-pick) | 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> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk gecommite bestanden |  |
@@ -220,9 +219,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <left>, h `` | Selecteer voorgaand conflict |  |
 | `` <right>, l `` | Selecteer volgende conflict |  |
 | `` z `` | Ongedaan maken | Undo last merge conflict resolution. |
-| `` e `` | Verander bestand | Open bestand in externe editor. |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
-| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. |
+| `` e `` | Verander bestand | Open file in external editor. |
+| `` o `` | Open bestand | Open file in default application. |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Ga terug naar het bestanden paneel |  |

 ## Normaal
@@ -231,25 +230,24 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Scroll omlaag |  |
 | `` <mouse wheel up> (fn+down) `` | Scroll omhoog |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
-| `` v `` | Toggle drag selecteer |  |
-| `` e `` | Verander bestand | Open bestand in externe editor. |
-| `` <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. |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
+| `` / `` | Start met zoeken |  |
+
+## Patch bouwen
+
+| Key | Action | Info |
+|-----|--------|-------------|
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
-| `` w `` | Commit veranderingen zonder pre-commit hook |  |
-| `` C `` | Commit veranderingen met de git editor |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` v `` | Toggle drag selecteer |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` o `` | Open bestand | Open file in default application. |
+| `` e `` | Verander bestand | Open file in external editor. |
+| `` <space> `` | Voeg toe/verwijder lijn(en) in patch |  |
+| `` 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> `` | Sluit lijn-bij-lijn modus |  |
 | `` / `` | Start met zoeken |  |

 ## Reflog
@@ -257,16 +255,16 @@ _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 |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
+| `` 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 `` | New worktree |  |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Kopieer commit (cherry-pick) | 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> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
@@ -277,16 +275,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer branch name naar klembord |  |
-| `` <space> `` | Uitchecken | Geselecteerde remote branch uitchecken als nieuwe locale branch of als detached head. |
+| `` <space> `` | Uitchecken | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | Nieuwe branch |  |
 | `` 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. |
-| `` u `` | Instellen als upstream | Stel in als upstream van uitgecheckte branch |
+| `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
+| `` d `` | Delete | Delete the remote branch from the remote. |
+| `` u `` | Set as 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. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
 | `` / `` | Filter the current view by text |  |
@@ -295,9 +293,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <enter> `` | Bekijk branches |  |
+| `` <enter> `` | View 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 `` | Remove | 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. |
@@ -307,25 +305,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
-| `` v `` | Toggle drag selecteer |  |
-| `` e `` | Verander bestand | Open bestand in externe editor. |
-| `` <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. |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
+| `` / `` | Start met zoeken |  |
+
+## Staging
+
+| Key | Action | Info |
+|-----|--------|-------------|
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
+| `` v `` | Toggle drag selecteer |  |
+| `` 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. |
+| `` o `` | Open bestand | Open file in default application. |
+| `` e `` | Verander bestand | Open file in external editor. |
+| `` <esc> `` | Ga terug naar het bestanden paneel |  |
+| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
+| `` E `` | Edit hunk | Edit selected hunk in external editor. |
+| `` c `` | Commit veranderingen | Commit staged changes. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
 | `` C `` | Commit veranderingen met de git editor |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <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> |
 | `` / `` | Start met zoeken |  |

 ## Stash
@@ -337,7 +340,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` d `` | Laten vallen | Remove the stash entry from the stash list. |
 | `` n `` | Nieuwe branch | 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 `` | New worktree |  |
-| `` r `` | Hernoem stash |  |
+| `` r `` | Rename stash |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk gecommite bestanden |  |
 | `` / `` | Filter the current view by text |  |
@@ -346,7 +349,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` e `` | Verander config bestand | Open bestand in externe editor. |
+| `` e `` | Verander config bestand | Open file in external editor. |
 | `` u `` | Check voor updates |  |
 | `` <enter> `` | Wissel naar een recente repo |  |
 | `` a `` | Show/cycle all branch logs |  |
@@ -358,16 +361,16 @@ _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 |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
+| `` 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 `` | New worktree |  |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Kopieer commit (cherry-pick) | 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> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk gecommite bestanden |  |
@@ -379,7 +382,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer submodule naam naar klembord |  |
 | `` <enter> `` | Enter | Enter submodule |
-| `` d `` | Verwijderen | Remove the selected submodule and its corresponding directory. |
+| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
 | `` u `` | Update | Update selected submodule. |
 | `` n `` | Voeg nieuwe submodule toe |  |
 | `` e `` | Update submodule URL |  |
@@ -392,13 +395,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <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. |
+| `` <space> `` | Uitchecken | Checkout the selected tag as a detached HEAD. |
+| `` 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. |
-| `` g `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` d `` | Delete | View delete options for local/remote tag. |
+| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
+| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
 | `` / `` | Filter the current view by text |  |
@@ -409,6 +412,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` n `` | New worktree |  |
 | `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Openen in editor |  |
-| `` d `` | Verwijderen | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
+| `` o `` | Open in editor |  |
+| `` 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. |
 | `` / `` | Filter the current view by text |  |
@@ -22,9 +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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | 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. |
@@ -99,25 +98,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | Przełącz zaznaczenie zakresu |  |
-| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
-| `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
-| `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
-| `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
-| `` <right>, l `` | Idź do następnego fragmentu |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
 | `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
-| `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
-| `` C `` | Zatwierdź zmiany używając edytora git |  |
-| `` <ctrl+f> `` | Znajdź bazowy commit do poprawki | Znajdź commit, na którym opierają się Twoje obecne zmiany, w celu poprawienia/zmiany commita. To pozwala Ci uniknąć przeglądania commitów w Twojej gałęzi jeden po drugim, aby zobaczyć, który commit powinien być poprawiony/zmieniony. Zobacz dokumentację: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Szukaj w bieżącym widoku po tekście |  |

 ## Drzewa pracy
@@ -150,6 +132,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | Pokaż commity |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |

+## Główny panel (budowanie łatki)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
+| `` <right>, l `` | Idź do następnego fragmentu |  |
+| `` v `` | Przełącz zaznaczenie zakresu |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
+| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
+| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
+| `` <space> `` | Przełącz linie w łatce |  |
+| `` 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> `` | Wyjdź z budowniczego niestandardowej łatki |  |
+| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+
 ## Input prompt

 | Key | Action | Info |
@@ -202,25 +200,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Przewiń w dół |  |
 | `` <mouse wheel up> (fn+down) `` | Przewiń w górę |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | Przełącz zaznaczenie zakresu |  |
-| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
-| `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
-| `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
-| `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
-| `` <right>, l `` | Idź do następnego fragmentu |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
 | `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
-| `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
-| `` C `` | Zatwierdź zmiany używając edytora git |  |
-| `` <ctrl+f> `` | Znajdź bazowy commit do poprawki | Znajdź commit, na którym opierają się Twoje obecne zmiany, w celu poprawienia/zmiany commita. To pozwala Ci uniknąć przeglądania commitów w Twojej gałęzi jeden po drugim, aby zobaczyć, który commit powinien być poprawiony/zmieniony. Zobacz dokumentację: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Szukaj w bieżącym widoku po tekście |  |

 ## Panel główny (scalanie)
@@ -239,6 +220,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Wróć do panelu plików |  |

+## Panel główny (zatwierdzanie)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
+| `` <right>, l `` | Idź do następnego fragmentu |  |
+| `` v `` | Przełącz zaznaczenie zakresu |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
+| `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
+| `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
+| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
+| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
+| `` <esc> `` | Wróć do panelu plików |  |
+| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
+| `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
+| `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
+| `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
+| `` C `` | Zatwierdź zmiany używając edytora git |  |
+| `` <ctrl+f> `` | Znajdź bazowy commit do poprawki | Znajdź commit, na którym opierają się Twoje obecne zmiany, w celu poprawienia/zmiany commita. To pozwala Ci uniknąć przeglądania commitów w Twojej gałęzi jeden po drugim, aby zobaczyć, który commit powinien być poprawiony/zmieniony. Zobacz dokumentację: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | Szukaj w bieżącym widoku po tekście |  |
+
 ## Panel potwierdzenia

 | Key | Action | Info |
@@ -293,7 +296,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` <space> `` | Przełącz plik włączony w łatkę | Przełącz, czy plik jest włączony w niestandardową łatkę. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Przełącz wszystkie pliki | Dodaj/usuń wszystkie pliki commita do niestandardowej łatki. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Wejdź do pliku / Przełącz zwiń katalog | Jeśli plik jest wybrany, wejdź do pliku, aby móc dodawać/usuwać poszczególne linie do niestandardowej łatki. Jeśli wybrany jest katalog, przełącz katalog. |
 | `` ` `` | Przełącz widok drzewa plików | 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 |
@@ -22,9 +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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | 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. |
@@ -149,7 +148,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` <space> `` | Alternar entre o arquivo incluído no patch | Alternar se o arquivo está incluído no patch personalizado. Veja https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Alternar todos os arquivos | Adicionar/remover todos os arquivos de commit para atualização personalizada. Consulte https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | Insira o arquivo / Alternar diretório recolhido | Se um arquivo estiver selecionado, insira o arquivo para que você possa adicionar/remover linhas individuais no patch personalizado. Se um diretório for selecionado, ative o diretório. |
 | `` ` `` | Alternar exibição de árvore de arquivo | 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'. |
 | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos |
 | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo |
@@ -235,21 +234,26 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Rolar para baixo |  |
 | `` <mouse wheel up> (fn+down) `` | Rolar para cima |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
-| `` v `` | Toggle range select |  |
-| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
-| `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
-| `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
-| `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
+| `` <esc> `` | Exit back to side panel |  |
+| `` / `` | Pesquisar na visualização atual por texto |  |
+
+## Painel Principal (preparação)
+
+| Key | Action | Info |
+|-----|--------|-------------|
 | `` <left>, h `` | Ir para o local anterior |  |
 | `` <right>, l `` | Ir para o próximo trecho |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | Exit back to side panel |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
+| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
+| `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
+| `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
+| `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
+| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
+| `` <esc> `` | Retornar ao painel de arquivos |  |
+| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
+| `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
 | `` c `` | Commit | Submeter mudanças em staging |
 | `` w `` | Fazer commit de alterações sem pré-commit |  |
 | `` C `` | Enviar alteração usando um editor Git |  |
@@ -280,6 +284,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Retornar ao painel de arquivos |  |

+## Painel principal (patch build)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Ir para o local anterior |  |
+| `` <right>, l `` | Ir para o próximo trecho |  |
+| `` v `` | Toggle range select |  |
+| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
+| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
+| `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
+| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
+| `` <space> `` | Alternar linhas no caminho |  |
+| `` d `` | Remover linhas do 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> `` | Sair do construtor de patch personalizado |  |
+| `` / `` | Pesquisar na visualização atual por texto |  |
+
 ## Reflog

 | Key | Action | Info |
@@ -316,25 +336,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
-| `` v `` | Toggle range select |  |
-| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
-| `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
-| `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
-| `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | Ir para o local anterior |  |
-| `` <right>, l `` | Ir para o próximo trecho |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
 | `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Commit | Submeter mudanças em staging |
-| `` w `` | Fazer commit de alterações sem pré-commit |  |
-| `` C `` | Enviar alteração usando um editor Git |  |
-| `` <ctrl+f> `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado<br>Veja a documentação:<br><https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Pesquisar na visualização atual por texto |  |

 ## Stash
@@ -10,8 +10,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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 `` | Отправить изменения | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. If other branches are stacked below the current one and have commits to push, you are offered to push those too. |
-| `` p `` | Получить и слить изменения | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. If other branches are stacked below the current one and have changed on the remote, you are offered to update those too. |
+| `` P `` | Отправить изменения | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
+| `` p `` | Получить и слить изменения | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
 | `` ) `` | 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 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'. |
@@ -22,9 +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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -74,21 +73,26 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
-| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
+| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
+| `` / `` | Найти |  |
+
+## Главная панель (Индексирование)
+
+| Key | Action | Info |
+|-----|--------|-------------|
 | `` <left>, h `` | Выбрать предыдущую часть |  |
 | `` <right>, l `` | Выбрать следующую часть |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | Exit back to side panel |  |
+| `` v `` | Переключить выборку перетаскивания |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
+| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
+| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
+| `` o `` | Открыть файл | Open file in default application. |
+| `` e `` | Редактировать файл | Open file in external editor. |
+| `` <esc> `` | Вернуться к панели файлов |  |
+| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
+| `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
 | `` c `` | Сохранить изменения | Commit staged changes. |
 | `` w `` | Закоммитить изменения без предварительного хука коммита |  |
 | `` C `` | Сохранить изменения с помощью редактора git |  |
@@ -101,25 +105,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> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
-| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | Выбрать предыдущую часть |  |
-| `` <right>, l `` | Выбрать следующую часть |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
-| `` c `` | Сохранить изменения | Commit staged changes. |
-| `` w `` | Закоммитить изменения без предварительного хука коммита |  |
-| `` C `` | Сохранить изменения с помощью редактора git |  |
-| `` <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> |
 | `` / `` | Найти |  |

 ## Главная панель (Слияние)
@@ -138,6 +125,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Вернуться к панели файлов |  |

+## Главная панель (сборка патчей)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | Выбрать предыдущую часть |  |
+| `` <right>, l `` | Выбрать следующую часть |  |
+| `` v `` | Переключить выборку перетаскивания |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
+| `` o `` | Открыть файл | Open file in default application. |
+| `` e `` | Редактировать файл | Open file in external editor. |
+| `` <space> `` | Добавить/удалить строку(и) для патча |  |
+| `` 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> `` | Выйти из сборщика пользовательских патчей |  |
+| `` / `` | Найти |  |
+
 ## Журнал ссылок (Reflog)

 | Key | Action | Info |
@@ -220,7 +223,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` d `` | Delete | View delete options for local/remote branch. |
 | `` r `` | Перебазировать переключённую ветку на эту ветку | Rebase the checked-out branch onto the selected branch. |
 | `` M `` | Слияние с текущей переключённой веткой | View options for merging the selected item into the current branch (regular merge, squash merge) |
-| `` f `` | Перемотать эту ветку вперёд из её upstream-ветки | Fast-forward selected branch from its upstream. If the branch has diverged from its upstream because the upstream branch was rewritten, and it has no commits of its own, it is reset to its upstream instead. This needs reflogs to be enabled; a bare repository doesn't keep them by default (core.logAllRefUpdates). |
+| `` f `` | Перемотать эту ветку вперёд из её upstream-ветки | Fast-forward selected branch from its upstream. |
 | `` T `` | Создать тег |  |
 | `` s `` | Порядок сортировки |  |
 | `` g `` | Просмотреть параметры сброса |  |
@@ -301,7 +304,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See 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> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <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. |
 | `` ` `` | Переключить вид дерева файлов | 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 |
@@ -386,7 +389,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Просмотреть параметры хранилища | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Все проиндексированные/непроиндексированные | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
+| `` <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 `` | Просмотреть параметры «отмены изменении» | View options for discarding changes to the selected file. |
 | `` g `` | Просмотреть параметры сброса upstream-ветки |  |
 | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
@@ -22,9 +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. |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
+| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
@@ -179,7 +178,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
+| `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。 |
 | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
 | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
 | `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
@@ -250,6 +249,22 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | 查看提交 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

+## 构建补丁中
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 选择上一个区块 |  |
+| `` <right>, l `` | 选择下一个区块 |  |
+| `` v `` | 切换拖动选择 |  |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
+| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
+| `` o `` | 打开文件 | 使用默认程序打开该文件 |
+| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
+| `` <space> `` | 添加/移除 行到补丁 |  |
+| `` d `` | 从提交中移除行 | 从本次提交中移除所选行。此操作会在后台运行交互式变基，因此如果后续提交也修改了这些行，您可能会遇到合并冲突。 |
+| `` <esc> `` | 退出逐行模式 |  |
+| `` / `` | 开始搜索 |  |
+
 ## 标签

 | Key | Action | Info |
@@ -270,25 +285,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
-| `` v `` | 切换拖动选择 |  |
-| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
-| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
-| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
-| `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 选择上一个区块 |  |
-| `` <right>, l `` | 选择下一个区块 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
 | `` <esc> `` | 退出回到侧边面板 |  |
-| `` c `` | 提交变更 | 提交暂存文件 |
-| `` w `` | 提交变更而无需预先提交钩子 |  |
-| `` C `` | 使用 Git 编辑器提交变更 |  |
-| `` <ctrl+f> `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 开始搜索 |  |

 ## 正在合并
@@ -307,31 +305,36 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` <esc> `` | 返回文件面板 |  |

+## 正在暂存
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 选择上一个区块 |  |
+| `` <right>, l `` | 选择下一个区块 |  |
+| `` v `` | 切换拖动选择 |  |
+| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
+| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
+| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
+| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
+| `` o `` | 打开文件 | 使用默认程序打开该文件 |
+| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
+| `` <esc> `` | 返回文件面板 |  |
+| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
+| `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
+| `` c `` | 提交变更 | 提交暂存文件 |
+| `` w `` | 提交变更而无需预先提交钩子 |  |
+| `` C `` | 使用 Git 编辑器提交变更 |  |
+| `` <ctrl+f> `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` / `` | 开始搜索 |  |
+
 ## 正常

 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下滚动 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上滚动 |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
-| `` v `` | 切换拖动选择 |  |
-| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
-| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
-| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
-| `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 选择上一个区块 |  |
-| `` <right>, l `` | 选择下一个区块 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
+| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
 | `` <esc> `` | 退出回到侧边面板 |  |
-| `` c `` | 提交变更 | 提交暂存文件 |
-| `` w `` | 提交变更而无需预先提交钩子 |  |
-| `` C `` | 使用 Git 编辑器提交变更 |  |
-| `` <ctrl+f> `` | 找到用于修复的基准提交 | 找到您当前变更所基于的提交，以便于修正/改进该提交。这样做可以省去您逐一查看分支提交来确定应该修正/改进哪个提交的麻烦。请参阅文档: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 开始搜索 |  |

 ## 状态
@@ -9,29 +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' 更改。 |
-| `` ( `` | 降低重新命名相似度閾值 | 降低將刪除和新增對視為重新命名所需的相似度閾值。<br><br>預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 |
-| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | 增加差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
-| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | 減少差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
-| `` : `` | 執行 Shell 命令 | 調出可輸入shell命令執行的提示符。 |
+| `` ) `` | 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 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 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'. |
+| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. |
 | `` <ctrl+p> `` | 檢視自訂補丁選項 |  |
-| `` m `` | 查看合併/變基選項 | 檢視目前合併或變基的中止、繼續、跳過選項。 |
-| `` R `` | 重新整理 | 重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。 |
+| `` m `` | 查看合併/變基選項 | View options to abort/continue/skip the current merge/rebase. |
+| `` 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`. |
 | `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） |  |
 | `` _ `` | 上一個螢幕模式 |  |
-| `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 |
-| `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 |
-| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
+| `` \| `` | 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> `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 |
-| `` W, <ctrl+e> `` | 開啟差異比較選單 | 檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。 |
+| `` <ctrl+s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
+| `` 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+w> `` | 切換是否在差異檢視中顯示空格變更 | 切換是否在差異檢視中顯示空白字元更改。<br><br>預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。 |
+| `` <ctrl+z> `` | Suspend the application |  |
+| `` <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 指令以重作。這不包括工作區更改；只考慮提交。 |
@@ -45,39 +44,45 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <, <home> `` | 捲動到頂部 |  |
 | `` >, <end> `` | 捲動到底部 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` <shift+down> `` | 向下擴充套件選擇範圍 |  |
-| `` <shift+up> `` | 向上擴充套件選擇範圍 |  |
+| `` <shift+down> `` | Range select down |  |
+| `` <shift+up> `` | Range select up |  |
 | `` / `` | 搜尋 |  |
 | `` H `` | 向左捲動 |  |
 | `` L `` | 向右捲動 |  |
 | `` ] `` | 下一個索引標籤 |  |
 | `` [ `` | 上一個索引標籤 |  |

+## Input prompt
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 確認 |  |
+| `` <esc> `` | 關閉/取消 |  |
+
+## 主面板 (補丁生成)
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 選擇上一段 |  |
+| `` <right>, l `` | 選擇下一段 |  |
+| `` v `` | 切換拖曳選擇 |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
+| `` o `` | 開啟檔案 | 使用預設軟體開啟 |
+| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
+| `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  |
+| `` 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> `` | 退出自訂補丁建立器 |  |
+| `` / `` | 搜尋 |  |
+
 ## 主面板（一般）

 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下捲動 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上捲動 |  |
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
-| `` v `` | 切換拖曳選擇 |  |
-| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
-| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
-| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
-| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 選擇上一段 |  |
-| `` <right>, l `` | 選擇下一段 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | 退出回到側邊面板 |  |
-| `` c `` | 提交變更 | 提交暫存區變更 |
-| `` w `` | 沒有預提交 hook 就提交更改 |  |
-| `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |

 ## 主面板（合併）
@@ -85,17 +90,39 @@ _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> `` | 返回檔案面板 |  |

+## 主面板（預存）
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <left>, h `` | 選擇上一段 |  |
+| `` <right>, l `` | 選擇下一段 |  |
+| `` v `` | 切換拖曳選擇 |  |
+| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
+| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
+| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
+| `` 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> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
+| `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. |
+| `` c `` | 提交變更 | 提交暫存區變更 |
+| `` w `` | 沒有預提交 hook 就提交更改 |  |
+| `` C `` | 使用 git 編輯器提交變更 |  |
+| `` <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> |
+| `` / `` | 搜尋 |  |
+
 ## 功能表

 | Key | Action | Info |
@@ -108,19 +135,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` 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 `` | New worktree |  |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` 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) |  |
-| `` * `` | 選擇目前分支的提交 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` * `` | Select commits of current branch |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |

@@ -129,12 +156,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製子模組名稱到剪貼簿 |  |
-| `` <enter> `` | 進入 | 進入子模組 |
-| `` d `` | 刪除 | 刪除選定的子模組及其相應的目錄。 |
-| `` u `` | 更新 | 更新子模組 |
+| `` <enter> `` | Enter | 進入子模組 |
+| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
+| `` u `` | Update | 更新子模組 |
 | `` n `` | 新增子模組 |  |
 | `` e `` | 更新子模組 URL |  |
-| `` i `` | 初始化 | 初始化子模組 |
+| `` i `` | Initialize | 初始化子模組 |
 | `` b `` | 查看批量子模組選項 |  |
 | `` / `` | 搜尋 |  |

@@ -142,27 +169,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` n `` | 新建工作樹 |  |
-| `` <space> `` | 切換 | 切換到選中的工作樹。 |
+| `` n `` | New worktree |  |
+| `` <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) | 將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。 |
-| `` f `` | 修復 (Fixup) | 將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。 |
-| `` c `` | 設定修復提交資訊 | 設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。 |
+| `` 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 `` | 改寫提交 | 改寫選中的提交訊息 |
 | `` 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」提交？ |
@@ -171,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 `` | 設定/重設提交作者 | 設定或重置提交的作者，或新增其他作者。 |
-| `` t `` | 還原 | 為所選提交建立還原提交，這會反向應用所選提交的更改。 |
-| `` T `` | 打標籤到提交 | 建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。 |
-| `` <ctrl+l> `` | 開啟記錄選單 | 檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。 |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. |
+| `` t `` | 還原 | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
+| `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
+| `` <ctrl+l> `` | 開啟記錄選單 | 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> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` 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 `` | New worktree |  |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` 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) |  |
-| `` * `` | 選擇目前分支的提交 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` * `` | Select commits of current branch |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |

@@ -204,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。 |
-| `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` <space> `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See 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> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 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. |
+| `` ` `` | 顯示檔案樹狀視圖 | 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 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |

 ## 收藏 (Stash)

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <space> `` | 套用 | 將貯藏項應用到您的工作目錄。 |
-| `` g `` | 還原 | 將儲存項應用到工作目錄並刪除儲存項。 |
-| `` d `` | 捨棄 | 從貯藏列表中刪除該貯藏項。 |
-| `` n `` | 新分支 | 從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。 |
-| `` w `` | 新建工作樹 |  |
+| `` <space> `` | 套用 | Apply the stash entry to your working directory. |
+| `` g `` | 還原 | Apply the stash entry to your working directory and remove the stash entry. |
+| `` d `` | 捨棄 | Remove the stash entry from the stash list. |
+| `` 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 `` | New worktree |  |
 | `` r `` | 重新命名收藏 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
 | `` / `` | 搜尋 |  |

@@ -235,19 +262,19 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` 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 `` | New worktree |  |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` 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) |  |
-| `` * `` | 選擇目前分支的提交 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` * `` | Select commits of current branch |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |

@@ -259,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>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
+| `` 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 `` | New worktree |  |
 | `` o `` | 建立拉取請求 |  |
 | `` O `` | 建立拉取請求選項 |  |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
+| `` G `` | Open pull request in browser |  |
 | `` <ctrl+y> `` | 複製拉取請求的 URL 到剪貼板 |  |
-| `` c `` | 根據名稱檢出 | 按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。 |
-| `` - `` | 簽出上一個分支 |  |
-| `` F `` | 強制檢出 | 強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。 |
-| `` d `` | 刪除 | 檢視本地/遠端分支的刪除選項。 |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
+| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. |
+| `` - `` | Checkout previous branch |  |
+| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
+| `` d `` | 刪除 | View delete options for local/remote branch. |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` f `` | 從上游快進此分支 | 從遠端快進所選的分支 |
 | `` T `` | 建立標籤 |  |
 | `` s `` | 排序規則 |  |
@@ -278,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> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |

@@ -286,15 +313,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製標籤到剪貼簿 |  |
-| `` <space> `` | 檢出 | 檢出選擇的標籤作為分離的HEAD。 |
-| `` n `` | 建立標籤 | 基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。 |
-| `` w `` | 新建工作樹 |  |
-| `` d `` | 刪除 | 檢視本機／遠端標籤的刪除選項。 |
-| `` P `` | 推送標籤 | 推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。 |
-| `` g `` | 重設 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` <ctrl+o> `` | Copy tag to clipboard |  |
+| `` <space> `` | 檢出 | Checkout the selected tag as a detached HEAD. |
+| `` n `` | 建立標籤 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
+| `` w `` | New worktree |  |
+| `` d `` | 刪除 | View delete options for local/remote tag. |
+| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
+| `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |

@@ -303,57 +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 `` | 檢視收藏選項 | 檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。 |
-| `` a `` | 全部預存/取消預存 | 切換工作區中所有檔案的已暫存/未暫存狀態。 |
-| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | 如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。 |
+| `` s `` | 收藏 | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
+| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). |
+| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. |
+| `` <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 `` | 重設 | 檢視工作樹的重置選項（例如：清除工作樹）。 |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
+| `` D `` | 重設 | View reset options for working tree (e.g. nuking the working tree). |
+| `` ` `` | 顯示檔案樹狀視圖 | 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 `` | 擷取 | 同步遠端異動 |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` - `` | Collapse all files | Collapse all directories in the files tree |
+| `` = `` | Expand all files | Expand all directories in the file tree |
+| `` 0 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |

 ## 次要

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
-| `` v `` | 切換拖曳選擇 |  |
-| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
-| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
-| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
-| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
-| `` <left>, h `` | 選擇上一段 |  |
-| `` <right>, l `` | 選擇下一段 |  |
-| `` N `` | Go to previous file |  |
-| `` n `` | Go to next file |  |
-| `` <ctrl+g> `` | Jump to file |  |
-| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
-| `` <esc> `` | 退出回到側邊面板 |  |
-| `` c `` | 提交變更 | 提交暫存區變更 |
-| `` w `` | 沒有預提交 hook 就提交更改 |  |
-| `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |

 ## 狀態
@@ -363,9 +373,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` u `` | 檢查更新 |  |
 | `` <enter> `` | 切換到最近使用的版本庫 |  |
-| `` a `` | 顯示/迴圈所有分支日誌 |  |
-| `` A `` | 顯示/迴圈所有分支日誌（反向） |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` a `` | Show/cycle all branch logs |  |
+| `` A `` | Show/cycle all branch logs (reverse) |  |
+| `` 0 `` | Focus main view |  |

 ## 確認面板

@@ -375,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. |
 | `` / `` | 搜尋 |  |

 ## 遠端分支
@@ -399,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 `` | 新建工作樹 |  |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
-| `` d `` | 刪除 | 從遠端刪除遠端分支。 |
+| `` w `` | New worktree |  |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
+| `` 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> `` | 檢視提交 |  |
 | `` / `` | 搜尋 |  |
@@ -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
-  # 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: 4

  # If true, capture mouse events.
@@ -110,26 +110,6 @@ gui:
  # is true.
  expandedSidePanelWeight: 2

-  # If true, don't give a side panel more height than it needs to show its
-  # content; when all panels fit, the leftover height is shared among them so that
-  # they still fill the screen.
-  shrinkSidePanelsToContent: false
-
-  # The side panels, in the order they appear from top to bottom.
-  # Each entry is a list of one or more names that share a single panel as tabs
-  # (cycle through them with the next-tab/previous-tab keys).
-  # Omit a name to hide it; give a name its own one-element list to promote a tab
-  # to a top-level panel.
-  # Valid names are: 'status', 'files', 'worktrees', 'submodules', 'branches',
-  # 'remotes', 'tags', 'commits', 'reflog', 'stash'. 'files', 'branches', and
-  # 'commits' must always be included; they can't be hidden.
-  sidePanels:
-    - [status]
-    - [files, worktrees, submodules]
-    - [branches, remotes, tags]
-    - [commits, reflog]
-    - [stash]
-
  # 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.
@@ -336,13 +316,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 +340,30 @@ 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'
-  #   # | 'rawGit'
-  #   type: "stdinFilter"
-  #
-  #   # 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
-  #   # '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: "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
-  #   # difft --color=always
-  #   command: ""
+  #   # ydiff -p cat -s --wrap --width={{columnWidth}}
+  #   pager: ""
  #
-  #   # Extra arguments (array of strings) passed to the git command. Only
-  #   # applicable if the type is 'rawGit'.
-  #   args: []
+  #   # e.g. 'difft --color=always'
+  #   externalDiffCommand: ""
  #
-  # 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
+  #
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
  # for more information.
-  diffRenderers: []
+  pagers: []

  # Config relating to committing
  commit:
@@ -435,11 +406,6 @@ git:
  # 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 not "none", lazygit will automatically fast-forward local branches to match
  # their upstream after fetching. Applies to branches that are not the currently
  # checked out branch, and only to those that are strictly behind their upstream
@@ -533,15 +499,6 @@ git:
  # to 40 to disable truncation.
  truncateCopiedCommitHashesTo: 12

-# Config relating to git worktrees
-worktree:
-  # Default parent directory for new worktrees. It is offered as a candidate
-  # location alongside the parent directories of any worktrees you already have.
-  # A relative path is resolved against the repository's root directory, so
-  # "../worktrees" sits beside the repo and ".worktrees" sits inside it.
-  # A leading "~" is expanded to your home directory, so "~/worktrees" works.
-  defaultPath: ""
-
 # Periodic update checks
 update:
  # One of: 'prompt' (default) | 'background' | 'never'
@@ -560,11 +517,6 @@ refresher:
  # 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

@@ -696,7 +648,6 @@ keybinding:
    confirmInEditor: [<ctrl+enter>, <ctrl+s>]
    remove: d
    new: "n"
-    newWorktree: w
    edit: e
    openFile: o
    scrollUpMain: [<pgup>, K, <ctrl+u>]
@@ -715,8 +666,7 @@ keybinding:
    prevTab: '['
    nextScreenMode: +
    prevScreenMode: _
-    cycleDiffRenderers: '|'
-    cycleDiffRenderersReverse: \
+    cyclePagers: '|'
    undo: z
    redo: Z
    filteringMenu: <ctrl+s>
@@ -731,7 +681,6 @@ keybinding:
    increaseRenameSimilarityThreshold: )
    decreaseRenameSimilarityThreshold: (
    openDiffTool: <ctrl+t>
-    editConfig: <alt+shift+c>
  status:
    checkForUpdate: u
    recentRepos: <enter>
@@ -777,6 +726,8 @@ keybinding:
    fetchRemote: f
    addForkRemote: F
    sortOrder: s
+  worktrees:
+    viewWorktreeOptions: w
  commits:
    squashDown: s
    renameCommit: r
@@ -1108,12 +1059,6 @@ keybinding:
    edit: <disabled> # disable 'edit file'
 ```

-### Overriding the platform for default keybindings
-
-A few keybindings have different defaults on macOS than on Linux and Windows (e.g. word-wise cursor movement in text inputs uses `alt` on macOS but `ctrl` elsewhere). Lazygit picks these based on the OS it's running on, but you can override that with the `LAZYGIT_KEYBINDING_PLATFORM` environment variable. Set it to `darwin`, `linux`, or `windows`; any other value is ignored and the actual OS is used.
-
-This is useful when running lazygit in a Linux container that you access over ssh from a Mac, where you'd rather use the macOS keybindings.
-
 ### Example Keybindings For Colemak Users

 ```yaml
@@ -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)
@@ -0,0 +1,119 @@
+# 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).
+
+Support does not extend to Windows users, because we're making use of a package which doesn't have Windows support. However, see [below](#emulating-custom-pagers-on-windows) for a workaround.
+
+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` and `pager` options are 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.
+
+## Emulating custom pagers on Windows
+
+There is a trick to emulate custom pagers on Windows using a Powershell script configured as an external diff command. It's not perfect, but certainly better than nothing. To do this, save the following script as `lazygit-pager.ps1` at a convenient place on your disk:
+
+```pwsh
+#!/usr/bin/env pwsh
+
+$old = $args[1].Replace('\', '/')
+$new = $args[4].Replace('\', '/')
+$path = $args[0]
+git diff --no-index --no-ext-diff $old $new
+  | %{ $_.Replace($old, $path).Replace($new, $path) }
+  | delta --width=$env:LAZYGIT_COLUMNS
+```
+
+Use the pager of your choice with the arguments you like in the last line of the script. Personally I wouldn't want to use lazygit anymore without delta's `--hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"` args, see [above](#delta).
+
+In your lazygit config, use
+
+```yml
+git:
+  pagers:
+    - externalDiffCommand: "C:/wherever/lazygit-pager.ps1"
+```
+
+The main limitation of this approach compared to a "real" pager is that renames are not displayed correctly; they are shown as if they were modifications of the old file. (This affects only the hunk headers; the diff itself is always correct.)
@@ -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)
@@ -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.
@@ -22,8 +22,7 @@ _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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next 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. |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | Quit |  |
 | `` <ctrl+z> `` | Suspend the application |  |
 | `` <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> `` | Edit config file | Open file in external editor. |
 | `` z `` | Undo | 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 | 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. |

@@ -112,13 +110,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Open commit in browser |  |
 | `` n `` | Create new branch off of commit |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Copy (cherry-pick) | 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> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View files |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Search the current view by text |  |

 ## Confirmation panel
@@ -178,7 +176,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | Checkout | Checkout selected item. |
 | `` n `` | New branch |  |
 | `` 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 `` | New worktree |  |
 | `` o `` | Create pull request |  |
 | `` O `` | View create pull request options |  |
 | `` G `` | Open pull request in browser |  |
@@ -198,6 +195,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Main panel (merging)
@@ -205,7 +203,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | Pick hunk |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | Pick all hunks |  |
 | `` <up>, k `` | Previous hunk |  |
 | `` <down>, j `` | Next hunk |  |
 | `` <left>, h `` | Previous conflict |  |
@@ -282,7 +280,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Open commit in browser |  |
 | `` n `` | Create new branch off of commit |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Copy (cherry-pick) | 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> `` | Reset copied (cherry-picked) commits selection |  |
@@ -290,6 +287,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Remote branches
@@ -299,7 +297,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Copy branch name to clipboard |  |
 | `` <space> `` | Checkout | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | New branch |  |
-| `` w `` | New worktree |  |
 | `` M `` | Merge | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
 | `` d `` | Delete | Delete the remote branch from the remote. |
@@ -309,6 +306,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Remotes
@@ -339,16 +337,17 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
 | `` d `` | Drop | Remove the stash entry from the stash list. |
 | `` n `` | New branch | 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 `` | New worktree |  |
 | `` r `` | Rename stash |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View files |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Status

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | Open config file | Open file in default application. |
 | `` e `` | Edit config file | Open file in external editor. |
 | `` u `` | Check for update |  |
 | `` <enter> `` | Switch to a recent repo |  |
@@ -366,7 +365,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Open commit in browser |  |
 | `` n `` | Create new branch off of commit |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Copy (cherry-pick) | 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> `` | Reset copied (cherry-picked) commits selection |  |
@@ -374,6 +372,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View files |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Search the current view by text |  |

 ## Submodules
@@ -397,13 +396,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Copy tag to clipboard |  |
 | `` <space> `` | Checkout | Checkout the selected tag as a detached HEAD. |
 | `` n `` | New tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` w `` | New worktree |  |
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Worktrees
@@ -22,8 +22,7 @@ _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 | Choose the next pager in the list of configured pagers |
 | `` <esc> `` | キャンセル |  |
 | `` ? `` | キーバインディングメニューを開く |  |
 | `` <ctrl+s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | 終了 |  |
 | `` <ctrl+z> `` | Suspend the application |  |
 | `` <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 `` | 元に戻す | 最後のgitコマンドを元に戻すために実行するgitコマンドを決定するためにreflogが使用されます。これにはワーキングツリーへの変更は含まれません。コミットのみが考慮されます。 |
 | `` Z `` | やり直す | 最後のgitコマンドをやり直すために実行するgitコマンドを決定するためにreflogが使用されます。これにはワーキングツリーへの変更は含まれません。コミットのみが考慮されます。 |

@@ -92,13 +90,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | ブラウザでコミットを開く |  |
 | `` n `` | コミットから新しいブランチを作成 |  |
 | `` N `` | コミットを新しいブランチに移動 | 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 `` | 新しいワークツリー |  |
 | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：<br>- ソフトリセット：変更を保持し、ステージされた状態にします<br>- ミックスリセット：変更を保持し、ステージされていない状態にします<br>- ハードリセット：すべての変更を破棄します |
 | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `<esc>` を押して選択をキャンセルできます。 |
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` * `` | 現在のブランチのコミットを選択 |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | ファイルを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストで検索 |  |

 ## コミットファイル
@@ -138,7 +136,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | ブラウザでコミットを開く |  |
 | `` n `` | コミットから新しいブランチを作成 |  |
 | `` N `` | コミットを新しいブランチに移動 | 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 `` | 新しいワークツリー |  |
 | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：<br>- ソフトリセット：変更を保持し、ステージされた状態にします<br>- ミックスリセット：変更を保持し、ステージされていない状態にします<br>- ハードリセット：すべての変更を破棄します |
 | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `<esc>` を押して選択をキャンセルできます。 |
 | `` <ctrl+r> `` | コピーされた（チェリーピックされた）コミットの選択をリセット |  |
@@ -146,6 +143,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | 現在のブランチのコミットを選択 |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | ファイルを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストで検索 |  |

 ## サブモジュール
@@ -170,16 +168,17 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | ポップ | スタッシュエントリをワーキングディレクトリに適用し、スタッシュエントリを削除します。 |
 | `` d `` | 削除 | スタッシュリストからスタッシュエントリを削除します。 |
 | `` n `` | 新しいブランチ | 選択したスタッシュエントリから新しいブランチを作成します。これは、スタッシュエントリが作成されたコミットをgitがチェックアウトし、そのコミットから新しいブランチを作成した後、スタッシュエントリを追加のコミットとして新しいブランチに適用することで機能します。 |
-| `` w `` | 新しいワークツリー |  |
 | `` r `` | スタッシュの名前を変更 |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | ファイルを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

 ## ステータス

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | 設定ファイルを開く | デフォルトのアプリケーションでファイルを開きます。 |
 | `` e `` | 設定ファイルを編集 | 外部エディタでファイルを開きます。 |
 | `` u `` | 更新を確認 |  |
 | `` <enter> `` | 最近のリポジトリをチェックアウト |  |
@@ -202,13 +201,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | タグをクリップボードにコピー |  |
 | `` <space> `` | チェックアウト（ブランチの切り替え） | 選択したタグをデタッチドHEADとしてチェックアウトします。 |
 | `` n `` | 新しいタグを作成 | 現在のコミットから新しいタグを作成します。タグ名とオプションの説明を入力するよう促されます。 |
-| `` w `` | 新しいワークツリー |  |
 | `` d `` | 削除 | ローカル/リモートタグの削除オプションを表示します。 |
 | `` P `` | タグをプッシュ | 選択したタグをリモートにプッシュします。リモートを選択するよう促されます。 |
 | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：<br>- ソフトリセット：変更を保持し、ステージされた状態にします<br>- ミックスリセット：変更を保持し、ステージされていない状態にします<br>- ハードリセット：すべての変更を破棄します |
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | コミットを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

 ## ファイル
@@ -287,7 +286,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | ハンクを選択 |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | すべてのハンクを選択 |  |
 | `` <up>, k `` | 前のハンク |  |
 | `` <down>, j `` | 次のハンク |  |
 | `` <left>, h `` | 前のコンフリクト |  |
@@ -326,7 +325,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | ブラウザでコミットを開く |  |
 | `` n `` | コミットから新しいブランチを作成 |  |
 | `` N `` | コミットを新しいブランチに移動 | 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 `` | 新しいワークツリー |  |
 | `` g `` | リセット | 選択した項目へのリセットオプション（ソフト/ミックス/ハード）を表示します。各リセットタイプの詳細は次の通りです：<br>- ソフトリセット：変更を保持し、ステージされた状態にします<br>- ミックスリセット：変更を保持し、ステージされていない状態にします<br>- ハードリセット：すべての変更を破棄します |
 | `` C `` | コピー（チェリーピック） | コミットをコピーとしてマークします。ローカルコミットビューで `V` を押すと、コピーしたコミットをチェックアウトしたブランチにペースト（チェリーピック）できます。いつでも `<esc>` を押して選択をキャンセルできます。 |
 | `` <ctrl+r> `` | コピーされた（チェリーピックされた）コミットの選択をリセット |  |
@@ -334,6 +332,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | 現在のブランチのコミットを選択 |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | コミットを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

 ## リモート
@@ -355,7 +354,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | ブランチ名をクリップボードにコピー |  |
 | `` <space> `` | チェックアウト（ブランチの切り替え） | 選択したリモートブランチに基づいて新しいローカルブランチをチェックアウトするか、リモートブランチをデタッチドヘッドとしてチェックアウトします。 |
 | `` n `` | 新しいブランチ |  |
-| `` w `` | 新しいワークツリー |  |
 | `` M `` | マージ | 選択した項目を現在のブランチにマージするためのオプションを表示します（通常のマージ、スカッシュマージ） |
 | `` r `` | リベース | チェックアウトしたブランチを選択したブランチ上にリベースします。 |
 | `` d `` | 削除 | リモートからリモートブランチを削除します。 |
@@ -365,6 +363,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | コミットを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

 ## ローカルブランチ
@@ -376,7 +375,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | チェックアウト（ブランチの切り替え） | 選択した項目をチェックアウトします。 |
 | `` n `` | 新しいブランチ |  |
 | `` N `` | コミットを新しいブランチに移動 | 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 `` | 新しいワークツリー |  |
 | `` o `` | プルリクエストを作成 |  |
 | `` O `` | プルリクエスト作成オプションを表示 |  |
 | `` G `` | Open pull request in browser |  |
@@ -396,6 +394,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` 0 `` | メインビューにフォーカス |  |
 | `` <enter> `` | コミットを表示 |  |
+| `` w `` | ワークツリーオプションを表示 |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

 ## ワークツリー
@@ -22,8 +22,7 @@ _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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next 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. |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | 종료 |  |
 | `` <ctrl+z> `` | Suspend the application |  |
 | `` <ctrl+w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | 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> `` | 설정 파일 수정 | Open file in external editor. |
 | `` z `` | 되돌리기 (reflog) (실험적) | 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 `` | 다시 실행 (reflog) (실험적) | 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. |

@@ -69,7 +67,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | 브라우저에서 커밋 열기 |  |
 | `` n `` | 커밋에서 새 브랜치를 만듭니다. |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | 커밋을 복사 (cherry-pick) | 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> `` | Reset cherry-picked (copied) commits selection |  |
@@ -77,6 +74,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 커밋 보기 |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Secondary
@@ -95,10 +93,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
 | `` d `` | Drop | Remove the stash entry from the stash list. |
 | `` 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 `` | New worktree |  |
 | `` r `` | Rename stash |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View selected item's files |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Sub-commits
@@ -111,7 +109,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | 브라우저에서 커밋 열기 |  |
 | `` n `` | 커밋에서 새 브랜치를 만듭니다. |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | 커밋을 복사 (cherry-pick) | 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> `` | Reset cherry-picked (copied) commits selection |  |
@@ -119,6 +116,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View selected item's files |  |
+| `` w `` | View worktree options |  |
 | `` / `` | 검색 시작 |  |

 ## Worktrees
@@ -144,7 +142,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | Pick hunk |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | Pick all hunks |  |
 | `` <up>, k `` | 이전 hunk를 선택 |  |
 | `` <down>, j `` | 다음 hunk를 선택 |  |
 | `` <left>, h `` | 이전 충돌을 선택 |  |
@@ -212,7 +210,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | 체크아웃 | Checkout selected item. |
 | `` n `` | 새 브랜치 생성 |  |
 | `` 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 `` | New worktree |  |
 | `` o `` | 풀 리퀘스트 생성 |  |
 | `` O `` | 풀 리퀘스트 생성 옵션 |  |
 | `` G `` | Open pull request in browser |  |
@@ -232,12 +229,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 커밋 보기 |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## 상태

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | 설정 파일 열기 | Open file in default application. |
 | `` e `` | 설정 파일 수정 | Open file in external editor. |
 | `` u `` | 업데이트 확인 |  |
 | `` <enter> `` | 최근에 사용한 저장소로 전환 |  |
@@ -278,7 +277,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | 브랜치명을 클립보드에 복사 |  |
 | `` <space> `` | 체크아웃 | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | 새 브랜치 생성 |  |
-| `` w `` | New worktree |  |
 | `` M `` | 현재 브랜치에 병합 | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. |
 | `` d `` | 삭제 | Delete the remote branch from the remote. |
@@ -288,6 +286,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 커밋 보기 |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## 커밋
@@ -323,13 +322,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | 브라우저에서 커밋 열기 |  |
 | `` n `` | 커밋에서 새 브랜치를 만듭니다. |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | 커밋을 복사 (cherry-pick) | 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> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | View selected item's files |  |
+| `` w `` | View worktree options |  |
 | `` / `` | 검색 시작 |  |

 ## 커밋 파일
@@ -366,13 +365,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Copy tag to clipboard |  |
 | `` <space> `` | 체크아웃 | Checkout the selected tag as a detached HEAD. |
 | `` n `` | 태그를 생성 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` w `` | New worktree |  |
 | `` d `` | 삭제 | View delete options for local/remote tag. |
 | `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | 초기화 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 커밋 보기 |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## 파일
@@ -9,31 +9,29 @@ _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. |
-| `` 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. |
+| `` @ `` | 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 the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
+| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
 | `` ) `` | 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. |
+| `` m `` | Bekijk merge/rebase opties | View options to abort/continue/skip the current 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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next 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'. |
-| `` <alt+shift+c> `` | Verander config bestand | Open bestand in externe editor. |
+| `` q, <ctrl+c> `` | Quit |  |
+| `` <ctrl+z> `` | Suspend the application |  |
+| `` <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'. |
 | `` 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

@@ -47,8 +45,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <shift+down> `` | Range select down |  |
 | `` <shift+up> `` | Range select up |  |
 | `` / `` | Start met zoeken |  |
-| `` H `` | Scroll naar links |  |
-| `` L `` | Scroll naar rechts |  |
+| `` H `` | Scroll left |  |
+| `` L `` | Scroll right |  |
 | `` ] `` | Volgende tabblad |  |
 | `` [ `` | Vorige tabblad |  |

@@ -58,15 +56,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer de bestandsnaam naar het klembord |  |
 | `` <space> `` | Toggle staged | Toggle staged for selected file. |
-| `` <ctrl+b> `` | Filter bestanden op status |  |
-| `` y `` | Kopieer naar klembord |  |
-| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
+| `` <ctrl+b> `` | Filter files by status |  |
+| `` y `` | Copy to clipboard |  |
+| `` c `` | Commit veranderingen | Commit staged changes. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
 | `` A `` | Wijzig laatste commit |  |
 | `` C `` | Commit veranderingen met de git editor |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` e `` | Edit | Open bestand in externe editor. |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
+| `` <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 `` | Edit | Open file in external editor. |
+| `` o `` | Open bestand | Open file in default application. |
 | `` i `` | Ignore or exclude file |  |
 | `` r `` | Refresh bestanden |  |
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
@@ -75,13 +73,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | Stage individuele hunks/lijnen | 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 `` | Bekijk 'veranderingen ongedaan maken' opties | View options for discarding changes to the selected file. |
 | `` g `` | Bekijk upstream reset opties |  |
-| `` D `` | Resetten | View reset options for working tree (e.g. nuking the working tree). |
+| `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
 | `` ` `` | Toggle bestandsboom weergave | 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> `` | Open externe diff applicatie (git difftool) |  |
-| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` f `` | Fetch | Fetch changes from remote. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
-| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit |
+| `` = `` | Expand all files | Expand all directories in the file tree |
 | `` 0 `` | Focus main view |  |
 | `` / `` | Filter the current view by text |  |

@@ -91,7 +89,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <enter> `` | Bevestig |  |
 | `` <esc> `` | Sluiten |  |
-| `` <ctrl+o> `` | Kopieer naar klembord |  |
+| `` <ctrl+o> `` | Copy to clipboard |  |

 ## Branches

@@ -99,19 +97,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer branch name naar klembord |  |
 | `` i `` | Laat git-flow opties zien |  |
-| `` <space> `` | Uitchecken | Geselecteerd item uitchecken. |
+| `` <space> `` | Uitchecken | Checkout selected item. |
 | `` n `` | Nieuwe branch |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
-| `` w `` | New worktree |  |
+| `` 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). |
 | `` o `` | Maak een pull-request |  |
 | `` O `` | Bekijk opties voor pull-aanvraag |  |
 | `` G `` | Open pull request in browser |  |
 | `` <ctrl+y> `` | Kopieer de URL van het pull-verzoek naar het klembord |  |
 | `` c `` | Uitchecken bij naam | Checkout by name. In the input box you can enter '-' to switch to the previous branch. |
-| `` - `` | Vorige branch uitchecken |  |
+| `` - `` | Checkout previous branch |  |
 | `` F `` | Forceer checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
-| `` d `` | Verwijderen | View delete options for local/remote branch. |
-| `` r `` | Rebase branch | Rebase de uitgecheckte branch bovenop de geselecteerde branch. |
+| `` d `` | Delete | View delete options for local/remote branch. |
+| `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
 | `` M `` | Merge in met huidige checked out branch | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. |
 | `` T `` | Creëer tag |  |
@@ -119,9 +116,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Bekijk reset opties |  |
 | `` R `` | Hernoem branch |  |
 | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Commit bericht
@@ -136,18 +134,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer de bestandsnaam naar het klembord |  |
-| `` y `` | Kopieer naar klembord |  |
+| `` y `` | Copy to clipboard |  |
 | `` c `` | Uitchecken | Bestand uitchecken |
 | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | Uitsluit deze commit zijn veranderingen aan dit bestand |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
-| `` e `` | Edit | Open bestand in externe editor. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` o `` | Open bestand | Open file in default application. |
+| `` e `` | Edit | Open file in external editor. |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | 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. |
 | `` ` `` | Toggle bestandsboom weergave | 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 |
-| `` = `` | Vouw alle bestanden uit | Vouw alle mappen in de bestandsstructuur uit |
+| `` = `` | Expand all files | Expand all directories in the file tree |
 | `` 0 `` | Focus main view |  |
 | `` / `` | Filter the current view by text |  |

@@ -161,36 +159,36 @@ _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 |
-| `` 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`. |
+| `` e `` | Edit (start interactive rebase) | Wijzig commit |
+| `` 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 `` | Tag commit | Maak een nieuwe tag die naar de geselecteerde commit wijst. Je wordt gevraagd om een tag naam en optionele omschrijving. |
-| `` <ctrl+l> `` | Log opties weergeven | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
+| `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
+| `` 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> `` | 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 |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
-| `` w `` | New worktree |  |
+| `` 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). |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Kopieer commit (cherry-pick) | 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> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk gecommite bestanden |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Start met zoeken |  |

 ## Input prompt
@@ -213,15 +211,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | Kies stuk |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | Kies beide stukken |  |
 | `` <up>, k `` | Selecteer bovenste hunk |  |
 | `` <down>, j `` | Selecteer onderste hunk |  |
 | `` <left>, h `` | Selecteer voorgaand conflict |  |
 | `` <right>, l `` | Selecteer volgende conflict |  |
 | `` z `` | Ongedaan maken | Undo last merge conflict resolution. |
-| `` e `` | Verander bestand | Open bestand in externe editor. |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
-| `` M `` | Bekijk merge conflict opties | Bekijk opties voor het oplossen van mergeconflicten. |
+| `` e `` | Verander bestand | Open file in external editor. |
+| `` o `` | Open bestand | Open file in default application. |
+| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Ga terug naar het bestanden paneel |  |

 ## Normaal
@@ -241,10 +239,10 @@ _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. |
+| `` o `` | Open bestand | Open file in default application. |
+| `` e `` | Verander bestand | Open file in external editor. |
 | `` <space> `` | Voeg toe/verwijder lijn(en) in patch |  |
 | `` 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> `` | Sluit lijn-bij-lijn modus |  |
@@ -255,19 +253,19 @@ _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 |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
-| `` w `` | New worktree |  |
+| `` 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). |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Kopieer commit (cherry-pick) | 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> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Remote branches
@@ -275,27 +273,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer branch name naar klembord |  |
-| `` <space> `` | Uitchecken | Geselecteerde remote branch uitchecken als nieuwe locale branch of als detached head. |
+| `` <space> `` | Uitchecken | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | Nieuwe branch |  |
-| `` 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. |
-| `` u `` | Instellen als upstream | Stel in als upstream van uitgecheckte branch |
+| `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
+| `` d `` | Delete | Delete the remote branch from the remote. |
+| `` u `` | Set as 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. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Remotes

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <enter> `` | Bekijk branches |  |
+| `` <enter> `` | View 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 `` | Remove | 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,19 +314,19 @@ _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. |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
-| `` e `` | Verander bestand | Open bestand in externe editor. |
+| `` o `` | Open bestand | Open file in default application. |
+| `` e `` | Verander bestand | Open file in external editor. |
 | `` <esc> `` | Ga terug naar het bestanden paneel |  |
 | `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
+| `` c `` | Commit veranderingen | Commit staged changes. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
 | `` C `` | Commit veranderingen met de git editor |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Vind de commit waar je huidige wijzigingen bovenop zijn gebouwd met als doel die commit te amenden/fixen. Hierdoor hoef je dit niet met de hand te doen. Zie: <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> |
 | `` / `` | Start met zoeken |  |

 ## Stash
@@ -339,17 +337,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
 | `` d `` | Laten vallen | Remove the stash entry from the stash list. |
 | `` n `` | Nieuwe branch | 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 `` | New worktree |  |
-| `` r `` | Hernoem stash |  |
+| `` r `` | Rename stash |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk gecommite bestanden |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Status

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` e `` | Verander config bestand | Open bestand in externe editor. |
+| `` o `` | Open config bestand | Open file in default application. |
+| `` e `` | Verander config bestand | Open file in external editor. |
 | `` u `` | Check voor updates |  |
 | `` <enter> `` | Wissel naar een recente repo |  |
 | `` a `` | Show/cycle all branch logs |  |
@@ -361,19 +360,19 @@ _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 |  |
-| `` N `` | Verplaats commits naar nieuwe branch | Maak een nieuwe branch en verplaats niet-gepushte commits van de huidige branch hier naar toe. Gebruik dit in het geval dat je deze commits eigenlijk op een nieuwe branch had willen maken.<br><br>Let op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen). |
-| `` w `` | New worktree |  |
+| `` 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). |
 | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Kopieer commit (cherry-pick) | 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> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk gecommite bestanden |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Start met zoeken |  |

 ## Submodules
@@ -382,7 +381,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <ctrl+o> `` | Kopieer submodule naam naar klembord |  |
 | `` <enter> `` | Enter | Enter submodule |
-| `` d `` | Verwijderen | Remove the selected submodule and its corresponding directory. |
+| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
 | `` u `` | Update | Update selected submodule. |
 | `` n `` | Voeg nieuwe submodule toe |  |
 | `` e `` | Update submodule URL |  |
@@ -395,15 +394,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <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. |
-| `` 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. |
-| `` g `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` <space> `` | Uitchecken | Checkout the selected tag as a detached HEAD. |
+| `` n `` | Creëer tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
+| `` d `` | Delete | View delete options for local/remote tag. |
+| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
+| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Bekijk commits |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Worktrees
@@ -412,6 +411,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` n `` | New worktree |  |
 | `` <space> `` | Switch | Switch to the selected worktree. |
-| `` o `` | Openen in editor |  |
-| `` d `` | Verwijderen | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
+| `` o `` | Open in editor |  |
+| `` 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. |
 | `` / `` | Filter the current view by text |  |
@@ -22,8 +22,7 @@ _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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next 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. |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | Wyjdź |  |
 | `` <ctrl+z> `` | Suspend the application |  |
 | `` <ctrl+w> `` | Przełącz białe znaki | 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> `` | Edytuj plik konfiguracyjny | Otwórz plik w zewnętrznym edytorze. |
 | `` z `` | Cofnij | Dziennik reflog zostanie użyty do określenia, jakie polecenie git należy uruchomić, aby cofnąć ostatnie polecenie git. Nie obejmuje to zmian w drzewie roboczym; brane są pod uwagę tylko commity. |
 | `` Z `` | Ponów | Dziennik reflog zostanie użyty do określenia, jakie polecenie git należy uruchomić, aby ponowić ostatnie polecenie git. Nie obejmuje to zmian w drzewie roboczym; brane są pod uwagę tylko commity. |

@@ -85,13 +83,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Otwórz commit w przeglądarce |  |
 | `` n `` | Utwórz nową gałąź z commita |  |
 | `` N `` | Przenieś commity do nowej gałęzi | 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 `` | Nowe drzewo pracy |  |
 | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
 | `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Wyświetl pliki |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Szukaj w bieżącym widoku po tekście |  |

 ## Dodatkowy
@@ -122,7 +120,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Otwórz commit w przeglądarce |  |
 | `` n `` | Utwórz nową gałąź z commita |  |
 | `` N `` | Przenieś commity do nowej gałęzi | 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 `` | Nowe drzewo pracy |  |
 | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
 | `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
 | `` <ctrl+r> `` | Resetuj wybrane (cherry-picked) commity |  |
@@ -130,6 +127,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Pokaż commity |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |

 ## Główny panel (budowanie łatki)
@@ -164,7 +162,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | Przełącz | Przełącz wybrany element. |
 | `` n `` | Nowa gałąź |  |
 | `` N `` | Przenieś commity do nowej gałęzi | 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 `` | Nowe drzewo pracy |  |
 | `` o `` | Utwórz żądanie ściągnięcia |  |
 | `` O `` | Zobacz opcje tworzenia pull requesta |  |
 | `` G `` | Otwórz żądanie ściągnięcia w przeglądarce |  |
@@ -184,6 +181,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Pokaż commity |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |

 ## Menu
@@ -209,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | Wybierz fragment |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | Wybierz wszystkie fragmenty |  |
 | `` <up>, k `` | Poprzedni fragment |  |
 | `` <down>, j `` | Następny fragment |  |
 | `` <left>, h `` | Poprzedni konflikt |  |
@@ -318,16 +316,17 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Wyciągnij | Zastosuj wpis schowka do katalogu roboczego i usuń wpis schowka. |
 | `` d `` | Usuń | Usuń wpis schowka z listy schowka. |
 | `` n `` | Nowa gałąź | Utwórz nową gałąź z wybranego wpisu schowka. Działa poprzez przełączenie git na commit, na którym wpis schowka został utworzony, tworzenie nowej gałęzi z tego commita, a następnie zastosowanie wpisu schowka do nowej gałęzi jako dodatkowego commita. |
-| `` w `` | Nowe drzewo pracy |  |
 | `` r `` | Zmień nazwę schowka |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Wyświetl pliki |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |

 ## Status

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | Otwórz plik konfiguracyjny | Otwórz plik w domyślnej aplikacji. |
 | `` e `` | Edytuj plik konfiguracyjny | Otwórz plik w zewnętrznym edytorze. |
 | `` u `` | Sprawdź aktualizacje |  |
 | `` <enter> `` | Przełącz na ostatnie repozytorium |  |
@@ -345,7 +344,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Otwórz commit w przeglądarce |  |
 | `` n `` | Utwórz nową gałąź z commita |  |
 | `` N `` | Przenieś commity do nowej gałęzi | 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 `` | Nowe drzewo pracy |  |
 | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
 | `` C `` | Kopiuj (cherry-pick) | Oznacz commit jako skopiowany. Następnie, w widoku lokalnych commitów, możesz nacisnąć `V`, aby wkleić (cherry-pick) skopiowane commity do sprawdzonej gałęzi. W dowolnym momencie możesz nacisnąć `<esc>`, aby anulować zaznaczenie. |
 | `` <ctrl+r> `` | Resetuj wybrane (cherry-picked) commity |  |
@@ -353,6 +351,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Wyświetl pliki |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Szukaj w bieżącym widoku po tekście |  |

 ## Submoduły
@@ -376,13 +375,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Skopiuj tag do schowka |  |
 | `` <space> `` | Przełącz | Przełącz wybrany tag jako odłączoną głowę (detached HEAD). |
 | `` n `` | Nowy tag | Utwórz nowy tag z bieżącego commita. Zostaniesz poproszony o wprowadzenie nazwy tagu i opcjonalnego opisu. |
-| `` w `` | Nowe drzewo pracy |  |
 | `` d `` | Usuń | Wyświetl opcje usuwania lokalnego/odległego tagu. |
 | `` P `` | Wyślij tag | Wyślij wybrany tag do zdalnego. Zostaniesz poproszony o wybranie zdalnego. |
 | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. |
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Pokaż commity |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |

 ## Zdalne
@@ -404,7 +403,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Kopiuj nazwę gałęzi do schowka |  |
 | `` <space> `` | Przełącz | Przełącz na nową lokalną gałąź na podstawie wybranej gałęzi zdalnej. Nowa gałąź będzie śledzić gałąź zdalną. |
 | `` n `` | Nowa gałąź |  |
-| `` w `` | Nowe drzewo pracy |  |
 | `` M `` | Scal | Scal wybraną gałąź z aktualnie sprawdzoną gałęzią. |
 | `` r `` | Przebazuj | Przebazuj przełączoną gałąź na wybraną gałąź. |
 | `` d `` | Usuń | Usuń gałąź zdalną ze zdalnego. |
@@ -414,4 +412,5 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Pokaż commity |  |
+| `` w `` | Zobacz opcje drzewa pracy |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |
@@ -22,8 +22,7 @@ _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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next 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. |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | Sair |  |
 | `` <ctrl+z> `` | Suspender a aplicação |  |
 | `` <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> `` | Editar arquivo de configuração | Abrir arquivo no editor externo. |
 | `` z `` | Desfazer | O reflog será usado para determinar qual comando git para executar para desfazer o último comando git. Isto não inclui mudanças na árvore de trabalho; apenas compromissos são tidos em consideração. |
 | `` Z `` | Refazer | O reflog será usado para determinar qual comando git para executar para refazer o último comando git. Isto não inclui mudanças na árvore de trabalho; apenas compromissos são tidos em consideração. |

@@ -94,7 +92,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | Verificar | Checar item selecionado |
 | `` n `` | Nova branch |  |
 | `` N `` | Mover commits para uma nova 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 `` | Nova árvore de trabalho |  |
 | `` o `` | Criar solicitação de pull |  |
 | `` O `` | View create pull request options |  |
 | `` G `` | Open pull request in browser |  |
@@ -114,6 +111,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver commits |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Filtrar a visualização atual por texto |  |

 ## Branches remotos
@@ -123,7 +121,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Copiar nome da branch para área de transferência |  |
 | `` <space> `` | Verificar | Checar a nova branch baseada na brach remota selecionada, ou a branch remota como HEAD, desanexado |
 | `` n `` | Nova branch |  |
-| `` w `` | Nova árvore de trabalho |  |
 | `` M `` | Mesclar | Ver opções para mesclar o item selecionado no branch atual (mesclar regularmente, mesclar squash) |
 | `` r `` | Refazer | Refazer a branch checada na branch selecionada |
 | `` d `` | Apagar | Excluir o branch remoto do controle remoto. |
@@ -133,6 +130,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver commits |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Filtrar a visualização atual por texto |  |

 ## Commit arquivos
@@ -188,13 +186,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Abrir commit no navegador |  |
 | `` n `` | Create new branch off of commit |  |
 | `` N `` | Mover commits para uma nova 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 `` | Nova árvore de trabalho |  |
 | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. |
 | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver arquivos |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Pesquisar na visualização atual por texto |  |

 ## Etiquetas
@@ -204,13 +202,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Copiar etiqueta para área de transferência |  |
 | `` <space> `` | Verificar | Checar a tag selecionada como um HEAD, desanexado |
 | `` n `` | Nova etiqueta | Crie uma nova etiqueta a partir do commit atual. Você será solicitado a digitar um nome e uma descrição opcional. |
-| `` w `` | Nova árvore de trabalho |  |
 | `` d `` | Apagar | Ver opções de exclusão para tag local/remoto. |
 | `` P `` | Empurrar etiqueta | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. |
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver commits |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Filtrar a visualização atual por texto |  |

 ## Input prompt
@@ -273,7 +271,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | Escolha o local |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | Pegar todos os pedaços |  |
 | `` <up>, k `` | Trecho anterior |  |
 | `` <down>, j `` | Próximo trecho |  |
 | `` <left>, h `` | Conflito anterior |  |
@@ -310,7 +308,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Abrir commit no navegador |  |
 | `` n `` | Create new branch off of commit |  |
 | `` N `` | Mover commits para uma nova 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 `` | Nova árvore de trabalho |  |
 | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. |
 | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
 | `` <ctrl+r> `` | Reset copied (cherry-picked) commits selection |  |
@@ -318,6 +315,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver commits |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Filtrar a visualização atual por texto |  |

 ## Remotes
@@ -348,16 +346,17 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Pop | Aplique a entrada de stash no seu diretório de trabalho e remova a entrada de stash. |
 | `` d `` | Descartar | Remova a entrada do stash da lista de armazenamento. |
 | `` n `` | Nova branch | Criar um novo ramo a partir da entrada de lixo selecionada. Isso funciona verificando o commit do qual a entrada de lixo foi criada, criar um novo branch a partir desse commit e, em seguida, aplicar a entrada de lixo ao novo branch como um commit adicional. |
-| `` w `` | Nova árvore de trabalho |  |
 | `` r `` | Renomear o stash |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver arquivos |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Filtrar a visualização atual por texto |  |

 ## Status

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | Abrir o ficheiro de config | Abrir arquivo no aplicativo padrão. |
 | `` e `` | Editar arquivo de configuração | Abrir arquivo no editor externo. |
 | `` u `` | Verificar atualização |  |
 | `` <enter> `` | Mudar para um repositório recente |  |
@@ -375,7 +374,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Abrir commit no navegador |  |
 | `` n `` | Create new branch off of commit |  |
 | `` N `` | Mover commits para uma nova 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 `` | Nova árvore de trabalho |  |
 | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. |
 | `` C `` | Copiar (cherry-pick) | Marcar commit como copiado. Então, dentro da visualização local de commits, você pode pressionar `V` para colar (cherry-pick) o(s) commit(s) copiado(s) em seu branch de check-out. A qualquer momento você pode pressionar `<esc>` para cancelar a seleção. |
 | `` <ctrl+r> `` | Reset copied (cherry-picked) commits selection |  |
@@ -383,6 +381,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focar visualização principal |  |
 | `` <enter> `` | Ver arquivos |  |
+| `` w `` | Ver opções da árvore de trabalho |  |
 | `` / `` | Pesquisar na visualização atual por texto |  |

 ## Submódulos
@@ -22,8 +22,7 @@ _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 diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` \| `` | Cycle pagers | Choose the next 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. |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | Выйти |  |
 | `` <ctrl+z> `` | Suspend the application |  |
 | `` <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> `` | Редактировать файл конфигурации | Open file in external editor. |
 | `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
 | `` Z `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |

@@ -114,7 +112,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | Выбрать эту часть |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | Выбрать все части |  |
 | `` <up>, k `` | Выбрать предыдущую часть |  |
 | `` <down>, j `` | Выбрать следующую часть |  |
 | `` <left>, h `` | Выбрать предыдущий конфликт |  |
@@ -151,7 +149,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Открыть коммит в браузере |  |
 | `` n `` | Создать новую ветку с этого коммита |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Скопировать отобранные коммит (cherry-pick) | 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> `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов |  |
@@ -159,6 +156,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть коммиты |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Коммиты
@@ -194,13 +192,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Открыть коммит в браузере |  |
 | `` n `` | Создать новую ветку с этого коммита |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Скопировать отобранные коммит (cherry-pick) | 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> `` | Open external diff tool (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть файлы выбранного элемента |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Найти |  |

 ## Локальные Ветки
@@ -212,7 +210,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | Переключить | Checkout selected item. |
 | `` n `` | Новая ветка |  |
 | `` 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 `` | New worktree |  |
 | `` o `` | Создать запрос на принятие изменений |  |
 | `` O `` | Создать параметры запроса принятие изменений |  |
 | `` G `` | Open pull request in browser |  |
@@ -232,6 +229,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть коммиты |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Меню
@@ -260,7 +258,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | Открыть коммит в браузере |  |
 | `` n `` | Создать новую ветку с этого коммита |  |
 | `` 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 `` | New worktree |  |
 | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` C `` | Скопировать отобранные коммит (cherry-pick) | 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> `` | Сбросить отобранную (скопированную \| cherry-picked) выборку коммитов |  |
@@ -268,6 +265,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть файлы выбранного элемента |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Найти |  |

 ## Подмодули
@@ -315,6 +313,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | Открыть файл конфигурации | Open file in default application. |
 | `` e `` | Редактировать файл конфигурации | Open file in external editor. |
 | `` u `` | Проверить обновления |  |
 | `` <enter> `` | Переключиться на последний репозиторий |  |
@@ -329,13 +328,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Copy tag to clipboard |  |
 | `` <space> `` | Переключить | Checkout the selected tag as a detached HEAD. |
 | `` n `` | Создать тег | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
-| `` w `` | New worktree |  |
 | `` d `` | Delete | View delete options for local/remote tag. |
 | `` P `` | Отправить тег | Push the selected tag to a remote. You'll be prompted to select a remote. |
 | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть коммиты |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Удалённые ветки
@@ -345,7 +344,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | Скопировать название ветки в буфер обмена |  |
 | `` <space> `` | Переключить | Checkout a new local branch based on the selected remote branch, or the remote branch as a detached head. |
 | `` n `` | Новая ветка |  |
-| `` w `` | New worktree |  |
 | `` M `` | Слияние с текущей переключённой веткой | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` r `` | Перебазировать переключённую ветку на эту ветку | Rebase the checked-out branch onto the selected branch. |
 | `` d `` | Delete | Delete the remote branch from the remote. |
@@ -355,6 +353,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть коммиты |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |

 ## Удалённые репозитории
@@ -410,8 +409,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища | Apply the stash entry to your working directory and remove the stash entry. |
 | `` d `` | Удалить припрятанные изменения из хранилища | Remove the stash entry from the stash list. |
 | `` 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 `` | New worktree |  |
 | `` r `` | Переименовать хранилище |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | Просмотреть файлы выбранного элемента |  |
+| `` w `` | View worktree options |  |
 | `` / `` | Filter the current view by text |  |
@@ -22,8 +22,7 @@ _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. |
+| `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
@@ -31,7 +30,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` q, <ctrl+c> `` | 退出 |  |
 | `` <ctrl+z> `` | 挂起应用程序 |  |
 | `` <ctrl+w> `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。<br><br>默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 |
-| `` <alt+shift+c> `` | 编辑配置文件 | 使用外部编辑器打开文件 |
 | `` z `` | 撤销 | Reflog将用于确定运行哪个git命令来撤消最后一个git命令。这并不包括对工作树的更改，只考虑提交。 |
 | `` Z `` | 重做 | Reflog将用于确定运行哪个git命令来重做上一个git命令。这并不包括对工作树的更改，只考虑提交。 |

@@ -62,7 +60,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
 | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
-| `` w `` | 新建工作树 |  |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <ctrl+r> `` | 重置已拣选(复制)的提交 |  |
@@ -70,6 +67,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | 选择当前分支的提交 |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交的文件 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 开始搜索 |  |

 ## 子模块
@@ -106,7 +104,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
 | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
-| `` w `` | 新建工作树 |  |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <ctrl+r> `` | 重置已拣选(复制)的提交 |  |
@@ -114,6 +111,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` * `` | 选择当前分支的提交 |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

 ## 提交
@@ -149,13 +147,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` o `` | 在浏览器中打开提交 |  |
 | `` n `` | 从提交创建新分支 |  |
 | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
-| `` w `` | 新建工作树 |  |
 | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` * `` | 选择当前分支的提交 |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交的文件 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 开始搜索 |  |

 ## 提交信息
@@ -227,7 +225,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | 检出 | 检出选中的项目 |
 | `` n `` | 新分支 |  |
 | `` N `` | 移动提交至新分支 | 创建一个新分支，并将当前分支未推送的提交移动到该分支。如果您打算开始新工作但忘记先创建新分支，这会很有用。<br><br>请注意，此操作忽略选择，新分支总是从主分支创建或堆叠在当前分支之上（您可以选择哪种方式）。 |
-| `` w `` | 新建工作树 |  |
 | `` o `` | 创建拉取请求 |  |
 | `` O `` | 创建拉取请求选项 |  |
 | `` G `` | 在浏览器中打开拉取请求 |  |
@@ -247,6 +244,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

 ## 构建补丁中
@@ -272,13 +270,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | 复制标签到剪贴板 |  |
 | `` <space> `` | 检出 | 检出选择的标签作为分离的HEAD |
 | `` n `` | 创建标签 | 基于当前提交创建一个新标签。您将在弹窗中输入标签名称和描述(可选)。 |
-| `` w `` | 新建工作树 |  |
 | `` d `` | 删除 | 查看本地/远程标签的删除选项 |
 | `` P `` | 推送标签 | 推送选择的标签到远端。您将在弹窗中选择一个远端。 |
 | `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

 ## 次要
@@ -294,7 +292,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | 选中区块 |  |
-| `` b `` | Pick both hunks |  |
+| `` b `` | 选中所有区块 |  |
 | `` <up>, k `` | 选择顶部块 |  |
 | `` <down>, j `` | 选择底部块 |  |
 | `` <left>, h `` | 选择上一个冲突 |  |
@@ -341,6 +339,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | 打开配置文件 | 使用默认程序打开该文件 |
 | `` e `` | 编辑配置文件 | 使用外部编辑器打开文件 |
 | `` u `` | 检查更新 |  |
 | `` <enter> `` | 切换到最近的仓库 |  |
@@ -372,10 +371,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` g `` | 应用并删除 | 将存储项应用到工作目录并删除存储项。 |
 | `` d `` | 删除 | 从贮藏列表中删除该贮藏项 |
 | `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交，从该提交创建一个新分支，然后将贮藏项作为附加提交应用到新分支来实现的。 |
-| `` w `` | 新建工作树 |  |
 | `` r `` | 重命名贮藏 |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交的文件 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

 ## 输入提示
@@ -404,7 +403,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+o> `` | 复制分支名称到剪贴板 |  |
 | `` <space> `` | 检出 | 基于当前选中的远程分支检出一个新的本地分支，或者将远程分支作分离的HEAD。 |
 | `` n `` | 新分支 |  |
-| `` w `` | 新建工作树 |  |
 | `` M `` | 合并到当前检出的分支 | 查看将选中项合并到当前分支的选项(正常合并，压缩合并) |
 | `` r `` | 变基 | 将检出的分支变基到所选的分支上。 |
 | `` d `` | 删除 | 从远程删除远程分支。 |
@@ -414,4 +412,5 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` 0 `` | 聚焦主视图 |  |
 | `` <enter> `` | 查看提交 |  |
+| `` w `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |
@@ -9,29 +9,27 @@ _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' 更改。 |
-| `` ( `` | 降低重新命名相似度閾值 | 降低將刪除和新增對視為重新命名所需的相似度閾值。<br><br>預設值可在設定檔中透過鍵 'git.renameSimilarityThreshold' 更改。 |
-| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | 增加差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
-| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | 減少差異檢視中變更周圍顯示的上下文量。<br><br>預設值可在設定檔中透過鍵 'git.diffContextSize' 更改。 |
-| `` : `` | 執行 Shell 命令 | 調出可輸入shell命令執行的提示符。 |
+| `` ) `` | 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 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 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'. |
+| `` : `` | Execute shell command | Bring up a prompt where you can enter a shell command to execute. |
 | `` <ctrl+p> `` | 檢視自訂補丁選項 |  |
-| `` m `` | 查看合併/變基選項 | 檢視目前合併或變基的中止、繼續、跳過選項。 |
-| `` R `` | 重新整理 | 重新整理Git狀態（即在背景執行`git status`、`git branch`等命令以更新面板內容）。此操作不會執行`git fetch`。 |
+| `` m `` | 查看合併/變基選項 | View options to abort/continue/skip the current merge/rebase. |
+| `` 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 |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 開啟選單 |  |
-| `` <ctrl+s> `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 |
-| `` W, <ctrl+e> `` | 開啟差異比較選單 | 檢視與比較兩個引用相關的選項，例如與選定的 ref 進行比較，輸入要比較的 ref，然後反轉比較方向。 |
+| `` <ctrl+s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
+| `` 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+w> `` | 切換是否在差異檢視中顯示空格變更 | 切換是否在差異檢視中顯示空白字元更改。<br><br>預設值可在設定檔中透過鍵 'git.ignoreWhitespaceInDiffView' 更改。 |
-| `` <alt+shift+c> `` | 編輯設定檔案 | 使用外部編輯器開啟 |
+| `` <ctrl+z> `` | Suspend the application |  |
+| `` <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'. |
 | `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 |
 | `` Z `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 |

@@ -44,14 +42,21 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <, <home> `` | 捲動到頂部 |  |
 | `` >, <end> `` | 捲動到底部 |  |
 | `` v `` | 切換拖曳選擇 |  |
-| `` <shift+down> `` | 向下擴充套件選擇範圍 |  |
-| `` <shift+up> `` | 向上擴充套件選擇範圍 |  |
+| `` <shift+down> `` | Range select down |  |
+| `` <shift+up> `` | Range select up |  |
 | `` / `` | 搜尋 |  |
 | `` H `` | 向左捲動 |  |
 | `` L `` | 向右捲動 |  |
 | `` ] `` | 下一個索引標籤 |  |
 | `` [ `` | 上一個索引標籤 |  |

+## Input prompt
+
+| Key | Action | Info |
+|-----|--------|-------------|
+| `` <enter> `` | 確認 |  |
+| `` <esc> `` | 關閉/取消 |  |
+
 ## 主面板 (補丁生成)

 | Key | Action | Info |
@@ -59,12 +64,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 +79,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> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
-| `` <esc> `` | 退出回到側邊面板 |  |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |

 ## 主面板（合併）
@@ -83,15 +88,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <space> `` | 挑選程式碼片段 |  |
-| `` b `` | 選取兩個區塊 |  |
+| `` b `` | 挑選所有程式碼片段 |  |
 | `` <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 +106,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> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
-| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
+| `` 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,20 +133,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` 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). |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` 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) |  |
-| `` * `` | 選擇目前分支的提交 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` * `` | Select commits of current branch |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 子模組
@@ -149,12 +154,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <ctrl+o> `` | 複製子模組名稱到剪貼簿 |  |
-| `` <enter> `` | 進入 | 進入子模組 |
-| `` d `` | 刪除 | 刪除選定的子模組及其相應的目錄。 |
-| `` u `` | 更新 | 更新子模組 |
+| `` <enter> `` | Enter | 進入子模組 |
+| `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
+| `` u `` | Update | 更新子模組 |
 | `` n `` | 新增子模組 |  |
 | `` e `` | 更新子模組 URL |  |
-| `` i `` | 初始化 | 初始化子模組 |
+| `` i `` | Initialize | 初始化子模組 |
 | `` b `` | 查看批量子模組選項 |  |
 | `` / `` | 搜尋 |  |

@@ -162,27 +167,27 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` n `` | 新建工作樹 |  |
-| `` <space> `` | 切換 | 切換到選中的工作樹。 |
+| `` n `` | New worktree |  |
+| `` <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) | 將已選提交壓縮到該提交之下。這些選定的提交的訊息會附加到該提交的訊息之下。 |
-| `` f `` | 修復 (Fixup) | 將選定的提交合併到其下面的提交中。與壓縮類似，但所選提交的訊息將被丟棄。 |
-| `` c `` | 設定修復提交資訊 | 設定修復提交的資訊選項。-C 選項表示使用此提交的資訊，而非目標提交的資訊。 |
+| `` 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 `` | 改寫提交 | 改寫選中的提交訊息 |
 | `` 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,23 +196,23 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` V `` | 貼上提交 (揀選) |  |
 | `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 |
 | `` A `` | 修改 | 使用已預存的更改修正提交 |
-| `` a `` | 設定/重設提交作者 | 設定或重置提交的作者，或新增其他作者。 |
-| `` t `` | 還原 | 為所選提交建立還原提交，這會反向應用所選提交的更改。 |
-| `` T `` | 打標籤到提交 | 建立一個新標籤指向所選提交。您可以在彈窗中輸入標籤名稱和描述(可選)。 |
-| `` <ctrl+l> `` | 開啟記錄選單 | 檢視提交日誌的選項，例如更改排序順序、隱藏 git graph、顯示整個 git graph。 |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. |
+| `` t `` | 還原 | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
+| `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
+| `` <ctrl+l> `` | 開啟記錄選單 | 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> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` 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). |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` 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) |  |
-| `` * `` | 選擇目前分支的提交 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` * `` | Select commits of current branch |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 提交摘要
@@ -224,51 +229,51 @@ _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。 |
-| `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` <space> `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See 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> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 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. |
+| `` ` `` | 顯示檔案樹狀視圖 | 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 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |

 ## 收藏 (Stash)

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <space> `` | 套用 | 將貯藏項應用到您的工作目錄。 |
-| `` g `` | 還原 | 將儲存項應用到工作目錄並刪除儲存項。 |
-| `` d `` | 捨棄 | 從貯藏列表中刪除該貯藏項。 |
-| `` n `` | 新分支 | 從選定的貯藏項建立一個新分支。這是透過 git 檢查建立貯藏項的提交，從該提交建立一個新分支，然後將貯藏項作為附加提交應用到新分支來實現的。 |
-| `` w `` | 新建工作樹 |  |
+| `` <space> `` | 套用 | Apply the stash entry to your working directory. |
+| `` g `` | 還原 | Apply the stash entry to your working directory and remove the stash entry. |
+| `` d `` | 捨棄 | Remove the stash entry from the stash list. |
+| `` 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. |
 | `` r `` | 重新命名收藏 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 日誌

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製縮略提交雜湊值到剪貼簿 |  |
-| `` <space> `` | 檢出 | 檢出所選擇的提交作為分離HEAD。 |
-| `` y `` | 複製提交屬性 | 複製提交屬性到剪貼簿(如hash、URL、diff、訊息、作者)。 |
+| `` <ctrl+o> `` | Copy abbreviated commit hash to clipboard |  |
+| `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
+| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 |  |
 | `` n `` | 從提交建立新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
-| `` g `` | 檢視重設選項 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
-| `` C `` | 複製提交 (揀選) | 標記提交為已複製。然後，在本地提交檢視中，您可以按 `V` (Cherry-Pick) 將已複製的提交貼上到已檢出的分支中。任何時候都可以按 `<esc>` 來取消選擇。 |
+| `` 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). |
+| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
+| `` 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) |  |
-| `` * `` | 選擇目前分支的提交 |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` * `` | Select commits of current branch |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 本地分支
@@ -279,18 +284,17 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` i `` | 顯示 git-flow 選項 |  |
 | `` <space> `` | 檢出 | 檢出選定的項目。 |
 | `` n `` | 新分支 |  |
-| `` N `` | 移動提交至新分支 | 建立一個新分支，並將目前分支未推送的提交移動到該分支。如果您打算開始新工作但忘記先建立新分支，這會很有用。<br><br>請注意，此操作忽略選擇，新分支總是從主分支建立或堆疊在目前分支之上（您可以選擇哪種方式）。 |
-| `` w `` | 新建工作樹 |  |
+| `` 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). |
 | `` o `` | 建立拉取請求 |  |
 | `` O `` | 建立拉取請求選項 |  |
-| `` G `` | 在瀏覽器中開啟拉取請求 |  |
+| `` G `` | Open pull request in browser |  |
 | `` <ctrl+y> `` | 複製拉取請求的 URL 到剪貼板 |  |
-| `` c `` | 根據名稱檢出 | 按名稱檢出。在輸入框中，您可以輸入'-' 來切換到最後一個分支。 |
-| `` - `` | 簽出上一個分支 |  |
-| `` F `` | 強制檢出 | 強制檢出所選分支。這將在檢出所選分支之前放棄工作目錄中的所有本地更改。 |
-| `` d `` | 刪除 | 檢視本地/遠端分支的刪除選項。 |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
+| `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the previous branch. |
+| `` - `` | Checkout previous branch |  |
+| `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
+| `` d `` | 刪除 | View delete options for local/remote branch. |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
 | `` f `` | 從上游快進此分支 | 從遠端快進所選的分支 |
 | `` T `` | 建立標籤 |  |
 | `` s `` | 排序規則 |  |
@@ -298,24 +302,25 @@ _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> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 標籤

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <ctrl+o> `` | 複製標籤到剪貼簿 |  |
-| `` <space> `` | 檢出 | 檢出選擇的標籤作為分離的HEAD。 |
-| `` n `` | 建立標籤 | 基於目前提交建立一個新標籤。您將在彈窗中輸入標籤名稱和描述(可選)。 |
-| `` w `` | 新建工作樹 |  |
-| `` d `` | 刪除 | 檢視本機／遠端標籤的刪除選項。 |
-| `` P `` | 推送標籤 | 推送選擇的標籤到遠端。您將在彈窗中選擇一個遠端。 |
-| `` g `` | 重設 | 檢視重置選項 (soft/mixed/hard) 用於重置到選擇項。 |
+| `` <ctrl+o> `` | Copy tag to clipboard |  |
+| `` <space> `` | 檢出 | Checkout the selected tag as a detached HEAD. |
+| `` n `` | 建立標籤 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
+| `` d `` | 刪除 | View delete options for local/remote tag. |
+| `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
+| `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 檔案
@@ -323,52 +328,53 @@ _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 `` | 檢視收藏選項 | 檢視貯藏選項（例如：貯藏所有、貯藏已暫存變更、貯藏未暫存變更）。 |
-| `` a `` | 全部預存/取消預存 | 切換工作區中所有檔案的已暫存/未暫存狀態。 |
-| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | 如果選中的是一個檔案，則會進入到暫存檢視，以便可以暫存單個程式碼塊/行。如果選中的是一個目錄，則會摺疊/展開這個目錄。 |
+| `` s `` | 收藏 | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
+| `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). |
+| `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. |
+| `` <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 `` | 重設 | 檢視工作樹的重置選項（例如：清除工作樹）。 |
-| `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
+| `` D `` | 重設 | View reset options for working tree (e.g. nuking the working tree). |
+| `` ` `` | 顯示檔案樹狀視圖 | 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 `` | 擷取 | 同步遠端異動 |
-| `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
-| `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` - `` | Collapse all files | Collapse all directories in the files tree |
+| `` = `` | Expand all files | Expand all directories in the file tree |
+| `` 0 `` | Focus main view |  |
 | `` / `` | 搜尋 |  |

 ## 次要

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
-| `` <esc> `` | 退出回到側邊面板 |  |
+| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
+| `` <esc> `` | Exit back to side panel |  |
 | `` / `` | 搜尋 |  |

 ## 狀態

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | 開啟設定檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` u `` | 檢查更新 |  |
 | `` <enter> `` | 切換到最近使用的版本庫 |  |
-| `` a `` | 顯示/迴圈所有分支日誌 |  |
-| `` A `` | 顯示/迴圈所有分支日誌（反向） |  |
-| `` 0 `` | 聚焦主檢視 |  |
+| `` a `` | Show/cycle all branch logs |  |
+| `` A `` | Show/cycle all branch logs (reverse) |  |
+| `` 0 `` | Focus main view |  |

 ## 確認面板

@@ -378,23 +384,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 +401,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 `` | 新建工作樹 |  |
-| `` M `` | 合併到當前檢出的分支 | 檢視將選中項合併到目前分支的選項(正常合併，壓縮合並) |
-| `` r `` | 將已檢出的分支變基至此分支 | 將檢出的分支變基到所選的分支上。 |
-| `` d `` | 刪除 | 從遠端刪除遠端分支。 |
+| `` M `` | 合併到當前檢出的分支 | View options for merging the selected item into the current branch (regular merge, squash merge) |
+| `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
+| `` 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> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |
@@ -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,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "lastModified": 1759362264,
+        "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,
-        "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=",
+        "lastModified": 1759831965,
+        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb",
+        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
        "type": "github"
      },
      "original": {
@@ -50,11 +50,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1785031560,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "lastModified": 1754788789,
+        "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,
-        "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
+        "lastModified": 1754340878,
+        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
+        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
        "type": "github"
      },
      "original": {
@@ -108,11 +108,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1785360170,
-        "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=",
+        "lastModified": 1758728421,
+        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0",
+        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
        "type": "github"
      },
      "original": {
@@ -97,12 +97,10 @@
              # Go toolchain
              go
              gotools
-              gopls

              # Development tools
              git
              gnumake
-              just
            ];

            # Environment variables for development
@@ -110,8 +108,8 @@
          };

          treefmt = {
-            programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt.compiler;
-            programs.nixfmt.package = pkgs.nixfmt;
+            programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt-rfc-style.compiler;
+            programs.nixfmt.package = pkgs.nixfmt-rfc-style;
            programs.gofmt.enable = true;
          };

@@ -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.5.0
+	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/lucasb-eyer/go-colorful v1.4.1
+	github.com/kyokomi/emoji/v2 v2.2.13
+	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/xo/terminfo v1.0.0
+	github.com/stretchr/testify v1.11.1
+	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/sys v0.47.0
+	golang.org/x/sync v0.21.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.38.0 // indirect
-	golang.org/x/term v0.45.0 // indirect
-	golang.org/x/text v0.41.0 // indirect
-	golang.org/x/tools v0.48.0 // indirect
+	golang.org/x/mod v0.35.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/term v0.43.0 // indirect
+	golang.org/x/text v0.37.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
@@ -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.5.0 h1:SCp9czLv2K2aPORgD6+4fjV0xNAzKIkiezCkp6bHLe4=
-github.com/gdamore/tcell/v3 v3.5.0/go.mod h1:Oe5U3S3jm3NzypswDNUhe+LUnF5CoFq2b4sepD++QHo=
+github.com/gdamore/tcell/v3 v3.4.0 h1:VUym1HQZiYodA5PGQrqLxF7QwqQndcAUwQD7G7XUy5E=
+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.102.0/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI=
+github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
+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.14/go.mod h1:1AnYl9IgmJZXKd5m1PEijyyUw85SqYsuAr8lpU/s+9s=
-github.com/lucasb-eyer/go-colorful v1.4.1 h1:1EO+WB73+EH8EVbzlrG3KLAfEypQWVHIBqlTf+2hNss=
-github.com/lucasb-eyer/go-colorful v1.4.1/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/kyokomi/emoji/v2 v2.2.13 h1:GhTfQa67venUUvmleTNFnb+bi7S3aocF7ZCXU9fSO7U=
+github.com/kyokomi/emoji/v2 v2.2.13/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
+github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
+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.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+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.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=
+github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
+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.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+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 v1.0.0/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
+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.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
+golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
+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.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+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.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+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.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+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.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
+golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
+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.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
+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.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
+golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
+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.11.0/go.mod h1:BeT5wCsOJt6J9zT2MZIOGszjUHzFkn1/l9g6xAzqsXo=
+mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4=
+mvdan.cc/gofumpt v0.9.2/go.mod h1:iB7Hn+ai8lPvofHd9ZFGVg2GOr8sBUw1QUWjNbmIL/s=
@@ -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:
@@ -61,9 +61,10 @@ func Run(
 	}
 }

-func NewCommon(config config.AppConfigurer, log *logrus.Entry) (*common.Common, error) {
+func NewCommon(config config.AppConfigurer) (*common.Common, error) {
 	userConfig := config.GetUserConfig()
 	appState := config.GetAppState()
+	log := newLogger(config)
 	// Initialize with English for the time being; the real translation set for
 	// the configured language will be read after reading the user config
 	tr := i18n.EnglishTranslationSet()
@@ -79,8 +80,8 @@ func NewCommon(config config.AppConfigurer, log *logrus.Entry) (*common.Common,
 	return cmn, nil
 }

-func NewLogger(debug bool) *logrus.Entry {
-	if debug {
+func newLogger(cfg config.AppConfigurer) *logrus.Entry {
+	if cfg.GetDebug() {
 		logPath, err := config.LogPath()
 		if err != nil {
 			log.Fatal(err)
@@ -3,13 +3,14 @@ package daemon
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"os"
 	"os/exec"
 	"strconv"

+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
-	"github.com/sirupsen/logrus"
 )

 // Sometimes lazygit will be invoked in daemon mode from a parent lazygit process.
@@ -65,14 +66,14 @@ func getInstruction() Instruction {
 	return mapping[getDaemonKind()](jsonData)
 }

-func Handle(log *logrus.Entry) {
+func Handle(common *common.Common) {
 	if !InDaemonMode() {
 		return
 	}

 	instruction := getInstruction()

-	if err := instruction.run(log); err != nil {
+	if err := instruction.run(common); err != nil {
 		log.Fatal(err)
 	}
 }
@@ -106,7 +107,7 @@ type Instruction interface {
 	SerializedInstructions() string

 	// runs the instruction
-	run(log *logrus.Entry) error
+	run(common *common.Common) error
 }

 func serializeInstruction[T any](instruction T) string {
@@ -146,7 +147,7 @@ func (self *ExitImmediatelyInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *ExitImmediatelyInstruction) run(log *logrus.Entry) error {
+func (self *ExitImmediatelyInstruction) run(common *common.Common) error {
 	return nil
 }

@@ -164,8 +165,8 @@ func (self *RemoveUpdateRefsForCopiedBranchInstruction) SerializedInstructions()
 	return serializeInstruction(self)
 }

-func (self *RemoveUpdateRefsForCopiedBranchInstruction) run(log *logrus.Entry) error {
-	return handleInteractiveRebase(log, func(path string) error {
+func (self *RemoveUpdateRefsForCopiedBranchInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
 		return nil
 	})
 }
@@ -192,8 +193,8 @@ func (self *ChangeTodoActionsInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *ChangeTodoActionsInstruction) run(log *logrus.Entry) error {
-	return handleInteractiveRebase(log, func(path string) error {
+func (self *ChangeTodoActionsInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
 		changes := lo.Map(self.Changes, func(c ChangeTodoAction, _ int) utils.TodoChange {
 			return utils.TodoChange{
 				Hash:      c.Hash,
@@ -224,8 +225,8 @@ func (self *DropMergeCommitInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *DropMergeCommitInstruction) run(log *logrus.Entry) error {
-	return handleInteractiveRebase(log, func(path string) error {
+func (self *DropMergeCommitInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
 		return utils.DropMergeCommit(path, self.Hash, getCommentChar())
 	})
 }
@@ -255,21 +256,19 @@ func (self *MoveFixupCommitDownInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *MoveFixupCommitDownInstruction) run(log *logrus.Entry) error {
-	return handleInteractiveRebase(log, func(path string) error {
+func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
 		return utils.MoveFixupCommitDown(path, self.OriginalHash, self.FixupHash, self.ChangeToFixup, getCommentChar())
 	})
 }

 type MoveTodosUpInstruction struct {
-	Hashes   []string
-	Distance int
+	Hashes []string
 }

-func NewMoveTodosUpInstruction(hashes []string, distance int) Instruction {
+func NewMoveTodosUpInstruction(hashes []string) Instruction {
 	return &MoveTodosUpInstruction{
-		Hashes:   hashes,
-		Distance: distance,
+		Hashes: hashes,
 	}
 }

@@ -281,27 +280,25 @@ func (self *MoveTodosUpInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *MoveTodosUpInstruction) run(log *logrus.Entry) error {
+func (self *MoveTodosUpInstruction) run(common *common.Common) error {
 	todosToMove := lo.Map(self.Hashes, func(hash string, _ int) utils.Todo {
 		return utils.Todo{
 			Hash: hash,
 		}
 	})

-	return handleInteractiveRebase(log, func(path string) error {
-		return utils.MoveTodos(path, todosToMove, false, -self.Distance, getCommentChar())
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.MoveTodosUp(path, todosToMove, false, getCommentChar())
 	})
 }

 type MoveTodosDownInstruction struct {
-	Hashes   []string
-	Distance int
+	Hashes []string
 }

-func NewMoveTodosDownInstruction(hashes []string, distance int) Instruction {
+func NewMoveTodosDownInstruction(hashes []string) Instruction {
 	return &MoveTodosDownInstruction{
-		Hashes:   hashes,
-		Distance: distance,
+		Hashes: hashes,
 	}
 }

@@ -313,15 +310,15 @@ func (self *MoveTodosDownInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *MoveTodosDownInstruction) run(log *logrus.Entry) error {
+func (self *MoveTodosDownInstruction) run(common *common.Common) error {
 	todosToMove := lo.Map(self.Hashes, func(hash string, _ int) utils.Todo {
 		return utils.Todo{
 			Hash: hash,
 		}
 	})

-	return handleInteractiveRebase(log, func(path string) error {
-		return utils.MoveTodos(path, todosToMove, false, self.Distance, getCommentChar())
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.MoveTodosDown(path, todosToMove, false, getCommentChar())
 	})
 }

@@ -339,8 +336,8 @@ func (self *InsertBreakInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *InsertBreakInstruction) run(log *logrus.Entry) error {
-	return handleInteractiveRebase(log, func(path string) error {
+func (self *InsertBreakInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
 		return utils.PrependStrToTodoFile(path, []byte("break\n"))
 	})
 }
@@ -363,8 +360,8 @@ func (self *WriteRebaseTodoInstruction) SerializedInstructions() string {
 	return serializeInstruction(self)
 }

-func (self *WriteRebaseTodoInstruction) run(log *logrus.Entry) error {
-	return handleInteractiveRebase(log, func(path string) error {
+func (self *WriteRebaseTodoInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
 		return os.WriteFile(path, self.TodosFileContent, 0o644)
 	})
 }
@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"strings"

+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/env"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/sirupsen/logrus"
 	"github.com/stefanhaller/git-todo-parser/todo"
 )

@@ -17,9 +17,9 @@ type ChangeTodoAction struct {
 	Flag      string
 }

-func handleInteractiveRebase(log *logrus.Entry, f func(path string) error) error {
-	log.Info("Lazygit invoked as interactive rebase demon")
-	log.Info("args: ", os.Args)
+func handleInteractiveRebase(common *common.Common, f func(path string) error) error {
+	common.Log.Info("Lazygit invoked as interactive rebase demon")
+	common.Log.Info("args: ", os.Args)
 	path := os.Args[1]

 	if strings.HasSuffix(path, "git-rebase-todo") {
@@ -32,7 +32,7 @@ func handleInteractiveRebase(log *logrus.Entry, f func(path string) error) error
 		// if we are rebasing and squashing, we'll see a COMMIT_EDITMSG
 		// but in this case we don't need to edit it, so we'll just return
 	} else {
-		log.Info("Lazygit demon did not match on any use cases")
+		common.Log.Info("Lazygit demon did not match on any use cases")
 	}

 	return nil
@@ -93,15 +93,6 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		env.SetGitDirEnv(cliArgs.GitDir)
 	}

-	// The log file lives in the config dir, so this must come after setting the
-	// CONFIG_DIR env var above.
-	logger := NewLogger(cliArgs.Debug)
-
-	if daemon.InDaemonMode() {
-		daemon.Handle(logger)
-		return
-	}
-
 	if cliArgs.PrintVersionInfo {
 		gitVersion := getGitVersionInfo()
 		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s, git version=%s\n", buildInfo.Commit, buildInfo.Date, buildInfo.BuildSource, buildInfo.Version, runtime.GOOS, runtime.GOARCH, gitVersion)
@@ -152,6 +143,9 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes

 	if integrationTest != nil {
 		integrationTest.SetupConfig(appConfig)
+		// Set this to true so that integration tests don't have to explicitly deal with the hunk
+		// staging hint:
+		appConfig.GetAppState().DidShowHunkStagingHint = true

 		// Preserve the changes that the test setup just made to the config, so
 		// they don't get lost when we reload the config while running the test
@@ -160,11 +154,16 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		appConfig.SaveGlobalUserConfig()
 	}

-	common, err := NewCommon(appConfig, logger)
+	common, err := NewCommon(appConfig)
 	if err != nil {
 		log.Fatal(err)
 	}

+	if daemon.InDaemonMode() {
+		daemon.Handle(common)
+		return
+	}
+
 	if cliArgs.Profile {
 		go func() {
 			if err := http.ListenAndServe("localhost:6060", nil); err != nil {
@@ -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
@@ -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) {
@@ -58,11 +58,10 @@ func generateAtDir(cheatsheetDir string) {
 		log.Fatal(err)
 	}
 	mConfig := config.NewDummyAppConfig()
-	logger := app.NewLogger(mConfig.GetDebug())

 	for lang := range translationSetsByLang {
 		mConfig.GetUserConfig().Gui.Language = lang
-		common, err := app.NewCommon(mConfig, logger)
+		common, err := app.NewCommon(mConfig)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -120,7 +119,9 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"prompt":            tr.PromptTitle,
 		"information":       tr.InformationTitle,
 		"main":              tr.NormalTitle,
+		"patchBuilding":     tr.PatchBuildingTitle,
 		"mergeConflicts":    tr.MergingTitle,
+		"staging":           tr.StagingTitle,
 		"menu":              tr.MenuTitle,
 		"search":            tr.SearchTitle,
 		"secondary":         tr.SecondaryTitle,
@@ -139,7 +140,12 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 }

 func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*bindingSection {
+	excludedViews := []string{"stagingSecondary", "patchBuildingSecondary"}
 	bindingsToDisplay := lo.Filter(bindings, func(binding *types.Binding, _ int) bool {
+		if lo.Contains(excludedViews, binding.ViewName) {
+			return false
+		}
+
 		return (binding.Description != "" || binding.Alternative != "") && len(binding.Keys) > 0
 	})

@@ -190,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))
@@ -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)
@@ -135,15 +117,8 @@ func NewGitCommandAux(
 	rebaseCommands := git_commands.NewRebaseCommands(gitCommon, commitCommands, workingTreeCommands)
 	stashCommands := git_commands.NewStashCommands(gitCommon, fileLoader, workingTreeCommands)
 	patchBuilder := patch.NewPatchBuilder(cmn.Log,
-		func(from string, to string, reverse bool, filename string, previousPath string) (string, error) {
-			// A patch is built from git's own diff: what a diff renderer would make of it
-			// is a picture of it, not something that can be applied.
-			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, previousPath, git_commands.DiffModePlain)
-		},
-		func() (string, error) {
-			// Under lazygit's own temp dir, so that it honours the configured location
-			// and is cleaned up with everything else when we exit.
-			return os.MkdirTemp(osCommand.GetTempDir(), "custom-patch-")
+		func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
+			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, plain)
 		})
 	patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
 	bisectCommands := git_commands.NewBisectCommands(gitCommon)
@@ -152,11 +127,11 @@ func NewGitCommandAux(
 	gitHubCommands := git_commands.NewGitHubCommands(gitCommon)
 	hostingServiceCommands := git_commands.NewHostingServiceCommand(gitCommon)

-	branchLoader := git_commands.NewBranchLoader(cmn, gitCommon, cmd, branchCommands.CurrentBranchInfo, branchCommands.HasLocalOnlyCommits, configCommands)
+	branchLoader := git_commands.NewBranchLoader(cmn, gitCommon, cmd, branchCommands.CurrentBranchInfo, configCommands)
 	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
 	commitLoader := git_commands.NewCommitLoader(cmn, cmd, statusCommands.WorkingTreeState, gitCommon)
 	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
-	remoteLoader := git_commands.NewRemoteLoader(gitCommon)
+	remoteLoader := git_commands.NewRemoteLoader(cmn, cmd)
 	worktreeLoader := git_commands.NewWorktreeLoader(gitCommon)
 	stashLoader := git_commands.NewStashLoader(cmn, cmd)
 	tagLoader := git_commands.NewTagLoader(cmn, cmd)
@@ -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,29 +21,26 @@ 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{
-			log:               log,
-			innerRunner:       runner,
-			initialRetryDelay: defaultInitialRetryDelay,
+			log:         log,
+			innerRunner: runner,
 		}
 	})

 	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 {
@@ -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"})
-}
@@ -11,42 +11,20 @@ import (
 // here we're wrapping the default command runner in some git-specific stuff e.g. retry logic if we get an error due to the presence of .git/index.lock

 const (
-	// defaultInitialRetryDelay is how long we wait before the first retry of a
-	// command that failed with a transient lock error. We double it before each
-	// subsequent retry (see retryOnLockError), so across maxRetries attempts we
-	// wait for a bit over a second in total. That's long enough to outlast the
-	// brief window during which another git process holds a lock we need —
-	// typically our own foreground `git status` refresh, which takes index.lock
-	// to persist its refreshed stat-cache.
-	defaultInitialRetryDelay = 20 * time.Millisecond
-	maxRetries               = 7
+	WaitTime   = 50 * time.Millisecond
+	RetryCount = 5
 )

 type gitCmdObjRunner struct {
 	log         *logrus.Entry
 	innerRunner oscommands.ICmdObjRunner
-	// initialRetryDelay is the wait before the first lock-error retry. It's a
-	// field rather than the constant directly so tests can set it to zero and
-	// not actually sleep.
-	initialRetryDelay time.Duration
 }

-// isRetryableError returns true if a failed command hit a transient
-// lock-related condition that may succeed on retry. The lock message can reach
-// us either in the command's captured output or, for streamed commands whose
-// output we don't capture, only in the returned error, so we check both.
-//
-// We match the bare "index.lock" fragment rather than a fuller path or message
-// so we catch the lock wherever git puts it: the main .git dir, a linked
-// worktree's git dir (.git/worktrees/<name>/index.lock), or a submodule's git
-// dir.
-func isRetryableError(output string, err error) bool {
-	text := output
-	if err != nil {
-		text += "\n" + err.Error()
-	}
-	return strings.Contains(text, "index.lock") ||
-		strings.Contains(text, "cannot lock ref")
+// isRetryableError returns true if the error output indicates a transient
+// lock-related error that may succeed on retry
+func isRetryableError(output string) bool {
+	return strings.Contains(output, ".git/index.lock") ||
+		strings.Contains(output, "cannot lock ref")
 }

 func (self *gitCmdObjRunner) Run(cmdObj *oscommands.CmdObj) error {
@@ -55,44 +33,41 @@ func (self *gitCmdObjRunner) Run(cmdObj *oscommands.CmdObj) error {
 }

 func (self *gitCmdObjRunner) RunWithOutput(cmdObj *oscommands.CmdObj) (string, error) {
-	return self.retryOnLockError(func() (string, error) {
-		return self.innerRunner.RunWithOutput(cmdObj.Clone())
-	})
+	var output string
+	var err error
+	for range RetryCount {
+		newCmdObj := cmdObj.Clone()
+		output, err = self.innerRunner.RunWithOutput(newCmdObj)
+
+		if err == nil || !isRetryableError(output) {
+			return output, err
+		}
+
+		// if we have an error based on a lock, we should wait a bit and then retry
+		self.log.Warn("lock error prevented command from running. Retrying command after a small wait")
+		time.Sleep(WaitTime)
+	}
+
+	return output, err
 }

 func (self *gitCmdObjRunner) RunWithOutputs(cmdObj *oscommands.CmdObj) (string, string, error) {
 	var stdout, stderr string
-	_, err := self.retryOnLockError(func() (string, error) {
-		var runErr error
-		stdout, stderr, runErr = self.innerRunner.RunWithOutputs(cmdObj.Clone())
-		return stdout + stderr, runErr
-	})
-	return stdout, stderr, err
-}
-
-// retryOnLockError runs the given function, retrying if it fails with a
-// transient lock error (see isRetryableError). The string returned by run is
-// the command output we inspect to classify the failure. We clone the command
-// for each attempt (inside run) because an *exec.Cmd can only be run once.
-func (self *gitCmdObjRunner) retryOnLockError(run func() (string, error)) (string, error) {
-	delay := self.initialRetryDelay
-	var output string
 	var err error
-	for attempt := range maxRetries {
-		output, err = run()
+	for range RetryCount {
+		newCmdObj := cmdObj.Clone()
+		stdout, stderr, err = self.innerRunner.RunWithOutputs(newCmdObj)

-		if err == nil || !isRetryableError(output, err) {
-			break
+		if err == nil || !isRetryableError(stdout+stderr) {
+			return stdout, stderr, err
 		}

-		if attempt < maxRetries-1 {
-			self.log.Warnf("lock error prevented command from running; retrying in %s", delay)
-			time.Sleep(delay)
-			delay *= 2
-		}
+		// if we have an error based on a lock, we should wait a bit and then retry
+		self.log.Warn("lock error prevented command from running. Retrying command after a small wait")
+		time.Sleep(WaitTime)
 	}

-	return output, err
+	return stdout, stderr, err
 }

 // Retry logic not implemented here, but these commands typically don't need to obtain a lock.
@@ -1,137 +0,0 @@
-package commands
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/stretchr/testify/assert"
-)
-
-type runnerResult struct {
-	output string
-	err    error
-}
-
-// scriptedRunner is an ICmdObjRunner stub that returns a preconfigured result
-// for each successive call, letting us drive the retry loop deterministically.
-// It counts calls so tests can assert whether a command was retried.
-type scriptedRunner struct {
-	results []runnerResult
-	calls   int
-}
-
-func (self *scriptedRunner) next() (string, error) {
-	result := self.results[self.calls]
-	self.calls++
-	return result.output, result.err
-}
-
-func (self *scriptedRunner) Run(*oscommands.CmdObj) error {
-	_, err := self.next()
-	return err
-}
-
-func (self *scriptedRunner) RunWithOutput(*oscommands.CmdObj) (string, error) {
-	return self.next()
-}
-
-func (self *scriptedRunner) RunWithOutputs(*oscommands.CmdObj) (string, string, error) {
-	output, err := self.next()
-	return output, "", err
-}
-
-func (self *scriptedRunner) RunAndProcessLines(*oscommands.CmdObj, func(string) (bool, error)) error {
-	panic("not implemented")
-}
-
-func newTestRunner(inner *scriptedRunner) *gitCmdObjRunner {
-	return &gitCmdObjRunner{
-		log:         utils.NewDummyLog(),
-		innerRunner: inner,
-		// don't actually sleep between retries
-		initialRetryDelay: 0,
-	}
-}
-
-// dummyCmdObj returns a throwaway command; only its clonability matters, since
-// the scriptedRunner ignores it and returns preconfigured results.
-func dummyCmdObj() *oscommands.CmdObj {
-	return oscommands.NewDummyCmdObjBuilder(nil).New([]string{"git", "status"})
-}
-
-func TestRunWithOutputReturnsSuccessWithoutRetrying(t *testing.T) {
-	inner := &scriptedRunner{results: []runnerResult{{output: "done", err: nil}}}
-
-	output, err := newTestRunner(inner).RunWithOutput(dummyCmdObj())
-
-	assert.NoError(t, err)
-	assert.Equal(t, "done", output)
-	assert.Equal(t, 1, inner.calls)
-}
-
-func TestRunWithOutputDoesNotRetryNonLockError(t *testing.T) {
-	inner := &scriptedRunner{results: []runnerResult{{output: "boom", err: errors.New("boom")}}}
-
-	_, err := newTestRunner(inner).RunWithOutput(dummyCmdObj())
-
-	assert.Error(t, err)
-	assert.Equal(t, 1, inner.calls)
-}
-
-func TestRunWithOutputRetriesWhenLockErrorIsInOutput(t *testing.T) {
-	inner := &scriptedRunner{results: []runnerResult{
-		{output: "fatal: Unable to create '/repo/.git/index.lock': File exists.", err: errors.New("exit status 128")},
-		{output: "done", err: nil},
-	}}
-
-	output, err := newTestRunner(inner).RunWithOutput(dummyCmdObj())
-
-	assert.NoError(t, err)
-	assert.Equal(t, "done", output)
-	assert.Equal(t, 2, inner.calls)
-}
-
-func TestRunWithOutputRetriesWhenLockErrorIsOnlyInError(t *testing.T) {
-	// A streamed command (e.g. an amend run through the gpg helper) doesn't
-	// capture its output, so a lock failure surfaces only in the returned error
-	// with an empty output string. The retry logic must still recognize it.
-	inner := &scriptedRunner{results: []runnerResult{
-		{output: "", err: errors.New("fatal: Unable to create '/repo/.git/index.lock': File exists.")},
-		{output: "", err: nil},
-	}}
-
-	_, err := newTestRunner(inner).RunWithOutput(dummyCmdObj())
-
-	assert.NoError(t, err)
-	assert.Equal(t, 2, inner.calls)
-}
-
-func TestRunWithOutputGivesUpAfterMaxRetries(t *testing.T) {
-	results := make([]runnerResult, maxRetries)
-	for i := range results {
-		results[i] = runnerResult{err: errors.New("fatal: Unable to create '/repo/.git/index.lock': File exists.")}
-	}
-	inner := &scriptedRunner{results: results}
-
-	_, err := newTestRunner(inner).RunWithOutput(dummyCmdObj())
-
-	assert.Error(t, err)
-	assert.Equal(t, maxRetries, inner.calls)
-}
-
-func TestRunWithOutputRetriesLockErrorInLinkedWorktree(t *testing.T) {
-	// In a linked worktree the lock lives at .git/worktrees/<name>/index.lock
-	// rather than .git/index.lock, so only matching the bare "index.lock"
-	// fragment lets the retry fire there too.
-	inner := &scriptedRunner{results: []runnerResult{
-		{output: "", err: errors.New("fatal: Unable to create '/repo/.git/worktrees/feature/index.lock': File exists.")},
-		{output: "", err: nil},
-	}}
-
-	_, err := newTestRunner(inner).RunWithOutput(dummyCmdObj())
-
-	assert.NoError(t, err)
-	assert.Equal(t, 2, inner.calls)
-}
@@ -1,103 +0,0 @@
-package git_commands
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/samber/lo"
-)
-
-// Holds parsed values from a single %(ahead-behind:<base>) field.
-type aheadBehind struct {
-	ahead, behind int
-	valid         bool
-}
-
-type branchAheadBehind struct {
-	refName      string
-	aheadBehinds []aheadBehind
-}
-
-// Parses output produced by:
-//
-//	git for-each-ref --format='%(refname)\x00%(ahead-behind:<base1>)\x00...' refs/heads
-//
-// Lines whose NUL-split column count doesn't match (1 + numBases) are dropped.
-// Blank lines are ignored.
-// Individual malformed ahead-behind fields produce {valid: false} entries, so
-// that the entries of a line stay aligned with the bases.
-func parseAheadBehindForEachRefOutput(
-	output string,
-	numBases int, // number of %(ahead-behind:...) tokens
-) []branchAheadBehind {
-	if output == "" {
-		return nil
-	}
-	lines := strings.Split(output, "\n")
-	result := make([]branchAheadBehind, 0, len(lines))
-	for _, line := range lines {
-		cols := strings.Split(line, "\x00")
-		if len(cols) != numBases+1 {
-			continue
-		}
-		refName := cols[0]
-		aheadBehinds := lo.Map(cols[1:], func(col string, _ int) aheadBehind {
-			return parseAheadBehindField(col)
-		})
-		entry := branchAheadBehind{
-			refName:      refName,
-			aheadBehinds: aheadBehinds,
-		}
-		result = append(result, entry)
-	}
-	return result
-}
-
-func parseAheadBehindField(s string) aheadBehind {
-	parts := strings.Fields(s)
-	if len(parts) != 2 {
-		return aheadBehind{}
-	}
-	ahead, err1 := strconv.Atoi(parts[0])
-	behind, err2 := strconv.Atoi(parts[1])
-	if err1 != nil || err2 != nil {
-		return aheadBehind{}
-	}
-	return aheadBehind{ahead: ahead, behind: behind, valid: true}
-}
-
-// Picks the "closest" base by smallest ahead value (commits the branch
-// has that the base doesn't = roughly "since fork point") and returns
-// its behind value.
-// Ties are broken by index order
-func selectBehindForBranch(aheadBehinds []aheadBehind) int {
-	validOnes := lo.Filter(aheadBehinds, func(ab aheadBehind, _ int) bool {
-		return ab.valid
-	})
-	return lo.MinBy(validOnes, func(a, b aheadBehind) bool {
-		return a.ahead < b.ahead
-	}).behind
-}
-
-// Builds a for-each-ref command that reports, for each ref matched by one of
-// refPatterns, how far it is ahead and behind each of the bases. A base is a
-// ref name or a commit hash. The output format is:
-//
-//	<refname>\x00<ahead> <behind>\x00<ahead> <behind>...\n
-//
-// with one ahead-behind field per base, in the same order as bases.
-//
-// Requires git >= 2.41 (when %(ahead-behind:...) was added).
-func buildAheadBehindForEachRefArgs(bases []string, refPatterns []string) []string {
-	formatParts := make([]string, 0, 1+len(bases))
-	formatParts = append(formatParts, "%(refname)")
-	for _, base := range bases {
-		formatParts = append(formatParts, "%(ahead-behind:"+base+")")
-	}
-	format := strings.Join(formatParts, "%00")
-
-	return NewGitCmd("for-each-ref").
-		Arg("--format=" + format).
-		Arg(refPatterns...).
-		ToArgv()
-}
@@ -1,262 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParseAheadBehindForEachRefOutput(t *testing.T) {
-	type scenario struct {
-		testName string
-		input    string
-		numBases int
-		expected []branchAheadBehind
-	}
-
-	scenarios := []scenario{
-		{
-			testName: "single branch single base",
-			input:    "refs/heads/feat\x002 5\n",
-			numBases: 1,
-			expected: []branchAheadBehind{
-				{
-					refName:      "refs/heads/feat",
-					aheadBehinds: []aheadBehind{{ahead: 2, behind: 5, valid: true}},
-				},
-			},
-		},
-		{
-			testName: "multiple branches multiple bases",
-			input: "refs/heads/feat\x002 5\x0010 1\n" +
-				"refs/heads/main\x000 0\x000 0\n",
-			numBases: 2,
-			expected: []branchAheadBehind{
-				{
-					refName: "refs/heads/feat",
-					aheadBehinds: []aheadBehind{
-						{ahead: 2, behind: 5, valid: true},
-						{ahead: 10, behind: 1, valid: true},
-					},
-				},
-				{
-					refName: "refs/heads/main",
-					aheadBehinds: []aheadBehind{
-						{ahead: 0, behind: 0, valid: true},
-						{ahead: 0, behind: 0, valid: true},
-					},
-				},
-			},
-		},
-		{
-			testName: "empty ahead-behind field for unreachable base",
-			input:    "refs/heads/feat\x00\x002 5\n",
-			numBases: 2,
-			expected: []branchAheadBehind{
-				{
-					refName: "refs/heads/feat",
-					aheadBehinds: []aheadBehind{
-						{},
-						{ahead: 2, behind: 5, valid: true},
-					},
-				},
-			},
-		},
-		{
-			testName: "ref name containing slashes and dashes",
-			input:    "refs/heads/feat/foo-bar\x001 2\n",
-			numBases: 1,
-			expected: []branchAheadBehind{
-				{
-					refName:      "refs/heads/feat/foo-bar",
-					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
-				},
-			},
-		},
-		{
-			testName: "trailing newline and blank lines are ignored",
-			input:    "refs/heads/feat\x001 2\n\n",
-			numBases: 1,
-			expected: []branchAheadBehind{
-				{
-					refName:      "refs/heads/feat",
-					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
-				},
-			},
-		},
-		{
-			testName: "line with wrong column count is skipped",
-			input: "refs/heads/good\x001 2\n" +
-				"refs/heads/bad\n" +
-				"refs/heads/also_good\x003 4\n",
-			numBases: 1,
-			expected: []branchAheadBehind{
-				{
-					refName:      "refs/heads/good",
-					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
-				},
-				{
-					refName:      "refs/heads/also_good",
-					aheadBehinds: []aheadBehind{{ahead: 3, behind: 4, valid: true}},
-				},
-			},
-		},
-		{
-			testName: "malformed ahead-behind field becomes invalid but line is kept",
-			input:    "refs/heads/feat\x00not_a_number\n",
-			numBases: 1,
-			expected: []branchAheadBehind{
-				{
-					refName:      "refs/heads/feat",
-					aheadBehinds: []aheadBehind{{}},
-				},
-			},
-		},
-		{
-			testName: "empty input",
-			input:    "",
-			numBases: 1,
-			expected: nil,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			result := parseAheadBehindForEachRefOutput(s.input, s.numBases)
-			assert.Equal(t, s.expected, result)
-		})
-	}
-}
-
-func TestSelectBehindForBranch(t *testing.T) {
-	type scenario struct {
-		testName     string
-		aheadBehinds []aheadBehind
-		expected     int
-	}
-
-	scenarios := []scenario{
-		{
-			testName:     "single base, valid value",
-			aheadBehinds: []aheadBehind{{ahead: 3, behind: 7, valid: true}},
-			expected:     7,
-		},
-		{
-			testName: "multi-base, clear winner by ahead",
-			aheadBehinds: []aheadBehind{
-				{ahead: 50, behind: 10, valid: true}, // master
-				{ahead: 5, behind: 2, valid: true},   // develop  ← smallest ahead
-			},
-			expected: 2,
-		},
-		{
-			testName: "develop forked from master case (ancestor-of-each-other)",
-			// feat-x has 5 commits since fork from develop.
-			// develop is 50 commits ahead of master.
-			// ahead vs master = 5 + 50 = 55; behind vs master = 0
-			// ahead vs develop = 5;          behind vs develop = 5
-			aheadBehinds: []aheadBehind{
-				{ahead: 55, behind: 0, valid: true}, // master
-				{ahead: 5, behind: 5, valid: true},  // develop  ← smallest ahead
-			},
-			expected: 5,
-		},
-		{
-			testName: "tie on ahead - first base wins (config order)",
-			aheadBehinds: []aheadBehind{
-				{ahead: 5, behind: 10, valid: true}, // first
-				{ahead: 5, behind: 99, valid: true}, // second, same ahead
-			},
-			expected: 10,
-		},
-		{
-			testName: "first base invalid, second valid",
-			aheadBehinds: []aheadBehind{
-				{},
-				{ahead: 3, behind: 8, valid: true},
-			},
-			expected: 8,
-		},
-		{
-			testName:     "all invalid - returns 0",
-			aheadBehinds: []aheadBehind{{}, {}},
-			expected:     0,
-		},
-		{
-			testName:     "empty - returns 0",
-			aheadBehinds: nil,
-			expected:     0,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			result := selectBehindForBranch(s.aheadBehinds)
-			assert.Equal(t, s.expected, result)
-		})
-	}
-}
-
-func TestBuildAheadBehindForEachRefArgs(t *testing.T) {
-	type scenario struct {
-		testName    string
-		bases       []string
-		refPatterns []string
-		expected    []string
-	}
-
-	scenarios := []scenario{
-		{
-			testName:    "single base",
-			bases:       []string{"refs/heads/master"},
-			refPatterns: []string{"refs/heads"},
-			expected: []string{
-				"git",
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:refs/heads/master)",
-				"refs/heads",
-			},
-		},
-		{
-			testName:    "two bases",
-			bases:       []string{"refs/heads/master", "refs/remotes/origin/develop"},
-			refPatterns: []string{"refs/heads"},
-			expected: []string{
-				"git",
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:refs/heads/master)%00%(ahead-behind:refs/remotes/origin/develop)",
-				"refs/heads",
-			},
-		},
-		{
-			testName:    "four bases",
-			bases:       []string{"refs/heads/a", "refs/heads/b", "refs/heads/c", "refs/heads/d"},
-			refPatterns: []string{"refs/heads"},
-			expected: []string{
-				"git",
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:refs/heads/a)%00%(ahead-behind:refs/heads/b)%00%(ahead-behind:refs/heads/c)%00%(ahead-behind:refs/heads/d)",
-				"refs/heads",
-			},
-		},
-		{
-			testName:    "commit hashes as bases, individual refs as patterns",
-			bases:       []string{"1234567", "89abcde"},
-			refPatterns: []string{"refs/heads/a", "refs/remotes/origin/b"},
-			expected: []string{
-				"git",
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:1234567)%00%(ahead-behind:89abcde)",
-				"refs/heads/a",
-				"refs/remotes/origin/b",
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			result := buildAheadBehindForEachRefArgs(s.bases, s.refPatterns)
-			assert.Equal(t, s.expected, result)
-		})
-	}
-}
@@ -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()
 }
@@ -285,26 +285,11 @@ func (self *BranchCommands) Merge(branchName string, variant MergeVariant) error
 	return self.cmd.New(cmdArgs).Run()
 }

-// Fast-forwards the branch that is checked out in the given worktree to the
-// given ref. Fails if that can't be done without a merge commit. Pass empty
-// strings for the worktree to use the current one.
-func (self *BranchCommands) FastForwardMerge(refName string, worktreeGitDir string, worktreePath string) error {
-	cmdArgs := NewGitCmd("merge").
-		Arg("--ff-only").
-		Arg(refName).
-		GitDirIf(worktreeGitDir != "", worktreeGitDir).
-		WorktreePathIf(worktreePath != "", worktreePath).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// Returns whether the first ref is an ancestor of the second one, which also
-// means that the second one can be fast-forward merged into the first one
-func (self *BranchCommands) IsAncestor(ancestorRefName string, refName string) bool {
+// Returns whether refName can be fast-forward merged into the current branch
+func (self *BranchCommands) CanDoFastForwardMerge(refName string) bool {
 	cmdArgs := NewGitCmd("merge-base").
 		Arg("--is-ancestor").
-		Arg(ancestorRefName, refName).
+		Arg("HEAD", refName).
 		ToArgv()
 	err := self.cmd.New(cmdArgs).DontLog().Run()
 	return err == nil
@@ -368,85 +353,9 @@ func (self *BranchCommands) IsBranchMerged(branch *models.Branch, mainBranches *
 	return stdout == "", nil
 }

-// Returns whether the given branch has commits of its own, meaning commits
-// that its remote branch never contained. Those are the commits that would be
-// lost if we reset the branch to its upstream.
-//
-// A branch that has diverged from its upstream doesn't necessarily have any
-// commits of its own. If somebody else rewrote the remote branch and
-// force-pushed it, our branch is still at the commits it had before, and all
-// of those were on the remote branch at some point. The reflog of the
-// remote-tracking branch records the values it had before it was rewritten, so
-// a commit that was ever on the remote branch is contained in one of them.
-func (self *BranchCommands) HasLocalOnlyCommits(branch *models.Branch) (bool, error) {
-	upstreamValues := append(
-		[]string{branch.FullUpstreamRefName()},
-		self.previousUpstreamValues(branch.FullUpstreamRefName())...,
-	)
-
-	cmdArgs := NewGitCmd("rev-list").
-		Arg("--max-count=1").
-		// A value that the remote-tracking branch had long ago might not be
-		// available any more, e.g. in a partial clone. Skip it rather than
-		// failing; it only means we exclude fewer commits.
-		Arg("--ignore-missing").
-		Arg(branch.FullRefName()).
-		Arg(lo.Map(upstreamValues, func(value string, _ int) string {
-			return "^" + value
-		})...).
-		Arg("--").
-		ToArgv()
-
-	stdout, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs()
-	if err != nil {
-		return false, err
-	}
-
-	return stdout != "", nil
-}
-
-// Returns the values that the given remote-tracking branch had before its
-// current one, as far back as its reflog goes. Returns nothing if the reflog
-// is unavailable, for example because core.logAllRefUpdates is false; a branch
-// that is strictly behind its upstream is recognized without it.
-func (self *BranchCommands) previousUpstreamValues(upstreamRef string) []string {
-	cmdArgs := NewGitCmd("reflog").
-		Arg("show").
-		Arg("--format=%H").
-		Arg(upstreamRef).
-		ToArgv()
-
-	stdout, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs()
-	if err != nil {
-		return nil
-	}
-
-	// Each entry holds the value that the ref was updated to.
-	values := utils.SplitLines(stdout)
-
-	// The value it had before the oldest entry is that entry's old value, and
-	// the only way to name it is <ref>@{<number of entries>}. It doesn't exist
-	// if the oldest entry is the one that created the ref, and asking for it
-	// then is an error rather than an empty result.
-	cmdArgs = NewGitCmd("rev-parse").
-		Arg("-q", "--verify").
-		Arg(fmt.Sprintf("%s@{%d}", upstreamRef, len(values))).
-		ToArgv()
-
-	if stdout, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs(); err == nil {
-		values = append(values, strings.TrimSpace(stdout))
-	}
-
-	return values
-}
-
-// Moves branches by writing refs directly. The reflog message is what
-// `git reflog <branch>` shows for the update; it is the only hint about who
-// moved the branch, as no git command shows up in the reflog for this.
-func (self *BranchCommands) UpdateBranchRefs(updateCommands string, reflogMessage string) error {
+func (self *BranchCommands) UpdateBranchRefs(updateCommands string) error {
 	cmdArgs := NewGitCmd("update-ref").
 		Arg("--stdin").
-		Arg("-m", reflogMessage).
 		ToArgv()

 	return self.cmd.New(cmdArgs).SetStdin(updateCommands).Run()
@@ -44,7 +44,6 @@ type BranchLoader struct {
 	*GitCommon
 	cmd                  oscommands.ICmdObjBuilder
 	getCurrentBranchInfo func() (BranchInfo, error)
-	hasLocalOnlyCommits  func(*models.Branch) (bool, error)
 	config               BranchLoaderConfigCommands
 }

@@ -53,7 +52,6 @@ func NewBranchLoader(
 	gitCommon *GitCommon,
 	cmd oscommands.ICmdObjBuilder,
 	getCurrentBranchInfo func() (BranchInfo, error),
-	hasLocalOnlyCommits func(*models.Branch) (bool, error),
 	config BranchLoaderConfigCommands,
 ) *BranchLoader {
 	return &BranchLoader{
@@ -61,7 +59,6 @@ func NewBranchLoader(
 		GitCommon:            gitCommon,
 		cmd:                  cmd,
 		getCurrentBranchInfo: getCurrentBranchInfo,
-		hasLocalOnlyCommits:  hasLocalOnlyCommits,
 		config:               config,
 	}
 }
@@ -70,21 +67,13 @@ func NewBranchLoader(
 func (self *BranchLoader) Load(reflogCommits []*models.Commit,
 	mainBranches *MainBranches,
 	oldBranches []*models.Branch,
-	loadExtraInfo bool,
+	loadBehindCounts bool,
 	onWorker func(func() error),
 	renderFunc func(),
 ) ([]*models.Branch, error) {
-	branches, tips := self.obtainBranches()
+	branches := self.obtainBranches()

-	switch self.UserConfig().Git.LocalBranchSortOrder {
-	case "date":
-		if err := sortRefsWithEqualDatesByAncestry(
-			self.cmd, self.version, branches, (*models.Branch).FullRefName, tips,
-		); err != nil {
-			self.Log.Errorf("Failed to sort branches by ancestry: %v", err)
-		}
-
-	case "recency":
+	if self.UserConfig().Git.LocalBranchSortOrder == "recency" {
 		reflogBranches := self.obtainReflogBranches(reflogCommits)
 		// loop through reflog branches. If there is a match, merge them, then remove it from the branches and keep it in the reflog branches
 		branchesWithRecency := make([]*models.Branch, 0)
@@ -138,63 +127,24 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit,
 			branch.UpstreamBranch = match.Merge
 		}

-		// If the branch already existed, take over the values that are
-		// determined in the background, to reduce flicker
+		// If the branch already existed, take over its BehindBaseBranch value
+		// to reduce flicker
 		if oldBranch, found := lo.Find(oldBranches, func(b *models.Branch) bool {
 			return b.Name == branch.Name
 		}); found {
 			branch.BehindBaseBranch.Store(oldBranch.BehindBaseBranch.Load())
-			branch.UpstreamRewritten.Store(oldBranch.UpstreamRewritten.Load())
 		}
 	}

-	if loadExtraInfo {
-		if self.UserConfig().Gui.ShowDivergenceFromBaseBranch != "none" {
-			onWorker(func() error {
-				return self.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, renderFunc)
-			})
-		}
-
+	if loadBehindCounts && self.UserConfig().Gui.ShowDivergenceFromBaseBranch != "none" {
 		onWorker(func() error {
-			return self.checkForRewrittenUpstreams(branches, renderFunc)
+			return self.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, renderFunc)
 		})
 	}

 	return branches, nil
 }

-// For each branch that has diverged from its upstream, determines whether the
-// divergence comes from the upstream branch having been rewritten, and stores
-// the answer in the branch. A branch that we can't determine it for keeps the
-// answer "no", so that we don't offer anything we aren't sure about.
-func (self *BranchLoader) checkForRewrittenUpstreams(branches []*models.Branch, renderFunc func()) error {
-	t := time.Now()
-	errg := errgroup.Group{}
-
-	for _, branch := range branches {
-		if !branch.IsAheadForPull() || !branch.IsBehindForPull() {
-			branch.UpstreamRewritten.Store(false)
-			continue
-		}
-
-		errg.Go(func() error {
-			hasLocalOnlyCommits, err := self.hasLocalOnlyCommits(branch)
-			if err != nil {
-				// Not worth bothering the user about; it only means that we
-				// don't show this branch differently.
-				self.Log.Errorf("Failed to check whether branch %s has commits of its own: %v", branch.Name, err)
-			}
-			branch.UpstreamRewritten.Store(err == nil && !hasLocalOnlyCommits)
-			return nil
-		})
-	}
-
-	err := errg.Wait()
-	self.Log.Debugf("time to check for rewritten upstreams for all branches: %s", time.Since(t))
-	renderFunc()
-	return err
-}
-
 func (self *BranchLoader) GetBehindBaseBranchValuesForAllBranches(
 	branches []*models.Branch,
 	mainBranches *MainBranches,
@@ -206,7 +156,7 @@ func (self *BranchLoader) GetBehindBaseBranchValuesForAllBranches(
 	}

 	if self.version.IsAtLeast(2, 41, 0) {
-		return self.getBehindBaseBranchValuesFast(branches, mainBranchRefs, renderFunc)
+		return self.getBehindBaseBranchValuesFast(branches, mainBranches, renderFunc)
 	}
 	return self.getBehindBaseBranchValuesLegacy(branches, mainBranches, renderFunc)
 }
@@ -221,31 +171,11 @@ func (self *BranchLoader) getBehindBaseBranchValuesLegacy(

 	for _, branch := range branches {
 		errg.Go(func() error {
-			baseBranch, err := self.GetBaseBranch(branch, mainBranches)
+			_, behinds, err := self.baseBranchCandidatesAndBehinds(branch, mainBranches)
 			if err != nil {
 				return err
 			}
-			behind := 0 // prime it in case something below fails
-			if baseBranch != "" {
-				output, err := self.cmd.New(
-					NewGitCmd("rev-list").
-						Arg("--left-right").
-						Arg("--count").
-						Arg(fmt.Sprintf("%s...%s", branch.FullRefName(), baseBranch)).
-						ToArgv(),
-				).DontLog().RunWithOutput()
-				if err != nil {
-					return err
-				}
-				// The format of the output is "<ahead>\t<behind>"
-				aheadBehindStr := strings.Split(strings.TrimSpace(output), "\t")
-				if len(aheadBehindStr) == 2 {
-					if value, err := strconv.Atoi(aheadBehindStr[1]); err == nil {
-						behind = value
-					}
-				}
-			}
-			branch.BehindBaseBranch.Store(int32(behind))
+			branch.BehindBaseBranch.Store(classifyBehind(behinds))
 			return nil
 		})
 	}
@@ -256,15 +186,158 @@ func (self *BranchLoader) getBehindBaseBranchValuesLegacy(
 	return err
 }

+// Holds parsed values from a single %(ahead-behind:<base>) field. `valid`
+// is false when the field failed to parse (e.g. the base was unreachable
+// from this ref); the entry is preserved so that the slice stays index-
+// aligned with the configured main branches.
+type aheadBehind struct {
+	ahead, behind int
+	valid         bool
+}
+
+type branchAheadBehind struct {
+	refName      string
+	aheadBehinds []aheadBehind
+}
+
+// Parses output produced by:
+//
+//	git for-each-ref --format='%(refname)\x00%(ahead-behind:<base1>)\x00...' refs/heads
+//
+// Lines whose NUL-split column count doesn't match (1 + numBases) are dropped.
+// Blank lines are ignored.
+// Individual malformed ahead-behind fields produce {valid: false} entries.
+func parseAheadBehindForEachRefOutput(
+	output string,
+	numBases int, // number of %(ahead-behind:...) tokens
+) []branchAheadBehind {
+	if output == "" {
+		return nil
+	}
+	lines := strings.Split(output, "\n")
+	result := make([]branchAheadBehind, 0, len(lines))
+	for _, line := range lines {
+		cols := strings.Split(line, "\x00")
+		if len(cols) != numBases+1 {
+			continue
+		}
+		refName := cols[0]
+		aheadBehinds := lo.Map(cols[1:], func(col string, _ int) aheadBehind {
+			return parseAheadBehindField(col)
+		})
+		entry := branchAheadBehind{
+			refName:      refName,
+			aheadBehinds: aheadBehinds,
+		}
+		result = append(result, entry)
+	}
+	return result
+}
+
+func parseAheadBehindField(s string) aheadBehind {
+	parts := strings.Fields(s)
+	if len(parts) != 2 {
+		return aheadBehind{}
+	}
+	ahead, err1 := strconv.Atoi(parts[0])
+	behind, err2 := strconv.Atoi(parts[1])
+	if err1 != nil || err2 != nil {
+		return aheadBehind{}
+	}
+	return aheadBehind{ahead: ahead, behind: behind, valid: true}
+}
+
+// selectBaseForBranch picks the closest base(s) for a branch given
+// (ahead, behind) measurements against each configured main branch.
+// "Closest" = smallest ahead value (fewest branch commits not in the
+// base). Ties are broken by the order of mainRefs (i.e. config order).
+//
+// aheadBehinds must be index-aligned with mainRefs; invalid entries are
+// skipped. Returns parallel slices: the refs tied at the minimum ahead
+// (in config order) and their behind values. The caller picks
+// candidates[0] for a single answer, or detects ambiguity via
+// `len(candidates) > 1`.
+func selectBaseForBranch(
+	aheadBehinds []aheadBehind, mainRefs []string,
+) (candidates []string, behinds []int) {
+	bestAhead := -1
+	for i, ab := range aheadBehinds {
+		if !ab.valid {
+			continue
+		}
+		switch {
+		case bestAhead < 0 || ab.ahead < bestAhead:
+			bestAhead = ab.ahead
+			candidates = []string{mainRefs[i]}
+			behinds = []int{ab.behind}
+		case ab.ahead == bestAhead:
+			candidates = append(candidates, mainRefs[i])
+			behinds = append(behinds, ab.behind)
+		}
+	}
+	return candidates, behinds
+}
+
+// classifyBehind condenses per-candidate behind values into the single
+// number stored on Branch.BehindBaseBranch for column display. When the
+// candidates all agree (possibly on 0), return that value; otherwise
+// return one of the BehindBaseAmbiguous* sentinels so the renderer can
+// show "?" or "↓?" instead of a misleadingly precise count.
+func classifyBehind(behinds []int) int32 {
+	if len(behinds) == 0 {
+		return 0
+	}
+	first := behinds[0]
+	allEqual := true
+	anyZero := first == 0
+	for _, b := range behinds[1:] {
+		if b != first {
+			allEqual = false
+		}
+		if b == 0 {
+			anyZero = true
+		}
+	}
+	if allEqual {
+		return int32(first)
+	}
+	if anyZero {
+		return models.BehindBaseAmbiguousMaybeUpToDate
+	}
+	return models.BehindBaseAmbiguousDefinitelyBehind
+}
+
+// The output format is:
+//
+//	<refname>\x00<ahead> <behind>\x00<ahead> <behind>...\n
+//
+// with one ahead-behind field per base, in the same order as mainBranchRefs.
+//
+// Requires git >= 2.41 (when %(ahead-behind:...) was added).
+func buildAheadBehindForEachRefArgs(mainBranchRefs []string) []string {
+	formatParts := make([]string, 0, 1+len(mainBranchRefs))
+	formatParts = append(formatParts, "%(refname)")
+	for _, ref := range mainBranchRefs {
+		formatParts = append(formatParts, "%(ahead-behind:"+ref+")")
+	}
+	format := strings.Join(formatParts, "%00")
+
+	return NewGitCmd("for-each-ref").
+		Arg("--format=" + format).
+		Arg("refs/heads").
+		ToArgv()
+}
+
 func (self *BranchLoader) getBehindBaseBranchValuesFast(
 	branches []*models.Branch,
-	mainBranchRefs []string,
+	mainBranches *MainBranches,
 	renderFunc func(),
 ) error {
 	t := time.Now()

+	mainBranchRefs := mainBranches.Get()
 	output, err := self.cmd.New(
-		buildAheadBehindForEachRefArgs(mainBranchRefs, []string{"refs/heads"}),
+		buildAheadBehindForEachRefArgs(mainBranchRefs),
 	).DontLog().RunWithOutput()
 	if err != nil {
 		return err
@@ -275,8 +348,8 @@ func (self *BranchLoader) getBehindBaseBranchValuesFast(

 	for _, p := range parsed {
 		if branch, ok := branchByRef[p.refName]; ok {
-			behind := selectBehindForBranch(p.aheadBehinds)
-			branch.BehindBaseBranch.Store(int32(behind))
+			_, behinds := selectBaseForBranch(p.aheadBehinds, mainBranchRefs)
+			branch.BehindBaseBranch.Store(classifyBehind(behinds))
 			delete(branchByRef, p.refName)
 		}
 	}
@@ -291,42 +364,86 @@ func (self *BranchLoader) getBehindBaseBranchValuesFast(
 	return nil
 }

-// Find the base branch for the given branch (i.e. the main branch that the
-// given branch was forked off of)
-//
-// Note that this function may return an empty string even if the returned error
-// is nil, e.g. when none of the configured main branches exist. This is not
-// considered an error condition, so callers need to check both the returned
-// error and whether the returned base branch is empty (and possibly react
-// differently in both cases).
-func (self *BranchLoader) GetBaseBranch(branch *models.Branch, mainBranches *MainBranches) (string, error) {
+// GetBaseBranchCandidates returns the configured main branches that are the
+// closest base for the given branch — typically a single ref, but more
+// when the closeness rule (smallest ahead value) leaves a tie. Candidates
+// are returned in config order, so callers wanting one answer can use
+// candidates[0] as the config-order tiebreak. An empty slice (with nil
+// error) means no configured main branch contains the branch's merge-base.
+func (self *BranchLoader) GetBaseBranchCandidates(branch *models.Branch, mainBranches *MainBranches) ([]string, error) {
+	candidates, _, err := self.baseBranchCandidatesAndBehinds(branch, mainBranches)
+	return candidates, err
+}
+
+// baseBranchCandidatesAndBehinds is the full computation behind
+// GetBaseBranchCandidates: it also reports the behind count for each
+// returned candidate, which the legacy behind-base loader needs in order
+// to classify the column display when the candidates disagree. Slices
+// are parallel and in config order.
+func (self *BranchLoader) baseBranchCandidatesAndBehinds(branch *models.Branch, mainBranches *MainBranches) ([]string, []int, error) {
 	mergeBase := mainBranches.GetMergeBase(branch.FullRefName())
 	if mergeBase == "" {
-		return "", nil
+		return nil, nil, nil
 	}

+	mainBranchRefs := mainBranches.Get()
 	output, err := self.cmd.New(
 		NewGitCmd("for-each-ref").
 			Arg("--contains").
 			Arg(mergeBase).
 			Arg("--format=%(refname)").
-			Arg(mainBranches.Get()...).
+			Arg(mainBranchRefs...).
 			ToArgv(),
 	).DontLog().RunWithOutput()
 	if err != nil {
-		return "", err
+		return nil, nil, err
 	}
 	trimmedOutput := strings.TrimSpace(output)
-	split := strings.Split(trimmedOutput, "\n")
-	if len(split) == 0 || split[0] == "" {
-		return "", nil
+	if trimmedOutput == "" {
+		return nil, nil, nil
 	}
-	return split[0], nil
+	contained := strings.Split(trimmedOutput, "\n")
+
+	// for-each-ref sorts its output alphabetically by refname regardless of
+	// the order we passed the refs in. Restore the user's configured order so
+	// it can serve as the natural tiebreaker.
+	containing := lo.Filter(mainBranchRefs, func(ref string, _ int) bool {
+		return lo.Contains(contained, ref)
+	})
+	if len(containing) == 0 {
+		return nil, nil, nil
+	}
+
+	// Measure ahead/behind against each containing ref and hand off to
+	// selectBaseForBranch — the same selector the fast path uses — so
+	// both paths agree on the closeness rule and the config-order
+	// tiebreak. We do this even when there's only one containing ref,
+	// because the legacy column display still needs the behind value.
+	aheadBehinds := make([]aheadBehind, len(containing))
+	for i, ref := range containing {
+		revListOutput, err := self.cmd.New(
+			NewGitCmd("rev-list").
+				Arg("--left-right").
+				Arg("--count").
+				Arg(fmt.Sprintf("%s...%s", branch.FullRefName(), ref)).
+				ToArgv(),
+		).DontLog().RunWithOutput()
+		if err != nil {
+			return nil, nil, err
+		}
+		aheadBehinds[i] = parseAheadBehindField(strings.TrimSpace(revListOutput))
+	}
+
+	candidates, behinds := selectBaseForBranch(aheadBehinds, containing)
+	if len(candidates) == 0 {
+		// Every rev-list output was malformed; fall back to config order
+		// with no reliable behinds.
+		return containing, nil, nil
+	}
+	return candidates, behinds, nil
 }

-// Returns the branches, along with the tip of each of them, keyed by full ref
-// name
-func (self *BranchLoader) obtainBranches() ([]*models.Branch, map[string]refTip) {
+func (self *BranchLoader) obtainBranches() []*models.Branch {
 	output, err := self.getRawBranches()
 	if err != nil {
 		panic(err)
@@ -335,8 +452,7 @@ func (self *BranchLoader) obtainBranches() ([]*models.Branch, map[string]refTip)
 	trimmedOutput := strings.TrimSpace(output)
 	outputLines := strings.Split(trimmedOutput, "\n")

-	tips := make(map[string]refTip, len(outputLines))
-	branches := lo.FilterMap(outputLines, func(line string, _ int) (*models.Branch, bool) {
+	return lo.FilterMap(outputLines, func(line string, _ int) (*models.Branch, bool) {
 		if line == "" {
 			return nil, false
 		}
@@ -350,12 +466,8 @@ func (self *BranchLoader) obtainBranches() ([]*models.Branch, map[string]refTip)
 		}

 		storeCommitDateAsRecency := self.UserConfig().Git.LocalBranchSortOrder != "recency"
-		branch, tip := obtainBranch(split, storeCommitDateAsRecency)
-		tips[branch.FullRefName()] = tip
-		return branch, true
+		return obtainBranch(split, storeCommitDateAsRecency), true
 	})
-
-	return branches, tips
 }

 func (self *BranchLoader) getRawBranches() (string, error) {
@@ -391,28 +503,25 @@ var branchFields = []string{
 	"upstream:short",
 	"upstream:track",
 	"push:track",
-	"push",
 	"subject",
 	"objectname",
 	"committerdate:unix",
 }

 // Obtain branch information from parsed line output of getRawBranches()
-func obtainBranch(split []string, storeCommitDateAsRecency bool) (*models.Branch, refTip) {
+func obtainBranch(split []string, storeCommitDateAsRecency bool) *models.Branch {
 	headMarker := split[0]
 	fullName := split[1]
 	upstreamName := split[2]
 	track := split[3]
 	pushTrack := split[4]
-	pushRef := split[5]
-	subject := split[6]
-	commitHash := split[7]
-	commitDate := split[8]
+	subject := split[5]
+	commitHash := split[6]
+	commitDate := split[7]

 	name := strings.TrimPrefix(fullName, "heads/")
 	aheadForPull, behindForPull, gone := parseUpstreamInfo(upstreamName, track)
 	aheadForPush, behindForPush, _ := parseUpstreamInfo(upstreamName, pushTrack)
-	pushRemote, pushBranch := parsePushDestination(pushRef)

 	recency := ""
 	if storeCommitDateAsRecency {
@@ -421,22 +530,18 @@ func obtainBranch(split []string, storeCommitDateAsRecency bool) (*models.Branch
 		}
 	}

-	branch := &models.Branch{
+	return &models.Branch{
 		Name:          name,
 		Recency:       recency,
 		AheadForPull:  aheadForPull,
 		BehindForPull: behindForPull,
 		AheadForPush:  aheadForPush,
 		BehindForPush: behindForPush,
-		PushRemote:    pushRemote,
-		PushBranch:    pushBranch,
 		UpstreamGone:  gone,
 		Head:          headMarker == "*",
 		Subject:       subject,
 		CommitHash:    commitHash,
 	}
-
-	return branch, refTip{hash: commitHash, committerDate: commitDate}
 }

 func parseUpstreamInfo(upstreamName string, track string) (string, string, bool) {
@@ -457,25 +562,6 @@ func parseUpstreamInfo(upstreamName string, track string) (string, string, bool)
 	return ahead, behind, false
 }

-// Splits the remote-tracking ref that the %(push) field names, e.g.
-// refs/remotes/origin/main, into the remote and the remote branch. Returns
-// empty strings if the field is empty because git has no push destination for
-// the branch, or if the ref isn't under refs/remotes/.
-func parsePushDestination(pushRef string) (string, string) {
-	remoteAndBranch, ok := strings.CutPrefix(pushRef, "refs/remotes/")
-	if !ok {
-		return "", ""
-	}
-
-	// Remote names can't contain slashes, so the first one ends the remote name
-	remote, branch, ok := strings.Cut(remoteAndBranch, "/")
-	if !ok {
-		return "", ""
-	}
-
-	return remote, branch
-}
-
 func parseDifference(track string, regexStr string) string {
 	re := regexp.MustCompile(regexStr)
 	match := re.FindStringSubmatch(track)
@@ -6,10 +6,8 @@ import (
 	"testing"
 	"time"

-	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/sasha-s/go-deadlock"
 	"github.com/stretchr/testify/assert"
 )

@@ -28,7 +26,7 @@ func TestObtainBranch(t *testing.T) {
 	scenarios := []scenario{
 		{
 			testName:                 "TrimHeads",
-			input:                    []string{"", "heads/a_branch", "", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"", "heads/a_branch", "", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
 				Name:          "a_branch",
@@ -43,7 +41,7 @@ func TestObtainBranch(t *testing.T) {
 		},
 		{
 			testName:                 "NoUpstream",
-			input:                    []string{"", "a_branch", "", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
 				Name:          "a_branch",
@@ -58,7 +56,7 @@ func TestObtainBranch(t *testing.T) {
 		},
 		{
 			testName:                 "IsHead",
-			input:                    []string{"*", "a_branch", "", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"*", "a_branch", "", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
 				Name:          "a_branch",
@@ -73,7 +71,7 @@ func TestObtainBranch(t *testing.T) {
 		},
 		{
 			testName:                 "IsBehindAndAhead",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "[behind 2, ahead 3]", "refs/remotes/a_remote/a_branch", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "[behind 2, ahead 3]", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
 				Name:          "a_branch",
@@ -81,40 +79,6 @@ func TestObtainBranch(t *testing.T) {
 				BehindForPull: "2",
 				AheadForPush:  "3",
 				BehindForPush: "2",
-				PushRemote:    "a_remote",
-				PushBranch:    "a_branch",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "PushDestinationDiffersFromUpstream",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[ahead 3]", "[ahead 5]", "refs/remotes/my_fork/feature/a_branch", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "3",
-				BehindForPull: "0",
-				AheadForPush:  "5",
-				BehindForPush: "0",
-				PushRemote:    "my_fork",
-				PushBranch:    "feature/a_branch",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
-			},
-		},
-		{
-			testName:                 "PushDestinationNotARemoteTrackingRef",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "", "", "refs/published/a_branch", "subject", "123", timeStamp},
-			storeCommitDateAsRecency: false,
-			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "0",
-				BehindForPull: "0",
-				AheadForPush:  "0",
-				BehindForPush: "0",
 				Head:          false,
 				Subject:       "subject",
 				CommitHash:    "123",
@@ -122,7 +86,7 @@ func TestObtainBranch(t *testing.T) {
 		},
 		{
 			testName:                 "RemoteBranchIsGone",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[gone]", "[gone]", "refs/remotes/a_remote/a_branch", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "a_remote/a_branch", "[gone]", "[gone]", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
 				Name:          "a_branch",
@@ -131,8 +95,6 @@ func TestObtainBranch(t *testing.T) {
 				BehindForPull: "?",
 				AheadForPush:  "?",
 				BehindForPush: "?",
-				PushRemote:    "a_remote",
-				PushBranch:    "a_branch",
 				Head:          false,
 				Subject:       "subject",
 				CommitHash:    "123",
@@ -140,7 +102,7 @@ func TestObtainBranch(t *testing.T) {
 		},
 		{
 			testName:                 "WithCommitDateAsRecency",
-			input:                    []string{"", "a_branch", "", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: true,
 			expectedBranch: &models.Branch{
 				Name:          "a_branch",
@@ -158,9 +120,296 @@ func TestObtainBranch(t *testing.T) {

 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
-			branch, tip := obtainBranch(s.input, s.storeCommitDateAsRecency)
+			branch := obtainBranch(s.input, s.storeCommitDateAsRecency)
 			assert.EqualValues(t, s.expectedBranch, branch)
-			assert.Equal(t, refTip{hash: "123", committerDate: timeStamp}, tip)
+		})
+	}
+}
+
+func TestParseAheadBehindForEachRefOutput(t *testing.T) {
+	type scenario struct {
+		testName string
+		input    string
+		numBases int
+		expected []branchAheadBehind
+	}
+
+	scenarios := []scenario{
+		{
+			testName: "single branch single base",
+			input:    "refs/heads/feat\x002 5\n",
+			numBases: 1,
+			expected: []branchAheadBehind{
+				{
+					refName:      "refs/heads/feat",
+					aheadBehinds: []aheadBehind{{ahead: 2, behind: 5, valid: true}},
+				},
+			},
+		},
+		{
+			testName: "multiple branches multiple bases",
+			input: "refs/heads/feat\x002 5\x0010 1\n" +
+				"refs/heads/main\x000 0\x000 0\n",
+			numBases: 2,
+			expected: []branchAheadBehind{
+				{
+					refName: "refs/heads/feat",
+					aheadBehinds: []aheadBehind{
+						{ahead: 2, behind: 5, valid: true},
+						{ahead: 10, behind: 1, valid: true},
+					},
+				},
+				{
+					refName: "refs/heads/main",
+					aheadBehinds: []aheadBehind{
+						{ahead: 0, behind: 0, valid: true},
+						{ahead: 0, behind: 0, valid: true},
+					},
+				},
+			},
+		},
+		{
+			testName: "empty ahead-behind field for unreachable base",
+			input:    "refs/heads/feat\x00\x002 5\n",
+			numBases: 2,
+			expected: []branchAheadBehind{
+				{
+					refName: "refs/heads/feat",
+					aheadBehinds: []aheadBehind{
+						{valid: false},
+						{ahead: 2, behind: 5, valid: true},
+					},
+				},
+			},
+		},
+		{
+			testName: "ref name containing slashes and dashes",
+			input:    "refs/heads/feat/foo-bar\x001 2\n",
+			numBases: 1,
+			expected: []branchAheadBehind{
+				{
+					refName:      "refs/heads/feat/foo-bar",
+					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
+				},
+			},
+		},
+		{
+			testName: "trailing newline and blank lines are ignored",
+			input:    "refs/heads/feat\x001 2\n\n",
+			numBases: 1,
+			expected: []branchAheadBehind{
+				{
+					refName:      "refs/heads/feat",
+					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
+				},
+			},
+		},
+		{
+			testName: "line with wrong column count is skipped",
+			input: "refs/heads/good\x001 2\n" +
+				"refs/heads/bad\n" +
+				"refs/heads/also_good\x003 4\n",
+			numBases: 1,
+			expected: []branchAheadBehind{
+				{
+					refName:      "refs/heads/good",
+					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
+				},
+				{
+					refName:      "refs/heads/also_good",
+					aheadBehinds: []aheadBehind{{ahead: 3, behind: 4, valid: true}},
+				},
+			},
+		},
+		{
+			testName: "malformed ahead-behind field becomes invalid but line is kept",
+			input:    "refs/heads/feat\x00not_a_number\n",
+			numBases: 1,
+			expected: []branchAheadBehind{
+				{
+					refName:      "refs/heads/feat",
+					aheadBehinds: []aheadBehind{{valid: false}},
+				},
+			},
+		},
+		{
+			testName: "empty input",
+			input:    "",
+			numBases: 1,
+			expected: nil,
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			result := parseAheadBehindForEachRefOutput(s.input, s.numBases)
+			assert.Equal(t, s.expected, result)
+		})
+	}
+}
+
+func TestClassifyBehind(t *testing.T) {
+	type scenario struct {
+		testName string
+		behinds  []int
+		expected int32
+	}
+
+	scenarios := []scenario{
+		{"empty", nil, 0},
+		{"single zero", []int{0}, 0},
+		{"single non-zero", []int{5}, 5},
+		{"all equal zero", []int{0, 0, 0}, 0},
+		{"all equal non-zero", []int{7, 7}, 7},
+		{"mixed zero and non-zero → ?", []int{0, 5}, models.BehindBaseAmbiguousMaybeUpToDate},
+		{"mixed zero and non-zero, reversed → ?", []int{5, 0}, models.BehindBaseAmbiguousMaybeUpToDate},
+		{"all non-zero, different → ↓?", []int{3, 5}, models.BehindBaseAmbiguousDefinitelyBehind},
+		{"all non-zero, different (three) → ↓?", []int{3, 5, 7}, models.BehindBaseAmbiguousDefinitelyBehind},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			assert.Equal(t, s.expected, classifyBehind(s.behinds))
+		})
+	}
+}
+
+func TestSelectBaseForBranch(t *testing.T) {
+	type scenario struct {
+		testName           string
+		aheadBehinds       []aheadBehind
+		mainRefs           []string
+		expectedCandidates []string
+		expectedBehinds    []int
+	}
+
+	scenarios := []scenario{
+		{
+			testName:           "single base, valid value",
+			aheadBehinds:       []aheadBehind{{ahead: 3, behind: 7, valid: true}},
+			mainRefs:           []string{"refs/heads/master"},
+			expectedCandidates: []string{"refs/heads/master"},
+			expectedBehinds:    []int{7},
+		},
+		{
+			testName: "multi-base, clear winner by ahead",
+			aheadBehinds: []aheadBehind{
+				{ahead: 50, behind: 10, valid: true}, // master
+				{ahead: 5, behind: 2, valid: true},   // develop  ← smallest ahead
+			},
+			mainRefs:           []string{"refs/heads/master", "refs/heads/develop"},
+			expectedCandidates: []string{"refs/heads/develop"},
+			expectedBehinds:    []int{2},
+		},
+		{
+			testName: "develop forked from master case (ancestor-of-each-other)",
+			// feat-x has 5 commits since fork from develop.
+			// develop is 50 commits ahead of master.
+			// ahead vs master = 5 + 50 = 55; behind vs master = 0
+			// ahead vs develop = 5;          behind vs develop = 5
+			aheadBehinds: []aheadBehind{
+				{ahead: 55, behind: 0, valid: true}, // master
+				{ahead: 5, behind: 5, valid: true},  // develop  ← smallest ahead
+			},
+			mainRefs:           []string{"refs/heads/master", "refs/heads/develop"},
+			expectedCandidates: []string{"refs/heads/develop"},
+			expectedBehinds:    []int{5},
+		},
+		{
+			testName: "tie on ahead - both candidates returned in config order",
+			aheadBehinds: []aheadBehind{
+				{ahead: 5, behind: 10, valid: true}, // first
+				{ahead: 5, behind: 99, valid: true}, // second, same ahead
+			},
+			mainRefs: []string{"refs/heads/main", "refs/heads/develop"},
+			expectedCandidates: []string{
+				"refs/heads/main",
+				"refs/heads/develop",
+			},
+			expectedBehinds: []int{10, 99},
+		},
+		{
+			testName: "first base invalid, second valid",
+			aheadBehinds: []aheadBehind{
+				{valid: false},
+				{ahead: 3, behind: 8, valid: true},
+			},
+			mainRefs:           []string{"refs/heads/master", "refs/heads/develop"},
+			expectedCandidates: []string{"refs/heads/develop"},
+			expectedBehinds:    []int{8},
+		},
+		{
+			testName: "all invalid - returns empty",
+			aheadBehinds: []aheadBehind{
+				{valid: false},
+				{valid: false},
+			},
+			mainRefs:           []string{"refs/heads/master", "refs/heads/develop"},
+			expectedCandidates: nil,
+			expectedBehinds:    nil,
+		},
+		{
+			testName:           "empty - returns empty",
+			aheadBehinds:       nil,
+			mainRefs:           nil,
+			expectedCandidates: nil,
+			expectedBehinds:    nil,
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			candidates, behinds := selectBaseForBranch(s.aheadBehinds, s.mainRefs)
+			assert.Equal(t, s.expectedCandidates, candidates)
+			assert.Equal(t, s.expectedBehinds, behinds)
+		})
+	}
+}
+
+func TestBuildAheadBehindForEachRefArgs(t *testing.T) {
+	type scenario struct {
+		testName       string
+		mainBranchRefs []string
+		expected       []string
+	}
+
+	scenarios := []scenario{
+		{
+			testName:       "single base",
+			mainBranchRefs: []string{"refs/heads/master"},
+			expected: []string{
+				"git",
+				"for-each-ref",
+				"--format=%(refname)%00%(ahead-behind:refs/heads/master)",
+				"refs/heads",
+			},
+		},
+		{
+			testName:       "two bases",
+			mainBranchRefs: []string{"refs/heads/master", "refs/remotes/origin/develop"},
+			expected: []string{
+				"git",
+				"for-each-ref",
+				"--format=%(refname)%00%(ahead-behind:refs/heads/master)%00%(ahead-behind:refs/remotes/origin/develop)",
+				"refs/heads",
+			},
+		},
+		{
+			testName:       "four bases",
+			mainBranchRefs: []string{"refs/heads/a", "refs/heads/b", "refs/heads/c", "refs/heads/d"},
+			expected: []string{
+				"git",
+				"for-each-ref",
+				"--format=%(refname)%00%(ahead-behind:refs/heads/a)%00%(ahead-behind:refs/heads/b)%00%(ahead-behind:refs/heads/c)%00%(ahead-behind:refs/heads/d)",
+				"refs/heads",
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			result := buildAheadBehindForEachRefArgs(s.mainBranchRefs)
+			assert.Equal(t, s.expected, result)
 		})
 	}
 }
@@ -260,8 +509,8 @@ func TestGetBehindBaseBranchValuesForAllBranches_LegacyPath(t *testing.T) {
 		{Name: "feat-x"},
 	}

-	// In legacy path: per-branch GetBaseBranch (merge-base + for-each-ref --contains)
-	// then rev-list --left-right --count.
+	// In legacy path: per-branch GetBaseBranchCandidates (merge-base +
+	// for-each-ref --contains) then rev-list --left-right --count.
 	runner := oscommands.NewFakeRunner(t).
 		ExpectGitArgs([]string{"merge-base", "refs/heads/feat-x", "refs/heads/master"}, "abc123\n", nil).
 		ExpectGitArgs([]string{"for-each-ref", "--contains", "abc123", "--format=%(refname)", "refs/heads/master"}, "refs/heads/master\n", nil).
@@ -294,61 +543,97 @@ func TestGetBehindBaseBranchValuesForAllBranches_LegacyPath(t *testing.T) {
 	runner.CheckForMissingCalls()
 }

-func TestCheckForRewrittenUpstreams(t *testing.T) {
-	branch := func(name string, ahead string, behind string) *models.Branch {
-		return &models.Branch{
-			Name:           name,
-			UpstreamRemote: "origin",
-			UpstreamBranch: name,
-			AheadForPull:   ahead,
-			BehindForPull:  behind,
-		}
-	}
+// When the branch's merge-base is contained in more than one configured main
+// branch and the ahead counts are equal, the candidate list must preserve
+// the user's configured order rather than the alphabetical order of
+// for-each-ref's output.
+func TestGetBaseBranchCandidates_AmbiguousReturnsAllInConfigOrder(t *testing.T) {
+	mainBranchRefs := []string{"refs/heads/main", "refs/heads/develop"}
+	branch := &models.Branch{Name: "feat-x"}

-	notDiverged := branch("not-diverged", "0", "2")
-	rewritten := branch("rewritten", "3", "5")
-	ownCommits := branch("own-commits", "3", "5")
-	failing := branch("failing", "1", "1")
+	runner := oscommands.NewFakeRunner(t).
+		ExpectGitArgs(
+			[]string{"merge-base", "refs/heads/feat-x", "refs/heads/main", "refs/heads/develop"},
+			"abc123\n", nil).
+		ExpectGitArgs(
+			[]string{
+				"for-each-ref", "--contains", "abc123", "--format=%(refname)",
+				"refs/heads/main", "refs/heads/develop",
+			},
+			"refs/heads/develop\nrefs/heads/main\n", nil).
+		ExpectGitArgs(
+			[]string{"rev-list", "--left-right", "--count", "refs/heads/feat-x...refs/heads/main"},
+			"5\t10\n", nil).
+		ExpectGitArgs(
+			[]string{"rev-list", "--left-right", "--count", "refs/heads/feat-x...refs/heads/develop"},
+			"5\t8\n", nil)

-	// A branch that is no longer diverged must lose the value it had before
-	notDiverged.UpstreamRewritten.Store(true)
+	gitCommon := buildGitCommon(commonDeps{runner: runner})

-	branches := []*models.Branch{notDiverged, rewritten, ownCommits, failing}
-
-	var mutex deadlock.Mutex
-	queried := []string{}
-	hasLocalOnlyCommits := func(branch *models.Branch) (bool, error) {
-		mutex.Lock()
-		queried = append(queried, branch.Name)
-		mutex.Unlock()
-
-		switch branch.Name {
-		case "own-commits":
-			return true, nil
-		case "failing":
-			return false, errors.New("error")
-		default:
-			return false, nil
-		}
-	}
-
-	gitCommon := buildGitCommon(commonDeps{})
 	loader := &BranchLoader{
-		Common:              gitCommon.Common,
-		GitCommon:           gitCommon,
-		cmd:                 gitCommon.cmd,
-		hasLocalOnlyCommits: hasLocalOnlyCommits,
+		Common:    gitCommon.Common,
+		GitCommon: gitCommon,
+		cmd:       gitCommon.cmd,
 	}

-	rendered := false
-	err := loader.checkForRewrittenUpstreams(branches, func() { rendered = true })
-	assert.NoError(t, err)
-	assert.True(t, rendered, "renderFunc should have been called")
+	mainBranches := &MainBranches{
+		c:                    gitCommon.Common,
+		cmd:                  gitCommon.cmd,
+		existingMainBranches: mainBranchRefs,
+		previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches,
+	}

-	assert.ElementsMatch(t, []string{"rewritten", "own-commits", "failing"}, queried,
-		"only diverged branches should be looked at")
-	assert.False(t, notDiverged.UpstreamRewritten.Load())
-	assert.True(t, rewritten.UpstreamRewritten.Load())
-	assert.False(t, ownCommits.UpstreamRewritten.Load())
-	assert.False(t, failing.UpstreamRewritten.Load(), "a failed check should not claim anything")
+	candidates, err := loader.GetBaseBranchCandidates(branch, mainBranches)
+	assert.NoError(t, err)
+	assert.Equal(t, []string{"refs/heads/main", "refs/heads/develop"}, candidates)
+
+	runner.CheckForMissingCalls()
+}
+
+// When a configured main branch has a strictly smaller ahead count than any
+// other (e.g. the branch was forked off `main` after main's last merge into
+// `develop`, so `develop` doesn't yet contain the fork point's recent main
+// history), that base wins outright regardless of config order, so only
+// that one ref is returned.
+func TestGetBaseBranchCandidates_UnambiguousReturnsSmallestAheadOnly(t *testing.T) {
+	mainBranchRefs := []string{"refs/heads/develop", "refs/heads/main"}
+	branch := &models.Branch{Name: "feat-x"}
+
+	runner := oscommands.NewFakeRunner(t).
+		ExpectGitArgs(
+			[]string{"merge-base", "refs/heads/feat-x", "refs/heads/develop", "refs/heads/main"},
+			"abc123\n", nil).
+		ExpectGitArgs(
+			[]string{
+				"for-each-ref", "--contains", "abc123", "--format=%(refname)",
+				"refs/heads/develop", "refs/heads/main",
+			},
+			"refs/heads/develop\nrefs/heads/main\n", nil).
+		ExpectGitArgs(
+			[]string{"rev-list", "--left-right", "--count", "refs/heads/feat-x...refs/heads/develop"},
+			"8\t3\n", nil).
+		ExpectGitArgs(
+			[]string{"rev-list", "--left-right", "--count", "refs/heads/feat-x...refs/heads/main"},
+			"5\t10\n", nil)
+
+	gitCommon := buildGitCommon(commonDeps{runner: runner})
+
+	loader := &BranchLoader{
+		Common:    gitCommon.Common,
+		GitCommon: gitCommon,
+		cmd:       gitCommon.cmd,
+	}
+
+	mainBranches := &MainBranches{
+		c:                    gitCommon.Common,
+		cmd:                  gitCommon.cmd,
+		existingMainBranches: mainBranchRefs,
+		previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches,
+	}
+
+	candidates, err := loader.GetBaseBranchCandidates(branch, mainBranches)
+	assert.NoError(t, err)
+	assert.Equal(t, []string{"refs/heads/main"}, candidates)
+
+	runner.CheckForMissingCalls()
 }
@@ -4,7 +4,6 @@ import (
 	"testing"

 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/stretchr/testify/assert"
@@ -318,111 +317,3 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
 		})
 	}
 }
-
-func TestBranchHasLocalOnlyCommits(t *testing.T) {
-	type scenario struct {
-		testName string
-		runner   *oscommands.FakeCmdObjRunner
-		test     func(bool, error)
-	}
-
-	branch := &models.Branch{
-		Name:           "branch",
-		UpstreamRemote: "origin",
-		UpstreamBranch: "branch",
-	}
-
-	scenarios := []scenario{
-		{
-			"branch is strictly behind its upstream, and there are no reflogs",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reflog", "show", "--format=%H", "refs/remotes/origin/branch"}, "", nil).
-				ExpectGitArgs([]string{"rev-parse", "-q", "--verify", "refs/remotes/origin/branch@{0}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{
-					"rev-list", "--max-count=1", "--ignore-missing", "refs/heads/branch",
-					"^refs/remotes/origin/branch", "--",
-				}, "", nil),
-			func(hasLocalOnlyCommits bool, err error) {
-				assert.NoError(t, err)
-				assert.False(t, hasLocalOnlyCommits)
-			},
-		},
-		{
-			"the upstream branch was rewritten, so all our commits were on it before",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reflog", "show", "--format=%H", "refs/remotes/origin/branch"},
-					"1111111111111111111111111111111111111111\n2222222222222222222222222222222222222222\n", nil).
-				ExpectGitArgs([]string{"rev-parse", "-q", "--verify", "refs/remotes/origin/branch@{2}"},
-					"3333333333333333333333333333333333333333\n", nil).
-				ExpectGitArgs([]string{
-					"rev-list", "--max-count=1", "--ignore-missing", "refs/heads/branch",
-					"^refs/remotes/origin/branch",
-					"^1111111111111111111111111111111111111111",
-					"^2222222222222222222222222222222222222222",
-					"^3333333333333333333333333333333333333333",
-					"--",
-				}, "", nil),
-			func(hasLocalOnlyCommits bool, err error) {
-				assert.NoError(t, err)
-				assert.False(t, hasLocalOnlyCommits)
-			},
-		},
-		{
-			"the oldest reflog entry is the one that created the ref",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reflog", "show", "--format=%H", "refs/remotes/origin/branch"},
-					"1111111111111111111111111111111111111111\n", nil).
-				ExpectGitArgs([]string{"rev-parse", "-q", "--verify", "refs/remotes/origin/branch@{1}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{
-					"rev-list", "--max-count=1", "--ignore-missing", "refs/heads/branch",
-					"^refs/remotes/origin/branch",
-					"^1111111111111111111111111111111111111111",
-					"--",
-				}, "", nil),
-			func(hasLocalOnlyCommits bool, err error) {
-				assert.NoError(t, err)
-				assert.False(t, hasLocalOnlyCommits)
-			},
-		},
-		{
-			"the branch has a commit that was never on the upstream branch",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reflog", "show", "--format=%H", "refs/remotes/origin/branch"},
-					"1111111111111111111111111111111111111111\n", nil).
-				ExpectGitArgs([]string{"rev-parse", "-q", "--verify", "refs/remotes/origin/branch@{1}"},
-					"2222222222222222222222222222222222222222\n", nil).
-				ExpectGitArgs([]string{
-					"rev-list", "--max-count=1", "--ignore-missing", "refs/heads/branch",
-					"^refs/remotes/origin/branch",
-					"^1111111111111111111111111111111111111111",
-					"^2222222222222222222222222222222222222222",
-					"--",
-				}, "4444444444444444444444444444444444444444\n", nil),
-			func(hasLocalOnlyCommits bool, err error) {
-				assert.NoError(t, err)
-				assert.True(t, hasLocalOnlyCommits)
-			},
-		},
-		{
-			"bubbles up an error from rev-list",
-			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reflog", "show", "--format=%H", "refs/remotes/origin/branch"}, "", nil).
-				ExpectGitArgs([]string{"rev-parse", "-q", "--verify", "refs/remotes/origin/branch@{0}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{
-					"rev-list", "--max-count=1", "--ignore-missing", "refs/heads/branch",
-					"^refs/remotes/origin/branch", "--",
-				}, "", errors.New("error")),
-			func(hasLocalOnlyCommits bool, err error) {
-				assert.Error(t, err)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildBranchCommands(commonDeps{runner: s.runner})
-			s.test(instance.HasLocalOnlyCommits(branch))
-			s.runner.CheckForMissingCalls()
-		})
-	}
-}
@@ -240,16 +240,24 @@ func (self *CommitCommands) AmendHeadCmdObj() *oscommands.CmdObj {
 	return self.cmd.New(cmdArgs)
 }

-func (self *CommitCommands) ShowCmdObj(hash string, filterPaths []string, mode DiffMode) *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(), mode).
+		ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd).
+		ArgIfElse(extDiffCmd != "" || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
-		Arg("--color=" + mode.colorArg(self.diffRendererConfigManager)).
+		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).
@@ -1,12 +1,12 @@
 package git_commands

 import (
-	"fmt"
 	"strings"

 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/samber/lo"
 )

 type CommitFileLoader struct {
@@ -29,7 +29,7 @@ func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse boo
 		Arg("--no-ext-diff").
 		Arg("--name-status").
 		Arg("-z").
-		Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)).
+		Arg("--no-renames").
 		ArgIf(reverse, "-R").
 		Arg(from).
 		Arg(to).
@@ -44,37 +44,18 @@ func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse boo
 }

 // filenames string is something like "MM\x00file1\x00MU\x00file2\x00AA\x00file3\x00"
-// so we need to split it by the null character and then map each status-name pair
-// to a commit file. Renames (and copies) are special: their status is followed by
-// two paths (the old one and the new one) rather than one, e.g.
-// "R100\x00old\x00new\x00".
+// so we need to split it by the null character and then map each status-name pair to a commit file
 func getCommitFilesFromFilenames(filenames string) []*models.CommitFile {
-	fields := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00")
-	if len(fields) == 1 {
+	lines := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00")
+	if len(lines) == 1 {
 		return []*models.CommitFile{}
 	}

-	commitFiles := make([]*models.CommitFile, 0, len(fields)/2)
-	for i := 0; i < len(fields)-1; {
-		changeStatus := fields[i]
-		if changeStatus[0] == 'R' || changeStatus[0] == 'C' {
-			// The status has a similarity score appended (e.g. "R100"); drop it
-			// so the rest of the code only has to deal with a plain "R" or "C".
-			commitFiles = append(commitFiles, &models.CommitFile{
-				ChangeStatus: changeStatus[:1],
-				PreviousPath: fields[i+1],
-				Path:         fields[i+2],
-			})
-			i += 3
-		} else {
-			// typical result looks like 'A my_file' meaning my_file was added
-			commitFiles = append(commitFiles, &models.CommitFile{
-				ChangeStatus: changeStatus,
-				Path:         fields[i+1],
-			})
-			i += 2
+	// typical result looks like 'A my_file' meaning my_file was added
+	return lo.Map(lo.Chunk(lines, 2), func(chunk []string, _ int) *models.CommitFile {
+		return &models.CommitFile{
+			ChangeStatus: chunk[0],
+			Path:         chunk[1],
 		}
-	}
-
-	return commitFiles
+	})
 }
@@ -60,25 +60,6 @@ func TestGetCommitFilesFromFilenames(t *testing.T) {
 				},
 			},
 		},
-		{
-			testName: "a rename among regular files",
-			input:    "M\x00Myfile\x00R100\x00before\x00after\x00A\x00Added\x00",
-			output: []*models.CommitFile{
-				{
-					Path:         "Myfile",
-					ChangeStatus: "M",
-				},
-				{
-					Path:         "after",
-					PreviousPath: "before",
-					ChangeStatus: "R",
-				},
-				{
-					Path:         "Added",
-					ChangeStatus: "A",
-				},
-			},
-		},
 	}

 	for _, test := range tests {
@@ -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) {
-	return self.getHydratedTodoCommits(hashPool, self.getRebasingCommits(hashPool, addConflictingCommit), existingCommits, false)
+func (self *CommitLoader) getHydratedRebasingCommits(hashPool *utils.StringPool, addConflictingCommit bool) ([]*models.Commit, error) {
+	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(
-	hashPool *utils.StringPool,
-	todoCommits []*models.Commit,
-	existingCommits []*models.Commit,
-	todoFileHasShortHashes bool,
-) ([]*models.Commit, error) {
+func (self *CommitLoader) getHydratedTodoCommits(hashPool *utils.StringPool, todoCommits []*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
-	// unnecessary git show calls.
-	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
+	commitHashes := lo.FilterMap(todoCommits, func(commit *models.Commit, _ int) (string, bool) {
+		return commit.Hash(), commit.Hash() != ""
 	})

-	if len(commitHashesToFetch) > 0 {
-		// note that we're not filtering these as we do non-rebasing commits just because
-		// I suspect that will cause some damage
-		cmdObj := self.cmd.New(
-			NewGitCmd("show").
-				Config("log.showSignature=false").
-				Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
-				Arg(commitHashesToFetch...).
-				ToArgv(),
-		).DontLog()
+	// note that we're not filtering these as we do non-rebasing commits just because
+	// I suspect that will cause some damage
+	cmdObj := self.cmd.New(
+		NewGitCmd("show").
+			Config("log.showSignature=false").
+			Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
+			Arg(commitHashes...).
+			ToArgv(),
+	).DontLog()

-		err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
-			if line == "" || line[0] != '+' {
-				return false, nil
-			}
-			commit := self.extractCommitFromLine(hashPool, line[1:], false)
-			fullCommits[commit.Hash()] = commit
+	fullCommits := map[string]*models.Commit{}
+	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
+		if line == "" || line[0] != '+' {
 			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,
@@ -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
@@ -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,
-			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", "--"},
+			pagerConfig:         nil,
+			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,
-			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"},
+			pagerConfig:         nil,
+			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,
-			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", "--"},
+			pagerConfig:         nil,
+			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,
-			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", "--"},
+			pagerConfig:         nil,
+			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,
-			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", "--"},
+			pagerConfig:         nil,
+			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"},
-			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", "--"},
+			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", "--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"},
-			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", "--"},
+			pagerConfig:         &config.PagingConfig{UseExternalDiffGitConfig: true},
+			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 {
-				userConfig.Git.DiffRenderers = []config.DiffRendererConfig{*s.diffRendererConfig}
+			if s.pagerConfig != nil {
+				userConfig.Git.Pagers = []config.PagingConfig{*s.pagerConfig}
 			}
 			userConfig.Git.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
 			userConfig.Git.DiffContextSize = s.contextSize
@@ -341,7 +341,7 @@ func TestCommitShowCmdObj(t *testing.T) {
 			}
 			instance := buildCommitCommands(commonDeps{userConfig: userConfig, appState: &config.AppState{}, runner: runner, repoPaths: &repoPaths})

-			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPaths, DiffModeRendered).Run())
+			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPaths).Run())
 			runner.CheckForMissingCalls()
 		})
 	}
@@ -8,12 +8,12 @@ import (

 type GitCommon struct {
 	*common.Common
-	version                   *GitVersion
-	cmd                       oscommands.ICmdObjBuilder
-	os                        *oscommands.OSCommand
-	repoPaths                 *RepoPaths
-	config                    *ConfigCommands
-	diffRendererConfigManager *config.DiffRendererConfigManager
+	version     *GitVersion
+	cmd         oscommands.ICmdObjBuilder
+	os          *oscommands.OSCommand
+	repoPaths   *RepoPaths
+	config      *ConfigCommands
+	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,
-		version:                   version,
-		cmd:                       cmd,
-		os:                        osCommand,
-		repoPaths:                 repoPaths,
-		config:                    config,
-		diffRendererConfigManager: diffRendererConfigManager,
+		Common:      cmn,
+		version:     version,
+		cmd:         cmd,
+		os:          osCommand,
+		repoPaths:   repoPaths,
+		config:      config,
+		pagerConfig: pagerConfig,
 	}
 }
@@ -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()
 	})

@@ -2,135 +2,10 @@ package git_commands

 import (
 	"fmt"
-	"os"
-	"strings"

 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/mgutz/str"
 )

-// metadataHandshake is the record a diff renderer that speaks the OSC 1717 protocol
-// emits before anything else, to announce that it does: a version-only record, with
-// none of the fields a line's record has. See ProbeDiffRendererEmitsMetadata, and
-// gocui's escape interpreter for how it is kept off the screen on a real render.
-const metadataHandshake = "\x1b]1717"
-
-// probeWidth is the width a probe asks the renderer to lay out to. A probe has
-// nothing to render, so any width does, as long as it is one a renderer will
-// accept: a renderer that lays its rendering out in columns may well refuse a
-// width of zero, and would then never get as far as announcing itself.
-const probeWidth = 80
-
-// ProbeDiffRendererEmitsMetadata reports whether the configured diff renderer states
-// which line of which file it is rendering, by running it on empty input and looking
-// for the handshake. The answer decides whether a diff the renderer produced can be
-// acted on at all, or has to be replaced by git's own when the user wants to act on it
-// (see DiffLineHelper.MainViewDiffMode).
-//
-// Asking rather than watching a real render: the handshake is the renderer's first
-// output whatever the diff, so the answer is a property of the renderer, known before
-// we render anything — where watching would have to see a diff go by first, and would
-// be fooled by a diff with no lines to describe.
-//
-// No terminal is needed. git only invokes a stdin filter when it thinks it is talking
-// to one, but the renderer itself doesn't care: it announces itself whenever OSC1717 is
-// set, so it can be run directly with empty input.
-func (self *DiffCommands) ProbeDiffRendererEmitsMetadata() bool {
-	manager := self.diffRendererConfigManager
-	values := config.DiffRendererValues{Width: probeWidth, DiffContext: 3}
-
-	switch manager.GetDiffRendererType() {
-	case config.DiffRendererType_StdinFilter:
-		if command, err := manager.GetStdinFilterCommand(values); err == nil && command != "" {
-			return self.probeEmitsMetadata(self.cmd.NewShell(command, ""))
-		}
-	case config.DiffRendererType_ExtDiff:
-		// An empty command means git's own diff.external config, which picks a driver
-		// per file through .gitattributes: there is no one renderer to ask, and a single
-		// diff can be produced by several, so we take it that it says nothing.
-		if command, err := manager.GetExternalDiffCommand(values); err == nil && command != "" {
-			return self.externalDiffEmitsMetadata(command)
-		}
-	case config.DiffRendererType_RawGit:
-		// git describes only the formats whose output can't be read back as a diff, and
-		// asked with the renderer's own arguments it answers for exactly the format
-		// those select: a handshake for a word diff, silence for a unified one. With no
-		// arguments there is nothing to fall back to anyway, since this already is git's
-		// own diff.
-		if args := manager.GetRawGitArgs(); len(args) > 0 {
-			return self.rawGitEmitsMetadata(args)
-		}
-	}
-
-	return false
-}
-
-// rawGitEmitsMetadata asks git itself, run with the diff renderer's own arguments.
-func (self *DiffCommands) rawGitEmitsMetadata(rawGitArgs []string) bool {
-	oldPath, newPath, cleanup, ok := self.probeFiles()
-	if !ok {
-		return false
-	}
-	defer cleanup()
-
-	return self.probeEmitsMetadata(self.cmd.New(
-		NewGitCmd("diff").
-			Arg("--no-index").
-			Arg(rawGitArgs...).
-			Arg(oldPath, newPath).
-			ToArgv(),
-	))
-}
-
-// externalDiffEmitsMetadata asks an external diff command, invoking it the way git
-// invokes one — with the seven positional arguments of git's diff.external convention —
-// over two empty files, so that it announces itself without having a diff to render.
-func (self *DiffCommands) externalDiffEmitsMetadata(externalDiffCommand string) bool {
-	oldPath, newPath, cleanup, ok := self.probeFiles()
-	if !ok {
-		return false
-	}
-	defer cleanup()
-
-	args := append(str.ToArgv(externalDiffCommand),
-		"probe", oldPath, "0000000", "100644", newPath, "0000000", "100644")
-	return self.probeEmitsMetadata(self.cmd.New(args))
-}
-
-// probeFiles makes the two empty files a probe stands a diff up from, and the cleanup
-// that removes them. Empty, because what the probe wants is for the renderer to announce
-// itself, not for it to have anything to say.
-func (self *DiffCommands) probeFiles() (string, string, func(), bool) {
-	tempDir := self.os.GetTempDir()
-
-	oldFile, err := os.CreateTemp(tempDir, "lazygit-probe-old-*")
-	if err != nil {
-		return "", "", nil, false
-	}
-	oldFile.Close()
-
-	newFile, err := os.CreateTemp(tempDir, "lazygit-probe-new-*")
-	if err != nil {
-		os.Remove(oldFile.Name())
-		return "", "", nil, false
-	}
-	newFile.Close()
-
-	return oldFile.Name(), newFile.Name(), func() {
-		os.Remove(oldFile.Name())
-		os.Remove(newFile.Name())
-	}, true
-}
-
-func (self *DiffCommands) probeEmitsMetadata(cmdObj *oscommands.CmdObj) bool {
-	cmdObj.AddEnvVars("OSC1717=V1")
-	// A renderer may well object to being handed nothing to render. We want to know
-	// whatever it said before objecting, and that is captured either way.
-	output, _ := cmdObj.RunWithOutput()
-	return strings.Contains(output, metadataHandshake)
-}
-
 type DiffCommands struct {
 	*GitCommon
 }
@@ -142,45 +17,31 @@ 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.
-func (self *DiffCommands) DiffCmdObj(diffArgs []string, mode DiffMode) *oscommands.CmdObj {
+// 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(), mode).
+			ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
+			ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 			Arg("--submodule").
-			Arg(fmt.Sprintf("--color=%s", mode.colorArg(self.diffRendererConfigManager))).
+			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(),
 	)
 }

-// CustomPatchDiffCmdObj is the command that renders the custom patch being built: a diff
-// of the two trees the patch was materialized into (PatchCommands.WriteCustomPatchDiffTrees),
-// under the directory holding them. It goes through the same wiring as any other diff we
-// show, so the patch is rendered by whatever renders the rest of them, and git works out
-// how much context to give it.
-//
-// git's own path prefixes are suppressed because the trees are named a and b themselves,
-// which leaves the paths reading like an ordinary diff's over the repo's own paths.
-func (self *DiffCommands) CustomPatchDiffCmdObj(dir string, mode DiffMode) *oscommands.CmdObj {
-	return self.cmd.New(
-		NewGitCmd("diff").
-			AddCommonDiffArgs(self.diffRendererConfigManager, self.UserConfig(), mode).
-			NoLineEndingConversion().
-			Arg("--no-index").
-			Arg("--no-prefix").
-			Arg(fmt.Sprintf("--color=%s", mode.colorArg(self.diffRendererConfigManager))).
-			Arg("a", "b").
-			Dir(dir).
-			ToArgv(),
-	)
-}
-
 // 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,
-// and does not use user configs such as ignore whitespace.
+// (e.g. copying a diff to the clipboard). It will not use a custom pager, and
+// 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
@@ -1,35 +0,0 @@
-package git_commands
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-)
-
-// DiffMode says what a diff command's output is for. This decides whether the
-// configured diff renderer produces it, and whether it is coloured.
-type DiffMode int
-
-const (
-	// DiffModeRendered is the diff as the user has arranged for it to look: through the
-	// diff renderer, with the renderer's own arguments and its preference about colour.
-	DiffModeRendered DiffMode = iota
-	// DiffModeRaw is git's own coloured diff, for showing a diff whose rendered form
-	// couldn't be acted on.
-	DiffModeRaw
-	// DiffModePlain is git's own uncoloured diff, for building patches from and copying
-	// text out of rather than for looking at.
-	DiffModePlain
-)
-
-// colorArg returns the value to pass to git's --color for this mode. Rendered output is
-// coloured however the renderer wants its input; a raw diff gets git's own colour, which
-// is the point of it; a plain one is for reading as text, not for looking at.
-func (self DiffMode) colorArg(diffRendererConfigManager *config.DiffRendererConfigManager) string {
-	switch self {
-	case DiffModeRendered:
-		return diffRendererConfigManager.GetColorArg()
-	case DiffModeRaw:
-		return "always"
-	default:
-		return "never"
-	}
-}
@@ -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
@@ -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)
-
-	return files
-}
-
-// Looks up how long the conflict markers in the conflicted files are. We ask
-// git for all of them at once, because spawning a process per file would be
-// painfully slow when hundreds of files are conflicted (especially on Windows).
-func (self *FileLoader) setConflictMarkerSizes(files []*models.File) {
-	conflictedFiles := lo.Filter(files, func(file *models.File, _ int) bool {
-		return file.HasInlineMergeConflicts
-	})
-	if len(conflictedFiles) == 0 {
-		return
-	}
-
-	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
+	// Go through the files to see if any of these files are actually worktrees
+	// so that we can render them correctly
+	worktreePaths := linkedWortkreePaths(self.Fs, self.repoPaths.RepoGitDirPath())
+	for _, file := range files {
+		for _, worktreePath := range worktreePaths {
+			absFilePath, err := filepath.Abs(file.Path)
+			if err != nil {
+				self.Log.Error(err)
+				continue
+			}
+			if absFilePath == worktreePath {
+				file.IsWorktree = true
+				// `git status` renders this worktree as a folder with a trailing slash but we'll represent it as a singular worktree
+				// If we include the slash, it will be rendered as a folder with a null file inside.
+				file.Path = strings.TrimSuffix(file.Path, "/")
+				break
+			}
 		}
 	}

-	return markerSizes, nil
+	return files
 }

 type FileDiff struct {
@@ -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,
@@ -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 {
@@ -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,44 +111,6 @@ func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommand
 	return self
 }

-// NoLineEndingConversion keeps git's line-ending machinery away from files that are not
-// a working tree's. The trees the custom patch is materialized into hold the bytes git
-// states the patch in, so a command over them has to read and write those bytes as they
-// are. On a machine that checks files out with CRLF, `git apply` writes the after tree
-// in that form while the before tree keeps the LF it was written with. git's own diff
-// converts both back, but it warns about a round trip through a working tree these
-// files never belong to, and an external diff renderer is handed the two files as they
-// stand, one line ending apart in every line.
-func (self *GitCommandBuilder) NoLineEndingConversion() *GitCommandBuilder {
-	return self.
-		// The setting that converts on most machines, and the one Git for Windows
-		// installs itself with.
-		Config("core.autocrlf=false").
-		// An attributes file outside the repo can still mark the files as text. The
-		// form to keep them in is then the form they are written in.
-		Config("core.eol=lf").
-		// An attribute naming CRLF outright overrides that, and git converts after all.
-		// The warning it gives is about a checkout these files never have.
-		Config("core.safecrlf=false")
-}
-
-func (self *GitCommandBuilder) AddCommonDiffArgs(diffRendererConfigManager *config.DiffRendererConfigManager, userConfig *config.UserConfig, mode DiffMode) *GitCommandBuilder {
-	contextSize := userConfig.Git.DiffContextSize
-	useExtDiff := mode == DiffModeRendered && diffRendererConfigManager.GetDiffRendererType() == config.DiffRendererType_ExtDiff
-
-	return self.
-		ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
-		Arg(fmt.Sprintf("--unified=%d", contextSize)).
-		// Ignoring whitespace is about what the user wants to see, so it holds for a raw
-		// diff as much as for a rendered one. Patches are built from a plain diff,
-		// where a diff that leaves changes out would apply to nothing.
-		ArgIf(mode != DiffModePlain && userConfig.Git.IgnoreWhitespaceInDiffView, "--ignore-all-space").
-		Arg(fmt.Sprintf("--find-renames=%d%%", userConfig.Git.RenameSimilarityThreshold)).
-		// The renderer's own arguments to git — a word diff, say — are part of the
-		// rendering, so they go with it.
-		ArgIf(mode == DiffModeRendered, diffRendererConfigManager.GetRawGitArgs()...)
-}
-
 func (self *GitCommandBuilder) ToArgv() []string {
 	return append([]string{"git"}, self.args...)
 }
@@ -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()
-	if ghExe == "" {
-		// 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
+	token, _ := auth.TokenForHost(host)
+	return token
 }

 // 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
-	// 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}
+	client := &http.Client{}
 	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,
@@ -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"},
 				},
@@ -2,16 +2,13 @@ package git_commands

 import (
 	"fmt"
-	"os"
 	"path/filepath"
-	"strings"
 	"time"

 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/app/daemon"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/samber/lo"
 	"github.com/stefanhaller/git-todo-parser/todo"
 )

@@ -23,10 +20,6 @@ type PatchCommands struct {
 	stash  *StashCommands

 	PatchBuilder *patch.PatchBuilder
-
-	// The version of the patch the diff trees were last written for, so that they are
-	// written again when, and only when, the patch has changed since.
-	treesWrittenForGeneration int
 }

 func NewPatchCommands(
@@ -47,88 +40,6 @@ func NewPatchCommands(
 	}
 }

-// EnsureCustomPatchDiffTrees writes the custom patch's diff trees if what is there no
-// longer describes the patch. Call it before rendering the patch, which is often — every
-// time the panel showing it re-renders — while the patch itself changes rarely.
-func (self *PatchCommands) EnsureCustomPatchDiffTrees() error {
-	if self.PatchBuilder.Generation() == self.treesWrittenForGeneration {
-		return nil
-	}
-	if err := self.WriteCustomPatchDiffTrees(); err != nil {
-		return err
-	}
-	self.treesWrittenForGeneration = self.PatchBuilder.Generation()
-	return nil
-}
-
-// WriteCustomPatchDiffTrees materializes the custom patch as two file trees under the
-// directory the patch builder keeps for it: `a` holds each of the patch's files as it is
-// before the patch, `b` as it is after. Diffing those two trees against each other
-// (DiffCommands.CustomPatchDiffCmdObj) turns the patch into a diff of real files, which
-// can then be rendered exactly as any other diff is — through a diff renderer of any
-// kind, and with git's own idea of how much context to show.
-//
-// The trees are named a and b so that the diff's paths, with git's own prefixes
-// suppressed, come out reading like the a/ and b/ of an ordinary diff, over the real
-// repo-relative paths.
-func (self *PatchCommands) WriteCustomPatchDiffTrees() error {
-	dir := self.PatchBuilder.TempDir()
-	if dir == "" {
-		return nil
-	}
-
-	before := filepath.Join(dir, "a")
-	after := filepath.Join(dir, "b")
-	for _, tree := range []string{before, after} {
-		if err := os.RemoveAll(tree); err != nil {
-			return err
-		}
-		if err := os.MkdirAll(tree, 0o700); err != nil {
-			return err
-		}
-	}
-
-	for _, file := range self.PatchBuilder.FilesInPatch() {
-		content, err := self.commit.ShowFileContentCmdObj(self.PatchBuilder.From, file.ContentPath).RunWithOutput()
-		// A file the patch adds has no content on the before side, so git has nothing to
-		// show for it.
-		added := err != nil
-
-		// The before side holds an added file as an empty file rather than not at all, so
-		// that the diff pairs the two sides up and states the file's real path, instead of
-		// reporting a file that only one of the trees has.
-		if err := self.os.CreateFileWithContent(filepath.Join(before, file.Path),
-			lo.Ternary(added, "", content)); err != nil {
-			return err
-		}
-		// The after side is seeded with the same content, for the patch to change; a file
-		// the patch adds is left absent, for the patch to create.
-		if !added {
-			if err := self.os.CreateFileWithContent(filepath.Join(after, file.Path), content); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Write added files as creations rather than as diffs against an empty file: the
-	// patch is applied in one go, so a file it expects to be there already would make
-	// the whole of it fail.
-	patchText := self.PatchBuilder.PatchToApply(false, false)
-	if strings.TrimSpace(patchText) == "" {
-		// Nothing in the patch, so the two trees are alike and the diff is empty.
-		return nil
-	}
-	patchFilePath, err := self.SaveTemporaryPatch(patchText)
-	if err != nil {
-		return err
-	}
-	return self.cmd.New(NewGitCmd("apply").
-		NoLineEndingConversion().
-		Arg(patchFilePath).
-		Dir(after).
-		ToArgv()).Run()
-}
-
 type ApplyPatchOpts struct {
 	ThreeWay bool
 	Cached   bool
@@ -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)
-}
-
-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)
+	baseHashOrRoot := getBaseHashOrRoot(commits, endIdx+2)

 	hashes := lo.Map(commits[startIdx:endIdx+1], func(commit *models.Commit, _ int) string {
 		return commit.Hash()
 	})

-	var instruction daemon.Instruction
-	if offset > 0 {
-		instruction = daemon.NewMoveTodosDownInstruction(hashes, offset)
-	} else {
-		instruction = daemon.NewMoveTodosUpInstruction(hashes, -offset)
-	}
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseHashOrRoot: baseHashOrRoot,
+		instruction:    daemon.NewMoveTodosDownInstruction(hashes),
+		overrideEditor: true,
+	}).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
@@ -1,223 +0,0 @@
-package git_commands
-
-import (
-	"slices"
-
-	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/samber/lo"
-)
-
-// The tip commit of a ref, as far as sorting refs by ancestry needs it. The
-// date is the raw %(committerdate:unix) field, and is only ever compared for
-// equality.
-type refTip struct {
-	hash          string
-	committerDate string
-}
-
-// Determining ancestry costs one %(ahead-behind:<tip>) field per tip, and git
-// evaluates each of those for every tip we ask about, so the work grows with
-// the square of the number of tips. Branches whose tips came out of one rebase
-// are nowhere near this many, so leave the refs in the order git returned them
-// once the tips add up to more than this.
-const maxTipsForAncestrySorting = 100
-
-// Sorts each group of refs that share a committer date so that a ref comes
-// before the refs it is descended from. Refs that are not descended from one
-// another keep the order they came in.
-//
-// git sorts refs with equal committer dates by name, and a stack of branches
-// that gets rebased in one go ends up with the same committer date on all of
-// its tips. Without this, such a stack appears in alphabetical order.
-//
-// refs must be sorted by committer date already, and tips must have an entry
-// for each of them.
-func sortRefsWithEqualDatesByAncestry[T any](
-	cmd oscommands.ICmdObjBuilder,
-	version *GitVersion,
-	refs []T,
-	fullRefName func(T) string,
-	tips map[string]refTip,
-) error {
-	// %(ahead-behind:...) was added in git 2.41
-	if !version.IsAtLeast(2, 41, 0) {
-		return nil
-	}
-
-	groups := lo.Filter(groupRefsWithEqualDates(refs, fullRefName, tips),
-		func(group []T, _ int) bool {
-			return pointAtMoreThanOneCommit(group, fullRefName, tips)
-		})
-	if len(groups) == 0 {
-		return nil
-	}
-
-	// Ancestry is a property of the tip commits, so ask git about each of them
-	// once, however many refs point at it. A repository with several remotes
-	// has the same branches under each of them, and they all share a date.
-	tipHashes := []string{}
-	refNames := []string{}
-	seenTips := set.New[string]()
-	for _, ref := range lo.Flatten(groups) {
-		refName := fullRefName(ref)
-		if hash := tips[refName].hash; !seenTips.Includes(hash) {
-			seenTips.Add(hash)
-			tipHashes = append(tipHashes, hash)
-			refNames = append(refNames, refName)
-		}
-	}
-	if len(tipHashes) > maxTipsForAncestrySorting {
-		return nil
-	}
-
-	containedTips, err := loadContainedTips(cmd, tipHashes, refNames)
-	if err != nil {
-		return err
-	}
-
-	for _, group := range groups {
-		sortGroupByAncestry(group, fullRefName, tips, containedTips)
-	}
-
-	return nil
-}
-
-// Refs that all point at the same commit have no order to be put in, so
-// there is nothing to ask git about them
-func pointAtMoreThanOneCommit[T any](
-	refs []T,
-	fullRefName func(T) string,
-	tips map[string]refTip,
-) bool {
-	firstHash := tips[fullRefName(refs[0])].hash
-	return lo.SomeBy(refs, func(ref T) bool {
-		return tips[fullRefName(ref)].hash != firstHash
-	})
-}
-
-// Returns the runs of consecutive refs that share a committer date, for runs of
-// more than one ref. The returned slices share their backing array with refs,
-// so sorting a run sorts that part of refs.
-func groupRefsWithEqualDates[T any](
-	refs []T,
-	fullRefName func(T) string,
-	tips map[string]refTip,
-) [][]T {
-	committerDate := func(ref T) string {
-		return tips[fullRefName(ref)].committerDate
-	}
-
-	groups := [][]T{}
-	start := 0
-	for i := 1; i <= len(refs); i++ {
-		if i < len(refs) && committerDate(refs[i]) == committerDate(refs[start]) {
-			continue
-		}
-		if i-start > 1 {
-			groups = append(groups, refs[start:i])
-		}
-		start = i
-	}
-
-	return groups
-}
-
-// For each of the given tips, which of the tips its history contains. Keyed by
-// tip hash, with an entry for every tip passed in. refNames names, for each
-// tip, a ref that points at it; git reports the values by ref name.
-func loadContainedTips(
-	cmd oscommands.ICmdObjBuilder,
-	tipHashes []string,
-	refNames []string,
-) (map[string]*set.Set[string], error) {
-	output, err := cmd.New(
-		buildAheadBehindForEachRefArgs(tipHashes, refNames),
-	).DontLog().RunWithOutput()
-	if err != nil {
-		return nil, err
-	}
-
-	containedTips := make(map[string]*set.Set[string], len(tipHashes))
-	for _, hash := range tipHashes {
-		containedTips[hash] = set.New[string]()
-	}
-	tipByRefName := make(map[string]string, len(refNames))
-	for i, refName := range refNames {
-		tipByRefName[refName] = tipHashes[i]
-	}
-
-	for _, entry := range parseAheadBehindForEachRefOutput(output, len(tipHashes)) {
-		hash, ok := tipByRefName[entry.refName]
-		if !ok {
-			continue
-		}
-		contained := containedTips[hash]
-		for i, ab := range entry.aheadBehinds {
-			// The tip's history contains the other tip if it has commits the
-			// other one doesn't have, and the other one has none it doesn't
-			// have.
-			if ab.valid && ab.ahead > 0 && ab.behind == 0 {
-				contained.Add(tipHashes[i])
-			}
-		}
-	}
-
-	return containedTips, nil
-}
-
-func sortGroupByAncestry[T any](
-	group []T,
-	fullRefName func(T) string,
-	tips map[string]refTip,
-	containedTips map[string]*set.Set[string],
-) {
-	hashes := lo.Map(group, func(ref T, _ int) string {
-		return tips[fullRefName(ref)].hash
-	})
-	contained := lo.Map(hashes, func(hash string, _ int) *set.Set[string] {
-		if contained, ok := containedTips[hash]; ok {
-			return contained
-		}
-		return set.New[string]()
-	})
-	isDescendedFrom := func(descendant int, ancestor int) bool {
-		return contained[descendant].Includes(hashes[ancestor])
-	}
-
-	// Indices into group, holding the refs we haven't placed yet
-	remaining := lo.Range(len(group))
-	// A ref can only go in once every ref that is descended from it is in
-	canBePlaced := func(i int) bool {
-		return !lo.SomeBy(remaining, func(j int) bool {
-			return isDescendedFrom(j, i)
-		})
-	}
-
-	sorted := make([]T, 0, len(group))
-	lastPlaced := -1
-	for len(remaining) > 0 {
-		next := -1
-		if lastPlaced != -1 {
-			// Walk from the ref we placed last down to the refs it is based on,
-			// so that the branches of a stack come out as one run even when an
-			// unrelated branch sorts into the middle of them by name
-			next = slices.IndexFunc(remaining, func(i int) bool {
-				return isDescendedFrom(lastPlaced, i) && canBePlaced(i)
-			})
-		}
-		if next == -1 {
-			next = slices.IndexFunc(remaining, canBePlaced)
-		}
-		if next == -1 {
-			// Commits can't descend from each other in a circle; only take the
-			// first ref so that we don't spin if the values ever say otherwise.
-			next = 0
-		}
-		lastPlaced = remaining[next]
-		sorted = append(sorted, group[lastPlaced])
-		remaining = slices.Delete(remaining, next, next+1)
-	}
-
-	copy(group, sorted)
-}
@@ -1,331 +0,0 @@
-package git_commands
-
-import (
-	"errors"
-	"fmt"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/samber/lo"
-	"github.com/stretchr/testify/assert"
-)
-
-// A branch as the tests below describe it: a name, the hash of its tip, and the
-// committer date of its tip
-type testRef struct {
-	name string
-	hash string
-	date string
-}
-
-func buildTestRefs(refs []testRef) ([]*models.Branch, map[string]refTip) {
-	branches := lo.Map(refs, func(ref testRef, _ int) *models.Branch {
-		return &models.Branch{Name: ref.name, CommitHash: ref.hash}
-	})
-	tips := make(map[string]refTip, len(refs))
-	for _, ref := range refs {
-		tips["refs/heads/"+ref.name] = refTip{hash: ref.hash, committerDate: ref.date}
-	}
-	return branches, tips
-}
-
-func branchNames(branches []*models.Branch) []string {
-	return lo.Map(branches, func(branch *models.Branch, _ int) string {
-		return branch.Name
-	})
-}
-
-func TestGroupRefsWithEqualDates(t *testing.T) {
-	scenarios := []struct {
-		testName string
-		refs     []testRef
-		expected [][]string
-	}{
-		{
-			testName: "no refs",
-			refs:     []testRef{},
-			expected: [][]string{},
-		},
-		{
-			testName: "all dates distinct",
-			refs: []testRef{
-				{name: "a", hash: "1", date: "300"},
-				{name: "b", hash: "2", date: "200"},
-				{name: "c", hash: "3", date: "100"},
-			},
-			expected: [][]string{},
-		},
-		{
-			testName: "all dates equal",
-			refs: []testRef{
-				{name: "a", hash: "1", date: "100"},
-				{name: "b", hash: "2", date: "100"},
-				{name: "c", hash: "3", date: "100"},
-			},
-			expected: [][]string{{"a", "b", "c"}},
-		},
-		{
-			testName: "two groups, with a lone ref between and after them",
-			refs: []testRef{
-				{name: "a", hash: "1", date: "300"},
-				{name: "b", hash: "2", date: "300"},
-				{name: "c", hash: "3", date: "200"},
-				{name: "d", hash: "4", date: "100"},
-				{name: "e", hash: "5", date: "100"},
-				{name: "f", hash: "6", date: "50"},
-			},
-			expected: [][]string{{"a", "b"}, {"d", "e"}},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			branches, tips := buildTestRefs(s.refs)
-			groups := groupRefsWithEqualDates(branches, (*models.Branch).FullRefName, tips)
-			assert.Equal(t, s.expected, lo.Map(groups,
-				func(group []*models.Branch, _ int) []string {
-					return branchNames(group)
-				}))
-		})
-	}
-}
-
-func TestSortRefsWithEqualDatesByAncestry(t *testing.T) {
-	// A stack of three branches, all committed within the same second, as git
-	// returns them: sorted by name. bottom is the base of middle, which is the
-	// base of top.
-	stack := []testRef{
-		{name: "middle", hash: "m", date: "100"},
-		{name: "top", hash: "t", date: "100"},
-		{name: "bottom", hash: "b", date: "100"},
-	}
-
-	// One %(ahead-behind:<hash>) field per tip, in the order the tips appear in
-	// the branch list
-	stackOutput := "refs/heads/middle\x000 0\x000 1\x001 0\n" +
-		"refs/heads/top\x001 0\x000 0\x002 0\n" +
-		"refs/heads/bottom\x000 1\x000 2\x000 0\n"
-
-	stackArgs := []string{
-		"for-each-ref",
-		"--format=%(refname)%00%(ahead-behind:m)%00%(ahead-behind:t)%00%(ahead-behind:b)",
-		"refs/heads/middle", "refs/heads/top", "refs/heads/bottom",
-	}
-
-	scenarios := []struct {
-		testName      string
-		refs          []testRef
-		gitVersion    *GitVersion
-		expectedArgs  []string
-		output        string
-		outputErr     error
-		expectedOrder []string
-		expectedErr   string
-	}{
-		{
-			testName:      "a stack of branches is sorted from the top down",
-			refs:          stack,
-			gitVersion:    &GitVersion{2, 41, 0, ""},
-			expectedArgs:  stackArgs,
-			output:        stackOutput,
-			expectedOrder: []string{"top", "middle", "bottom"},
-		},
-		{
-			testName:      "git too old for %(ahead-behind:...), so nothing to do",
-			refs:          stack,
-			gitVersion:    &GitVersion{2, 40, 0, ""},
-			expectedOrder: []string{"middle", "top", "bottom"},
-		},
-		{
-			testName: "no two refs share a date, so nothing to do",
-			refs: []testRef{
-				{name: "middle", hash: "m", date: "300"},
-				{name: "top", hash: "t", date: "200"},
-				{name: "bottom", hash: "b", date: "100"},
-			},
-			gitVersion:    &GitVersion{2, 41, 0, ""},
-			expectedOrder: []string{"middle", "top", "bottom"},
-		},
-		{
-			testName:      "the command fails",
-			refs:          stack,
-			gitVersion:    &GitVersion{2, 41, 0, ""},
-			expectedArgs:  stackArgs,
-			outputErr:     errors.New("fatal: failed to find 'm'"),
-			expectedOrder: []string{"middle", "top", "bottom"},
-			expectedErr:   "fatal: failed to find 'm'",
-		},
-		{
-			testName: "a branch unrelated to the stack is placed by name",
-			refs: []testRef{
-				{name: "middle", hash: "m", date: "100"},
-				{name: "other", hash: "o", date: "100"},
-				{name: "top", hash: "t", date: "100"},
-				{name: "bottom", hash: "b", date: "100"},
-			},
-			gitVersion: &GitVersion{2, 41, 0, ""},
-			expectedArgs: []string{
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:m)%00%(ahead-behind:o)%00%(ahead-behind:t)%00%(ahead-behind:b)",
-				"refs/heads/middle", "refs/heads/other", "refs/heads/top", "refs/heads/bottom",
-			},
-			output: "refs/heads/middle\x000 0\x002 1\x000 1\x001 0\n" +
-				"refs/heads/other\x001 2\x000 0\x001 3\x001 1\n" +
-				"refs/heads/top\x001 0\x003 1\x000 0\x002 0\n" +
-				"refs/heads/bottom\x000 1\x001 1\x000 2\x000 0\n",
-			expectedOrder: []string{"other", "top", "middle", "bottom"},
-		},
-		{
-			testName: "a stack stays together when a branch sorts into the middle of it",
-			refs: []testRef{
-				{name: "add-tests", hash: "t", date: "100"},
-				{name: "cleanup", hash: "c", date: "100"},
-				{name: "fix-parser", hash: "p", date: "100"},
-			},
-			gitVersion: &GitVersion{2, 41, 0, ""},
-			expectedArgs: []string{
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:t)%00%(ahead-behind:c)%00%(ahead-behind:p)",
-				"refs/heads/add-tests", "refs/heads/cleanup", "refs/heads/fix-parser",
-			},
-			// add-tests is based on fix-parser, and cleanup is on a line of its
-			// own, but its name sorts between the two
-			output: "refs/heads/add-tests\x000 0\x002 1\x001 0\n" +
-				"refs/heads/cleanup\x001 2\x000 0\x001 1\n" +
-				"refs/heads/fix-parser\x000 1\x001 1\x000 0\n",
-			expectedOrder: []string{"add-tests", "fix-parser", "cleanup"},
-		},
-		{
-			testName: "each group is sorted on its own",
-			refs: []testRef{
-				{name: "middle", hash: "m", date: "200"},
-				{name: "top", hash: "t", date: "200"},
-				{name: "lone", hash: "l", date: "150"},
-				{name: "base", hash: "a", date: "100"},
-				{name: "derived", hash: "d", date: "100"},
-			},
-			gitVersion: &GitVersion{2, 41, 0, ""},
-			expectedArgs: []string{
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:m)%00%(ahead-behind:t)%00%(ahead-behind:a)%00%(ahead-behind:d)",
-				"refs/heads/middle", "refs/heads/top", "refs/heads/base", "refs/heads/derived",
-			},
-			output: "refs/heads/middle\x000 0\x000 1\x002 0\x001 0\n" +
-				"refs/heads/top\x001 0\x000 0\x003 0\x002 0\n" +
-				"refs/heads/base\x000 2\x000 3\x000 0\x000 1\n" +
-				"refs/heads/derived\x000 1\x000 2\x001 0\x000 0\n",
-			expectedOrder: []string{"top", "middle", "lone", "derived", "base"},
-		},
-		{
-			testName: "a group whose branches are all on one commit is left alone",
-			refs: []testRef{
-				{name: "a", hash: "x", date: "100"},
-				{name: "b", hash: "x", date: "100"},
-			},
-			gitVersion:    &GitVersion{2, 41, 0, ""},
-			expectedOrder: []string{"a", "b"},
-		},
-		{
-			testName: "branches on the same commit are asked about once",
-			refs: []testRef{
-				{name: "mirror-1", hash: "s", date: "100"},
-				{name: "mirror-2", hash: "s", date: "100"},
-				{name: "stack-bottom", hash: "u", date: "100"},
-				{name: "stack-top", hash: "t", date: "100"},
-			},
-			gitVersion: &GitVersion{2, 41, 0, ""},
-			expectedArgs: []string{
-				"for-each-ref",
-				"--format=%(refname)%00%(ahead-behind:s)%00%(ahead-behind:u)%00%(ahead-behind:t)",
-				"refs/heads/mirror-1", "refs/heads/stack-bottom", "refs/heads/stack-top",
-			},
-			output: "refs/heads/mirror-1\x000 0\x001 1\x001 2\n" +
-				"refs/heads/stack-bottom\x001 1\x000 0\x000 1\n" +
-				"refs/heads/stack-top\x002 1\x001 0\x000 0\n",
-			expectedOrder: []string{"mirror-1", "mirror-2", "stack-top", "stack-bottom"},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			runner := oscommands.NewFakeRunner(t)
-			if s.expectedArgs != nil {
-				runner.ExpectGitArgs(s.expectedArgs, s.output, s.outputErr)
-			}
-			gitCommon := buildGitCommon(commonDeps{runner: runner, gitVersion: s.gitVersion})
-
-			branches, tips := buildTestRefs(s.refs)
-			err := sortRefsWithEqualDatesByAncestry(gitCommon.cmd, gitCommon.version,
-				branches, (*models.Branch).FullRefName, tips)
-
-			if s.expectedErr == "" {
-				assert.NoError(t, err)
-			} else {
-				assert.ErrorContains(t, err, s.expectedErr)
-			}
-			assert.Equal(t, s.expectedOrder, branchNames(branches))
-			runner.CheckForMissingCalls()
-		})
-	}
-}
-
-func TestSortRefsWithEqualDatesByAncestry_TooManyTips(t *testing.T) {
-	refs := lo.Map(lo.Range(maxTipsForAncestrySorting+1), func(i int, _ int) testRef {
-		return testRef{
-			name: fmt.Sprintf("branch-%03d", i),
-			hash: fmt.Sprintf("hash-%03d", i),
-			date: "100",
-		}
-	})
-
-	// The runner fails the test if the command runs at all
-	runner := oscommands.NewFakeRunner(t)
-	gitCommon := buildGitCommon(commonDeps{runner: runner, gitVersion: &GitVersion{2, 41, 0, ""}})
-
-	branches, tips := buildTestRefs(refs)
-	err := sortRefsWithEqualDatesByAncestry(gitCommon.cmd, gitCommon.version,
-		branches, (*models.Branch).FullRefName, tips)
-
-	assert.NoError(t, err)
-	assert.Equal(t, lo.Map(refs, func(ref testRef, _ int) string { return ref.name }),
-		branchNames(branches))
-	runner.CheckForMissingCalls()
-}
-
-// A repository with many remotes has the same branches under each of them, so
-// a group can hold far more refs than the commits they point at
-func TestSortRefsWithEqualDatesByAncestry_ManyRefsOnTwoTips(t *testing.T) {
-	refs := lo.Map(lo.Range(4*maxTipsForAncestrySorting), func(i int, _ int) testRef {
-		return testRef{
-			name: fmt.Sprintf("branch-%03d", i),
-			hash: lo.Ternary(i%2 == 0, "bottom", "top"),
-			date: "100",
-		}
-	})
-
-	runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
-		"for-each-ref",
-		"--format=%(refname)%00%(ahead-behind:bottom)%00%(ahead-behind:top)",
-		"refs/heads/branch-000", "refs/heads/branch-001",
-	},
-		"refs/heads/branch-000\x000 0\x000 1\n"+
-			"refs/heads/branch-001\x001 0\x000 0\n", nil)
-	gitCommon := buildGitCommon(commonDeps{runner: runner, gitVersion: &GitVersion{2, 41, 0, ""}})
-
-	branches, tips := buildTestRefs(refs)
-	err := sortRefsWithEqualDatesByAncestry(gitCommon.cmd, gitCommon.version,
-		branches, (*models.Branch).FullRefName, tips)
-
-	assert.NoError(t, err)
-	// the branches on the top commit first, each half still ordered by name
-	expected := append(
-		lo.FilterMap(refs, func(ref testRef, _ int) (string, bool) {
-			return ref.name, ref.hash == "top"
-		}),
-		lo.FilterMap(refs, func(ref testRef, _ int) (string, bool) {
-			return ref.name, ref.hash == "bottom"
-		})...)
-	assert.Equal(t, expected, branchNames(branches))
-	runner.CheckForMissingCalls()
-}
@@ -59,10 +59,9 @@ func (self *RemoteCommands) DeleteRemoteBranch(task gocui.Task, remoteName strin
 	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
 }

-func (self *RemoteCommands) DeleteRemoteTag(task gocui.Task, remoteName string, tagNames []string) error {
+func (self *RemoteCommands) DeleteRemoteTag(task gocui.Task, remoteName string, tagName string) error {
 	cmdArgs := NewGitCmd("push").
-		Arg(remoteName, "--delete").
-		Arg(lo.Map(tagNames, func(t string, _ int) string { return "refs/tags/" + t })...).
+		Arg(remoteName, "--delete", "refs/tags/"+tagName).
 		ToArgv()

 	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
@@ -5,25 +5,53 @@ import (
 	"maps"
 	"slices"
 	"strings"
+	"sync"

 	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/samber/lo"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 type RemoteLoader struct {
-	*GitCommon
+	*common.Common
+	cmd oscommands.ICmdObjBuilder
 }

-func NewRemoteLoader(gitCommon *GitCommon) *RemoteLoader {
-	return &RemoteLoader{GitCommon: gitCommon}
+func NewRemoteLoader(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+) *RemoteLoader {
+	return &RemoteLoader{
+		Common: common,
+		cmd:    cmd,
+	}
 }

-// GetRemotes returns the repo's remotes, without their branches; those are
-// loaded separately with GetRemoteBranchesByRemoteName, which takes a lot longer
-// in a repo with many remote branches.
-func (self *RemoteLoader) GetRemotes() []*models.Remote {
+func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
+	wg := sync.WaitGroup{}
+	wg.Add(1)
+
+	var remoteBranchesByRemoteName map[string][]*models.RemoteBranch
+	var remoteBranchesErr error
+	go utils.Safe(func() {
+		defer wg.Done()
+
+		remoteBranchesByRemoteName, remoteBranchesErr = self.getRemoteBranchesByRemoteName()
+	})
+
 	remotes := self.getRemotesFromConfig()

+	wg.Wait()
+
+	if remoteBranchesErr != nil {
+		return nil, remoteBranchesErr
+	}
+
+	for _, remote := range remotes {
+		remote.Branches = remoteBranchesByRemoteName[remote.Name]
+	}
+
 	// now lets sort our remotes by name alphabetically
 	slices.SortFunc(remotes, func(a, b *models.Remote) int {
 		// we want origin at the top because we'll be most likely to want it
@@ -36,7 +64,7 @@ func (self *RemoteLoader) GetRemotes() []*models.Remote {
 		return strings.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
 	})

-	return remotes
+	return remotes, nil
 }

 func (self *RemoteLoader) getRemotesFromConfig() []*models.Remote {
@@ -83,47 +111,29 @@ func (self *RemoteLoader) getRemotesFromConfig() []*models.Remote {
 	return slices.Collect(maps.Values(remotesByName))
 }

-// GetRemoteBranchesByRemoteName returns all remote branches, keyed by the name
-// of the remote they belong to.
-func (self *RemoteLoader) GetRemoteBranchesByRemoteName() (map[string][]*models.RemoteBranch, error) {
-	remoteBranches, err := self.getRemoteBranches()
-	if err != nil {
-		return nil, err
-	}
+func (self *RemoteLoader) getRemoteBranchesByRemoteName() (map[string][]*models.RemoteBranch, error) {
+	remoteBranchesByRemoteName := make(map[string][]*models.RemoteBranch)

-	return lo.GroupBy(remoteBranches, func(branch *models.RemoteBranch) string {
-		return branch.RemoteName
-	}), nil
-}
-
-// Returns all remote branches, sorted the way the config asks for
-func (self *RemoteLoader) getRemoteBranches() ([]*models.RemoteBranch, error) {
-	sortByDate := strings.ToLower(self.UserConfig().Git.RemoteBranchSortOrder) == "date"
-	sortOrder := "refname"
-	if sortByDate {
+	var sortOrder string
+	switch strings.ToLower(self.UserConfig().Git.RemoteBranchSortOrder) {
+	case "alphabetical":
+		sortOrder = "refname"
+	case "date":
 		sortOrder = "-committerdate"
-	}
-
-	// Asking for the tip of a branch makes git read its commit, so only do it
-	// when we are going to sort by ancestry below
-	format := "%(refname)"
-	if sortByDate {
-		format += "%00%(objectname)%00%(committerdate:unix)"
+	default:
+		sortOrder = "refname"
 	}

 	cmdArgs := NewGitCmd("for-each-ref").
 		Arg(fmt.Sprintf("--sort=%s", sortOrder)).
-		Arg(fmt.Sprintf("--format=%s", format)).
+		Arg("--format=%(refname)").
 		Arg("refs/remotes").
 		ToArgv()

-	remoteBranches := []*models.RemoteBranch{}
-	tips := map[string]refTip{}
 	err := self.cmd.New(cmdArgs).DontLog().RunAndProcessLines(func(line string) (bool, error) {
-		fields := strings.Split(strings.TrimSpace(line), "\x00")
-		refName := fields[0]
+		line = strings.TrimSpace(line)

-		split := strings.SplitN(refName, "/", 4)
+		split := strings.SplitN(line, "/", 4)
 		if len(split) != 4 {
 			return false, nil
 		}
@@ -134,27 +144,21 @@ func (self *RemoteLoader) getRemoteBranches() ([]*models.RemoteBranch, error) {
 			return false, nil
 		}

-		remoteBranches = append(remoteBranches,
+		_, ok := remoteBranchesByRemoteName[remoteName]
+		if !ok {
+			remoteBranchesByRemoteName[remoteName] = []*models.RemoteBranch{}
+		}
+
+		remoteBranchesByRemoteName[remoteName] = append(remoteBranchesByRemoteName[remoteName],
 			&models.RemoteBranch{
 				Name:       name,
 				RemoteName: remoteName,
 			})
-		if len(fields) == 3 {
-			tips[refName] = refTip{hash: fields[1], committerDate: fields[2]}
-		}
 		return false, nil
 	})
 	if err != nil {
 		return nil, err
 	}

-	if sortByDate {
-		if err := sortRefsWithEqualDatesByAncestry(
-			self.cmd, self.version, remoteBranches, (*models.RemoteBranch).FullRefName, tips,
-		); err != nil {
-			self.Log.Errorf("Failed to sort remote branches by ancestry: %v", err)
-		}
-	}
-
-	return remoteBranches, nil
+	return remoteBranchesByRemoteName, nil
 }
@@ -6,6 +6,7 @@ import (

 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/stretchr/testify/assert"
 )

@@ -94,7 +95,8 @@ func TestGetRemotesFromConfig(t *testing.T) {
 	for _, scenario := range scenarios {
 		t.Run(scenario.testName, func(t *testing.T) {
 			loader := &RemoteLoader{
-				GitCommon: buildGitCommon(commonDeps{runner: scenario.runner}),
+				Common: common.NewDummyCommon(),
+				cmd:    oscommands.NewDummyCmdObjBuilder(scenario.runner),
 			}

 			// map iteration order is non-deterministic, so compare unordered
@@ -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
-// worktree at all.
+// be the same as RepoPath()
 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)
-	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")
+	gitDirOutput, err := callGitRevParseWithDir(cmd, dir, "--show-toplevel", "--absolute-git-dir", "--git-common-dir", "--is-bare-repository", "--show-superproject-working-tree")
 	if err != nil {
-		// --show-toplevel is the only one of these that needs a work tree, and
-		// 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)
+		return nil, 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
-	// worktree, so it is the repoPath. That holds for a submodule as well: its
-	// git dir lives under the superproject's .git/modules, but it is still the
-	// submodule's own common dir.
-	isMainWorktree := worktreeGitDirPath == repoGitDirPath
+	// If we're in a submodule, --show-superproject-working-tree will return
+	// a value, meaning gitDirResults will be length 5. In that case
+	// return the worktree path as the repoPath. Otherwise we're in a
+	// normal repo or a worktree so return the parent of the git common
+	// 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,
-		gitLocationEnvVars: gitLocationEnvVars(cmd, worktreePath, worktreeGitDirPath),
+		isBareRepo:         isBareRepo,
 	}, 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()
-}
-
-func runGitRevParse(gitCmd *oscommands.CmdObj) (string, error) {
+	gitCmd := cmd.New(gitRevParse.ToArgv()).DontLog()
 	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
+}
@@ -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(
-					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) {
+				// setup for main worktree
 				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`,
-				worktreeGitDirPath: `C:\path\to\repo\.git`,
-				repoPath:           `C:\path\to\worktree`,
-				repoGitDirPath:     `C:\path\to\repo\.git`,
-				repoName:           `worktree`,
-				isBareRepo:         false,
-				gitLocationEnvVars: []string{`GIT_DIR=C:\path\to\repo\.git`, `GIT_WORK_TREE=C:\path\to\worktree`},
+				worktreePath:       `C:\path\to\repo`,
+				worktreeGitDirPath: `C:\path\to\bare_repo\bare.git`,
+				repoPath:           `C:\path\to\bare_repo`,
+				repoGitDirPath:     `C:\path\to\bare_repo\bare.git`,
+				repoName:           `bare_repo`,
+				isBareRepo:         true,
 			}, &RepoPaths{
-				worktreePath:       "/path/to/worktree",
-				worktreeGitDirPath: "/path/to/repo/.git",
-				repoPath:           "/path/to/worktree",
-				repoGitDirPath:     "/path/to/repo/.git",
-				repoName:           "worktree",
-				isBareRepo:         false,
-				gitLocationEnvVars: []string{"GIT_DIR=/path/to/repo/.git", "GIT_WORK_TREE=/path/to/worktree"},
+				worktreePath:       "/path/to/repo",
+				worktreeGitDirPath: "/path/to/bare_repo/bare.git",
+				repoPath:           "/path/to/bare_repo",
+				repoGitDirPath:     "/path/to/bare_repo/bare.git",
+				repoName:           "bare_repo",
+				isBareRepo:         true,
 			}),
 			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"),
-					"",
-					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"),
+					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"))
 			},
@@ -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)
 			},
 		},
 	}
@@ -80,14 +80,21 @@ func (self *StashCommands) Hash(index int) (string, error) {
 	return strings.Trim(hash, "\r\n"), err
 }

-func (self *StashCommands) ShowStashEntryCmdObj(index int, mode DiffMode) *oscommands.CmdObj {
+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(), mode).
 		Arg("-p").
 		Arg("--stat").
 		Arg("-u").
-		Arg(fmt.Sprintf("--color=%s", mode.colorArg(self.diffRendererConfigManager))).
+		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()
@@ -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"},
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			pagerConfig:         &config.PagingConfig{ExternalDiffCommand: "difft --color=always"},
+			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"},
-			expected:            []string{"git", "-C", "/path/to/worktree", "stash", "show", "--ext-diff", "--unified=3", "--find-renames=50%", "-p", "--stat", "-u", "--color=always", "refs/stash@{5}"},
+			pagerConfig:         &config.PagingConfig{UseExternalDiffGitConfig: true},
+			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,15 +166,15 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			userConfig.Git.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
 			userConfig.Git.DiffContextSize = s.contextSize
 			userConfig.Git.RenameSimilarityThreshold = s.similarityThreshold
-			if s.diffRendererConfig != nil {
-				userConfig.Git.DiffRenderers = []config.DiffRendererConfig{*s.diffRendererConfig}
+			if s.pagerConfig != nil {
+				userConfig.Git.Pagers = []config.PagingConfig{*s.pagerConfig}
 			}
 			repoPaths := RepoPaths{
 				worktreePath: "/path/to/worktree",
 			}
 			instance := buildStashCommands(commonDeps{userConfig: userConfig, appState: &config.AppState{}, repoPaths: &repoPaths})

-			cmdStr := instance.ShowStashEntryCmdObj(s.index, DiffModeRendered).Args()
+			cmdStr := instance.ShowStashEntryCmdObj(s.index).Args()
 			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
@@ -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
-	// 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()
+	gitModulesPath := ".gitmodules"
 	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
 	}

@@ -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)
@@ -6,7 +6,6 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/samber/lo"
 )

 type SyncCommands struct {
@@ -19,21 +18,18 @@ func NewSyncCommands(gitCommon *GitCommon) *SyncCommands {
 	}
 }

+// Push pushes to a branch
 type PushOpts struct {
 	Force          bool
 	ForceWithLease bool
+	CurrentBranch  string
+	UpstreamRemote string
+	UpstreamBranch string
 	SetUpstream    bool
-	// The remote to push to. If empty, git picks it from its configuration,
-	// and Refspecs must be empty too.
-	Remote string
-	// What to push, each in the form "refs/heads/<local branch>:<remote ref>".
-	// If empty, git decides what to push based on push.default and
-	// remote.<name>.push.
-	Refspecs []string
 }

 func (self *SyncCommands) PushCmdObj(task gocui.Task, opts PushOpts) (*oscommands.CmdObj, error) {
-	if len(opts.Refspecs) > 0 && opts.Remote == "" {
+	if opts.UpstreamBranch != "" && opts.UpstreamRemote == "" {
 		return nil, errors.New(self.Tr.MustSpecifyOriginError)
 	}

@@ -41,8 +37,8 @@ func (self *SyncCommands) PushCmdObj(task gocui.Task, opts PushOpts) (*oscommand
 		ArgIf(opts.Force, "--force").
 		ArgIf(opts.ForceWithLease, "--force-with-lease").
 		ArgIf(opts.SetUpstream, "--set-upstream").
-		ArgIf(opts.Remote != "", opts.Remote).
-		Arg(opts.Refspecs...).
+		ArgIf(opts.UpstreamRemote != "", opts.UpstreamRemote).
+		ArgIf(opts.UpstreamBranch != "", fmt.Sprintf("refs/heads/%s:%s", opts.CurrentBranch, opts.UpstreamBranch)).
 		ToArgv()

 	cmdObj := self.cmd.New(cmdArgs).PromptOnCredentialRequest(task)
@@ -114,25 +110,15 @@ func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
 	return self.cmd.New(cmdArgs).AddEnvVars("GIT_SEQUENCE_EDITOR=:").PromptOnCredentialRequest(task).Run()
 }

-// Fetches the given branches of the given remote, updating their
-// remote-tracking branches. Local branches are left alone, including the ones
-// that track them.
-func (self *SyncCommands) FetchRemoteBranches(
+func (self *SyncCommands) FastForward(
 	task gocui.Task,
+	branchName string,
 	remoteName string,
-	remoteBranchNames []string,
+	remoteBranchName string,
 ) error {
-	// The explicit destinations and the leading + make sure that the
-	// remote-tracking branches are updated even when the remote branches were
-	// rewritten, whatever the remote's fetch refspec says
-	refspecs := lo.Map(remoteBranchNames, func(remoteBranchName string, _ int) string {
-		return fmt.Sprintf("+refs/heads/%s:refs/remotes/%s/%s",
-			remoteBranchName, remoteName, remoteBranchName)
-	})
-
 	cmdArgs := self.fetchCommandBuilder(false).
 		Arg(remoteName).
-		Arg(refspecs...).
+		Arg("refs/heads/" + remoteBranchName + ":" + branchName).
 		ToArgv()

 	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
@@ -41,11 +41,12 @@ func TestSyncPush(t *testing.T) {
 			},
 		},
 		{
-			testName: "Push with force disabled, refspec supplied",
+			testName: "Push with force disabled, upstream supplied",
 			opts: PushOpts{
 				ForceWithLease: false,
-				Remote:         "origin",
-				Refspecs:       []string{"refs/heads/master:master"},
+				CurrentBranch:  "master",
+				UpstreamRemote: "origin",
+				UpstreamBranch: "master",
 			},
 			test: func(cmdObj *oscommands.CmdObj, err error) {
 				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "origin", "refs/heads/master:master"})
@@ -56,8 +57,9 @@ func TestSyncPush(t *testing.T) {
 			testName: "Push with force disabled, setting upstream",
 			opts: PushOpts{
 				ForceWithLease: false,
-				Remote:         "origin",
-				Refspecs:       []string{"refs/heads/master-local:master"},
+				CurrentBranch:  "master-local",
+				UpstreamRemote: "origin",
+				UpstreamBranch: "master",
 				SetUpstream:    true,
 			},
 			test: func(cmdObj *oscommands.CmdObj, err error) {
@@ -69,8 +71,9 @@ func TestSyncPush(t *testing.T) {
 			testName: "Push with force-with-lease enabled, setting upstream",
 			opts: PushOpts{
 				ForceWithLease: true,
-				Remote:         "origin",
-				Refspecs:       []string{"refs/heads/master:master"},
+				CurrentBranch:  "master",
+				UpstreamRemote: "origin",
+				UpstreamBranch: "master",
 				SetUpstream:    true,
 			},
 			test: func(cmdObj *oscommands.CmdObj, err error) {
@@ -79,23 +82,11 @@ func TestSyncPush(t *testing.T) {
 			},
 		},
 		{
-			testName: "Push several refspecs",
+			testName: "Push with remote branch but no origin",
 			opts: PushOpts{
 				ForceWithLease: true,
-				Remote:         "origin",
-				Refspecs:       []string{"refs/heads/a:refs/heads/a", "refs/heads/b:refs/heads/b"},
-			},
-			test: func(cmdObj *oscommands.CmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease", "origin", "refs/heads/a:refs/heads/a", "refs/heads/b:refs/heads/b"})
-				assert.NoError(t, err)
-			},
-		},
-		{
-			testName: "Push with refspec but no remote",
-			opts: PushOpts{
-				ForceWithLease: true,
-				Remote:         "",
-				Refspecs:       []string{"refs/heads/master:master"},
+				UpstreamRemote: "",
+				UpstreamBranch: "master",
 				SetUpstream:    true,
 			},
 			test: func(cmdObj *oscommands.CmdObj, err error) {
@@ -5,7 +5,6 @@ import (

 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/samber/lo"
 )

 type TagCommands struct {
@@ -44,19 +43,18 @@ 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(tagNames []string) error {
-	cmdArgs := NewGitCmd("tag").Arg("-d").Arg(tagNames...).
+func (self *TagCommands) LocalDelete(tagName string) error {
+	cmdArgs := NewGitCmd("tag").Arg("-d", tagName).
 		ToArgv()

 	return self.cmd.New(cmdArgs).Run()
 }

-func (self *TagCommands) Push(task gocui.Task, remoteName string, tagNames []string) error {
-	cmdArgs := NewGitCmd("push").Arg(remoteName).
-		Arg(lo.FlatMap(tagNames, func(t string, _ int) []string { return []string{"tag", t} })...).
+func (self *TagCommands) Push(task gocui.Task, remoteName string, tagName string) error {
+	cmdArgs := NewGitCmd("push").Arg(remoteName, "tag", tagName).
 		ToArgv()

 	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
@@ -76,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) {
@@ -85,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
 }
@@ -383,28 +383,47 @@ func (self *WorkingTreeCommands) Exclude(filename string) error {
 }

 // WorktreeFileDiff returns the diff of a file
-func (self *WorkingTreeCommands) WorktreeFileDiff(file *models.File, mode DiffMode, cached bool) string {
+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, mode, cached, file.Names()).RunWithOutput()
+	s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached, nil).RunWithOutput()
 	return s
 }

-// WorktreeFileDiffCmdObj returns a command object for diffing the given paths
-// in the working tree. node is the item they belong to; all it decides is
-// whether git has to compare against /dev/null, which is the case for a file
-// that isn't in the index yet.
-func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, mode DiffMode, cached bool, paths []string) *oscommands.CmdObj {
+// WorktreeFileDiffCmdObj returns a command object for diffing a file or directory
+// in the working tree. When pathOverrides is non-empty, those paths are used instead of
+// the node's path (used to diff only filtered/visible files within a directory).
+func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool, pathOverrides []string) *oscommands.CmdObj {
+	colorArg := self.pagerConfig.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(), mode).
+		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
+		ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
-		Arg(fmt.Sprintf("--color=%s", mode.colorArg(self.diffRendererConfigManager))).
+		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()

@@ -413,25 +432,34 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, mode

 // ShowFileDiff get the diff of specified from and to. Typically this will be used for a single commit so it'll be 123abc^..123abc
 // but when we're in diff mode it could be any 'from' to any 'to'. The reverse flag is also here thanks to diff mode.
-// For a renamed file, previousPath is the path it was renamed from (empty otherwise);
-// both paths must be passed to git for the rename to be detected.
-func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bool, fileName string, previousPath string, mode DiffMode) (string, error) {
-	fileNames := []string{fileName}
-	if previousPath != "" {
-		fileNames = append(fileNames, previousPath)
-	}
-	return self.ShowFileDiffCmdObj(from, to, reverse, fileNames, mode).RunWithOutput()
+func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bool, fileName string, plain bool) (string, error) {
+	return self.ShowFileDiffCmdObj(from, to, reverse, []string{fileName}, plain).RunWithOutput()
 }

-func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reverse bool, fileNames []string, mode DiffMode) *oscommands.CmdObj {
+func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reverse bool, fileNames []string, plain bool) *oscommands.CmdObj {
+	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(), mode).
+		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
+		ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
-		Arg(fmt.Sprintf("--color=%s", mode.colorArg(self.diffRendererConfigManager))).
+		Arg(fmt.Sprintf("--unified=%d", contextSize)).
+		Arg("--no-renames").
+		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).
@@ -514,42 +542,6 @@ func (self *WorkingTreeCommands) ResetSoft(ref string) error {
 	return self.cmd.New(cmdArgs).Run()
 }

-// ResetKeep runs `git reset --keep` in the given worktree, which moves the
-// checked out branch to the given ref while keeping local modifications. It
-// fails rather than overwriting a file that differs between the two commits.
-// Pass empty strings for the worktree to use the current one.
-func (self *WorkingTreeCommands) ResetKeep(ref string, worktreeGitDir string, worktreePath string) error {
-	cmdArgs := NewGitCmd("reset").Arg("--keep", ref).
-		GitDirIf(worktreeGitDir != "", worktreeGitDir).
-		WorktreePathIf(worktreePath != "", worktreePath).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-// Returns whether the given worktree has changes to tracked files, either in
-// its working tree or in its index. Untracked files don't count, and neither do
-// submodules. A submodule that is checked out at a different commit than the
-// one recorded, or that has changes of its own, doesn't get in the way of
-// moving the branch, because moving it leaves the submodules alone. Pass empty
-// strings for the worktree to use the current one.
-func (self *WorkingTreeCommands) HasChangesToTrackedFiles(worktreeGitDir string, worktreePath string) (bool, error) {
-	cmdArgs := NewGitCmd("status").
-		Arg("--porcelain").
-		Arg("--untracked-files=no").
-		Arg("--ignore-submodules").
-		GitDirIf(worktreeGitDir != "", worktreeGitDir).
-		WorktreePathIf(worktreePath != "", worktreePath).
-		ToArgv()
-
-	stdout, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs()
-	if err != nil {
-		return false, err
-	}
-
-	return stdout != "", nil
-}
-
 func (self *WorkingTreeCommands) ResetMixed(ref string) error {
 	cmdArgs := NewGitCmd("reset").Arg("--mixed", ref).
 		ToArgv()
@@ -197,7 +197,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 	type scenario struct {
 		testName            string
 		file                *models.File
-		mode                DiffMode
+		plain               bool
 		cached              bool
 		ignoreWhitespace    bool
 		contextSize         uint64
@@ -215,13 +215,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          true,
 			},
-			mode:                DiffModeRendered,
+			plain:               false,
 			cached:              false,
 			ignoreWhitespace:    false,
 			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",
@@ -230,13 +230,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          true,
 			},
-			mode:                DiffModeRendered,
+			plain:               false,
 			cached:              true,
 			ignoreWhitespace:    false,
 			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",
@@ -245,13 +245,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          true,
 			},
-			mode:                DiffModePlain,
+			plain:               true,
 			cached:              false,
 			ignoreWhitespace:    false,
 			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",
@@ -260,13 +260,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          false,
 			},
-			mode:                DiffModeRendered,
+			plain:               false,
 			cached:              false,
 			ignoreWhitespace:    false,
 			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)",
@@ -275,13 +275,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          true,
 			},
-			mode:                DiffModeRendered,
+			plain:               false,
 			cached:              false,
 			ignoreWhitespace:    true,
 			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",
@@ -290,13 +290,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          true,
 			},
-			mode:                DiffModeRendered,
+			plain:               false,
 			cached:              false,
 			ignoreWhitespace:    false,
 			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",
@@ -305,13 +305,13 @@ func TestWorkingTreeDiff(t *testing.T) {
 				HasStagedChanges: false,
 				Tracked:          true,
 			},
-			mode:                DiffModeRendered,
+			plain:               false,
 			cached:              false,
 			ignoreWhitespace:    false,
 			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),
 		},
 	}

@@ -326,7 +326,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			}

 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig, appState: &config.AppState{}, repoPaths: &repoPaths})
-			result := instance.WorktreeFileDiff(s.file, s.mode, s.cached)
+			result := instance.WorktreeFileDiff(s.file, s.plain, s.cached)
 			assert.Equal(t, expectedResult, result)
 			s.runner.CheckForMissingCalls()
 		})
@@ -339,9 +339,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 		from             string
 		to               string
 		reverse          bool
-		fileName         string
-		previousPath     string
-		mode             DiffMode
+		plain            bool
 		ignoreWhitespace bool
 		contextSize      uint64
 		runner           *oscommands.FakeCmdObjRunner
@@ -355,49 +353,33 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			from:             "1234567890",
 			to:               "0987654321",
 			reverse:          false,
-			fileName:         "test.txt",
-			mode:             DiffModeRendered,
+			plain:            false,
 			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", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Show diff with custom context size",
 			from:             "1234567890",
 			to:               "0987654321",
 			reverse:          false,
-			fileName:         "test.txt",
-			mode:             DiffModeRendered,
+			plain:            false,
 			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", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Default case (ignore whitespace)",
 			from:             "1234567890",
 			to:               "0987654321",
 			reverse:          false,
-			fileName:         "test.txt",
-			mode:             DiffModeRendered,
+			plain:            false,
 			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),
-		},
-		{
-			testName:         "Renamed file passes both paths so the rename is detected",
-			from:             "1234567890",
-			to:               "0987654321",
-			reverse:          false,
-			fileName:         "new.txt",
-			previousPath:     "old.txt",
-			mode:             DiffModeRendered,
-			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", "--no-renames", "--color=always", "1234567890", "0987654321", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
 		},
 	}

@@ -412,7 +394,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {

 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig, appState: &config.AppState{}, repoPaths: &repoPaths})

-			result, err := instance.ShowFileDiff(s.from, s.to, s.reverse, s.fileName, s.previousPath, s.mode)
+			result, err := instance.ShowFileDiff(s.from, s.to, s.reverse, "test.txt", s.plain)
 			assert.NoError(t, err)
 			assert.Equal(t, expectedResult, result)
 			s.runner.CheckForMissingCalls()
@@ -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) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stefan Haller	6e74cc0268	Show base branches as bare names in labels ShortBranchName previously turned "refs/remotes/origin/main" into "origin/main", leaking the resolved-ref shape into UI labels that the user thinks of as plain "main" — the name they put in their mainBranches config. With the ambiguous-base label now potentially listing several branches ("pick: origin/main, origin/13"), the noise is even more pronounced. Strip the remote name along with the "refs/remotes/" prefix so the short name matches what the user configured. Rename the helper to BaseBranchDisplayName to make the constraint explicit at every call site: dropping the remote is a sensible choice only for base-branch display, not for refs in general. All current callers happen to be base-branch related, so the rename is just a scope-tightening. Existing integration test updated to expect the bare "master" form.	2026-07-03 19:37:37 +02:00
Stefan Haller	cee2de60ba	Signal ambiguity in the move-commits-to-new-branch label and prompt Same idea as the rebase and view-divergence labels: when the base is ambiguous, the menu prompt and the "New branch from base branch (...)" item both substitute "pick: main, develop" for the parenthetical so the user knows the disambiguation picker will appear before they pick the "from base" option.	2026-07-03 19:37:37 +02:00
Stefan Haller	d688fa9319	Signal ambiguity in the view-divergence-from-base-branch label Same idea as the rebase menu's label: when the resolver reports the selected branch's base is ambiguous, show "pick: main, develop" in the parenthetical instead of just the config-order tiebreak, so the user knows the prompt will appear before they press 'b'.	2026-07-03 19:37:37 +02:00
Stefan Haller	272235925b	Signal ambiguity in the rebase-onto-base-branch label The label currently looks identical in the unambiguous case ("Rebase onto base branch (develop)") and the ambiguous case where develop is just the config-order tiebreak; pressing 'b' would then surprise the user with a picker. Show "pick: main, develop" in the parenthetical when the resolver reports the base is ambiguous so the upcoming prompt is no longer a surprise. The new PickBaseBranchLabel i18n string lives next to the existing PickBaseBranchTitle/Prompt so the disambiguation UI is grouped in one place.	2026-07-03 19:37:37 +02:00
Stefan Haller	2efaa38124	Document mainBranches and the disambiguation prompt	2026-07-03 19:37:37 +02:00
Stefan Haller	df138a4c72	Show ? and ↓? in the branches list when the base is ambiguous When a branch's fork point is reachable from more than one configured main branch and the candidates disagree on the behind count, the branches column was silently showing the config-order first candidate's number — confidently asserting something we don't actually know. Worse, "nothing" in the column means "up to date with the base", which may or may not be true under ambiguity. Compute behind values for every candidate (the fast path already had them; the legacy path now does too via baseBranchCandidatesAndBehinds), then classify: - all candidates agree → show that number (or nothing if 0) - some candidates 0, others not → "?" (we can't say if up to date) - all non-zero but differing → "↓?" (definitely behind, unknown amount) Two sentinel constants on the Branch model (BehindBaseAmbiguousMaybeUpToDate and BehindBaseAmbiguousDefinitelyBehind) encode these states in the existing atomic.Int32 field via negative values; the renderer switches on them.	2026-07-03 19:37:37 +02:00
Stefan Haller	acc15a6e43	Prompt for base branch when move-commits-to-new-branch is ambiguous The "off of <base>" item in the move-commits-to-new-branch menu now shows the disambiguation picker first when the base is ambiguous, then continues into the existing new-branch-name prompt with the chosen base. The "stacked on current branch" path doesn't use the base, so it's unaffected.	2026-07-03 19:37:37 +02:00
Stefan Haller	dcf0532020	Prompt for base branch when viewing divergence is ambiguous Pressing 'b' on the branches view's divergence menu now shows the disambiguation menu when the selected branch's fork point is reachable from more than one configured main branch. The user's selection drives the sub-commits view and gets recorded so subsequent actions on the branch skip the prompt.	2026-07-03 19:37:37 +02:00
Stefan Haller	f59f993d1c	Prompt for base branch when rebase-onto-base is ambiguous When the checked-out branch's fork point is contained in more than one configured main branch, pressing 'b' on the rebase menu now opens a small disambiguation menu first; the selection is recorded and then the rebase runs against the chosen base. The unambiguous case is unchanged.	2026-07-03 19:37:37 +02:00
Stefan Haller	c9eb915279	Add disambiguation menu to BaseBranchHelper When ResolveBaseBranch reports a tie, callers need a way to ask the user which of the configured main branches to use as the base. ShowPicker takes the candidate list and a continuation, presents a menu of short branch names, and runs the continuation with the user's selection. Subsequent commits wire this into the three GUI actions that care (rebase-onto-base, view-divergence, move-commits).	2026-07-03 19:37:37 +02:00
Stefan Haller	98a421091f	Route base-branch lookups through the shared resolver The four call sites that need a single base branch (legacy behind-base loader, view-divergence menu, rebase-onto-base action, move-commits-to-new-branch) now go through BaseBranchHelper.ResolveBaseBranch in the GUI sites, and directly take candidates[0] in the loader. They all use the same config-order tiebreak. No prompt yet — the helper still returns the config-order first for ambiguous cases; subsequent commits add the disambiguation menu. MergeAndRebaseHelper and RefsHelper take BaseBranchHelper at construction since helpers don't have access to Helpers() the way controllers do.	2026-07-03 19:37:37 +02:00
Stefan Haller	672a37031d	Introduce BaseBranchHelper around candidate resolution GUI call sites that need a base branch all share the same logic: ask GetBaseBranchCandidates, take candidates[0] as the config-order tiebreak, and surface the candidate list when the user needs to disambiguate. Extracting that into a helper keeps the upcoming prompt and rebase wiring focused on UX concerns. Not yet routed through — subsequent commits replace the direct GetBaseBranchCandidates calls with ResolveBaseBranch.	2026-07-03 19:35:33 +02:00
Stefan Haller	84bd2b6fe1	Return all tied candidates from base-branch detection The four callers of GetBaseBranch all ultimately want a single ref, but the disambiguation prompt we're about to add needs to know when multiple main branches are genuinely tied at the closest position so it can ask the user. Change the function to return all min-ahead refs in config order and rename to GetBaseBranchCandidates; each caller now takes candidates[0] as a placeholder until the prompt wiring lands.	2026-07-03 19:35:33 +02:00
Stefan Haller	5a9e8c6af9	Share the multi-candidate selector between fast and legacy paths Have GetBaseBranch reuse selectBaseForBranch to disambiguate the multi-candidate case, so the fast path (for-each-ref %(ahead-behind)) and the legacy path (rev-list --left-right --count) agree on the same rule for which base is "closest" and the same config-order tiebreak when ahead values are equal. The bespoke loop in GetBaseBranch goes away.	2026-07-03 19:35:33 +02:00
Stefan Haller	28cfcaced2	Reshape selection to expose the winning base ref The fast path's selectBehindForBranch returned only the behind value of the closest base, throwing away which base actually won. We need that information so subsequent commits can present a disambiguation prompt when more than one main branch is the closest base. Rename to selectBaseForBranch and have it return (winner, behind, candidates), where candidates is the full set of refs tied at the minimum ahead (in config order) so callers can recognise ambiguity via len(candidates) > 1. To make that possible, parseAheadBehindForEachRefOutput now preserves malformed entries with a valid=false flag instead of silently dropping them — without this the slice would drift out of alignment with mainRefs and the index→ref mapping would be unreliable.	2026-07-03 19:35:33 +02:00
Stefan Haller	dd03884087	Pick base branch by smallest ahead instead of relying on for-each-ref's order GetBaseBranch was treating "contains the merge-base" as the equivalence class for "is the closest base," which is too loose — multiple main branches can contain the merge-base when one is dramatically closer to the feature branch than another. The candidate it returned was then whichever ref git for-each-ref happened to list first. For example, a branch forked off "develop" can have its combined merge-base with [main, develop] land on a commit reachable from both (via develop's own branch-off from main). Both main and develop end up in the candidate set, even though by any reasonable measure of closeness the branch differs from develop by a small ahead count and from main by a much larger one. Discriminate within the candidate set using ahead values: for each configured main branch that contains the merge-base, compute the ahead count from branch to base, and pick the candidate with the smallest ahead — the closest base. When more than one candidate is tied at the minimum, return that tied set unchanged so callers can flag the case as genuinely ambiguous instead of silently collapsing it; subsequent commits build the disambiguation prompt on top.	2026-07-03 19:35:33 +02:00
Stefan Haller	a0e51da643	Add test demonstrating wrong base branch on ambiguous merge-base GetBaseBranch was determining its candidates purely by "this main branch contains the merge-base" — and then returning the first one without further discrimination. That equivalence class is too loose: multiple main branches can contain the merge-base even when one is clearly closer to the feature branch than another. The new test exercises that case: with main and develop both containing the branch's merge-base, the current code returns whichever git for-each-ref happens to list first, ignoring how close each candidate actually is.	2026-07-03 19:35:33 +02:00