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-10-03 20:46:47 -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
62 changed files with 995 additions and 1377 deletions
@@ -419,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
@@ -10,15 +10,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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 |  |
 | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | Push | Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
-| `` p `` | Pull | Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
+| `` 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'. |
 | `` : `` | 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 |  |
@@ -28,10 +28,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` ? `` | 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 |  |
+| `` 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 bestand in externe editor. |
+| `` <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) | 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. |

@@ -47,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 |  |

@@ -58,15 +58,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 +75,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 +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

@@ -99,19 +99,19 @@ _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. |
 | `` T `` | Creëer tag |  |
@@ -119,7 +119,7 @@ _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 |  |
 | `` / `` | Filter the current view by text |  |
@@ -136,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> `` | 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 |  |

@@ -183,11 +183,11 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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 |  |
@@ -219,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
@@ -243,8 +243,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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 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 |  |
@@ -259,12 +259,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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 |  |
@@ -275,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 | Delete the remote branch from the 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 |  |
@@ -293,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 | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
+| `` 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. |
@@ -320,15 +320,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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
@@ -340,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 |  |
@@ -349,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 |  |
@@ -365,12 +365,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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 |  |
@@ -382,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 |  |
@@ -395,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. |
+| `` <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. |
+| `` 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 `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` 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 |  |
@@ -412,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 |  |
@@ -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.
@@ -362,11 +342,6 @@ gui:
 git:
  # Array of pagers. Each entry has the following format:
  #
-  #   # 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. Some pagers want
  #   # this to be set to 'always' and some want it set to 'never'
  #   colorArg: "always"
@@ -386,9 +361,6 @@ git:
  #   # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.
  #   useExternalDiffGitConfig: false
  #
-  # 'pager', 'externalDiffCommand', and 'useExternalDiffGitConfig' are mutually
-  # exclusive; set at most one per entry.
-  #
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
  # for more information.
  pagers: []
@@ -434,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
@@ -532,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'
@@ -559,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

@@ -695,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,7 +667,6 @@ keybinding:
    nextScreenMode: +
    prevScreenMode: _
    cyclePagers: '|'
-    cyclePagersReverse: \
    undo: z
    redo: Z
    filteringMenu: <ctrl+s>
@@ -730,7 +681,6 @@ keybinding:
    increaseRenameSimilarityThreshold: )
    decreaseRenameSimilarityThreshold: (
    openDiffTool: <ctrl+t>
-    editConfig: <alt+shift+c>
  status:
    checkForUpdate: u
    recentRepos: <enter>
@@ -776,6 +726,8 @@ keybinding:
    fetchRemote: f
    addForkRemote: F
    sortOrder: s
+  worktrees:
+    viewWorktreeOptions: w
  commits:
    squashDown: s
    renameCommit: r
@@ -1107,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
@@ -2,6 +2,8 @@

 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):
@@ -69,7 +71,7 @@ git:
    - externalDiffCommand: difft --color=always
 ```

-The `colorArg` option is not used in this case.
+The `colorArg` and `pager` options are not used in this case.

 You can add whatever extra arguments you prefer for your difftool; for instance

@@ -89,4 +91,29 @@ git:

 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.
+## 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.)
@@ -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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 |  |

 ## 파일
@@ -10,28 +10,26 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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 |  |
 | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
-| `` P `` | Push | Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
-| `` p `` | Pull | Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren. |
+| `` 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'. |
 | `` : `` | 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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 |  |
+| `` 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 bestand in externe editor. |
 | `` z `` | Ongedaan maken (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
 | `` Z `` | Redo (via reflog) (experimenteel) | 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. |

@@ -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 |  |

@@ -183,14 +181,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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
@@ -243,8 +241,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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 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 |  |
@@ -259,15 +257,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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 | Delete the remote branch from the 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 | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
+| `` 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. |
@@ -320,15 +318,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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 |  |
@@ -365,15 +364,15 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 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. |
+| `` <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. |
+| `` 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 `` | Resetten | View reset options (soft/mixed/hard) for resetting onto selected item. |
-| `` <ctrl+t> `` | Open externe diff applicatie (git difftool) |  |
+| `` 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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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 |  |
@@ -23,7 +23,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` + `` | 下一屏模式(正常/半屏/全屏) |  |
 | `` _ `` | 上一屏模式 |  |
 | `` \| `` | 切换分页器 | 从已配置的分页器列表中选择下一个分页器 |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous 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> `` | 挂起应用程序 |  |
 | `` <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 `` | 查看工作区选项 |  |
 | `` / `` | 通过文本过滤当前视图 |  |
@@ -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 pagers | Choose the next pager in the list of configured pagers. |
-| `` \ `` | Cycle pagers (reverse) | Choose the previous pager in the list of configured pagers. |
+| `` \| `` | 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> `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 |
 | `` Z `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 |

@@ -90,7 +88,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 `` | 選擇上一個衝突 |  |
@@ -141,7 +139,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 `` | 複製提交 (揀選) | 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> `` | 重設選定的揀選 (複製) 提交 |  |
@@ -149,6 +146,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 `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 子模組
@@ -208,13 +206,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 `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
 | `` * `` | Select commits of current branch |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視所選項目的檔案 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 提交摘要
@@ -252,10 +250,10 @@ _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 `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 日誌
@@ -268,7 +266,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 `` | 複製提交 (揀選) | 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> `` | 重設選定的揀選 (複製) 提交 |  |
@@ -276,6 +273,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 `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 本地分支
@@ -287,7 +285,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <space> `` | 檢出 | 檢出選定的項目。 |
 | `` 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 |  |
@@ -307,6 +304,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 標籤
@@ -316,13 +314,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 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 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |

 ## 檔案
@@ -370,6 +368,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
+| `` o `` | 開啟設定檔案 | 使用預設軟體開啟 |
 | `` e `` | 編輯設定檔案 | 使用外部編輯器開啟 |
 | `` u `` | 檢查更新 |  |
 | `` <enter> `` | 切換到最近使用的版本庫 |  |
@@ -404,7 +403,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. |
@@ -414,4 +412,5 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
 | `` 0 `` | Focus main view |  |
 | `` <enter> `` | 檢視提交 |  |
+| `` w `` | 檢視工作目錄選項 |  |
 | `` / `` | 搜尋 |  |
@@ -117,8 +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, plain bool) (string, error) {
-			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, previousPath, plain)
+		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)
@@ -156,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)
 }
@@ -171,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
 		})
 	}
@@ -206,9 +186,13 @@ func (self *BranchLoader) getBehindBaseBranchValuesLegacy(
 	return err
 }

-// Holds parsed values from a single %(ahead-behind:<base>) field.
+// 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 {
@@ -222,7 +206,7 @@ type branchAheadBehind struct {
 //
 // 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
+// Individual malformed ahead-behind fields produce {valid: false} entries.
 func parseAheadBehindForEachRefOutput(
 	output string,
 	numBases int, // number of %(ahead-behind:...) tokens
@@ -238,7 +222,7 @@ func parseAheadBehindForEachRefOutput(
 			continue
 		}
 		refName := cols[0]
-		aheadBehinds := lo.FilterMap(cols[1:], func(col string, _ int) (aheadBehind, bool) {
+		aheadBehinds := lo.Map(cols[1:], func(col string, _ int) aheadBehind {
 			return parseAheadBehindField(col)
 		})
 		entry := branchAheadBehind{
@@ -250,27 +234,77 @@ func parseAheadBehindForEachRefOutput(
 	return result
 }

-func parseAheadBehindField(s string) (aheadBehind, bool) {
+func parseAheadBehindField(s string) aheadBehind {
 	parts := strings.Fields(s)
 	if len(parts) != 2 {
-		return aheadBehind{}, false
+		return aheadBehind{}
 	}
 	ahead, err1 := strconv.Atoi(parts[0])
 	behind, err2 := strconv.Atoi(parts[1])
 	if err1 != nil || err2 != nil {
-		return aheadBehind{}, false
+		return aheadBehind{}
 	}
-	return aheadBehind{ahead: ahead, behind: behind}, true
+	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 {
-	return lo.MinBy(aheadBehinds, func(a, b aheadBehind) bool {
-		return a.ahead < b.ahead
-	}).behind
+// 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:
@@ -296,11 +330,12 @@ func buildAheadBehindForEachRefArgs(mainBranchRefs []string) []string {

 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),
 	).DontLog().RunWithOutput()
@@ -313,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)
 		}
 	}
@@ -329,37 +364,83 @@ 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
 }

 func (self *BranchLoader) obtainBranches() []*models.Branch {
@@ -142,7 +142,7 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 			expected: []branchAheadBehind{
 				{
 					refName:      "refs/heads/feat",
-					aheadBehinds: []aheadBehind{{ahead: 2, behind: 5}},
+					aheadBehinds: []aheadBehind{{ahead: 2, behind: 5, valid: true}},
 				},
 			},
 		},
@@ -155,15 +155,15 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 				{
 					refName: "refs/heads/feat",
 					aheadBehinds: []aheadBehind{
-						{ahead: 2, behind: 5},
-						{ahead: 10, behind: 1},
+						{ahead: 2, behind: 5, valid: true},
+						{ahead: 10, behind: 1, valid: true},
 					},
 				},
 				{
 					refName: "refs/heads/main",
 					aheadBehinds: []aheadBehind{
-						{ahead: 0, behind: 0},
-						{ahead: 0, behind: 0},
+						{ahead: 0, behind: 0, valid: true},
+						{ahead: 0, behind: 0, valid: true},
 					},
 				},
 			},
@@ -176,7 +176,8 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 				{
 					refName: "refs/heads/feat",
 					aheadBehinds: []aheadBehind{
-						{ahead: 2, behind: 5},
+						{valid: false},
+						{ahead: 2, behind: 5, valid: true},
 					},
 				},
 			},
@@ -188,7 +189,7 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 			expected: []branchAheadBehind{
 				{
 					refName:      "refs/heads/feat/foo-bar",
-					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2}},
+					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
 				},
 			},
 		},
@@ -199,7 +200,7 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 			expected: []branchAheadBehind{
 				{
 					refName:      "refs/heads/feat",
-					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2}},
+					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
 				},
 			},
 		},
@@ -212,11 +213,11 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 			expected: []branchAheadBehind{
 				{
 					refName:      "refs/heads/good",
-					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2}},
+					aheadBehinds: []aheadBehind{{ahead: 1, behind: 2, valid: true}},
 				},
 				{
 					refName:      "refs/heads/also_good",
-					aheadBehinds: []aheadBehind{{ahead: 3, behind: 4}},
+					aheadBehinds: []aheadBehind{{ahead: 3, behind: 4, valid: true}},
 				},
 			},
 		},
@@ -227,7 +228,7 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 			expected: []branchAheadBehind{
 				{
 					refName:      "refs/heads/feat",
-					aheadBehinds: []aheadBehind{},
+					aheadBehinds: []aheadBehind{{valid: false}},
 				},
 			},
 		},
@@ -247,26 +248,58 @@ func TestParseAheadBehindForEachRefOutput(t *testing.T) {
 	}
 }

-func TestSelectBehindForBranch(t *testing.T) {
+func TestClassifyBehind(t *testing.T) {
 	type scenario struct {
-		testName     string
-		aheadBehinds []aheadBehind
-		expected     int
+		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}},
-			expected:     7,
+			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}, // master
-				{ahead: 5, behind: 2},   // develop  ← smallest ahead
+				{ahead: 50, behind: 10, valid: true}, // master
+				{ahead: 5, behind: 2, valid: true},   // develop  ← smallest ahead
 			},
-			expected: 2,
+			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)",
@@ -275,42 +308,60 @@ func TestSelectBehindForBranch(t *testing.T) {
 			// ahead vs master = 5 + 50 = 55; behind vs master = 0
 			// ahead vs develop = 5;          behind vs develop = 5
 			aheadBehinds: []aheadBehind{
-				{ahead: 55, behind: 0}, // master
-				{ahead: 5, behind: 5},  // develop  ← smallest ahead
+				{ahead: 55, behind: 0, valid: true}, // master
+				{ahead: 5, behind: 5, valid: true},  // develop  ← smallest ahead
 			},
-			expected: 5,
+			mainRefs:           []string{"refs/heads/master", "refs/heads/develop"},
+			expectedCandidates: []string{"refs/heads/develop"},
+			expectedBehinds:    []int{5},
 		},
 		{
-			testName: "tie on ahead - first base wins (config order)",
+			testName: "tie on ahead - both candidates returned in config order",
 			aheadBehinds: []aheadBehind{
-				{ahead: 5, behind: 10}, // first
-				{ahead: 5, behind: 99}, // second, same ahead
+				{ahead: 5, behind: 10, valid: true}, // first
+				{ahead: 5, behind: 99, valid: true}, // second, same ahead
 			},
-			expected: 10,
+			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{
-				{ahead: 3, behind: 8},
+				{valid: false},
+				{ahead: 3, behind: 8, valid: true},
 			},
-			expected: 8,
+			mainRefs:           []string{"refs/heads/master", "refs/heads/develop"},
+			expectedCandidates: []string{"refs/heads/develop"},
+			expectedBehinds:    []int{8},
 		},
 		{
-			testName:     "all invalid - returns 0",
-			aheadBehinds: []aheadBehind{},
-			expected:     0,
+			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 0",
-			aheadBehinds: nil,
-			expected:     0,
+			testName:           "empty - returns empty",
+			aheadBehinds:       nil,
+			mainRefs:           nil,
+			expectedCandidates: nil,
+			expectedBehinds:    nil,
 		},
 	}

 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
-			result := selectBehindForBranch(s.aheadBehinds)
-			assert.Equal(t, s.expected, result)
+			candidates, behinds := selectBaseForBranch(s.aheadBehinds, s.mainRefs)
+			assert.Equal(t, s.expectedCandidates, candidates)
+			assert.Equal(t, s.expectedBehinds, behinds)
 		})
 	}
 }
@@ -458,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).
@@ -491,3 +542,98 @@ func TestGetBehindBaseBranchValuesForAllBranches_LegacyPath(t *testing.T) {

 	runner.CheckForMissingCalls()
 }
+
+// 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"}
+
+	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)
+
+	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", "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()
+}
@@ -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 {
@@ -432,14 +432,8 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain

 // 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, plain bool) (string, error) {
-	fileNames := []string{fileName}
-	if previousPath != "" {
-		fileNames = append(fileNames, previousPath)
-	}
-	return self.ShowFileDiffCmdObj(from, to, reverse, fileNames, plain).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, plain bool) *oscommands.CmdObj {
@@ -460,7 +454,7 @@ func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reve
 		ArgIfElse(useExtDiff || useExtDiffGitConfig, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
 		Arg(fmt.Sprintf("--unified=%d", contextSize)).
-		Arg(fmt.Sprintf("--find-renames=%d%%", self.UserConfig().Git.RenameSimilarityThreshold)).
+		Arg("--no-renames").
 		Arg(fmt.Sprintf("--color=%s", colorArg)).
 		Arg(from).
 		Arg(to).
@@ -339,8 +339,6 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 		from             string
 		to               string
 		reverse          bool
-		fileName         string
-		previousPath     string
 		plain            bool
 		ignoreWhitespace bool
 		contextSize      uint64
@@ -355,49 +353,33 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			from:             "1234567890",
 			to:               "0987654321",
 			reverse:          false,
-			fileName:         "test.txt",
 			plain:            false,
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				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",
 			plain:            false,
 			ignoreWhitespace: false,
 			contextSize:      123,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=123", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				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",
 			plain:            false,
 			ignoreWhitespace: true,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
-		},
-		{
-			testName:         "Renamed file passes both paths so the rename is detected",
-			from:             "1234567890",
-			to:               "0987654321",
-			reverse:          false,
-			fileName:         "new.txt",
-			previousPath:     "old.txt",
-			plain:            false,
-			ignoreWhitespace: false,
-			contextSize:      3,
-			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-C", "/path/to/worktree", "-c", "diff.noprefix=false", "diff", "--no-ext-diff", "--submodule", "--unified=3", "--find-renames=50%", "--color=always", "1234567890", "0987654321", "--", "new.txt", "old.txt"}, expectedResult, nil),
+				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.plain)
+			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()
@@ -39,9 +39,26 @@ type Branch struct {
 	// How far we have fallen behind our base branch. 0 means either not
 	// determined yet, or up to date with base branch. (We don't need to
 	// distinguish the two, as we don't draw anything in both cases.)
+	// Negative values are sentinels for the ambiguous case where we can't
+	// pick a single base; see BehindBase* constants below.
 	BehindBaseBranch atomic.Int32
 }

+// Sentinel values stored in Branch.BehindBaseBranch when the base branch
+// is ambiguous (more than one configured main branch tied at the closest
+// position) and the candidates disagree on the behind count.
+const (
+	// BehindBaseAmbiguousMaybeUpToDate means at least one candidate has
+	// the branch up to date and at least one has it behind; we don't
+	// know which. Rendered as "?".
+	BehindBaseAmbiguousMaybeUpToDate int32 = -1
+
+	// BehindBaseAmbiguousDefinitelyBehind means every candidate has the
+	// branch behind by a non-zero amount, but the amounts differ — so we
+	// know the branch is behind, just not by how much. Rendered as "↓?".
+	BehindBaseAmbiguousDefinitelyBehind int32 = -2
+)
+
 func (b *Branch) FullRefName() string {
 	if b.DetachedHead {
 		return b.Name
@@ -4,9 +4,6 @@ package models
 type CommitFile struct {
 	Path string

-	// For a renamed file, the path it was renamed from; empty otherwise.
-	PreviousPath string
-
 	ChangeStatus string // e.g. 'A' for added or 'M' for modified. This is based on the result from git diff --name-status
 }

@@ -26,24 +23,6 @@ func (f *CommitFile) Deleted() bool {
 	return f.ChangeStatus == "D"
 }

-func (f *CommitFile) IsRename() bool {
-	return f.PreviousPath != ""
-}
-
-// Names returns an array containing just the path, or in the case of a rename,
-// the after path and the before path.
-func (f *CommitFile) Names() []string {
-	result := []string{f.Path}
-	if f.PreviousPath != "" {
-		result = append(result, f.PreviousPath)
-	}
-	return result
-}
-
 func (f *CommitFile) GetPath() string {
 	return f.Path
 }
-
-func (f *CommitFile) GetPreviousPath() string {
-	return f.PreviousPath
-}
@@ -25,14 +25,10 @@ type fileInfo struct {
 	mode                PatchStatus
 	includedLineIndices []int
 	diff                string
-	// For a renamed file, the path it was renamed from; empty otherwise. We
-	// need to keep hold of it so we can re-render the file's patch (which is
-	// keyed by the new path) without the caller having to supply it again.
-	previousPath string
 }

 type (
-	loadFileDiffFunc func(from string, to string, reverse bool, filename string, previousPath string, plain bool) (string, error)
+	loadFileDiffFunc func(from string, to string, reverse bool, filename string, plain bool) (string, error)
 )

 // PatchBuilder manages the building of a patch for a commit to be applied to another commit (or the working tree, or removed from the current commit). We also support building patches from things like stashes, for which there is less flexibility
@@ -79,7 +75,6 @@ func (p *PatchBuilder) PatchToApply(reverse bool, turnAddedFilesIntoDiffAgainstE

 		patch.WriteString(p.RenderPatchForFile(RenderPatchForFileOpts{
 			Filename:                               filename,
-			PreviousPath:                           info.previousPath,
 			Plain:                                  true,
 			Reverse:                                reverse,
 			TurnAddedFilesIntoDiffAgainstEmptyFile: turnAddedFilesIntoDiffAgainstEmptyFile,
@@ -107,8 +102,8 @@ func (p *PatchBuilder) removeFile(info *fileInfo) {
 	info.includedLineIndices = nil
 }

-func (p *PatchBuilder) AddFileWhole(filename string, previousPath string) error {
-	info, err := p.getFileInfo(filename, previousPath)
+func (p *PatchBuilder) AddFileWhole(filename string) error {
+	info, err := p.getFileInfo(filename)
 	if err != nil {
 		return err
 	}
@@ -118,8 +113,8 @@ func (p *PatchBuilder) AddFileWhole(filename string, previousPath string) error
 	return nil
 }

-func (p *PatchBuilder) RemoveFile(filename string, previousPath string) error {
-	info, err := p.getFileInfo(filename, previousPath)
+func (p *PatchBuilder) RemoveFile(filename string) error {
+	info, err := p.getFileInfo(filename)
 	if err != nil {
 		return err
 	}
@@ -129,20 +124,19 @@ func (p *PatchBuilder) RemoveFile(filename string, previousPath string) error {
 	return nil
 }

-func (p *PatchBuilder) getFileInfo(filename string, previousPath string) (*fileInfo, error) {
+func (p *PatchBuilder) getFileInfo(filename string) (*fileInfo, error) {
 	info, ok := p.fileInfoMap[filename]
 	if ok {
 		return info, nil
 	}

-	diff, err := p.loadFileDiff(p.From, p.To, p.reverse, filename, previousPath, true)
+	diff, err := p.loadFileDiff(p.From, p.To, p.reverse, filename, true)
 	if err != nil {
 		return nil, err
 	}
 	info = &fileInfo{
-		mode:         UNSELECTED,
-		diff:         diff,
-		previousPath: previousPath,
+		mode: UNSELECTED,
+		diff: diff,
 	}

 	p.fileInfoMap[filename] = info
@@ -150,8 +144,8 @@ func (p *PatchBuilder) getFileInfo(filename string, previousPath string) (*fileI
 	return info, nil
 }

-func (p *PatchBuilder) AddFileLineRange(filename string, previousPath string, lineIndices []int) error {
-	info, err := p.getFileInfo(filename, previousPath)
+func (p *PatchBuilder) AddFileLineRange(filename string, lineIndices []int) error {
+	info, err := p.getFileInfo(filename)
 	if err != nil {
 		return err
 	}
@@ -161,8 +155,8 @@ func (p *PatchBuilder) AddFileLineRange(filename string, previousPath string, li
 	return nil
 }

-func (p *PatchBuilder) RemoveFileLineRange(filename string, previousPath string, lineIndices []int) error {
-	info, err := p.getFileInfo(filename, previousPath)
+func (p *PatchBuilder) RemoveFileLineRange(filename string, lineIndices []int) error {
+	info, err := p.getFileInfo(filename)
 	if err != nil {
 		return err
 	}
@@ -177,14 +171,13 @@ func (p *PatchBuilder) RemoveFileLineRange(filename string, previousPath string,

 type RenderPatchForFileOpts struct {
 	Filename                               string
-	PreviousPath                           string
 	Plain                                  bool
 	Reverse                                bool
 	TurnAddedFilesIntoDiffAgainstEmptyFile bool
 }

 func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {
-	info, err := p.getFileInfo(opts.Filename, opts.PreviousPath)
+	info, err := p.getFileInfo(opts.Filename)
 	if err != nil {
 		p.Log.Error(err)
 		return ""
@@ -205,12 +198,7 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {
 		Transform(TransformOpts{
 			Reverse:                                opts.Reverse,
 			TurnAddedFilesIntoDiffAgainstEmptyFile: opts.TurnAddedFilesIntoDiffAgainstEmptyFile,
-			// For a partial selection of a renamed file we keep only the
-			// content change and drop the rename, so that the rename stays in
-			// the commit. A whole-file selection keeps the rename (and short-
-			// circuits before this for plain output).
-			StripRename:         info.mode == PART && info.previousPath != "",
-			IncludedLineIndices: info.includedLineIndices,
+			IncludedLineIndices:                    info.includedLineIndices,
 		})

 	if opts.Plain {
@@ -227,7 +215,6 @@ func (p *PatchBuilder) renderEachFilePatch(plain bool) []string {
 	patches := lo.Map(filenames, func(filename string, _ int) string {
 		return p.RenderPatchForFile(RenderPatchForFileOpts{
 			Filename:                               filename,
-			PreviousPath:                           p.fileInfoMap[filename].previousPath,
 			Plain:                                  plain,
 			Reverse:                                false,
 			TurnAddedFilesIntoDiffAgainstEmptyFile: true,
@@ -257,8 +244,8 @@ func (p *PatchBuilder) GetFileStatus(filename string, parent string) PatchStatus
 	return info.mode
 }

-func (p *PatchBuilder) GetFileIncLineIndices(filename string, previousPath string) ([]int, error) {
-	info, err := p.getFileInfo(filename, previousPath)
+func (p *PatchBuilder) GetFileIncLineIndices(filename string) ([]int, error) {
+	info, err := p.getFileInfo(filename)
 	if err != nil {
 		return nil, err
 	}
@@ -19,22 +19,6 @@ index dcd3485..1ba5540 100644
 ...
 `

-const renameWithModificationDiff = `diff --git a/oldname b/newname
-similarity index 62%
-rename from oldname
-rename to newname
-index dcd3485..1ba5540 100644
--- a/oldname
-+++ b/newname
-@@ -1,5 +1,5 @@
- apple
-orange
-+grape
- ...
- ...
- ...
-`
-
 const addNewlineToEndOfFile = `diff --git a/filename b/filename
 index 80a73f1..e48a11c 100644
 --- a/filename
@@ -168,7 +152,6 @@ func TestTransform(t *testing.T) {
 		firstLineIndex int
 		lastLineIndex  int
 		reverse        bool
-		stripRename    bool
 		expected       string
 	}

@@ -532,43 +515,6 @@ func TestTransform(t *testing.T) {
 orange
 banana
 lemon
-`,
-		},
-		{
-			testName:       "renamed file, whole change selected, strips the rename so only the content change is applied",
-			firstLineIndex: 9,
-			lastLineIndex:  10,
-			stripRename:    true,
-			diffText:       renameWithModificationDiff,
-			expected: `diff --git a/newname b/newname
-index dcd3485..1ba5540 100644
--- a/newname
-+++ b/newname
-@@ -1,5 +1,5 @@
- apple
-orange
-+grape
- ...
- ...
- ...
-`,
-		},
-		{
-			testName:       "renamed file, only removal selected, strips the rename",
-			firstLineIndex: 9,
-			lastLineIndex:  9,
-			stripRename:    true,
-			diffText:       renameWithModificationDiff,
-			expected: `diff --git a/newname b/newname
-index dcd3485..1ba5540 100644
--- a/newname
-+++ b/newname
-@@ -1,5 +1,4 @@
- apple
-orange
- ...
- ...
- ...
 `,
 		},
 	}
@@ -581,7 +527,6 @@ index dcd3485..1ba5540 100644
 				Transform(TransformOpts{
 					Reverse:             s.reverse,
 					FileNameOverride:    s.filename,
-					StripRename:         s.stripRename,
 					IncludedLineIndices: lineIndices,
 				}).
 				FormatPlain()
@@ -33,13 +33,6 @@ type TransformOpts struct {
 	// treat it as a diff against an empty file.
 	TurnAddedFilesIntoDiffAgainstEmptyFile bool

-	// When building a partial patch for a renamed file, strip the rename
-	// metadata from the header and point it at the new path. Applying the
-	// resulting patch then only changes the file's contents and leaves the
-	// rename itself in place. (For a whole-file selection we keep the rename
-	// so that it moves or is discarded together with the contents.)
-	StripRename bool
-
 	// The indices of lines that should be included in the patch.
 	IncludedLineIndices []int
 }
@@ -79,61 +72,21 @@ func (self *patchTransformer) transformHeader() []string {
 			"--- a/" + self.opts.FileNameOverride,
 			"+++ b/" + self.opts.FileNameOverride,
 		}
-	}
-
-	header := self.patch.header
-	if self.opts.StripRename {
-		header = stripRenameFromHeader(header)
-	}
-
-	if self.opts.TurnAddedFilesIntoDiffAgainstEmptyFile {
-		result := make([]string, 0, len(header))
-		for idx, line := range header {
+	} else if self.opts.TurnAddedFilesIntoDiffAgainstEmptyFile {
+		result := make([]string, 0, len(self.patch.header))
+		for idx, line := range self.patch.header {
 			if strings.HasPrefix(line, "new file mode") {
 				continue
 			}
-			if line == "--- /dev/null" && strings.HasPrefix(header[idx+1], "+++ b/") {
-				line = "--- a/" + header[idx+1][6:]
+			if line == "--- /dev/null" && strings.HasPrefix(self.patch.header[idx+1], "+++ b/") {
+				line = "--- a/" + self.patch.header[idx+1][6:]
 			}
 			result = append(result, line)
 		}
 		return result
 	}

-	return header
-}
-
-// stripRenameFromHeader rewrites a rename diff header so that it looks like a
-// plain modification of the new path: it drops the rename metadata and points
-// the diff at the new path on both sides, while keeping the blob index line so
-// that `git apply --3way` can still fall back to a blob merge. See the
-// StripRename option for why we do this.
-func stripRenameFromHeader(header []string) []string {
-	newPath := ""
-	for _, line := range header {
-		if path, ok := strings.CutPrefix(line, "+++ b/"); ok {
-			newPath = path
-			break
-		}
-	}
-
-	result := make([]string, 0, len(header))
-	for _, line := range header {
-		switch {
-		case strings.HasPrefix(line, "similarity index "),
-			strings.HasPrefix(line, "dissimilarity index "),
-			strings.HasPrefix(line, "rename from "),
-			strings.HasPrefix(line, "rename to "):
-			// drop the rename metadata
-		case strings.HasPrefix(line, "diff --git "):
-			result = append(result, "diff --git a/"+newPath+" b/"+newPath)
-		case strings.HasPrefix(line, "--- "):
-			result = append(result, "--- a/"+newPath)
-		default:
-			result = append(result, line)
-		}
-	}
-	return result
+	return self.patch.header
 }

 func (self *patchTransformer) transformHunks() []*Hunk {
@@ -749,7 +749,7 @@ git:
    # The commit message to use for a squash merge commit. Can contain "{{selectedRef}}" and "{{currentBranch}}" placeholders.
    squashMergeMessage: Squash merge {{selectedRef}} into {{currentBranch}}

-  # list of branches that are considered 'main' branches, used when displaying commits
+  # list of branches that are considered 'main' branches, used when displaying 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
@@ -304,7 +304,7 @@ type GitConfig struct {
 	Commit CommitConfig `yaml:"commit"`
 	// Config relating to merging
 	Merging MergingConfig `yaml:"merging"`
-	// list of branches that are considered 'main' branches, used when displaying commits
+	// list of branches that are considered 'main' branches, used when displaying 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 []string `yaml:"mainBranches" jsonschema:"uniqueItems=true"`
 	// Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP'
 	SkipHookPrefix string `yaml:"skipHookPrefix"`
@@ -60,11 +60,8 @@ func NewContextTree(c *ContextCommon) *ContextTree {
 			"main",
 			PATCH_BUILDING_MAIN_CONTEXT_KEY,
 			func() []int {
-				file := commitFilesContext.GetSelectedFile()
-				if file == nil {
-					return nil
-				}
-				includedLineIndices, err := c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath)
+				filename := commitFilesContext.GetSelectedPath()
+				includedLineIndices, err := c.Git().Patch.PatchBuilder.GetFileIncLineIndices(filename)
 				if err != nil {
 					c.Log.Error(err)
 					return nil
@@ -25,8 +25,9 @@ func (gui *Gui) resetHelpersAndControllers() {
 	helperCommon := gui.c
 	recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon)
 	reposHelper := helpers.NewRecentReposHelper(helperCommon, recordDirectoryHelper, gui.onSwitchToNewRepo)
-	rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon)
-	refsHelper := helpers.NewRefsHelper(helperCommon, rebaseHelper)
+	baseBranchHelper := helpers.NewBaseBranchHelper(helperCommon)
+	rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, baseBranchHelper)
+	refsHelper := helpers.NewRefsHelper(helperCommon, rebaseHelper, baseBranchHelper)
 	suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon)
 	worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper, suggestionsHelper)

@@ -129,6 +130,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 		Search:     searchHelper,
 		Worktree:   worktreeHelper,
 		SubCommits: helpers.NewSubCommitsHelper(helperCommon, refreshHelper),
+		BaseBranch: helpers.NewBaseBranchHelper(helperCommon),
 	}

 	gui.CustomCommandsClient = custom_commands.NewClient(
@@ -291,18 +291,26 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc
 	}

 	var disabledReason *types.DisabledReason
-	baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(selectedBranch, self.c.Model().MainBranches)
+	baseBranch, baseAmbiguous, baseCandidates, err := self.c.Helpers().BaseBranch.ResolveBaseBranch(selectedBranch)
 	if err != nil {
 		return err
 	}
-	if baseBranch == "" {
-		baseBranch = self.c.Tr.CouldNotDetermineBaseBranch
+	baseBranchLabel := helpers.BaseBranchDisplayName(baseBranch)
+	switch {
+	case baseBranch == "":
+		baseBranchLabel = self.c.Tr.CouldNotDetermineBaseBranch
 		disabledReason = &types.DisabledReason{Text: self.c.Tr.CouldNotDetermineBaseBranch}
+	case baseAmbiguous:
+		shortNames := lo.Map(baseCandidates, func(ref string, _ int) string {
+			return helpers.BaseBranchDisplayName(ref)
+		})
+		baseBranchLabel = utils.ResolvePlaceholderString(self.c.Tr.PickBaseBranchLabel,
+			map[string]string{"candidates": strings.Join(shortNames, ", ")},
+		)
 	}
-	shortBaseBranchName := helpers.ShortBranchName(baseBranch)
 	label := utils.ResolvePlaceholderString(
 		self.c.Tr.ViewDivergenceFromBaseBranch,
-		map[string]string{"baseBranch": shortBaseBranchName},
+		map[string]string{"baseBranch": baseBranchLabel},
 	)
 	viewDivergenceFromBaseBranchItem := &types.MenuItem{
 		LabelColumns: []string{label},
@@ -312,14 +320,19 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc
 			if branch == nil {
 				return nil
 			}
-
-			return self.c.Helpers().SubCommits.ViewSubCommits(helpers.ViewSubCommitsOpts{
-				Ref:                     branch,
-				TitleRef:                fmt.Sprintf("%s <-> %s", branch.RefName(), shortBaseBranchName),
-				RefToShowDivergenceFrom: baseBranch,
-				Context:                 self.context(),
-				ShowBranchHeads:         false,
-			})
+			showDivergence := func(base string) error {
+				return self.c.Helpers().SubCommits.ViewSubCommits(helpers.ViewSubCommitsOpts{
+					Ref:                     branch,
+					TitleRef:                fmt.Sprintf("%s <-> %s", branch.RefName(), helpers.BaseBranchDisplayName(base)),
+					RefToShowDivergenceFrom: base,
+					Context:                 self.context(),
+					ShowBranchHeads:         false,
+				})
+			}
+			if baseAmbiguous {
+				return self.c.Helpers().BaseBranch.ShowPicker(branch, baseCandidates, showDivergence)
+			}
+			return showDivergence(baseBranch)
 		},
 		DisabledReason: disabledReason,
 	}
@@ -191,11 +191,11 @@ func (self *CommitFilesController) GetOnRenderToMain() func() {
 	}
 }

-func (self *CommitFilesController) copyDiffToClipboard(paths []string, toastMessage string) error {
+func (self *CommitFilesController) copyDiffToClipboard(path string, toastMessage string) error {
 	from, to := self.context().GetFromAndToForDiff()
 	from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from)

-	cmdObj := self.c.Git().WorkingTree.ShowFileDiffCmdObj(from, to, reverse, paths, true)
+	cmdObj := self.c.Git().WorkingTree.ShowFileDiffCmdObj(from, to, reverse, []string{path}, true)
 	diff, err := cmdObj.RunWithOutput()
 	if err != nil {
 		return err
@@ -263,7 +263,7 @@ func (self *CommitFilesController) openCopyMenu() error {
 	copyFileDiffItem := &types.MenuItem{
 		Label: self.c.Tr.CopySelectedDiff,
 		OnPress: func() error {
-			return self.copyDiffToClipboard(self.pathsForDiff(node), self.c.Tr.FileDiffCopiedToast)
+			return self.copyDiffToClipboard(node.GetPath(), self.c.Tr.FileDiffCopiedToast)
 		},
 		DisabledReason: self.require(self.singleItemSelected())(),
 		Keys:           menuKey('s'),
@@ -271,7 +271,7 @@ func (self *CommitFilesController) openCopyMenu() error {
 	copyAllDiff := &types.MenuItem{
 		Label: self.c.Tr.CopyAllFilesDiff,
 		OnPress: func() error {
-			return self.copyDiffToClipboard([]string{"."}, self.c.Tr.AllFilesDiffCopiedToast)
+			return self.copyDiffToClipboard(".", self.c.Tr.AllFilesDiffCopiedToast)
 		},
 		DisabledReason: self.require(self.itemsSelected())(),
 		Keys:           menuKey('a'),
@@ -348,10 +348,7 @@ func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileN

 				for _, node := range selectedNodes {
 					_ = node.ForEachFile(func(file *models.CommitFile) error {
-						// For a rename we discard both the new and the old path,
-						// so that the new file is removed and the old one is
-						// restored.
-						filePaths = append(filePaths, file.Names()...)
+						filePaths = append(filePaths, file.GetPath())
 						return nil
 					})
 				}
@@ -468,7 +465,7 @@ func (self *CommitFilesController) toggleForPatch(selectedNodes []*filetree.Comm

 			for _, node := range selectedNodes {
 				err := node.ForEachFile(func(file *models.CommitFile) error {
-					return patchOperationFunction(file.Path, file.PreviousPath)
+					return patchOperationFunction(file.Path)
 				})
 				if err != nil {
 					return err
@@ -613,16 +610,11 @@ func (self *CommitFilesController) pathsForDiff(node *filetree.CommitFileNode) [
 	if !node.IsFile() && self.context().IsFiltering() {
 		var paths []string
 		_ = node.ForEachFile(func(file *models.CommitFile) error {
-			// For a rename we need to pass both paths so that git detects it as
-			// a rename rather than an unrelated delete and add.
-			paths = append(paths, file.Names()...)
+			paths = append(paths, file.Path)
 			return nil
 		})
 		return paths
 	}
-	if file := node.GetFile(); file != nil {
-		return file.Names()
-	}
 	return []string{node.GetPath()}
 }

@@ -0,0 +1,63 @@
+package helpers
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/samber/lo"
+)
+
+// BaseBranchHelper resolves the base branch for a given branch. The
+// closeness rule (smallest ahead value) usually picks a single answer
+// but can leave a tie when the branch's fork point is reachable from
+// more than one main branch — in that case the helper surfaces the
+// candidates so the caller can disambiguate.
+type BaseBranchHelper struct {
+	c *HelperCommon
+}
+
+func NewBaseBranchHelper(c *HelperCommon) *BaseBranchHelper {
+	return &BaseBranchHelper{c: c}
+}
+
+// ResolveBaseBranch returns the base branch for the given branch, the
+// full set of tied candidates (for any disambiguation UI), and whether
+// the answer is genuinely ambiguous (more than one candidate tied at
+// the closest position).
+//
+// An empty baseRef (with no error) means no configured main branch
+// contains the branch — not an error condition.
+func (self *BaseBranchHelper) ResolveBaseBranch(branch *models.Branch) (baseRef string, ambiguous bool, candidates []string, err error) {
+	mainBranches := self.c.Model().MainBranches
+	candidates, err = self.c.Git().Loaders.BranchLoader.GetBaseBranchCandidates(branch, mainBranches)
+	if err != nil {
+		return "", false, nil, err
+	}
+	if len(candidates) == 0 {
+		return "", false, nil, nil
+	}
+	return candidates[0], len(candidates) > 1, candidates, nil
+}
+
+// ShowPicker presents a menu of candidate base branches and runs
+// onPicked with the user's selection. Callers should only invoke this
+// when ResolveBaseBranch reported ambiguous=true; for the
+// single-candidate case there is nothing to pick.
+func (self *BaseBranchHelper) ShowPicker(
+	branch *models.Branch,
+	candidates []string,
+	onPicked func(baseRef string) error,
+) error {
+	items := lo.Map(candidates, func(ref string, _ int) *types.MenuItem {
+		return &types.MenuItem{
+			Label:   BaseBranchDisplayName(ref),
+			OnPress: func() error { return onPicked(ref) },
+		}
+	})
+	return self.c.Menu(types.CreateMenuOptions{
+		Title: utils.ResolvePlaceholderString(self.c.Tr.PickBaseBranchTitle,
+			map[string]string{"branchName": branch.Name}),
+		Prompt: self.c.Tr.PickBaseBranchPrompt,
+		Items:  items,
+	})
+}
@@ -161,8 +161,30 @@ func (self *BranchesHelper) ConfirmLocalAndRemoteDelete(branches []*models.Branc
 	return nil
 }

-func ShortBranchName(fullBranchName string) string {
-	return strings.TrimPrefix(strings.TrimPrefix(fullBranchName, "refs/heads/"), "refs/remotes/")
+// BaseBranchDisplayName returns the user-facing name of a configured main
+// branch from its resolved full ref:
+//
+//	refs/heads/main             → main
+//	refs/remotes/origin/main    → main
+//	refs/remotes/origin/feat/x  → feat/x
+//
+// For remote-tracking refs the remote name is dropped along with the prefix:
+// the user configured plain "main" in mainBranches and shouldn't have to see
+// whether lazygit ultimately resolved it to a local or remote ref. The remote
+// is only meaningful internally, so this function is intended specifically for
+// base-branch display — don't use it where the local/remote distinction
+// matters.
+func BaseBranchDisplayName(fullBranchName string) string {
+	if name, ok := strings.CutPrefix(fullBranchName, "refs/heads/"); ok {
+		return name
+	}
+	if name, ok := strings.CutPrefix(fullBranchName, "refs/remotes/"); ok {
+		if _, withoutRemote, found := strings.Cut(name, "/"); found {
+			return withoutRemote
+		}
+		return name
+	}
+	return fullBranchName
 }

 func (self *BranchesHelper) checkedOutByOtherWorktree(branch *models.Branch) bool {
@@ -53,6 +53,7 @@ type Helpers struct {
 	Search            *SearchHelper
 	Worktree          *WorktreeHelper
 	SubCommits        *SubCommitsHelper
+	BaseBranch        *BaseBranchHelper
 }

 func NewStubHelpers() *Helpers {
@@ -90,5 +91,6 @@ func NewStubHelpers() *Helpers {
 		Search:            &SearchHelper{},
 		Worktree:          &WorktreeHelper{},
 		SubCommits:        &SubCommitsHelper{},
+		BaseBranch:        &BaseBranchHelper{},
 	}
 }
@@ -19,6 +19,8 @@ import (
 type MergeAndRebaseHelper struct {
 	c *HelperCommon

+	baseBranchHelper *BaseBranchHelper
+
 	// Whether the "continue the rebase/merge?" prompt is currently on screen.
 	// We use this to auto-dismiss it if the operation stops being in the state
 	// that the prompt is offering to act on (e.g. it was continued or aborted
@@ -29,9 +31,11 @@ type MergeAndRebaseHelper struct {

 func NewMergeAndRebaseHelper(
 	c *HelperCommon,
+	baseBranchHelper *BaseBranchHelper,
 ) *MergeAndRebaseHelper {
 	return &MergeAndRebaseHelper{
-		c: c,
+		c:                c,
+		baseBranchHelper: baseBranchHelper,
 	}
 }

@@ -343,13 +347,22 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
 		disabledReason = &types.DisabledReason{Text: self.c.Tr.CantRebaseOntoSelf}
 	}

-	baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(checkedOutBranch, self.c.Model().MainBranches)
+	baseBranch, baseAmbiguous, baseCandidates, err := self.baseBranchHelper.ResolveBaseBranch(checkedOutBranch)
 	if err != nil {
 		return err
 	}
-	if baseBranch == "" {
-		baseBranch = self.c.Tr.CouldNotDetermineBaseBranch
+	baseBranchLabel := BaseBranchDisplayName(baseBranch)
+	switch {
+	case baseBranch == "":
+		baseBranchLabel = self.c.Tr.CouldNotDetermineBaseBranch
 		baseBranchDisabledReason = &types.DisabledReason{Text: self.c.Tr.CouldNotDetermineBaseBranch}
+	case baseAmbiguous:
+		shortNames := lo.Map(baseCandidates, func(ref string, _ int) string {
+			return BaseBranchDisplayName(ref)
+		})
+		baseBranchLabel = utils.ResolvePlaceholderString(self.c.Tr.PickBaseBranchLabel,
+			map[string]string{"candidates": strings.Join(shortNames, ", ")},
+		)
 	}

 	menuItems := []*types.MenuItem{
@@ -405,27 +418,33 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
 		},
 		{
 			Label: utils.ResolvePlaceholderString(self.c.Tr.RebaseOntoBaseBranch,
-				map[string]string{"baseBranch": ShortBranchName(baseBranch)},
+				map[string]string{"baseBranch": baseBranchLabel},
 			),
 			Keys:           menuKey('b'),
 			DisabledReason: baseBranchDisabledReason,
 			Tooltip:        self.c.Tr.RebaseOntoBaseBranchTooltip,
 			OnPress: func() error {
-				self.c.LogAction(self.c.Tr.Actions.RebaseBranch)
-				return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error {
-					baseCommit := self.c.Modes().MarkedBaseCommit.GetHash()
-					var err error
-					if baseCommit != "" {
-						err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(baseBranch, baseCommit)
-					} else {
-						err = self.c.Git().Rebase.RebaseBranch(baseBranch)
-					}
-					err = self.CheckMergeOrRebase(err)
-					if err == nil {
-						return self.ResetMarkedBaseCommit()
-					}
-					return err
-				})
+				doRebase := func(base string) error {
+					self.c.LogAction(self.c.Tr.Actions.RebaseBranch)
+					return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error {
+						baseCommit := self.c.Modes().MarkedBaseCommit.GetHash()
+						var err error
+						if baseCommit != "" {
+							err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(base, baseCommit)
+						} else {
+							err = self.c.Git().Rebase.RebaseBranch(base)
+						}
+						err = self.CheckMergeOrRebase(err)
+						if err == nil {
+							return self.ResetMarkedBaseCommit()
+						}
+						return err
+					})
+				}
+				if baseAmbiguous {
+					return self.baseBranchHelper.ShowPicker(checkedOutBranch, baseCandidates, doRebase)
+				}
+				return doRebase(baseBranch)
 			},
 		},
 	}
@@ -66,21 +66,20 @@ func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpt
 	}

 	// get diff from commit file that's currently selected
-	file := self.c.Contexts().CommitFiles.GetSelectedFile()
-	if file == nil {
+	path := self.c.Contexts().CommitFiles.GetSelectedPath()
+	if path == "" {
 		return
 	}

 	from, to := self.c.Contexts().CommitFiles.GetFromAndToForDiff()
 	from, reverse := self.c.Modes().Diffing.GetFromAndReverseArgsForDiff(from)
-	diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, file.Path, file.PreviousPath, true)
+	diff, err := self.c.Git().WorkingTree.ShowFileDiff(from, to, reverse, path, true)
 	if err != nil {
 		return
 	}

 	secondaryDiff := self.c.Git().Patch.PatchBuilder.RenderPatchForFile(patch.RenderPatchForFileOpts{
-		Filename:                               file.Path,
-		PreviousPath:                           file.PreviousPath,
+		Filename:                               path,
 		Plain:                                  false,
 		Reverse:                                false,
 		TurnAddedFilesIntoDiffAgainstEmptyFile: true,
@@ -18,16 +18,19 @@ import (
 type RefsHelper struct {
 	c *HelperCommon

-	rebaseHelper *MergeAndRebaseHelper
+	rebaseHelper     *MergeAndRebaseHelper
+	baseBranchHelper *BaseBranchHelper
 }

 func NewRefsHelper(
 	c *HelperCommon,
 	rebaseHelper *MergeAndRebaseHelper,
+	baseBranchHelper *BaseBranchHelper,
 ) *RefsHelper {
 	return &RefsHelper{
-		c:            c,
-		rebaseHelper: rebaseHelper,
+		c:                c,
+		rebaseHelper:     rebaseHelper,
+		baseBranchHelper: baseBranchHelper,
 	}
 }

@@ -428,7 +431,7 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest

 func (self *RefsHelper) MoveCommitsToNewBranch() error {
 	currentBranch := self.c.Model().Branches[0]
-	baseBranchRef, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(currentBranch, self.c.Model().MainBranches)
+	baseBranchRef, baseAmbiguous, baseCandidates, err := self.baseBranchHelper.ResolveBaseBranch(currentBranch)
 	if err != nil {
 		return err
 	}
@@ -477,11 +480,19 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error {
 		return nil
 	}

-	shortBaseBranchName := ShortBranchName(baseBranchRef)
+	baseBranchLabel := BaseBranchDisplayName(baseBranchRef)
+	if baseAmbiguous {
+		shortNames := lo.Map(baseCandidates, func(ref string, _ int) string {
+			return BaseBranchDisplayName(ref)
+		})
+		baseBranchLabel = utils.ResolvePlaceholderString(self.c.Tr.PickBaseBranchLabel,
+			map[string]string{"candidates": strings.Join(shortNames, ", ")},
+		)
+	}
 	prompt := utils.ResolvePlaceholderString(
 		self.c.Tr.MoveCommitsToNewBranchMenuPrompt,
 		map[string]string{
-			"baseBranchName": shortBaseBranchName,
+			"baseBranchName": baseBranchLabel,
 		},
 	)
 	return self.c.Menu(types.CreateMenuOptions{
@@ -489,11 +500,17 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error {
 		Prompt: prompt,
 		Items: []*types.MenuItem{
 			{
-				Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchFromBaseItem, shortBaseBranchName),
+				Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchFromBaseItem, baseBranchLabel),
 				OnPress: func() error {
-					return withNewBranchNamePrompt(shortBaseBranchName, func(newBranchName string) error {
-						return self.moveCommitsToNewBranchOffOfMainBranch(newBranchName, baseBranchRef)
-					})
+					moveOff := func(base string) error {
+						return withNewBranchNamePrompt(BaseBranchDisplayName(base), func(newBranchName string) error {
+							return self.moveCommitsToNewBranchOffOfMainBranch(newBranchName, base)
+						})
+					}
+					if baseAmbiguous {
+						return self.baseBranchHelper.ShowPicker(currentBranch, baseCandidates, moveOff)
+					}
+					return moveOff(baseBranchRef)
 				},
 			},
 			{
@@ -138,8 +138,8 @@ func (self *PatchBuildingController) toggleSelection() error {
 	self.context().GetMutex().Lock()
 	defer self.context().GetMutex().Unlock()

-	file := self.c.Contexts().CommitFiles.GetSelectedFile()
-	if file == nil {
+	filename := self.c.Contexts().CommitFiles.GetSelectedPath()
+	if filename == "" {
 		return nil
 	}

@@ -152,7 +152,7 @@ func (self *PatchBuildingController) toggleSelection() error {
 		return nil
 	}

-	includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath)
+	includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(filename)
 	if err != nil {
 		return err
 	}
@@ -164,7 +164,7 @@ func (self *PatchBuildingController) toggleSelection() error {
 	}

 	// add range of lines to those set for the file
-	if err := toggleFunc(file.Path, file.PreviousPath, lineIndicesToToggle); err != nil {
+	if err := toggleFunc(filename, lineIndicesToToggle); err != nil {
 		// might actually want to return an error here
 		self.c.Log.Error(err)
 	}
@@ -1,7 +1,6 @@
 package controllers

 import (
-	"errors"
 	"fmt"

 	"github.com/jesseduffield/lazygit/pkg/gui/context"
@@ -50,10 +49,6 @@ func (self *RenameSimilarityThresholdController) Context() types.Context {
 }

 func (self *RenameSimilarityThresholdController) Increase() error {
-	if err := self.checkCanChangeThreshold(); err != nil {
-		return err
-	}
-
 	old_size := self.c.UserConfig().Git.RenameSimilarityThreshold

 	if old_size < 100 {
@@ -64,10 +59,6 @@ func (self *RenameSimilarityThresholdController) Increase() error {
 }

 func (self *RenameSimilarityThresholdController) Decrease() error {
-	if err := self.checkCanChangeThreshold(); err != nil {
-		return err
-	}
-
 	old_size := self.c.UserConfig().Git.RenameSimilarityThreshold

 	if old_size > 5 {
@@ -82,23 +73,11 @@ func (self *RenameSimilarityThresholdController) applyChange() error {

 	currentContext := self.c.Context().CurrentSide()
 	switch currentContext.GetKey() {
-	// we make an exception for the files and commit-files contexts, because
-	// they actually need to refresh their state afterwards: a changed threshold
-	// can turn a rename into a separate delete and add, or vice versa.
+	// we make an exception for our files context, because it actually need to refresh its state afterwards.
 	case context.FILES_CONTEXT_KEY:
 		self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}})
-	case context.COMMIT_FILES_CONTEXT_KEY:
-		self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMIT_FILES}})
 	default:
 		currentContext.HandleRenderToMain()
 	}
 	return nil
 }
-
-func (self *RenameSimilarityThresholdController) checkCanChangeThreshold() error {
-	if self.c.Git().Patch.PatchBuilder.Active() {
-		return errors.New(self.c.Tr.CantChangeRenameThresholdError)
-	}
-
-	return nil
-}
@@ -253,12 +253,28 @@ func divergenceStr(
 	result := ""
 	if ItemOperationToString(itemOperation, tr) == "" && userConfig.Gui.ShowDivergenceFromBaseBranch != "none" {
 		behind := branch.BehindBaseBranch.Load()
-		if behind != 0 {
-			if userConfig.Gui.ShowDivergenceFromBaseBranch == "arrowAndNumber" {
+		showNumber := userConfig.Gui.ShowDivergenceFromBaseBranch == "arrowAndNumber"
+		switch {
+		case behind > 0:
+			if showNumber {
 				result += fmt.Sprintf("↓%d", behind)
 			} else {
 				result += "↓"
 			}
+		case behind == models.BehindBaseAmbiguousMaybeUpToDate:
+			// We don't know whether the branch is up to date or behind,
+			// because the candidate bases disagree. "?" intentionally has
+			// no arrow — we'd be implying "behind" if it did.
+			result += "?"
+		case behind == models.BehindBaseAmbiguousDefinitelyBehind:
+			// Every candidate has the branch behind, but by different
+			// amounts — show that it's behind without committing to a
+			// specific count.
+			if showNumber {
+				result += "↓?"
+			} else {
+				result += "↓"
+			}
 		}
 	}

@@ -284,6 +284,66 @@ func Test_getBranchDisplayStrings(t *testing.T) {
 			showDivergenceCfg:    "none",
 			expected:             []string{"1m", "", "branc… Pushing |"},
 		},
+		// Ambiguous base, candidates disagree on whether branch is up to date
+		// → render "?" without an arrow (we don't know if it's behind).
+		{
+			branch: &models.Branch{
+				Name:             "branch_name",
+				Recency:          "1m",
+				BehindBaseBranch: *makeAtomic(models.BehindBaseAmbiguousMaybeUpToDate),
+			},
+			itemOperation:        types.ItemOperationNone,
+			fullDescription:      false,
+			viewWidth:            20,
+			useIcons:             false,
+			checkedOutByWorktree: false,
+			showDivergenceCfg:    "arrowAndNumber",
+			expected:             []string{"1m", "", "branch_name    ?"},
+		},
+		{
+			branch: &models.Branch{
+				Name:             "branch_name",
+				Recency:          "1m",
+				BehindBaseBranch: *makeAtomic(models.BehindBaseAmbiguousMaybeUpToDate),
+			},
+			itemOperation:        types.ItemOperationNone,
+			fullDescription:      false,
+			viewWidth:            20,
+			useIcons:             false,
+			checkedOutByWorktree: false,
+			showDivergenceCfg:    "onlyArrow",
+			expected:             []string{"1m", "", "branch_name    ?"},
+		},
+		// Ambiguous base, every candidate has branch behind by some non-zero
+		// amount → render "↓?" (arrowAndNumber) or "↓" (onlyArrow).
+		{
+			branch: &models.Branch{
+				Name:             "branch_name",
+				Recency:          "1m",
+				BehindBaseBranch: *makeAtomic(models.BehindBaseAmbiguousDefinitelyBehind),
+			},
+			itemOperation:        types.ItemOperationNone,
+			fullDescription:      false,
+			viewWidth:            20,
+			useIcons:             false,
+			checkedOutByWorktree: false,
+			showDivergenceCfg:    "arrowAndNumber",
+			expected:             []string{"1m", "", "branch_name   ↓?"},
+		},
+		{
+			branch: &models.Branch{
+				Name:             "branch_name",
+				Recency:          "1m",
+				BehindBaseBranch: *makeAtomic(models.BehindBaseAmbiguousDefinitelyBehind),
+			},
+			itemOperation:        types.ItemOperationNone,
+			fullDescription:      false,
+			viewWidth:            20,
+			useIcons:             false,
+			checkedOutByWorktree: false,
+			showDivergenceCfg:    "onlyArrow",
+			expected:             []string{"1m", "", "branch_name    ↓"},
+		},
 		{
 			branch:               &models.Branch{Name: "abc", Recency: "1m"},
 			itemOperation:        types.ItemOperationPushing,
@@ -328,8 +328,7 @@ func fileNameAtDepth(node *filetree.Node[models.File], depth int, showRootItem b

 func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) string {
 	splitName := split(node.GetInternalPath())
-	showRootItem := splitName[0] == "."
-	if depth == 0 && showRootItem {
+	if depth == 0 && splitName[0] == "." {
 		if len(splitName) == 1 {
 			return "/"
 		}
@@ -337,20 +336,6 @@ func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) st
 	}
 	name := join(splitName[depth:])

-	if node.File != nil && node.File.IsRename() {
-		splitPrevName := filetree.SplitFileTreePath(node.File.PreviousPath, showRootItem)
-
-		prevName := node.File.PreviousPath
-		// if the file has just been renamed inside the same directory, we can shave off
-		// the prefix for the previous path too. Otherwise we'll keep it unchanged
-		sameParentDir := len(splitName) == len(splitPrevName) && join(splitName[0:depth]) == join(splitPrevName[0:depth])
-		if sameParentDir {
-			prevName = join(splitPrevName[depth:])
-		}
-
-		return prevName + " → " + name
-	}
-
 	return name
 }

@@ -151,14 +151,6 @@ func TestRenderCommitFileTree(t *testing.T) {
 			showRootItem: true,
 			expected:     []string{"A test"},
 		},
-		{
-			name: "renamed file",
-			files: []*models.CommitFile{
-				{Path: "new.txt", PreviousPath: "old.txt", ChangeStatus: "R"},
-			},
-			showRootItem: false,
-			expected:     []string{"R old.txt → new.txt"},
-		},
 		{
 			name: "big example",
 			files: []*models.CommitFile{
@@ -227,7 +219,7 @@ M file1
 			}
 			patchBuilder := patch.NewPatchBuilder(
 				utils.NewDummyLog(),
-				func(from string, to string, reverse bool, filename string, previousPath string, plain bool) (string, error) {
+				func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
 					return "", nil
 				},
 			)
@@ -563,6 +563,9 @@ type TranslationSet struct {
 	ViewDivergenceFromUpstream            string
 	ViewDivergenceFromBaseBranch          string
 	CouldNotDetermineBaseBranch           string
+	PickBaseBranchTitle                   string
+	PickBaseBranchPrompt                  string
+	PickBaseBranchLabel                   string
 	DivergenceSectionHeaderLocal          string
 	DivergenceSectionHeaderRemote         string
 	ViewUpstreamResetOptions              string
@@ -819,7 +822,6 @@ type TranslationSet struct {
 	SortCommits                              string
 	SortCommitsTooltip                       string
 	CantChangeContextSizeError               string
-	CantChangeRenameThresholdError           string
 	OpenCommitInBrowser                      string
 	ViewBisectOptions                        string
 	ConfirmRevertCommit                      string
@@ -1716,6 +1718,9 @@ func EnglishTranslationSet() *TranslationSet {
 		ViewDivergenceFromUpstream:           "View divergence from upstream",
 		ViewDivergenceFromBaseBranch:         "View divergence from base branch ({{.baseBranch}})",
 		CouldNotDetermineBaseBranch:          "Couldn't determine base branch",
+		PickBaseBranchTitle:                  "Pick a base branch for {{.branchName}}",
+		PickBaseBranchPrompt:                 "More than one configured main branch is a candidate for this branch's base. Pick which one to treat as its base.",
+		PickBaseBranchLabel:                  "pick: {{.candidates}}",
 		DivergenceSectionHeaderLocal:         "Local",
 		DivergenceSectionHeaderRemote:        "Remote",
 		ViewUpstreamResetOptions:             "Reset checked-out branch onto {{.upstream}}",
@@ -1967,7 +1972,6 @@ func EnglishTranslationSet() *TranslationSet {
 		SortCommits:                              "Commit sort order",
 		SortCommitsTooltip:                       "Change the sort order of the commits in the commit log.\n\nThe default can be changed in the config file with the key 'git.log.sortOrder'.",
 		CantChangeContextSizeError:               "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!",
-		CantChangeRenameThresholdError:           "Cannot change the rename similarity threshold while in patch building mode, because the custom patch can't cope with a rename turning into a delete and add underneath it.",
 		OpenCommitInBrowser:                      "Open commit in browser",
 		ViewBisectOptions:                        "View bisect options",
 		ConfirmRevertCommit:                      "Are you sure you want to revert {{.selectedCommit}}?",
@@ -207,6 +207,7 @@
  "StashChanges": "変更をスタッシュ（一時保存）",
  "RenameStash": "スタッシュの名前を変更",
  "RenameStashPrompt": "スタッシュの名前を変更: {{.stashName}}",
+  "OpenConfig": "設定ファイルを開く",
  "EditConfig": "設定ファイルを編集",
  "ForcePush": "強制プッシュ",
  "ForcePushPrompt": "ローカルブランチはリモートブランチから分岐しています。キャンセルするには{{.cancelKey}}を、強制プッシュするには{{.confirmKey}}を押してください。",
@@ -275,6 +276,7 @@
  "ViewConflictsMenuItem": "コンフリクトを表示",
  "AbortMenuItem": "%s を中止",
  "PickHunk": "ハンクを選択",
+  "PickAllHunks": "すべてのハンクを選択",
  "ViewMergeRebaseOptions": "マージ/リベースオプションを表示",
  "ViewMergeRebaseOptionsTooltip": "現在のマージ/リベースを中止/継続/スキップするオプションを表示します。",
  "ViewMergeOptions": "マージオプションを表示",
@@ -768,6 +770,7 @@
  "DetachingWorktree": "ワークツリーをデタッチ中",
  "WorktreesTitle": "ワークツリー",
  "WorktreeTitle": "ワークツリー",
+  "RemoveWorktreePrompt": "ワークツリー '{{.worktreeName}}' を削除してよろしいですか？",
  "RemovingWorktree": "ワークツリーを削除中",
  "AddingWorktree": "ワークツリーを追加中",
  "CantDeleteCurrentWorktree": "現在のワークツリーは削除できません！",
@@ -777,8 +780,13 @@
  "MissingWorktree": "（見つかりません）",
  "NewWorktree": "新しいワークツリー",
  "NewWorktreePath": "新しいワークツリーのパス",
+  "NewWorktreeBase": "新しいワークツリーのベース参照",
  "RemoveWorktreeTooltip": "選択したワークツリーを削除します。これはワークツリーのディレクトリとワークツリーに関するメタデータの両方を.gitディレクトリから削除します。",
  "NewBranchName": "新しいブランチ名",
+  "NewBranchNameLeaveBlank": "新しいブランチ名（{{.default}} をチェックアウトするには空白のままにしてください）",
+  "ViewWorktreeOptions": "ワークツリーオプションを表示",
+  "CreateWorktreeFrom": "{{.ref}} からワークツリーを作成",
+  "CreateWorktreeFromDetached": "{{.ref}} からワークツリーを作成（デタッチド）",
  "LcWorktree": "ワークツリー",
  "ChangingDirectoryTo": "ディレクトリを {{.path}} に変更中",
  "Name": "名前",
@@ -101,6 +101,7 @@
  "StashApply": "Stash 적용",
  "SureApplyStashEntry": "정말로 Stash를 적용하시겠습니까?",
  "StashChanges": "변경을 Stash",
+  "OpenConfig": "설정 파일 열기",
  "EditConfig": "설정 파일 수정",
  "ForcePush": "강제 푸시",
  "ForcePushPrompt": "브랜치가 원격 브랜치에서 분기하고 있습니다. 'esc'를 눌러 취소하거나, 'enter'를 눌러 강제로 푸시하세요.",
@@ -5,81 +5,30 @@
  "BranchesTitle": "Branches",
  "CommitsTitle": "Commits",
  "StashTitle": "Stash",
-  "SnakeTitle": "Snake",
-  "EasterEgg": "Easter egg",
  "UnstagedChanges": "Unstaged wijzigingen",
  "StagedChanges": "Staged wijzigingen",
  "StagingTitle": "Staging",
  "MergingTitle": "Mergen",
  "NormalTitle": "Normaal",
-  "LogTitle": "Log",
-  "LogXOfYTitle": "Log (%d van %d)",
  "CommitSummary": "Commitbericht",
  "CredentialsUsername": "Gebruikersnaam",
  "CredentialsPassword": "Wachtwoord",
  "CredentialsPassphrase": "Voer een wachtwoordzin in voor de SSH-sleutel",
-  "CredentialsPIN": "Voer PIN voor SSH sleutel in",
-  "CredentialsToken": "Voer Token voor SSH sleutel in",
  "PassUnameWrong": "Wachtwoord en/of gebruikersnaam verkeerd",
  "Commit": "Commit veranderingen",
-  "CommitTooltip": "Commit gestagede wijzigingen.",
  "AmendLastCommit": "Wijzig laatste commit",
  "AmendLastCommitTitle": "Wijzig laatste commit",
  "SureToAmend": "Weet je zeker dat je de laatste commit wilt wijzigen? U kunt het commit-bericht wijzigen vanuit het commits-paneel.",
  "NoCommitToAmend": "Er is geen commits om te wijzigen.",
  "CommitChangesWithEditor": "Commit veranderingen met de git editor",
-  "FindBaseCommitForFixupTooltip": "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>",
-  "BaseCommitIsNotInCurrentView": "Basis commit is niet zichtbaar",
-  "StatusTitle": "Status",
  "GlobalTitle": "Globale sneltoetsen",
  "Execute": "Uitvoeren",
  "Stage": "Toggle staged",
  "ToggleStagedAll": "Toggle staged alle",
  "ToggleTreeView": "Toggle bestandsboom weergave",
-  "OpenDiffTool": "Open externe diff applicatie (git difftool)",
-  "OpenMergeTool": "Open externe merge applicatie",
  "Refresh": "Verversen",
-  "Push": "Push",
-  "Pull": "Pull",
-  "PushTooltip": "Push de huidige branch naar de bijbehorende upstream-branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren.",
-  "PullTooltip": "Pull wijzigingen van de remote voor de huidige branch. Als er geen upstream is geconfigureerd wordt er gevraagd om een upstream-branch te configureren.",
-  "FileFilter": "Filter bestanden op status",
-  "CopyToClipboardMenu": "Kopieer naar klembord",
-  "CopyFileName": "Bestandsnaam",
-  "CopyRelativeFilePath": "Relatief pad",
-  "CopyAbsoluteFilePath": "Absoluut pad",
-  "CopyFileDiffTooltip": "Als er gestagede items zijn neemt dit commando alleen deze items mee. Zo niet, neemt het alle niet-gestagede items mee.",
-  "CopySelectedDiff": "Diff van geselecteerde bestand",
-  "CopyAllFilesDiff": "Diff van alle bestanden",
-  "CopyFileContent": "Inhoud van geselecteerde bestand",
-  "NoContentToCopyError": "Er is niks om te kopiëren",
-  "FileNameCopiedToast": "Bestandsnaam gekopieerd naar klembord",
-  "FilePathCopiedToast": "Bestandspad gekopieerd naar klembord",
-  "FileDiffCopiedToast": "Diff van bestand gekopieerd naar klembord",
-  "AllFilesDiffCopiedToast": "Diff van alle bestanden gekopieerd naar klembord",
-  "FileContentCopiedToast": "Bestandsinhoud gekopieerd naar klembord",
-  "FilterStagedFiles": "Toon alleen gestagede bestanden",
-  "FilterUnstagedFiles": "Toon alleen niet-gestagede bestanden",
-  "FilterTrackedFiles": "Toon alleen getrackte bestanden",
-  "FilterUntrackedFiles": "Toon alleen niet-getrackte bestanden",
-  "NoFilter": "Geen filter",
-  "FilterLabelStagedFiles": "(alleen gestaged)",
-  "FilterLabelUnstagedFiles": "(alleen niet-gestaged)",
-  "FilterLabelTrackedFiles": "(alleen getrackt)",
-  "FilterLabelUntrackedFiles": "(alleen niet-getrackt)",
-  "FilterLabelConflictingFiles": "(alleen conflicten)",
  "MergeConflictsTitle": "Merge conflicten",
-  "MergeConflictDescription_UD": "Conflict: dit bestand is gewijzigd in de current changes en verwijderd in incoming changes.\n\nDe meest waarschijnlijke oplossing is om dit bestand te verwijderen nadat de current changes wijzigingen handmatig zijn toegepast op een andere plaats in de code.",
-  "MergeConflictIncomingDiff": "Inkomende wijziging:",
-  "MergeConflictCurrentDiff": "Huidige wijzigingen:",
-  "MergeConflictPressEnterToResolve": "Druk op %s om op te lossen.",
-  "MergeConflictKeepFile": "Behoud bestanden",
-  "MergeConflictDeleteFile": "Bestand verwijderen",
  "Checkout": "Uitchecken",
-  "CheckoutTooltip": "Geselecteerd item uitchecken.",
-  "CantCheckoutBranchWhilePulling": "Je kan geen andere branch uitchecken tijdens het pullen van de huidige branch",
-  "TagCheckoutTooltip": "Geselecteerde tag uitchecken als detached HEAD.",
-  "RemoteBranchCheckoutTooltip": "Geselecteerde remote branch uitchecken als nieuwe locale branch of als detached head.",
  "NoChangedFiles": "Geen veranderde bestanden",
  "SoftReset": "Zacht reset",
  "AlreadyCheckedOutBranch": "Je hebt deze branch al uitgecheckt",
@@ -88,94 +37,54 @@
  "BranchName": "Branch naam",
  "NewBranchNameBranchOff": "Nieuw branch naam (Branch is afgeleid van '{{.branchName}}')",
  "CantDeleteCheckOutBranch": "Je kan een uitgecheckte branch niet verwijderen!",
-  "DeleteBranchTitle": "Verwijder branch '{{.selectedBranchName}}'?",
-  "DeleteBranchesTitle": "Geselecteerde branches verwijderen?",
-  "DeleteLocalBranch": "Lokale branch verwijderen",
-  "DeleteLocalBranches": "Lokale branches verwijderen",
-  "DeleteRemoteBranchPrompt": "Weet je zeker dat je de remote branch '{{.selectedBranchName}}' wilt verwijderen uit '{{.upstream}}'?",
-  "ForceDeleteBranchTitle": "Forceer verwijderen van branch",
  "ForceDeleteBranchMessage": "Weet je zeker dat je branch '{{.selectedBranchName}}' geforceerd wil verwijderen?",
  "RebaseBranch": "Rebase branch",
-  "RebaseBranchTooltip": "Rebase de uitgecheckte branch bovenop de geselecteerde branch.",
  "CantRebaseOntoSelf": "Je kan niet een branch rebasen op zichzelf",
  "CantMergeBranchIntoItself": "Je kan niet een branch in zichzelf mergen",
  "ForceCheckout": "Forceer checkout",
  "CheckoutByName": "Uitchecken bij naam",
-  "CheckoutPreviousBranch": "Vorige branch uitchecken",
-  "RemoteBranchCheckoutTitle": "{{.branchName}} uitchecken",
-  "RemoteBranchCheckoutPrompt": "Hoe wil je deze branch uitchecken?",
-  "CheckoutTypeNewBranch": "Nieuwe lokale branch",
-  "CheckoutTypeDetachedHead": "Detached head",
  "NewBranch": "Nieuwe branch",
-  "MoveCommitsToNewBranch": "Verplaats commits naar nieuwe branch",
-  "MoveCommitsToNewBranchTooltip": "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.\n\nLet op dat de selectie genegeerd wordt. De nieuwe branch komt ofwel bovenop de main branch, of bovenop de huidige branch (je kan kiezen).",
-  "CannotMoveCommitsFromDetachedHead": "Kan geen commits verplaatsen van een detached head",
-  "CannotMoveCommitsNoUpstream": "Kan geen commits verplaatsen vanaf een branch die geen upstream-branch heeft",
-  "CannotMoveCommitsBehindUpstream": "Kan geen commits verplaatsen van een branch die achterloopt zijn upstream-branch",
  "NoBranchesThisRepo": "Geen branches voor deze repo",
  "CommitWithoutMessageErr": "Je kan geen commit maken zonder commit bericht",
  "Close": "Sluiten",
  "CloseCancel": "Sluiten",
  "Confirm": "Bevestig",
-  "Quit": "Afsluiten",
-  "Fixup": "Fixup",
  "SureSquashThisCommit": "Weet je zeker dat je deze commit wil samenvoegen met de commit hieronder?",
-  "Squash": "Squash",
  "PickCommitTooltip": "Kies commit (wanneer midden in rebase)",
  "Reword": "Hernoem commit",
  "DropCommit": "Verwijder commit",
  "MoveDownCommit": "Verplaats commit 1 naar beneden",
  "MoveUpCommit": "Verplaats commit 1 naar boven",
-  "CannotMoveAnyFurther": "Kan niet verder verplaatsen",
-  "CannotMoveMergeCommit": "Kan een merge commit niet verplaatsen",
  "EditCommitTooltip": "Wijzig commit",
  "AmendCommitTooltip": "Wijzig commit met staged veranderingen",
-  "AddCoAuthor": "Voeg co-auteur toe",
  "RewordCommitEditor": "Hernoem commit met editor",
  "NoCommitsThisBranch": "Geen commits in deze branch",
-  "ExecCommandHere": "Voer het volgende commando hier uit:",
  "Error": "Foutmelding",
  "Undo": "Ongedaan maken",
  "UndoReflog": "Ongedaan maken (via reflog) (experimenteel)",
  "RedoReflog": "Redo (via reflog) (experimenteel)",
-  "DiscardAllTooltip": "Verwijder zowel gestagede als niet-gestagede wijzigingen in '{{.path}}'.",
-  "DiscardUnstagedTooltip": "Verwijder niet-gestagede wijzigingen in '{{.path}}'.",
-  "DiscardUnstagedDisabled": "De geselecteerde items hebben geen mix van gestagede en niet-gestagede wijzigingen.",
-  "Pop": "Pop",
  "Drop": "Laten vallen",
  "Apply": "Toepassen",
  "NoStashEntries": "Geen stash items",
  "StashDrop": "Stash laten vallen",
-  "SureDropStashEntry": "Weet je het zeker dat je de geselecteerde stash(es) wilt verwijderen?",
-  "StashPop": "Stash poppen",
  "SurePopStashEntry": "Weet je zeker dat je deze stash entry wil poppen?",
  "StashApply": "Stash toepassen",
  "SureApplyStashEntry": "Weet je zeker dat je deze stash entry wil toepassen?",
  "NoTrackedStagedFilesStash": "Je hebt geen tracked/staged bestanden om te laten stashen",
-  "NoFilesToStash": "Je hebt geen bestanden om te stashen",
  "StashChanges": "Stash veranderingen",
-  "RenameStash": "Hernoem stash",
-  "RenameStashPrompt": "Hernoem stash: {{.stashName}}",
+  "OpenConfig": "Open config bestand",
  "EditConfig": "Verander config bestand",
  "ForcePush": "Forceer push",
  "ForcePushPrompt": "Je branch is afgeweken van de remote branch. Druk {{.cancelKey}} om te annuleren, of {{.confirmKey}} om geforceerd te pushen.",
  "CheckForUpdate": "Check voor updates",
  "CheckingForUpdates": "Zoeken naar updates...",
-  "UpdateAvailableTitle": "Update beschikbaar!",
-  "FailedToRetrieveLatestVersionErr": "Ophalen versie-informatie mislukt",
  "OnLatestVersionErr": "Je hebt al de laatste versie",
  "MajorVersionErr": "Nieuwe versie ({{.newVersion}}) is niet backwards compatibele vergeleken met de huidige versie ({{.currentVersion}})",
  "CouldNotFindBinaryErr": "Kon geen binary vinden op {{.url}}",
-  "ConfirmQuitDuringUpdate": "Er is een update bezig. Weet je zeker dat je wilt afsluiten?",
-  "IntroPopupMessage": "\nBedankt voor het gebruik van lazygit! Je bent een kanjer. Deze vier dingen wil ik met je delen:\n\n 1) Als je meer wilt weten over lazygit's features, kijk dan deze video:\n      https://youtu.be/CPLdltN7wgE\n\n 2) Lees de laatste release notes hier:\n      https://github.com/jesseduffield/lazygit/releases\n\n 3) Als je git gebruikt, dan ben je een programmeur! Met jouw hulp kunnen we\n    lazygit beter maken, dus overweeg mee te helpen met coden op\n      https://github.com/jesseduffield/lazygit\n    Of geef het repo een ster om te laten zien dat je het leuk vindt!\n\n 4) Als lazygit je leven makkelijker heeft gemaakt kan je \"dank je wel\" zeggen door\n    op de donatie knop rechtsonder te drukken. Doneren geeft geen recht op voorrang bij ondersteuning\n    maar wordt wel zeer gewaardeerd.\n\nDruk op {{confirmationKey}} om te beginnen.\n",
  "GitconfigParseErr": "Gogit kon je gitconfig bestand niet goed parsen door de aanwezigheid van losstaande '\\' tekens. Het weghalen van deze tekens zou het probleem moeten oplossen. ",
  "EditFile": "Verander bestand",
-  "EditFileTooltip": "Open bestand in externe editor.",
  "OpenFile": "Open bestand",
-  "OpenFileTooltip": "Open bestand in standaardapplicatie.",
-  "OpenInEditor": "Openen in editor",
  "IgnoreFile": "Voeg toe aan .gitignore",
-  "ExcludeFile": "Toevoegen aan .git/info/exclude",
  "RefreshFiles": "Refresh bestanden",
  "Merge": "Merge in met huidige checked out branch",
  "ConfirmQuit": "Weet je zeker dat je dit programma wil sluiten?",
@@ -183,8 +92,6 @@
  "UnsupportedGitService": "Niet-ondersteunde git-service",
  "CopyPullRequestURL": "Kopieer de URL van het pull-verzoek naar het klembord",
  "NoBranchOnRemote": "Deze branch bestaat niet op de remote. U moet het eerst naar de remote pushen.",
-  "ExpandAll": "Vouw alle bestanden uit",
-  "ExpandAllTooltip": "Vouw alle mappen in de bestandsstructuur uit",
  "FileEnter": "Stage individuele hunks/lijnen",
  "StageSelectionTooltip": "Toggle lijnen staged / unstaged",
  "DiscardSelection": "Verwijdert change (git reset)",
@@ -193,56 +100,26 @@
  "ReturnToFilesPanel": "Ga terug naar het bestanden paneel",
  "FastForward": "Fast-forward deze branch vanaf zijn upstream",
  "FoundConflictsTitle": "Conflicten!",
-  "ViewConflictsMenuItem": "Toon conflicten",
-  "AbortMenuItem": "Breek %s af",
  "PickHunk": "Kies stuk",
+  "PickAllHunks": "Kies beide stukken",
  "ViewMergeRebaseOptions": "Bekijk merge/rebase opties",
-  "ViewMergeRebaseOptionsTooltip": "Toon abort/continue/skip opties voor huidige merge/rebase.",
-  "ViewMergeOptions": "Toon merge opties",
-  "ViewRebaseOptions": "Toon rebase opties",
-  "ViewCherryPickOptions": "Toon cherry-pick opties",
-  "ViewRevertOptions": "Toon revert opties",
  "NotMergingOrRebasing": "Je bent momenteel niet aan het rebasen of mergen",
-  "AlreadyRebasing": "Deze actie kan niet worden uitgevoerd tijdens een rebase",
-  "NotMidRebase": "Deze actie werkt alleen tijdens een interactieve rebase",
-  "MustSelectFixupCommit": "Deze actie werkt alleen op fixup commits",
  "RecentRepos": "Recente repositories",
  "MergeOptionsTitle": "Merge opties",
  "RebaseOptionsTitle": "Rebase opties",
-  "CherryPickOptionsTitle": "Cherry-pick opties",
-  "RevertOptionsTitle": "Revert opties",
  "CommitSummaryTitle": "Commit bericht",
-  "CommitDescriptionTitle": "Commit beschrijving",
  "LocalBranchesTitle": "Branches",
  "SearchTitle": "Zoek",
-  "TagsTitle": "Tags",
-  "MenuTitle": "Menu",
-  "CommitMenuTitle": "Commit Menu",
-  "RemotesTitle": "Remotes",
-  "RemoteBranchesTitle": "Remote branches",
  "PatchBuildingTitle": "Patch bouwen",
  "InformationTitle": "Informatie",
-  "ReflogCommitsTitle": "Reflog",
-  "ConflictsResolved": "Alle mergeconflicten zijn opgelost. Doorgaan met de %s?",
-  "Continue": "Doorgaan",
-  "UnstagedFilesAfterConflictsResolved": "Er zijn bestanden gewijzigd nadat de mergeconflicten opgelost waren. Deze bestanden stagen en doorgaan?",
-  "RebasingTitle": "Rebase '{{.checkedOutBranch}}'",
-  "SimpleRebase": "Simpele rebase op '{{.ref}}'",
-  "InteractiveRebase": "Interactieve rebase op '{{.ref}}'",
-  "RebaseOntoBaseBranch": "Rebase op basis branch ({{.baseBranch}})",
  "FwdNoUpstream": "Kan niet de branch vooruitspoelen zonder upstream",
  "FwdCommitsToPush": "Je kan niet vooruitspoelen als de branch geen nieuwe commits heeft",
  "ErrorOccurred": "Er is iets fout gegaan! Zou je hier een issue aan willen maken",
-  "ConflictLabel": "CONFLICT",
-  "CommitsSectionHeader": "Commits",
-  "YouDied": "JE BENT DOOD!",
  "RewordNotSupported": "Herformatteren van commits in interactief rebasen is nog niet ondersteund",
  "CherryPickCopy": "Kopieer commit (cherry-pick)",
  "PasteCommits": "Plak commits (cherry-pick)",
-  "SureCherryPick": "Weet je zeker dat je de {{.numCommits}} gekopieerde commit(s) naar deze branch wilt cherry-picken?",
  "CherryPick": "Cherry-Pick",
  "Donate": "Doneer",
-  "AskQuestion": "Stel vraag",
  "PrevHunk": "Selecteer de vorige hunk",
  "NextHunk": "Selecteer de volgende hunk",
  "PrevConflict": "Selecteer voorgaand conflict",
@@ -253,10 +130,8 @@
  "ScrollUp": "Scroll omhoog",
  "ScrollUpMainWindow": "Scroll naar beneden vanaf hoofdpaneel",
  "ScrollDownMainWindow": "Scroll naar beneden vanaf hoofdpaneel",
-  "SuspendApp": "Pauzeer de applicatie",
  "AmendCommitTitle": "Commit wijzigen",
  "AmendCommitPrompt": "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?",
-  "AmendCommitWithConflictsContinue": "Nee, doorgaan met rebase",
  "DropCommitTitle": "Verwijder commit",
  "DropCommitPrompt": "Weet je zeker dat je deze commit wil verwijderen?",
  "PullingStatus": "Pullen",
@@ -270,15 +145,12 @@
  "CherryPickingStatus": "Cherry-picken",
  "UndoingStatus": "Ongedaan maken",
  "CheckingOutStatus": "Uitchecken",
-  "RevertingStatus": "Bezig met reverten",
  "CommitFiles": "Commit bestanden",
  "ViewItemFiles": "Bekijk gecommite bestanden",
  "CommitFilesTitle": "Commit bestanden",
  "CheckoutCommitFileTooltip": "Bestand uitchecken",
-  "Remove": "Verwijderen",
  "DiscardOldFileChangeTooltip": "Uitsluit deze commit zijn veranderingen aan dit bestand",
  "DiscardFileChangesTitle": "Uitsluit bestand zijn veranderingen",
-  "CreateRepo": "Niet in een git repository. Maak een nieuwe git repository? (y/N): ",
  "AutoStashPrompt": "Je moet je veranderingen stashen en poppen om ze over te brengen. Dit automatisch doen? (enter/esc)",
  "Discard": "Bekijk 'veranderingen ongedaan maken' opties",
  "Cancel": "Annuleren",
@@ -288,8 +160,6 @@
  "DiscardAnyUnstagedChanges": "Gooi unstaged wijzigingen weg",
  "DiscardUntrackedFiles": "Negeer niet-gevonden bestanden",
  "HardReset": "Harde reset",
-  "Delete": "Verwijderen",
-  "Reset": "Resetten",
  "ViewResetOptions": "Bekijk reset opties",
  "CreateFixupCommit": "Creëer fixup commit",
  "CreateFixupCommitTooltip": "Creëer fixup commit",
@@ -302,8 +172,6 @@
  "StashAllChangesKeepIndex": "Stash staged wijzigingen",
  "StashOptions": "Stash opties",
  "NotARepository": "Fout: moet in een git repository uitgevoerd worden",
-  "ScrollLeft": "Scroll naar links",
-  "ScrollRight": "Scroll naar rechts",
  "DiscardPatch": "Patch weg gooien",
  "DiscardPatchConfirm": "Je kan alleen maar een patch bouwen van 1 commit. Huidige patch weggooien?",
  "CantPatchWhileRebasingError": "Je kan geen patch bouwen of patch commando uitvoeren wanneer je in een merging of rebasing state zit",
@@ -317,16 +185,12 @@
  "NewRemote": "Voeg een nieuwe remote toe",
  "NewRemoteName": "Nieuwe remote name:",
  "NewRemoteUrl": "Nieuwe remote url:",
-  "ViewBranches": "Bekijk branches",
  "EditRemoteName": "Enter updated remote naam voor {{.remoteName}}:",
  "EditRemoteUrl": "Enter updated remote url voor {{.remoteName}}:",
  "RemoveRemote": "Verwijder remote",
  "DeleteRemoteBranch": "Verwijder remote branch",
-  "SetAsUpstream": "Instellen als upstream",
  "SetAsUpstreamTooltip": "Stel in als upstream van uitgecheckte branch",
  "SetUpstream": "Stel in als upstream van uitgecheckte branch",
-  "DivergenceSectionHeaderLocal": "Lokaal",
-  "DivergenceSectionHeaderRemote": "Remote",
  "SetUpstreamTitle": "Stel in als upstream branch",
  "EditRemoteTooltip": "Wijzig remote",
  "TagNameTitle": "Tag naam:",
@@ -343,7 +207,6 @@
  "PrevScreenMode": "Vorige scherm modus",
  "StartSearch": "Start met zoeken",
  "Keybindings": "Sneltoetsen",
-  "KeybindingsMenuSectionGlobal": "Algemeen",
  "RenameBranch": "Hernoem branch",
  "NewGitFlowBranchPrompt": "Nieuwe '{{.branchType}}' naam:",
  "RenameBranchWarning": "Deze branch volgt een remote. Deze actie zal alleen de locale branch name wijzigen niet de naam van de remote branch. Verder gaan?",
@@ -399,54 +262,8 @@
  "CreatePullRequest": "Maak een pull-request",
  "ConfirmRevertCommit": "Weet u zeker dat u {{.selectedCommit}} ongedaan wilt maken?",
  "ToggleRangeSelect": "Toggle drag selecteer",
-  "Actions": {
-    "CopyCommitAuthorToClipboard": "Kopieer commit auteur naar klembord",
-    "CopyCommitAttributeToClipboard": "Kopieer naar klembord",
-    "CopyCommitTagsToClipboard": "Kopieer commit tags naar klembord",
-    "CopyPatchToClipboard": "Kopieer patch naar klembord",
-    "Commit": "Commit",
-    "Push": "Push",
-    "Pull": "Pull",
-    "OpenFile": "Open bestand",
-    "CopyToClipboard": "Kopieer naar klembord",
-    "CopySelectedTextToClipboard": "Kopieer geselecteerde tekst naar klembord",
-    "AddRemote": "Voeg remote toe",
-    "RemoveSubmodule": "Verwijder submodule",
-    "ResetSubmodule": "Reset submodule",
-    "AddSubmodule": "Voeg submodule toe",
-    "UpdateSubmoduleUrl": "Update submodule URL",
-    "InitialiseSubmodule": "Initialiseer submodule",
-    "UpdateSubmodule": "Update submodule",
-    "NukeWorkingTree": "Blaas de working tree op met een kernbom",
-    "RemoveUntrackedFiles": "Verwijder niet-getrackte bestanden",
-    "SoftReset": "Soft reset",
-    "MixedReset": "Mixed reset",
-    "HardReset": "Hard reset",
-    "Undo": "Ongedaan maken",
-    "Redo": "Herhalen",
-    "OpenCommitInBrowser": "Open commit in browser",
-    "OpenPullRequest": "Open pull request in browser",
-    "AddWorktree": "Voeg worktree toe"
-  },
+  "Actions": {},
  "Bisect": {},
-  "Log": {
-    "RemoveFile": "Verwijder pad '{{.path}}'",
-    "RemoveEmptyDir": "Verwijder de lege map '{{.path}}'",
-    "CopyToClipboard": "Kopieer '{{.str}}' naar klembord",
-    "Remove": "Verwijder '{{.filename}}'",
-    "CreateFileWithContent": "Maak bestand '{{.path}}'",
-    "AppendingLineToFile": "Voeg {{.line}}' toe aan bestand '{{.filename}} '",
-    "EditRebaseFromBaseCommit": "Begin een interactieve rebase van '{{.baseCommit}}' op '{{.targetBranchName}}'",
-    "DroppingStash": "Verwijder stash %s",
-    "PoppingStash": "Pop stash %s",
-    "DeletingBranch": "Verwijder branch '{{.branchName}}' (was {{.hash}})"
-  },
-  "BreakingChangesByVersion": {},
-  "ViewMergeConflictOptions": "Bekijk merge conflict opties",
-  "ViewMergeConflictOptionsTooltip": "Bekijk opties voor het oplossen van mergeconflicten.",
-  "NoFilesWithMergeConflicts": "Er zijn geen files met mergeconflicten.",
-  "MergeConflictOptionsTitle": "Los mergeconflicten op",
-  "UseCurrentChanges": "Gebruik huidige wijzigingen",
-  "UseIncomingChanges": "Gebruik binnenkomende wijzigingen",
-  "UseBothChanges": "Gebruik beide"
+  "Log": {},
+  "BreakingChangesByVersion": {}
 }
@@ -187,6 +187,7 @@
  "StashChanges": "Schowaj zmiany",
  "RenameStash": "Zmień nazwę schowka",
  "RenameStashPrompt": "Zmień nazwę schowka: {{.stashName}}",
+  "OpenConfig": "Otwórz plik konfiguracyjny",
  "EditConfig": "Edytuj plik konfiguracyjny",
  "ForcePush": "Wymuś wysłanie",
  "ForcePushPrompt": "Twoja gałąź rozbiegła się z gałęzią zdalną. Naciśnij {{.cancelKey}}, aby anulować, lub {{.confirmKey}}, aby wymusić wysłanie.",
@@ -243,6 +244,7 @@
  "ViewConflictsMenuItem": "Pokaż konflikty",
  "AbortMenuItem": "Przerwij %s",
  "PickHunk": "Wybierz fragment",
+  "PickAllHunks": "Wybierz wszystkie fragmenty",
  "ViewMergeRebaseOptions": "Pokaż opcje scalania/rebase",
  "ViewMergeRebaseOptionsTooltip": "Pokaż opcje do przerwania/kontynuowania/pominięcia bieżącego scalania/rebase.",
  "ViewMergeOptions": "Pokaż opcje scalania",
@@ -679,6 +681,7 @@
  "DetachingWorktree": "Odłączanie drzewa pracy",
  "WorktreesTitle": "Drzewa pracy",
  "WorktreeTitle": "Drzewo pracy",
+  "RemoveWorktreePrompt": "Czy na pewno chcesz usunąć drzewo pracy '{{.worktreeName}}'?",
  "RemovingWorktree": "Usuwanie drzewa pracy",
  "AddingWorktree": "Dodawanie drzewa pracy",
  "CantDeleteCurrentWorktree": "Nie możesz usunąć bieżącego drzewa pracy!",
@@ -688,8 +691,13 @@
  "MissingWorktree": "(brakujące)",
  "NewWorktree": "Nowe drzewo pracy",
  "NewWorktreePath": "Nowa ścieżka drzewa pracy",
+  "NewWorktreeBase": "Nowa bazowa ref drzewa pracy",
  "RemoveWorktreeTooltip": "Usuń wybrane drzewo pracy. To usunie zarówno katalog drzewa pracy, jak i metadane o drzewie pracy w katalogu .git.",
  "NewBranchName": "Nowa nazwa brancha",
+  "NewBranchNameLeaveBlank": "Nowa nazwa brancha (pozostaw puste, aby przełączyć {{.default}})",
+  "ViewWorktreeOptions": "Zobacz opcje drzewa pracy",
+  "CreateWorktreeFrom": "Utwórz drzewo pracy z {{.ref}}",
+  "CreateWorktreeFromDetached": "Utwórz drzewo pracy z {{.ref}} (odłączone)",
  "LcWorktree": "drzewo pracy",
  "ChangingDirectoryTo": "Zmiana katalogu na {{.path}}",
  "Name": "Nazwa",
@@ -206,6 +206,7 @@
  "StashChanges": "Alterações preparadas",
  "RenameStash": "Renomear o stash",
  "RenameStashPrompt": "Renomear o estoque: {{.stashName}}",
+  "OpenConfig": "Abrir o ficheiro de config",
  "EditConfig": "Editar arquivo de configuração",
  "ForcePush": "Forçar push",
  "ForcePushPrompt": "Seu branch divergiu do branch remoto. Pressione {{.cancelKey}} para cancelar, ou {{.confirmKey}} para forçar a push.",
@@ -278,6 +279,7 @@
  "ViewConflictsMenuItem": "Visualizar conflitos",
  "AbortMenuItem": "Abortar %s",
  "PickHunk": "Escolha o local",
+  "PickAllHunks": "Pegar todos os pedaços",
  "ViewMergeRebaseOptions": "Ver opções de mesclar/rebase",
  "ViewMergeRebaseOptionsTooltip": "Ver opções para abortar/continuar/pular o merge/rebase atual.",
  "ViewMergeOptions": "Visualizar opções de merge",
@@ -637,6 +639,9 @@
  "MainWorktree": "(árvore de trabalho principal)",
  "NewWorktree": "Nova árvore de trabalho",
  "NewWorktreePath": "Caminho da nova árvore de trabalho",
+  "ViewWorktreeOptions": "Ver opções da árvore de trabalho",
+  "CreateWorktreeFrom": "Criar árvore de trabalho a partir de {{.ref}}",
+  "CreateWorktreeFromDetached": "Criar árvore de trabalho a partir de {{.ref}} (desanexado)",
  "LcWorktree": "árvore de trabalho",
  "Name": "Nome",
  "Path": "Caminho",
@@ -106,6 +106,7 @@
  "StashChanges": "Припрятать изменения",
  "RenameStash": "Переименовать хранилище",
  "RenameStashPrompt": "Переименовать хранилище: {{.stashName}}",
+  "OpenConfig": "Открыть файл конфигурации",
  "EditConfig": "Редактировать файл конфигурации",
  "ForcePush": "Принудительная отправка изменении",
  "ForcePushPrompt": "Ветка отклонилась от удалённой ветки. Нажмите «esc», чтобы отменить, или «enter», чтобы начать принудительную отправку изменении.",
@@ -151,6 +152,7 @@
  "ViewConflictsMenuItem": "Просмотр конфликтов",
  "AbortMenuItem": "Прервать %s",
  "PickHunk": "Выбрать эту часть",
+  "PickAllHunks": "Выбрать все части",
  "ViewMergeRebaseOptions": "Просмотреть параметры слияния/перебазирования",
  "NotMergingOrRebasing": "В данный момент вы не выполняете ни перебазирования, ни слияние",
  "AlreadyRebasing": "Невозможно выполнить это действие во время перебазирования",
@@ -219,6 +219,7 @@
  "StashChanges": "贮藏变更",
  "RenameStash": "重命名贮藏",
  "RenameStashPrompt": "重命名贮藏: {{.stashName}}",
+  "OpenConfig": "打开配置文件",
  "EditConfig": "编辑配置文件",
  "ForcePush": "强制推送",
  "ForcePushPrompt": "您的分支已与远程分支不同。按‘esc’取消，或‘enter’强制推送.",
@@ -304,6 +305,7 @@
  "ViewConflictsMenuItem": "查看冲突",
  "AbortMenuItem": "中止 %s",
  "PickHunk": "选中区块",
+  "PickAllHunks": "选中所有区块",
  "ViewMergeRebaseOptions": "查看合并/变基选项",
  "ViewMergeRebaseOptionsTooltip": "查看当前合并或变基的中止、继续、跳过选项",
  "ViewMergeOptions": "查看合并选项",
@@ -853,6 +855,7 @@
  "DetachingWorktree": "正在分离工作树",
  "WorktreesTitle": "工作区",
  "WorktreeTitle": "工作区",
+  "RemoveWorktreePrompt": "您确定要删除工作树 {{.worktreeName}}' ？",
  "ForceRemoveWorktreePrompt": "'{{.worktreeName}}' 包含已修改或未跟踪的文件，或子模块（或包含所有这些）。确定要移除它吗？",
  "RemovingWorktree": "正在删除工作树",
  "AddingWorktree": "添加工作区",
@@ -864,8 +867,13 @@
  "MainWorktree": "（主工作树）",
  "NewWorktree": "新建工作树",
  "NewWorktreePath": "新建工作树路径",
+  "NewWorktreeBase": "新建工作树基于ref",
  "RemoveWorktreeTooltip": "删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。",
  "NewBranchName": "新分支名称",
+  "NewBranchNameLeaveBlank": "新分支名称（为空则默认检出为 {{.default}}）",
+  "ViewWorktreeOptions": "查看工作区选项",
+  "CreateWorktreeFrom": "从 {{.ref}} 创建工作树",
+  "CreateWorktreeFromDetached": "从 {{.ref}} 创建工作树（分离）",
  "LcWorktree": "工作区",
  "ChangingDirectoryTo": "将目录更改为 {{.path}}",
  "Name": "名称",
@@ -1060,8 +1068,7 @@
    "0.50.0": "- 拉取后，如果主分支落后于其上游分支，现在会自动前推。这对于自动保持主分支或 master 分支最新很有用。如果不希望这样，可以通过在配置中设置以下内容来禁用它：\n\ngit:\n  autoForwardBranches: none\n\n相反，如果希望功能分支也这样做，可以将其设置为 'allBranches'。",
    "0.51.0": "- 自定义命令的 'subprocess'、'stream' 和 'showOutput' 字段已被替换为单个 'output' 字段。这应该是透明的，如果您在配置文件中使用了这些字段，它们应该已自动更新。但有一个显著变化：'stream' 字段过去意味着命令输出将流式传输到命令日志，并且命令将在伪终端 (pty) 中运行。我们将其转换为 'output: log'，这意味着命令输出将流式传输到命令日志，但不使用 pty，假设这是大多数人想要的。如果您确实希望在 pty 中运行命令，可以将其更改为 'output: logWithPty'。",
    "0.54.0": "- 本地和远程分支的默认排序顺序已更改：过去本地分支是 'recency'（基于 reflog），远程分支是 'alphabetical'。这两者都已更改为 'date'（即提交者日期）。如果您更喜欢旧的默认设置，可以通过以下配置恢复：\n\ngit:\n  localBranchSortOrder: recency\n  remoteBranchSortOrder: alphabetical\n\n- 暂存区和自定义补丁构建视图中的默认选择模式已更改为块模式。在大多数情况下，这是更有用的模式，因为它通常可以节省大量按键。如果想切换回旧的行模式默认设置，可以通过在配置中添加以下内容来实现：\n\ngui:\n  useHunkModeInStagingView: false\n",
-    "0.55.0": "- 原先绑定到 ctrl-z 的 'redo' 命令，现在改为绑定到 shift-Z。这是因为 ctrl-z 现在用于挂起应用程序；在 Linux 世界中，这是该功能的常用键绑定。如果你想恢复此更改，可以在配置中添加以下内容：\n\nkeybinding:\n  universal:\n    suspendApp: <disabled>\n    redo: <ctrl+z>\n\n- 'git.paging.useConfig' 选项已被移除。如果你之前依赖它来配置你的分页器，现在必须使用 'git.paging.pager' 选项重新明确设置分页器。",
-    "0.62.0": "从提交描述编辑器提交变更的默认快捷键已从 Mac 上的 alt-enter 改为 command-enter，在 Linux 和 Windows 上改为 ctrl-enter；这些和很多多行编辑框里用的快捷键一样，比如 GitHub 评论里用的那种。很遗憾，并非所有终端都支持这些快捷键；更多说明见：https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md#terminal-compatibility。如果你想恢复这个改动，可以在配置里加上：\n\nkeybinding:\n  universal:\n    confirmInEditor: <a-enter>\n"
+    "0.55.0": "- 原先绑定到 ctrl-z 的 'redo' 命令，现在改为绑定到 shift-Z。这是因为 ctrl-z 现在用于挂起应用程序；在 Linux 世界中，这是该功能的常用键绑定。如果你想恢复此更改，可以在配置中添加以下内容：\n\nkeybinding:\n  universal:\n    suspendApp: <disabled>\n    redo: <ctrl+z>\n\n- 'git.paging.useConfig' 选项已被移除。如果你之前依赖它来配置你的分页器，现在必须使用 'git.paging.pager' 选项重新明确设置分页器。"
  },
  "ViewMergeConflictOptions": "查看合并冲突选项",
  "ViewMergeConflictOptionsTooltip": "查看用于解决合并冲突的选项。",
@@ -128,6 +128,7 @@
  "StashChanges": "安置現有變更到收藏中",
  "RenameStash": "重新命名收藏",
  "RenameStashPrompt": "重新命名收藏：{{.stashName}}",
+  "OpenConfig": "開啟設定檔案",
  "EditConfig": "編輯設定檔案",
  "ForcePush": "強制推送",
  "ForcePushPrompt": "你的分支與遠端分支分岔。按 'ESC' 取消，或按 'Enter' 強制推送。",
@@ -178,6 +179,7 @@
  "ViewConflictsMenuItem": "檢視衝突",
  "AbortMenuItem": "中止%s",
  "PickHunk": "挑選程式碼片段",
+  "PickAllHunks": "挑選所有程式碼片段",
  "ViewMergeRebaseOptions": "查看合併/變基選項",
  "ViewRebaseOptions": "查看合併/變基選項",
  "NotMergingOrRebasing": "你當前既不在變基也不在合併中",
@@ -526,6 +528,7 @@
  "DetachingWorktree": "正在解除工作目錄連結",
  "WorktreesTitle": "工作目錄",
  "WorktreeTitle": "工作目錄",
+  "RemoveWorktreePrompt": "是否刪除 {{.worktreeName}} 工作目錄？",
  "RemovingWorktree": "正在刪除工作目錄",
  "AddingWorktree": "正在建立工作目錄",
  "CantDeleteCurrentWorktree": "無法刪除當前工作目錄！",
@@ -534,7 +537,12 @@
  "NoWorktreesThisRepo": "無工作目錄",
  "MissingWorktree": "（失蹤）",
  "NewWorktreePath": "工作目錄路徑",
+  "NewWorktreeBase": "工作目錄來源",
  "NewBranchName": "分支名稱",
+  "NewBranchNameLeaveBlank": "分支名稱（留空將檢出 {{.default}}）",
+  "ViewWorktreeOptions": "檢視工作目錄選項",
+  "CreateWorktreeFrom": "從 {{.ref}} 建立工作目錄",
+  "CreateWorktreeFromDetached": "從 {{.ref}} 建立工作目錄（未連結）",
  "LcWorktree": "工作目錄",
  "ChangingDirectoryTo": "切換至 {{.path}}",
  "Name": "名稱",
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"time"

+	"github.com/atotto/clipboard"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
 )
@@ -124,6 +125,17 @@ func (self *TestDriver) ExpectToast(matcher *TextMatcher) *TestDriver {
 	return self
 }

+func (self *TestDriver) ExpectClipboard(matcher *TextMatcher) {
+	self.assertWithRetries(func() (bool, string) {
+		text, err := clipboard.ReadAll()
+		if err != nil {
+			return false, "Error occurred when reading from clipboard: " + err.Error()
+		}
+		ok, _ := matcher.test(text)
+		return ok, fmt.Sprintf("Expected clipboard to match %s, but got %s", matcher.name(), text)
+	})
+}
+
 func (self *TestDriver) ExpectSearch() *SearchDriver {
 	self.inSearch()

@@ -37,11 +37,11 @@ var MoveCommitsToNewBranchFromBaseBranch = NewIntegrationTest(NewIntegrationTest

 		t.ExpectPopup().Menu().
 			Title(Equals("Move commits to new branch")).
-			Select(Contains("New branch from base branch (origin/master)")).
+			Select(Contains("New branch from base branch (master)")).
 			Confirm()

 		t.ExpectPopup().Prompt().
-			Title(Equals("New branch name (branch is off of 'origin/master')")).
+			Title(Equals("New branch name (branch is off of 'master')")).
 			Type("new branch").
 			Confirm()

@@ -1,57 +0,0 @@
-package commit
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var DiscardRenamedFile = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Discard a renamed file from an old commit; both the new and the old path are handled so the rename is undone",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n")
-		shell.CreateFileAndAdd("other", "other content\n")
-		shell.Commit("first commit")
-
-		shell.RenameFileInGit("original", "renamed")
-		shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n")
-		shell.Commit("rename with modification")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("rename with modification").IsSelected(),
-				Contains("first commit"),
-			).
-			PressEnter()
-
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("original → renamed").IsSelected(),
-			).
-			Press(keys.Universal.Remove)
-
-		t.ExpectPopup().Confirmation().
-			Title(Equals("Discard file changes")).
-			Content(Contains("Are you sure you want to discard changes to the selected file(s) from this commit?")).
-			Confirm()
-
-		// The rename is undone: the commit no longer touches any file. (If only
-		// the new path were discarded, the commit would still delete the old
-		// path and show "D original" here instead.)
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("(none)"),
-			).
-			PressEscape()
-
-		// The working tree is clean; the original file is back at HEAD.
-		t.Views().Files().
-			IsEmpty()
-	},
-})
@@ -1,60 +0,0 @@
-package patch_building
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-// note: this is required to simulate the clipboard during CI
-func expectClipboard(t *TestDriver, matcher *TextMatcher) {
-	defer t.Shell().DeleteFile("clipboard")
-
-	t.FileSystem().FileContent("clipboard", matcher)
-}
-
-var CopyRenamedFileDiff = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Copy the diff of a renamed file to the clipboard; the diff shows the rename rather than a delete and add",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard"
-	},
-	SetupRepo: func(shell *Shell) {
-		shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n")
-		shell.Commit("first commit")
-
-		shell.RenameFileInGit("original", "renamed")
-		shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n")
-		shell.Commit("rename with modification")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("rename with modification").IsSelected(),
-				Contains("first commit"),
-			).
-			PressEnter()
-
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("original → renamed").IsSelected(),
-			).
-			Press(keys.Files.CopyFileInfoToClipboard)
-
-		t.ExpectPopup().Menu().
-			Title(Equals("Copy to clipboard")).
-			Select(Contains("Diff of selected file")).
-			Confirm()
-
-		t.ExpectToast(Contains("File diff copied to clipboard"))
-
-		expectClipboard(t,
-			Contains("rename from original").
-				Contains("rename to renamed").
-				Contains("-line2").
-				Contains("+line2 changed"),
-		)
-	},
-})
@@ -1,66 +0,0 @@
-package patch_building
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var RenameSimilarityThresholdChange = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Changing the rename similarity threshold refreshes the commit files panel, but is disabled while building a patch",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		shell.CreateFileAndAdd("original", "one\ntwo\nthree\nfour\nfive\n")
-		shell.Commit("add original")
-
-		shell.RenameFileInGit("original", "renamed")
-		shell.UpdateFileAndAdd("renamed", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n")
-		shell.Commit("change name and contents")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("change name and contents").IsSelected(),
-				Contains("add original"),
-			).
-			PressEnter()
-
-		// At the default threshold of 50% the 50%-similar change is not detected
-		// as a rename.
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Equals("▼ /"),
-				Equals("  D original"),
-				Equals("  A renamed"),
-			).
-			// Lowering the threshold turns it into a rename; the panel refreshes.
-			Press(keys.Universal.DecreaseRenameSimilarityThreshold).
-			Tap(func() {
-				t.ExpectToast(Equals("Changed rename similarity threshold to 45%"))
-			}).
-			Lines(
-				Equals("R original → renamed"),
-			).
-			// Start building a patch from the renamed file.
-			PressPrimaryAction().
-			Tap(func() {
-				t.Views().Information().Content(Contains("Building patch"))
-
-				// Changing the threshold is now disabled: the patch builder
-				// can't cope with the rename turning into a delete and add.
-				t.Views().CommitFiles().
-					Press(keys.Universal.IncreaseRenameSimilarityThreshold)
-				t.ExpectPopup().Alert().
-					Title(Equals("Error")).
-					Content(Contains("Cannot change the rename similarity threshold while in patch building mode")).
-					Confirm()
-			}).
-			// The file is unchanged: still a rename, still in the patch.
-			Lines(
-				Contains("original → renamed").IsSelected(),
-			)
-	},
-})
@@ -1,73 +0,0 @@
-package patch_building
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var RenamedFilePartial = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Select part of a renamed file's changes into a custom patch and remove it from the commit, keeping the rename in place",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n")
-		shell.Commit("first commit")
-
-		shell.RenameFileInGit("original", "renamed")
-		shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n")
-		shell.Commit("rename with modification")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("rename with modification").IsSelected(),
-				Contains("first commit"),
-			).
-			PressEnter()
-
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("original → renamed").IsSelected(),
-			).
-			PressEnter()
-
-		// The main view shows the rename together with its content change.
-		t.Views().PatchBuilding().
-			IsFocused().
-			Content(Contains("rename from original").Contains("rename to renamed")).
-			ContainsLines(
-				Contains(" line1"),
-				Contains("-line2"),
-				Contains("+line2 changed"),
-				Contains(" line3"),
-			).
-			// Add the hunk (a line selection, as opposed to adding the whole
-			// file), so this is a partial patch.
-			PressPrimaryAction()
-
-		t.Views().Information().Content(Contains("Building patch"))
-
-		t.Common().SelectPatchOption(Contains("Remove patch from original commit"))
-
-		// The rename is preserved; only the content change is gone, so the file
-		// is still shown as a rename but now has no content change.
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("original → renamed").IsSelected(),
-			)
-
-		t.Views().Main().
-			Content(DoesNotContain("line2 changed"))
-
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("rename with modification").IsSelected(),
-				Contains("first commit"),
-			)
-	},
-})
@@ -1,62 +0,0 @@
-package patch_building
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var RenamedFileWhole = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Add a whole renamed file to a custom patch and remove it from the commit, taking the rename with it",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		shell.CreateFileAndAdd("original", "line1\nline2\nline3\nline4\nline5\n")
-		shell.Commit("first commit")
-
-		shell.RenameFileInGit("original", "renamed")
-		shell.UpdateFileAndAdd("renamed", "line1\nline2 changed\nline3\nline4\nline5\n")
-		shell.Commit("rename with modification")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("rename with modification").IsSelected(),
-				Contains("first commit"),
-			).
-			PressEnter()
-
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("original → renamed").IsSelected(),
-			).
-			PressPrimaryAction()
-
-		t.Views().Information().Content(Contains("Building patch"))
-
-		// The whole file is added, so the patch carries the rename itself.
-		t.Views().Secondary().
-			ContainsLines(
-				Contains("rename from original"),
-				Contains("rename to renamed"),
-			)
-
-		t.Common().SelectPatchOption(Contains("Remove patch from original commit"))
-
-		// The rename went with the patch, so the commit no longer touches the file.
-		t.Views().CommitFiles().
-			IsFocused().
-			Lines(
-				Contains("(none)"),
-			)
-
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("rename with modification").IsSelected(),
-				Contains("first commit"),
-			)
-	},
-})
@@ -128,7 +128,6 @@ var tests = []*components.IntegrationTest{
 	commit.CreateTag,
 	commit.DisableCopyCommitMessageBody,
 	commit.DiscardOldFileChanges,
-	commit.DiscardRenamedFile,
 	commit.DiscardSubmoduleChanges,
 	commit.DoNotShowBranchMarkerForHeadCommit,
 	commit.FailHooksThenCommitNoHooks,
@@ -352,7 +351,6 @@ var tests = []*components.IntegrationTest{
 	patch_building.ApplyInReverseWithConflict,
 	patch_building.ApplyWithModifiedFileConflict,
 	patch_building.ApplyWithModifiedFileNoConflict,
-	patch_building.CopyRenamedFileDiff,
 	patch_building.DiscardLinesFromCommit,
 	patch_building.EditLineInPatchBuildingPanel,
 	patch_building.MoveRangeToIndex,
@@ -375,9 +373,6 @@ var tests = []*components.IntegrationTest{
 	patch_building.MoveToNewCommitPartialHunk,
 	patch_building.RemoveFromCommit,
 	patch_building.RemovePartsOfAddedFile,
-	patch_building.RenameSimilarityThresholdChange,
-	patch_building.RenamedFilePartial,
-	patch_building.RenamedFileWhole,
 	patch_building.ResetWithEscape,
 	patch_building.SelectAllFiles,
 	patch_building.SpecificSelection,
@@ -337,7 +337,7 @@
          },
          "type": "array",
          "uniqueItems": true,
-          "description": "list of branches that are considered 'main' branches, used when displaying commits",
+          "description": "list of branches that are considered 'main' branches, used when displaying 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).",
          "default": [
            "master",
            "main"
@@ -321,7 +321,7 @@
            "$ref": "#/$defs/PagingConfig"
          },
          "type": "array",
-          "description": "Array of pagers. Each entry has the following format:\n\n  # A name for the pager, shown in the notification when cycling pagers.\n  # If not set, the name is derived from the first word of the pager\n  # command (or of the external diff command).\n  name: \"\"\n\n  # Value of the --color arg in the git diff command. Some pagers want\n  # this to be set to 'always' and some want it set to 'never'\n  colorArg: \"always\"\n\n  # e.g.\n  # diff-so-fancy\n  # delta --dark --paging=never\n  # ydiff -p cat -s --wrap --width={{columnWidth}}\n  pager: \"\"\n\n  # e.g. 'difft --color=always'\n  externalDiffCommand: \"\"\n\n  # If true, Lazygit will use git's `diff.external` config for paging.\n  # The advantage over `externalDiffCommand` is that this can be\n  # configured per file type in .gitattributes; see\n  # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.\n  useExternalDiffGitConfig: false\n\n'pager', 'externalDiffCommand', and 'useExternalDiffGitConfig' are mutually exclusive; set at most one per entry.\n\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md for more information."
+          "description": "Array of pagers. Each entry has the following format:\n\n  # Value of the --color arg in the git diff command. Some pagers want\n  # this to be set to 'always' and some want it set to 'never'\n  colorArg: \"always\"\n\n  # e.g.\n  # diff-so-fancy\n  # delta --dark --paging=never\n  # ydiff -p cat -s --wrap --width={{columnWidth}}\n  pager: \"\"\n\n  # e.g. 'difft --color=always'\n  externalDiffCommand: \"\"\n\n  # If true, Lazygit will use git's `diff.external` config for paging.\n  # The advantage over `externalDiffCommand` is that this can be\n  # configured per file type in .gitattributes; see\n  # https://git-scm.com/docs/gitattributes#_defining_an_external_diff_driver.\n  useExternalDiffGitConfig: false\n\nSee https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md for more information."
        },
        "commit": {
          "$ref": "#/$defs/CommitConfig",
@@ -358,11 +358,6 @@
          "description": "If true, periodically refresh files and submodules",
          "default": true
        },
-        "autoDetectExternalChanges": {
-          "type": "boolean",
-          "description": "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.",
-          "default": true
-        },
        "autoForwardBranches": {
          "type": "string",
          "enum": [
@@ -590,40 +585,6 @@
          "description": "The weight of the expanded side panel, relative to the other panels. 2 means twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.",
          "default": 2
        },
-        "shrinkSidePanelsToContent": {
-          "type": "boolean",
-          "description": "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.",
-          "default": false
-        },
-        "sidePanels": {
-          "items": {
-            "$ref": "#/$defs/SidePanel"
-          },
-          "type": "array",
-          "description": "The side panels, in the order they appear from top to bottom.\nEach 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).\nOmit a name to hide it; give a name its own one-element list to promote a tab to a top-level panel.\nValid 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.",
-          "default": [
-            [
-              "status"
-            ],
-            [
-              "files",
-              "worktrees",
-              "submodules"
-            ],
-            [
-              "branches",
-              "remotes",
-              "tags"
-            ],
-            [
-              "commits",
-              "reflog"
-            ],
-            [
-              "stash"
-            ]
-          ]
-        },
        "mainPanelSplitMode": {
          "type": "string",
          "enum": [
@@ -1663,6 +1624,9 @@
        "branches": {
          "$ref": "#/$defs/KeybindingBranchesConfig"
        },
+        "worktrees": {
+          "$ref": "#/$defs/KeybindingWorktreesConfig"
+        },
        "commits": {
          "$ref": "#/$defs/KeybindingCommitsConfig"
        },
@@ -2883,20 +2847,6 @@
          ],
          "default": "n"
        },
-        "newWorktree": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          ],
-          "default": "w"
-        },
        "edit": {
          "oneOf": [
            {
@@ -3177,20 +3127,6 @@
          ],
          "default": "|"
        },
-        "cyclePagersReverse": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          ],
-          "default": "\\"
-        },
        "undo": {
          "oneOf": [
            {
@@ -3404,8 +3340,14 @@
            }
          ],
          "default": "\u003cctrl+t\u003e"
-        },
-        "editConfig": {
+        }
+      },
+      "additionalProperties": false,
+      "type": "object"
+    },
+    "KeybindingWorktreesConfig": {
+      "properties": {
+        "viewWorktreeOptions": {
          "oneOf": [
            {
              "type": "string"
@@ -3417,7 +3359,7 @@
              "type": "array"
            }
          ],
-          "default": "\u003calt+shift+c\u003e"
+          "default": "w"
        }
      },
      "additionalProperties": false,
@@ -3546,10 +3488,6 @@
    },
    "PagingConfig": {
      "properties": {
-        "name": {
-          "type": "string",
-          "description": "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)."
-        },
        "colorArg": {
          "type": "string",
          "enum": [
@@ -3583,45 +3521,21 @@
      "properties": {
        "refreshInterval": {
          "type": "integer",
-          "exclusiveMinimum": 0,
+          "minimum": 0,
          "description": "File/submodule refresh interval in seconds.\nAuto-refresh can be disabled via option 'git.autoRefresh'.",
          "default": 10
        },
        "fetchInterval": {
          "type": "integer",
-          "exclusiveMinimum": 0,
+          "minimum": 0,
          "description": "Re-fetch interval in seconds.\nAuto-fetch can be disabled via option 'git.autoFetch'.",
          "default": 60
-        },
-        "externalChangeCheckInterval": {
-          "type": "integer",
-          "exclusiveMinimum": 0,
-          "description": "Interval in seconds at which lazygit polls for external ref changes (commits, branch updates, checkouts made outside lazygit).\nDetection can be disabled via option 'git.autoDetectExternalChanges'.",
-          "default": 2
        }
      },
      "additionalProperties": false,
      "type": "object",
      "description": "Background refreshes"
    },
-    "SidePanel": {
-      "items": {
-        "type": "string",
-        "enum": [
-          "status",
-          "files",
-          "worktrees",
-          "submodules",
-          "branches",
-          "remotes",
-          "tags",
-          "commits",
-          "reflog",
-          "stash"
-        ]
-      },
-      "type": "array"
-    },
    "SpinnerConfig": {
      "properties": {
        "frames": {
@@ -3830,10 +3744,6 @@
          "$ref": "#/$defs/GitConfig",
          "description": "Config relating to git"
        },
-        "worktree": {
-          "$ref": "#/$defs/WorktreeConfig",
-          "description": "Config relating to git worktrees"
-        },
        "update": {
          "$ref": "#/$defs/UpdateConfig",
          "description": "Periodic update checks"
@@ -3899,17 +3809,6 @@
      },
      "additionalProperties": false,
      "type": "object"
-    },
-    "WorktreeConfig": {
-      "properties": {
-        "defaultPath": {
-          "type": "string",
-          "description": "Default parent directory for new worktrees. It is offered as a candidate location alongside the parent directories of any worktrees you already have.\nA relative path is resolved against the repository's root directory, so \"../worktrees\" sits beside the repo and \".worktrees\" sits inside it.\nA leading \"~\" is expanded to your home directory, so \"~/worktrees\" works."
-        }
-      },
-      "additionalProperties": false,
-      "type": "object",
-      "description": "Config relating to git worktrees"
    }
  }
 }
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