Rename ctrl+o description to "Copy selected diff lines to clipboard"

In the staging panel it used to copy the selected text verbatim, but in the focused main view it copies the diff lines (that's also what the toast says), and now that the staging panel is gone, we can change the text to make it more specific.
Remove the last staging-panel language from tests
2026-10-03 12:36:57 -04:00 · 2026-10-01 17:28:30 +02:00 · 2026-10-01 17:28:30 +02:00 · 2026-10-01 17:28:30 +02:00 · 2026-10-01 17:28:30 +02:00 · 2026-10-01 17:28:30 +02:00
195 changed files with 1440 additions and 4715 deletions
@@ -135,7 +135,7 @@ Lazygit is not my fulltime job but it is a hefty part time job so if you want to

 ### Stage individual lines

-Press space on the selected line to stage it, or press `v` to start selecting a range of lines. You can also press `a` to select the entirety of the current hunk.
+Press `<enter>` on a changed file to focus its diff in the main view. Press `<space>` on the selected line to stage it, or press `v` to start selecting a range of lines. You can also press `a` to switch to hunk selection mode. When a file has both staged and unstaged changes, use `<tab>` to move between the two diff panes; the same actions stage or unstage the selection depending on the pane.

 ![stage_lines](../assets/demo/stage_lines-compressed.gif)

@@ -195,7 +195,7 @@ You can create worktrees to have multiple branches going at once without the nee

 You can build a custom patch from an old commit and then remove the patch from the commit, split out a new commit, apply the patch in reverse to the index, and more.

-In this example we have a redundant comment that we want to remove from an old commit. We hit `<enter>` on the commit to view its files, then `<enter>` on a file to focus the patch, then `<space>` to add the comment line to our custom patch, and then `ctrl+p` to view the custom patch options; selecting to remove the patch from the current commit.
+In this example we have a redundant comment that we want to remove from an old commit. We hit `<enter>` on the commit to view its files, then `<enter>` on a file to focus its diff. From there, `<space>` adds the selected comment line to the custom patch and `ctrl+p` opens the custom patch options, where we choose to remove the patch from the original commit.

 Learn more in the [Rebase magic Youtube tutorial](https://youtu.be/4XaToVut_hs).

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

-  # If true, do not show a warning when discarding changes in the staging view.
+  # If true, do not show a warning when discarding changes from a focused diff.
  skipDiscardChangeWarning: false

  # If true, do not show warning when applying/popping the stash
@@ -142,14 +142,13 @@ gui:
  # - 'top': split the window vertically (side panel on top, main view below)
  enlargedSideViewLocation: left

-  # If true, wrap lines in the staging view to the width of the view. This makes
-  # it much easier to work with diffs that have long lines, e.g. paragraphs of
+  # If true, wrap lines in focused diffs to the width of the view. This makes it
+  # much easier to work with diffs that have long lines, e.g. paragraphs of
  # markdown text.
-  wrapLinesInStagingView: true
+  wrapLinesInDiffView: true

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

  # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko'
  # | 'ru' | 'pt'
@@ -937,7 +936,7 @@ It is used, for example, when pasting a commit message into the commit message p

 ## Configuring File Editing

-There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file if you invoke it from the staging panel, for example.
+There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file when you invoke it from a focused diff.

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

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

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

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

 ## Filtering

@@ -31,7 +31,6 @@
 * `pkg/gui/keybindings`: Contains code for mapping between keybindings and their labels
 * `pkg/gui/mergeconflicts`: Contains code relating to the handling of merge conflicts
 * `pkg/gui/modes`: Contains code relating to the state of different modes e.g. cherry picking mode, rebase mode.
-* `pkg/gui/patch_exploring`: Contains code relating to the state of patch-oriented views like the staging view.
 * `pkg/gui/popup`: Contains code that lets you easily raise popups
 * `pkg/gui/presentation`: Contains presentation code i.e. code concerned with rendering content inside views
 * `pkg/gui/services/custom_commands`: Contains code related to user-defined custom commands.
@@ -65,7 +65,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -149,7 +149,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | View stash options | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Stage all | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage lines / Collapse directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
+| `` <enter> `` | Focus file diff / Collapse directory | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
 | `` d `` | Discard | View options for discarding changes to the selected file. |
 | `` g `` | View upstream reset options |  |
 | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
@@ -222,14 +222,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Scroll down |  |
 | `` <mouse wheel up> (fn+down) `` | Scroll up |  |
-| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Edit file | Open file in external editor. |
 | `` <space> `` | Stage | Toggle selection staged / unstaged. |
 | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Go to previous hunk |  |
 | `` <right>, l `` | Go to next hunk |  |
 | `` N `` | Go to previous file |  |
@@ -241,44 +241,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Search the current view by text |  |

-## Main panel (patch building)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Go to previous hunk |  |
-| `` <right>, l `` | Go to next hunk |  |
-| `` v `` | Toggle range select |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
-| `` o `` | Open file | Open file in default application. |
-| `` e `` | Edit file | Open file in external editor. |
-| `` <space> `` | Toggle lines in patch |  |
-| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
-| `` <esc> `` | Exit custom patch builder |  |
-| `` / `` | Search the current view by text |  |
-
-## Main panel (staging)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Go to previous hunk |  |
-| `` <right>, l `` | Go to next hunk |  |
-| `` v `` | Toggle range select |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
-| `` <space> `` | Stage | Toggle selection staged / unstaged. |
-| `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | Open file | Open file in default application. |
-| `` e `` | Edit file | Open file in external editor. |
-| `` <esc> `` | Return to files panel |  |
-| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | Commit | Commit staged changes. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` C `` | Commit changes using git editor |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Search the current view by text |  |
-
 ## Menu

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

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Edit file | Open file in external editor. |
 | `` <space> `` | Stage | Toggle selection staged / unstaged. |
 | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Go to previous hunk |  |
 | `` <right>, l `` | Go to next hunk |  |
 | `` N `` | Go to previous file |  |
@@ -114,7 +114,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 外部差分ツールを開く（git difftool） |  |
 | `` <space> `` | パッチに含めるファイルを切り替え | ファイルがカスタムパッチに含まれるかどうかを切り替えます。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 |
 | `` a `` | すべてのファイルを切り替え | コミットのすべてのファイルをカスタムパッチに追加/削除します。https://github.com/jesseduffield/lazygit#rebase-magic-custom-patchesを参照してください。 |
-| `` <enter> `` | ファイルに入る / ディレクトリの折りたたみを切り替える | ファイルが選択されている場合、そのファイルに入ってカスタムパッチに個々の行を追加/削除できます。ディレクトリが選択されている場合、ディレクトリを切り替えます。 |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | ファイルツリービューを切り替え | ファイル表示をフラット表示とツリー表示で切り替えます。フラット表示はすべてのファイルパスを一覧で表示し、ツリー表示はディレクトリごとにファイルをグループ化します。<br><br>デフォルトは設定ファイル内の 'gui.showFileTree' キーで変更できます。 |
 | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます |
 | `` = `` | すべてのファイルを展開 | ファイルツリー内のすべてのディレクトリを展開します |
@@ -191,14 +191,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 範囲選択を切り替え |  |
 | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
 | `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
 | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
 | `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
-| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 前のハンクに移動 |  |
 | `` <right>, l `` | 次のハンクに移動 |  |
 | `` N `` | Go to previous file |  |
@@ -259,44 +259,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` 0 `` | メインビューにフォーカス |  |
 | `` / `` | 現在のビューをテキストでフィルタリング |  |

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

 | Key | Action | Info |
@@ -319,14 +281,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 下にスクロール |  |
 | `` <mouse wheel up> (fn+down) `` | 上にスクロール |  |
-| `` <tab> `` | ビューを切り替え | 他のビュー（ステージされた変更/ステージされていない変更）に切り替えます。 |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | ハンクの選択を切り替える | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 範囲選択を切り替え |  |
 | `` e `` | ファイルを編集 | 外部エディタでファイルを開きます。 |
 | `` <space> `` | ステージ | 選択された部分のステージ / アンステージを切り替えます。 |
 | `` d `` | 破棄 | ステージされていない変更が選択されている場合、`git reset`を使用して変更を破棄します。ステージされた変更が選択されている場合、変更をアンステージします。 |
 | `` E `` | ハンクを編集 | 選択したハンクを外部エディタで編集します。 |
-| `` <ctrl+o> `` | 選択したテキストをクリップボードにコピー |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 前のハンクに移動 |  |
 | `` <right>, l `` | 次のハンクに移動 |  |
 | `` N `` | Go to previous file |  |
@@ -83,14 +83,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 드래그 선택 전환 |  |
 | `` e `` | 파일 편집 | Open file in external editor. |
 | `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
 | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 이전 hunk를 선택 |  |
 | `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` N `` | Go to previous file |  |
@@ -176,14 +176,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 아래로 스크롤 |  |
 | `` <mouse wheel up> (fn+down) `` | 위로 스크롤 |  |
-| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | 드래그 선택 전환 |  |
 | `` e `` | 파일 편집 | Open file in external editor. |
 | `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
 | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 이전 hunk를 선택 |  |
 | `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` N `` | Go to previous file |  |
@@ -195,44 +195,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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> |
 | `` / `` | 검색 시작 |  |

-## 메인 패널 (Patch Building)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | 이전 hunk를 선택 |  |
-| `` <right>, l `` | 다음 hunk를 선택 |  |
-| `` v `` | 드래그 선택 전환 |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` <space> `` | Line(s)을 패치에 추가/삭제 |  |
-| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
-| `` <esc> `` | Exit custom patch builder |  |
-| `` / `` | 검색 시작 |  |
-
-## 메인 패널 (Staging)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | 이전 hunk를 선택 |  |
-| `` <right>, l `` | 다음 hunk를 선택 |  |
-| `` v `` | 드래그 선택 전환 |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | 선택한 텍스트를 클립보드에 복사 |  |
-| `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
-| `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | 파일 닫기 | Open file in default application. |
-| `` e `` | 파일 편집 | Open file in external editor. |
-| `` <esc> `` | 파일 목록으로 돌아가기 |  |
-| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
-| `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
-| `` w `` | Commit changes without pre-commit hook |  |
-| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | 검색 시작 |  |
-
 ## 브랜치

 | Key | Action | Info |
@@ -375,7 +337,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -425,7 +387,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Stash 옵션 보기 | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | 모든 변경을 Staged/unstaged으로 전환 | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
+| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
 | `` d `` | View 'discard changes' options | View options for discarding changes to the selected file. |
 | `` g `` | View upstream reset options |  |
 | `` D `` | 초기화 | View reset options for working tree (e.g. nuking the working tree). |
@@ -72,7 +72,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Bekijk stash opties | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Toggle staged alle | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
+| `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
 | `` 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). |
@@ -144,7 +144,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open externe diff applicatie (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. |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | 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 |
@@ -230,14 +230,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Scroll omlaag |  |
 | `` <mouse wheel up> (fn+down) `` | Scroll omhoog |  |
-| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
 | `` v `` | Toggle drag selecteer |  |
 | `` e `` | Verander bestand | Open bestand in externe editor. |
 | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
 | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` N `` | Go to previous file |  |
@@ -249,22 +249,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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> |
 | `` / `` | Start met zoeken |  |

-## Patch bouwen
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Selecteer de vorige hunk |  |
-| `` <right>, l `` | Selecteer de volgende hunk |  |
-| `` v `` | Toggle drag selecteer |  |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
-| `` o `` | Open bestand | Open bestand in standaardapplicatie. |
-| `` e `` | Verander bestand | Open bestand in externe editor. |
-| `` <space> `` | Voeg toe/verwijder lijn(en) in patch |  |
-| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
-| `` <esc> `` | Sluit lijn-bij-lijn modus |  |
-| `` / `` | Start met zoeken |  |
-
 ## Reflog

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

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
 | `` v `` | Toggle drag selecteer |  |
 | `` e `` | Verander bestand | Open bestand in externe editor. |
 | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
 | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Edit hunk | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Copy selected text to clipboard |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Selecteer de vorige hunk |  |
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` N `` | Go to previous file |  |
@@ -339,28 +323,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <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> |
 | `` / `` | Start met zoeken |  |

-## Staging
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Selecteer de vorige hunk |  |
-| `` <right>, l `` | Selecteer de volgende hunk |  |
-| `` v `` | Toggle drag selecteer |  |
-| `` a `` | Wissel tussen hunk selectie aan of uit | Wissel tussen regel-voor-regel of hunk selectie modus. |
-| `` <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. |
-| `` <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. |
-| `` 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> |
-| `` / `` | Start met zoeken |  |
-
 ## Stash

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

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Przełącz zaznaczenie zakresu |  |
 | `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
 | `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
 | `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
 | `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Idź do poprzedniego fragmentu |  |
 | `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` N `` | Go to previous file |  |
@@ -147,22 +147,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | Pokaż commity |  |
 | `` / `` | Filtruj bieżący widok po tekście |  |

-## Główny panel (budowanie łatki)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Idź do poprzedniego fragmentu |  |
-| `` <right>, l `` | Idź do następnego fragmentu |  |
-| `` v `` | Przełącz zaznaczenie zakresu |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
-| `` o `` | Otwórz plik | Otwórz plik w domyślnej aplikacji. |
-| `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
-| `` <space> `` | Przełącz linie w łatce |  |
-| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
-| `` <esc> `` | Wyjdź z budowniczego niestandardowej łatki |  |
-| `` / `` | Szukaj w bieżącym widoku po tekście |  |
-
 ## Input prompt

 | Key | Action | Info |
@@ -215,14 +199,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Przewiń w dół |  |
 | `` <mouse wheel up> (fn+down) `` | Przewiń w górę |  |
-| `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Przełącz zaznaczenie zakresu |  |
 | `` e `` | Edytuj plik | Otwórz plik w zewnętrznym edytorze. |
 | `` <space> `` | Zatwierdź | Przełącz zaznaczenie zatwierdzone/niezatwierdzone. |
 | `` d `` | Odrzuć | Gdy zaznaczona jest niezatwierdzona zmiana, odrzuć ją używając `git reset`. Gdy zaznaczona jest zatwierdzona zmiana, cofnij zatwierdzenie. |
 | `` E `` | Edytuj fragment | Edytuj wybrany fragment w zewnętrznym edytorze. |
-| `` <ctrl+o> `` | Kopiuj zaznaczony tekst do schowka |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Idź do poprzedniego fragmentu |  |
 | `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` N `` | Go to previous file |  |
@@ -250,28 +234,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Wróć do panelu plików |  |

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

 | Key | Action | Info |
@@ -326,7 +288,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Otwórz zewnętrzne narzędzie różnic (git difftool) |  |
 | `` <space> `` | Przełącz plik włączony w łatkę | Przełącz, czy plik jest włączony w niestandardową łatkę. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Przełącz wszystkie pliki | Dodaj/usuń wszystkie pliki commita do niestandardowej łatki. Zobacz https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Wejdź do pliku / Przełącz zwiń katalog | Jeśli plik jest wybrany, wejdź do pliku, aby móc dodawać/usuwać poszczególne linie do niestandardowej łatki. Jeśli wybrany jest katalog, przełącz katalog. |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | Przełącz widok drzewa plików | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -148,7 +148,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Abrir ferramenta de diff externa (git difftool) |  |
 | `` <space> `` | Alternar entre o arquivo incluído no patch | Alternar se o arquivo está incluído no patch personalizado. Veja https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Alternar todos os arquivos | Adicionar/remover todos os arquivos de commit para atualização personalizada. Consulte https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Insira o arquivo / Alternar diretório recolhido | Se um arquivo estiver selecionado, insira o arquivo para que você possa adicionar/remover linhas individuais no patch personalizado. Se um diretório for selecionado, ative o diretório. |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | Alternar exibição de árvore de arquivo | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos |
 | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo |
@@ -234,14 +234,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Rolar para baixo |  |
 | `` <mouse wheel up> (fn+down) `` | Rolar para cima |  |
-| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
 | `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
 | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
 | `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Ir para o local anterior |  |
 | `` <right>, l `` | Ir para o próximo trecho |  |
 | `` N `` | Go to previous file |  |
@@ -253,28 +253,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado<br>Veja a documentação:<br><https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Pesquisar na visualização atual por texto |  |

-## Painel Principal (preparação)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Ir para o local anterior |  |
-| `` <right>, l `` | Ir para o próximo trecho |  |
-| `` v `` | Toggle range select |  |
-| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
-| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
-| `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
-| `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
-| `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
-| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
-| `` <esc> `` | Retornar ao painel de arquivos |  |
-| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
-| `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` c `` | Commit | Submeter mudanças em staging |
-| `` w `` | Fazer commit de alterações sem pré-commit |  |
-| `` C `` | Enviar alteração usando um editor Git |  |
-| `` <ctrl+f> `` | Encontrar commit da base para corrigir | Encontre o commit em que as suas mudanças atuais estão se baseando, para alterar/consertar o commit. Isso poupa-te você de ter que olhar pelos commits da sua branch um por um para ver qual commit deve ser alterado/consertado<br>Veja a documentação:<br><https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Pesquisar na visualização atual por texto |  |
-
 ## Painel de confirmação

 | Key | Action | Info |
@@ -299,22 +277,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Retornar ao painel de arquivos |  |

-## Painel principal (patch build)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Ir para o local anterior |  |
-| `` <right>, l `` | Ir para o próximo trecho |  |
-| `` v `` | Toggle range select |  |
-| `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
-| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
-| `` o `` | Abrir arquivo | Abrir arquivo no aplicativo padrão. |
-| `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
-| `` <space> `` | Alternar linhas no caminho |  |
-| `` d `` | Remover linhas do commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
-| `` <esc> `` | Sair do construtor de patch personalizado |  |
-| `` / `` | Pesquisar na visualização atual por texto |  |
-
 ## Reflog

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

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Ativa/desativa modo linha por linha vs. modo de seleção por partes. |
 | `` v `` | Toggle range select |  |
 | `` e `` | Editar arquivo | Abrir arquivo no editor externo. |
 | `` <space> `` | Etapa | Ativar/desativar seleção em staged/unstaged |
 | `` d `` | Descartar | Quando a mudança não desejada for selecionada, descarte a mudança usando `git reset`. Quando a mudança em fase é selecionada, despare a mudança. |
 | `` E `` | Editar hunk | Editar o local selecionado no editor externo. |
-| `` <ctrl+o> `` | Copiar texto selecionado para área de transferência |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Ir para o local anterior |  |
 | `` <right>, l `` | Ir para o próximo trecho |  |
 | `` N `` | Go to previous file |  |
@@ -73,14 +73,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Переключить выборку перетаскивания |  |
 | `` e `` | Редактировать файл | Open file in external editor. |
 | `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
 | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Выбрать предыдущую часть |  |
 | `` <right>, l `` | Выбрать следующую часть |  |
 | `` N `` | Go to previous file |  |
@@ -92,42 +92,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Найти |  |

-## Главная панель (Индексирование)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Выбрать предыдущую часть |  |
-| `` <right>, l `` | Выбрать следующую часть |  |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
-| `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
-| `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` <esc> `` | Вернуться к панели файлов |  |
-| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
-| `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` c `` | Сохранить изменения | Commit staged changes. |
-| `` w `` | Закоммитить изменения без предварительного хука коммита |  |
-| `` C `` | Сохранить изменения с помощью редактора git |  |
-| `` <ctrl+f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | Найти |  |
-
 ## Главная панель (Обычный)

 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | Прокрутить вниз |  |
 | `` <mouse wheel up> (fn+down) `` | Прокрутить вверх |  |
-| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
 | `` v `` | Переключить выборку перетаскивания |  |
 | `` e `` | Редактировать файл | Open file in external editor. |
 | `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
 | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
 | `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
-| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | Выбрать предыдущую часть |  |
 | `` <right>, l `` | Выбрать следующую часть |  |
 | `` N `` | Go to previous file |  |
@@ -155,22 +133,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | View merge conflict options | View options for resolving merge conflicts. |
 | `` <esc> `` | Вернуться к панели файлов |  |

-## Главная панель (сборка патчей)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | Выбрать предыдущую часть |  |
-| `` <right>, l `` | Выбрать следующую часть |  |
-| `` v `` | Переключить выборку перетаскивания |  |
-| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
-| `` <ctrl+o> `` | Скопировать выделенный текст в буфер обмена |  |
-| `` o `` | Открыть файл | Open file in default application. |
-| `` e `` | Редактировать файл | Open file in external editor. |
-| `` <space> `` | Добавить/удалить строку(и) для патча |  |
-| `` d `` | Remove lines from commit | Remove the selected lines from this commit. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes these lines. |
-| `` <esc> `` | Выйти из сборщика пользовательских патчей |  |
-| `` / `` | Найти |  |
-
 ## Журнал ссылок (Reflog)

 | Key | Action | Info |
@@ -334,7 +296,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | Open external diff tool (git difftool) |  |
 | `` <space> `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
 | `` a `` | Переключить все файлы, включённые в патч | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
-| `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | 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. |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
 | `` - `` | Collapse all files | Collapse all directories in the files tree |
 | `` = `` | Expand all files | Expand all directories in the file tree |
@@ -419,7 +381,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
 | `` S `` | Просмотреть параметры хранилища | View stash options (e.g. stash all, stash staged, stash unstaged). |
 | `` a `` | Все проиндексированные/непроиндексированные | Toggle staged/unstaged for all files in working tree. |
-| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
+| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it. |
 | `` d `` | Просмотреть параметры «отмены изменении» | View options for discarding changes to the selected file. |
 | `` g `` | Просмотреть параметры сброса upstream-ветки |  |
 | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
@@ -178,7 +178,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 使用外部差异比较工具(git difftool) |  |
 | `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。 |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
 | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
 | `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
@@ -249,22 +249,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <enter> `` | 查看提交 |  |
 | `` / `` | 通过文本过滤当前视图 |  |

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

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

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` v `` | 切换拖动选择 |  |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
 | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
 | `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
-| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 选择上一个区块 |  |
 | `` <right>, l `` | 选择下一个区块 |  |
 | `` N `` | Go to previous file |  |
@@ -320,42 +304,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | 查看合并冲突选项 | 查看用于解决合并冲突的选项。 |
 | `` <esc> `` | 返回文件面板 |  |

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

 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下滚动 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上滚动 |  |
-| `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | 切换代码块选择 | 切换逐行选择与代码块选择模式。 |
 | `` v `` | 切换拖动选择 |  |
 | `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
 | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
 | `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
 | `` E `` | 编辑代码块 | 在外部编辑器中编辑选中的代码块 |
-| `` <ctrl+o> `` | 复制选中文本到剪贴板 |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 选择上一个区块 |  |
 | `` <right>, l `` | 选择下一个区块 |  |
 | `` N `` | Go to previous file |  |
@@ -52,36 +52,20 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` ] `` | 下一個索引標籤 |  |
 | `` [ `` | 上一個索引標籤 |  |

-## 主面板 (補丁生成)
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | 選擇上一段 |  |
-| `` <right>, l `` | 選擇下一段 |  |
-| `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
-| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
-| `` o `` | 開啟檔案 | 使用預設軟體開啟 |
-| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
-| `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  |
-| `` d `` | 從提交中移除行 | 從本次提交中移除所選行。此操作會在背景執行互動式變基，因此如果後續提交也修改了這些行，您可能會遇到合併衝突。 |
-| `` <esc> `` | 退出自訂補丁建立器 |  |
-| `` / `` | 搜尋 |  |
-
 ## 主面板（一般）

 | Key | Action | Info |
 |-----|--------|-------------|
 | `` <mouse wheel down> (fn+up) `` | 向下捲動 |  |
 | `` <mouse wheel up> (fn+down) `` | 向上捲動 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
 | `` v `` | 切換拖曳選擇 |  |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
 | `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
 | `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` N `` | Go to previous file |  |
@@ -109,28 +93,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` M `` | 檢視合併衝突選項 | 檢視用於解決合併衝突的選項。 |
 | `` <esc> `` | 返回檔案面板 |  |

-## 主面板（預存）
-
-| Key | Action | Info |
-|-----|--------|-------------|
-| `` <left>, h `` | 選擇上一段 |  |
-| `` <right>, l `` | 選擇下一段 |  |
-| `` v `` | 切換拖曳選擇 |  |
-| `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
-| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
-| `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
-| `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
-| `` o `` | 開啟檔案 | 使用預設軟體開啟 |
-| `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
-| `` <esc> `` | 返回檔案面板 |  |
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
-| `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` c `` | 提交變更 | 提交暫存區變更 |
-| `` w `` | 沒有預提交 hook 就提交更改 |  |
-| `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <ctrl+f> `` | 尋找 fixup 的基礎提交 | 找出目前變更所依據的提交，以便 amend/fixup。這樣不必逐一檢視分支中的提交來找出要 amend/fixup 的提交。請見文件：<https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
-| `` / `` | 搜尋 |  |
-
 ## 功能表

 | Key | Action | Info |
@@ -245,7 +207,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <ctrl+t> `` | 開啟外部差異工具 (git difftool) |  |
 | `` <space> `` | 切換檔案是否包含在補丁中 | 切換檔案是否包含在自定義補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
 | `` a `` | 切換所有檔案是否包含在補丁中 | 新增或刪除所有提交中的檔案到自定義的補丁中。請參閱 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
-| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | 如果已選擇一個檔案，則Enter進入該檔案，以便您可以向自定義補丁新增/刪除單獨的行。如果選擇了目錄，則切換目錄。 |
+| `` <enter> `` | Focus file diff / Toggle directory | If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it. |
 | `` ` `` | 顯示檔案樹狀視圖 | 在平面佈局和樹佈局之間切換檔案檢視。平面佈局在單個列表中顯示所有檔案路徑，樹佈局按目錄分組檔案。<br><br>可以在設定檔中使用 'gui.showFileTree' 鍵更改預設設定。 |
 | `` - `` | 摺疊全部檔案 | 摺疊檔案樹中的全部目錄 |
 | `` = `` | 展開全部檔案 | 展開檔案樹中的全部目錄 |
@@ -370,14 +332,14 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct

 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | 切換到其他檢視（已暫存/未暫存的變更）。 |
+| `` <tab> `` | Switch diff pane | Switch to the other focused diff pane. |
 | `` a `` | 切換程式碼塊選擇 | 切換逐行選擇與程式碼塊選擇模式。 |
 | `` v `` | 切換拖曳選擇 |  |
 | `` e `` | 編輯檔案 | 使用外部編輯器開啟 |
 | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
 | `` d `` | 刪除變更 (git reset) | 選取未暫存的變更時，使用 `git reset` 捨棄變更。選取已暫存的變更時，取消暫存變更。 |
 | `` E `` | 編輯程式碼塊 | 在外部編輯器中編輯選中的程式碼塊。 |
-| `` <ctrl+o> `` | 複製所選文本至剪貼簿 |  |
+| `` <ctrl+o> `` | Copy selected diff lines to clipboard |  |
 | `` <left>, h `` | 選擇上一段 |  |
 | `` <right>, l `` | 選擇下一段 |  |
 | `` N `` | Go to previous file |  |
@@ -152,9 +152,6 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes

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

 		// Preserve the changes that the test setup just made to the config, so
 		// they don't get lost when we reload the config while running the test
@@ -120,9 +120,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"prompt":            tr.PromptTitle,
 		"information":       tr.InformationTitle,
 		"main":              tr.NormalTitle,
-		"patchBuilding":     tr.PatchBuildingTitle,
 		"mergeConflicts":    tr.MergingTitle,
-		"staging":           tr.StagingTitle,
 		"menu":              tr.MenuTitle,
 		"search":            tr.SearchTitle,
 		"secondary":         tr.SecondaryTitle,
@@ -141,12 +139,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 }

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

@@ -265,17 +265,3 @@ func (self *Patch) AdjustLineNumber(lineNumber int) int {

 	return adjustedLineNumber
 }
-
-func (self *Patch) IsSingleHunkForWholeFile() bool {
-	if len(self.hunks) != 1 {
-		return false
-	}
-
-	// We consider a patch to be a single hunk for the whole file if it has only additions or
-	// deletions but not both, and no context lines. This not quite correct, because it will also
-	// return true for a block of added or deleted lines if the diff context size is 0, but in this
-	// case you wouldn't be able to stage things anyway, so it doesn't matter.
-	bodyLines := self.hunks[0].bodyLines
-	return nLinesWithKind(bodyLines, []PatchLineKind{DELETION, CONTEXT}) == 0 ||
-		nLinesWithKind(bodyLines, []PatchLineKind{ADDITION, CONTEXT}) == 0
-}
@@ -442,16 +442,22 @@ func ChangeLineIndicesForLines(parsed *Patch, lines []LineIdentity) []int {
 }

 // PatchLineIndicesForLines maps change lines of filename to their indices in that
-// file's diff, which is what the patch is built in terms of.
+// file's diff; the patch is built in terms of those indices. everyChange reports
+// whether the given lines cover all of the file's changes; this distinguishes acting
+// on some of a file's lines from acting on the file itself.
 func (p *PatchBuilder) PatchLineIndicesForLines(
 	filename string, previousPath string, lines []LineIdentity,
-) ([]int, error) {
+) (indices []int, everyChange bool, err error) {
 	info, err := p.getFileInfo(filename, previousPath)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}

-	return ChangeLineIndicesForLines(Parse(info.diff), lines), nil
+	parsed := Parse(info.diff)
+	selected := set.NewFromSlice(lines)
+	everyChange = lo.EveryBy(maps.Keys(ChangeLineIndexByIdentity(parsed)),
+		func(identity LineIdentity) bool { return selected.Includes(identity) })
+	return ChangeLineIndicesForLines(parsed, lines), everyChange, nil
 }

 // IncludedLineIdentities says which change lines of filename are in the patch, as the
@@ -26,13 +26,14 @@ func newTestPatchBuilder(diff string) *PatchBuilder {
 func TestPatchLineIndicesForLines(t *testing.T) {
 	patchBuilder := newTestPatchBuilder(simpleDiff)

-	indices, err := patchBuilder.PatchLineIndicesForLines("filename", "", []LineIdentity{
+	indices, everyChange, err := patchBuilder.PatchLineIndicesForLines("filename", "", []LineIdentity{
 		{LineNumber: 2, IsDeletion: true},  // -orange
 		{LineNumber: 2, IsDeletion: false}, // +grape
 		{LineNumber: 1, IsDeletion: false}, // " apple", a context line
 	})
 	assert.NoError(t, err)
 	assert.Equal(t, []int{6, 7}, indices, "the context line names no change line")
+	assert.True(t, everyChange, "the two changes are all the diff has")
 }

 // A renamed file's rename header makes its change lines sit further down the diff, and
@@ -40,12 +41,44 @@ func TestPatchLineIndicesForLines(t *testing.T) {
 func TestPatchLineIndicesForLinesOfARenamedFile(t *testing.T) {
 	patchBuilder := newTestPatchBuilder(renameWithModificationDiff)

-	indices, err := patchBuilder.PatchLineIndicesForLines("newname", "oldname", []LineIdentity{
+	indices, everyChange, err := patchBuilder.PatchLineIndicesForLines("newname", "oldname", []LineIdentity{
 		{LineNumber: 2, IsDeletion: true},  // -orange
 		{LineNumber: 2, IsDeletion: false}, // +grape
 	})
 	assert.NoError(t, err)
 	assert.Equal(t, []int{9, 10}, indices)
+	assert.True(t, everyChange)
+}
+
+// everyChange is about the diff alone: whether anything the file changes was left out
+// of the selection. What that then means for the patch is the caller's question.
+func TestPatchLineIndicesForLinesEveryChange(t *testing.T) {
+	patchBuilder := newTestPatchBuilder(newFile)
+
+	_, everyChange, err := patchBuilder.PatchLineIndicesForLines("newfile", "", []LineIdentity{
+		{LineNumber: 1},
+		{LineNumber: 2},
+	})
+	assert.NoError(t, err)
+	assert.False(t, everyChange, "the file's third added line is left out")
+
+	_, everyChange, err = patchBuilder.PatchLineIndicesForLines("newfile", "", []LineIdentity{
+		{LineNumber: 1},
+		{LineNumber: 2},
+		{LineNumber: 3},
+	})
+	assert.NoError(t, err)
+	assert.True(t, everyChange)
+
+	// A line the diff doesn't have doesn't stand in for one it does.
+	patchBuilder = newTestPatchBuilder(deletedFile)
+	_, everyChange, err = patchBuilder.PatchLineIndicesForLines("newfile", "", []LineIdentity{
+		{LineNumber: 1, IsDeletion: true},
+		{LineNumber: 2, IsDeletion: true},
+		{LineNumber: 4, IsDeletion: true},
+	})
+	assert.NoError(t, err)
+	assert.False(t, everyChange)
 }

 func TestIncludedLineIdentities(t *testing.T) {
@@ -921,64 +921,3 @@ func TestAdjustLineNumber(t *testing.T) {
 		})
 	}
 }
-
-func TestIsSingleHunkForWholeFile(t *testing.T) {
-	scenarios := []struct {
-		testName       string
-		patchStr       string
-		expectedResult bool
-	}{
-		{
-			testName:       "simpleDiff",
-			patchStr:       simpleDiff,
-			expectedResult: false,
-		},
-		{
-			testName:       "addNewlineToEndOfFile",
-			patchStr:       addNewlineToEndOfFile,
-			expectedResult: false,
-		},
-		{
-			testName:       "removeNewlinefromEndOfFile",
-			patchStr:       removeNewlinefromEndOfFile,
-			expectedResult: false,
-		},
-		{
-			testName:       "twoHunks",
-			patchStr:       twoHunks,
-			expectedResult: false,
-		},
-		{
-			testName:       "twoChangesInOneHunk",
-			patchStr:       twoChangesInOneHunk,
-			expectedResult: false,
-		},
-		{
-			testName:       "newFile",
-			patchStr:       newFile,
-			expectedResult: true,
-		},
-		{
-			testName:       "deletedFile",
-			patchStr:       deletedFile,
-			expectedResult: true,
-		},
-		{
-			testName:       "addNewlineToPreviouslyEmptyFile",
-			patchStr:       addNewlineToPreviouslyEmptyFile,
-			expectedResult: true,
-		},
-		{
-			testName:       "exampleHunk",
-			patchStr:       exampleHunk,
-			expectedResult: false,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			patch := Parse(s.patchStr)
-			assert.Equal(t, s.expectedResult, patch.IsSingleHunkForWholeFile())
-		})
-	}
-}
@@ -297,6 +297,8 @@ func computeMigratedConfig(path string, content []byte, changes *ChangesSet) ([]
 		{[]string{"keybinding", "universal", "cyclePagers"}, "cycleDiffRenderers"},
 		{[]string{"keybinding", "universal", "cyclePagersReverse"}, "cycleDiffRenderersReverse"},
 		{[]string{"gui", "windowSize"}, "screenMode"},
+		{[]string{"gui", "wrapLinesInStagingView"}, "wrapLinesInDiffView"},
+		{[]string{"gui", "useHunkModeInStagingView"}, "useHunkModeInDiffView"},
 		{[]string{"keybinding", "files", "openMergeTool"}, "openMergeOptions"},
 	}

@@ -898,11 +900,10 @@ func (c *AppConfig) SaveGlobalUserConfig() {
 // AppState stores data between runs of the app like when the last update check
 // was performed and which other repos have been checked out
 type AppState struct {
-	LastUpdateCheck        int64
-	RecentRepos            []string
-	StartupPopupVersion    int
-	DidShowHunkStagingHint bool
-	LastVersion            string // this is the last version the user was using, for the purpose of showing release notes
+	LastUpdateCheck     int64
+	RecentRepos         []string
+	StartupPopupVersion int
+	LastVersion         string // this is the last version the user was using, for the purpose of showing release notes

 	// these are for shell commands typed in directly, not for custom commands in the lazygit config.
 	// For backwards compatibility we keep the old name in yaml files.
@@ -108,6 +108,22 @@ func TestMigrationOfRenamedKeys(t *testing.T) {
 				"Renamed 'gui.windowSize' to 'screenMode'",
 			},
 		},
+		{
+			name: "Rename staging view options",
+			input: `gui:
+  wrapLinesInStagingView: false
+  useHunkModeInStagingView: true
+`,
+			expected: `gui:
+  wrapLinesInDiffView: false
+  useHunkModeInDiffView: true
+`,
+			expectedDidChange: true,
+			expectedChanges: []string{
+				"Renamed 'gui.wrapLinesInStagingView' to 'wrapLinesInDiffView'",
+				"Renamed 'gui.useHunkModeInStagingView' to 'useHunkModeInDiffView'",
+			},
+		},
 	}

 	for _, s := range scenarios {
@@ -87,7 +87,7 @@ type GuiConfig struct {
 	MouseEvents bool `yaml:"mouseEvents"`
 	// If true, do not show a warning when amending a commit.
 	SkipAmendWarning bool `yaml:"skipAmendWarning"`
-	// If true, do not show a warning when discarding changes in the staging view.
+	// If true, do not show a warning when discarding changes from a focused diff.
 	SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"`
 	// If true, do not show warning when applying/popping the stash
 	SkipStashWarning bool `yaml:"skipStashWarning"`
@@ -122,10 +122,10 @@ type GuiConfig struct {
 	// - 'left': split the window horizontally (side panel on the left, main view on the right)
 	// - 'top': split the window vertically (side panel on top, main view below)
 	EnlargedSideViewLocation string `yaml:"enlargedSideViewLocation"`
-	// If true, wrap lines in the staging view to the width of the view. This makes it much easier to work with diffs that have long lines, e.g. paragraphs of markdown text.
-	WrapLinesInStagingView bool `yaml:"wrapLinesInStagingView"`
-	// If true, hunk selection mode will be enabled by default when entering the staging view.
-	UseHunkModeInStagingView bool `yaml:"useHunkModeInStagingView"`
+	// If true, wrap lines in focused diffs to the width of the view. This makes it much easier to work with diffs that have long lines, e.g. paragraphs of markdown text.
+	WrapLinesInDiffView bool `yaml:"wrapLinesInDiffView"`
+	// If true, hunk selection mode will be enabled by default when focusing a diff.
+	UseHunkModeInDiffView bool `yaml:"useHunkModeInDiffView"`
 	// One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru' | 'pt'
 	Language string `yaml:"language" jsonschema:"enum=auto,enum=en,enum=zh-TW,enum=zh-CN,enum=pl,enum=nl,enum=ja,enum=ko,enum=ru"`
 	// Format used when displaying time e.g. commit time.
@@ -890,8 +890,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 			},
 			MainPanelSplitMode:       "flexible",
 			EnlargedSideViewLocation: "left",
-			WrapLinesInStagingView:   true,
-			UseHunkModeInStagingView: true,
+			WrapLinesInDiffView:      true,
+			UseHunkModeInDiffView:    true,
 			Language:                 "auto",
 			TimeFormat:               "02 Jan 06",
 			ShortTimeFormat:          time.Kitchen,
@@ -228,10 +228,6 @@ var ValidCustomCommandContexts = []string{
 	"stash",
 	"normal",
 	"normalSecondary",
-	"staging",
-	"stagingSecondary",
-	"patchBuilding",
-	"patchBuildingSecondary",
 	"mergeConflicts",
 	"menu",
 	"confirmation",
@@ -242,6 +242,10 @@ func TestUserConfigValidate_enums(t *testing.T) {
 				{value: "commits,subCommits", valid: true},
 				{value: "invalid_value", valid: false},
 				{value: "commits, invalid_value", valid: false},
+				// The staging and patch-building panels are gone, so a config that
+				// still names their contexts is reported rather than fatal.
+				{value: "staging", valid: false},
+				{value: "patchBuilding", valid: false},
 			},
 		},
 		{
@@ -350,18 +350,6 @@ func (self *ContextMgr) AllList() []types.IListContext {
 	return listContexts
 }

-func (self *ContextMgr) AllPatchExplorer() []types.IPatchExplorerContext {
-	var listContexts []types.IPatchExplorerContext
-
-	for _, context := range self.allContexts.Flatten() {
-		if listContext, ok := context.(types.IPatchExplorerContext); ok {
-			listContexts = append(listContexts, listContext)
-		}
-	}
-
-	return listContexts
-}
-
 func (self *ContextMgr) ContextForKey(key types.ContextKey) types.Context {
 	self.RLock()
 	defer self.RUnlock()
@@ -8,27 +8,23 @@ const (
 	// used as a nil value when passing a context key as an arg
 	NO_CONTEXT types.ContextKey = "none"

-	GLOBAL_CONTEXT_KEY                   types.ContextKey = "global"
-	STATUS_CONTEXT_KEY                   types.ContextKey = "status"
-	SNAKE_CONTEXT_KEY                    types.ContextKey = "snake"
-	FILES_CONTEXT_KEY                    types.ContextKey = "files"
-	LOCAL_BRANCHES_CONTEXT_KEY           types.ContextKey = "localBranches"
-	REMOTES_CONTEXT_KEY                  types.ContextKey = "remotes"
-	WORKTREES_CONTEXT_KEY                types.ContextKey = "worktrees"
-	REMOTE_BRANCHES_CONTEXT_KEY          types.ContextKey = "remoteBranches"
-	TAGS_CONTEXT_KEY                     types.ContextKey = "tags"
-	LOCAL_COMMITS_CONTEXT_KEY            types.ContextKey = "commits"
-	REFLOG_COMMITS_CONTEXT_KEY           types.ContextKey = "reflogCommits"
-	SUB_COMMITS_CONTEXT_KEY              types.ContextKey = "subCommits"
-	COMMIT_FILES_CONTEXT_KEY             types.ContextKey = "commitFiles"
-	STASH_CONTEXT_KEY                    types.ContextKey = "stash"
-	NORMAL_MAIN_CONTEXT_KEY              types.ContextKey = "normal"
-	NORMAL_SECONDARY_CONTEXT_KEY         types.ContextKey = "normalSecondary"
-	STAGING_MAIN_CONTEXT_KEY             types.ContextKey = "staging"
-	STAGING_SECONDARY_CONTEXT_KEY        types.ContextKey = "stagingSecondary"
-	PATCH_BUILDING_MAIN_CONTEXT_KEY      types.ContextKey = "patchBuilding"
-	PATCH_BUILDING_SECONDARY_CONTEXT_KEY types.ContextKey = "patchBuildingSecondary"
-	MERGE_CONFLICTS_CONTEXT_KEY          types.ContextKey = "mergeConflicts"
+	GLOBAL_CONTEXT_KEY           types.ContextKey = "global"
+	STATUS_CONTEXT_KEY           types.ContextKey = "status"
+	SNAKE_CONTEXT_KEY            types.ContextKey = "snake"
+	FILES_CONTEXT_KEY            types.ContextKey = "files"
+	LOCAL_BRANCHES_CONTEXT_KEY   types.ContextKey = "localBranches"
+	REMOTES_CONTEXT_KEY          types.ContextKey = "remotes"
+	WORKTREES_CONTEXT_KEY        types.ContextKey = "worktrees"
+	REMOTE_BRANCHES_CONTEXT_KEY  types.ContextKey = "remoteBranches"
+	TAGS_CONTEXT_KEY             types.ContextKey = "tags"
+	LOCAL_COMMITS_CONTEXT_KEY    types.ContextKey = "commits"
+	REFLOG_COMMITS_CONTEXT_KEY   types.ContextKey = "reflogCommits"
+	SUB_COMMITS_CONTEXT_KEY      types.ContextKey = "subCommits"
+	COMMIT_FILES_CONTEXT_KEY     types.ContextKey = "commitFiles"
+	STASH_CONTEXT_KEY            types.ContextKey = "stash"
+	NORMAL_MAIN_CONTEXT_KEY      types.ContextKey = "normal"
+	NORMAL_SECONDARY_CONTEXT_KEY types.ContextKey = "normalSecondary"
+	MERGE_CONFLICTS_CONTEXT_KEY  types.ContextKey = "mergeConflicts"

 	// these shouldn't really be needed for anything but I'm giving them unique keys nonetheless
 	OPTIONS_CONTEXT_KEY        types.ContextKey = "options"
@@ -66,10 +62,6 @@ var AllContextKeys = []types.ContextKey{
 	STASH_CONTEXT_KEY,
 	NORMAL_MAIN_CONTEXT_KEY,
 	NORMAL_SECONDARY_CONTEXT_KEY,
-	STAGING_MAIN_CONTEXT_KEY,
-	STAGING_SECONDARY_CONTEXT_KEY,
-	PATCH_BUILDING_MAIN_CONTEXT_KEY,
-	PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
 	MERGE_CONFLICTS_CONTEXT_KEY,

 	MENU_CONTEXT_KEY,
@@ -83,35 +75,31 @@ var AllContextKeys = []types.ContextKey{
 }

 type ContextTree struct {
-	Global                      types.Context
-	Status                      types.Context
-	Snake                       types.Context
-	Files                       *WorkingTreeContext
-	Menu                        *MenuContext
-	Branches                    *BranchesContext
-	Tags                        *TagsContext
-	LocalCommits                *LocalCommitsContext
-	CommitFiles                 *CommitFilesContext
-	Remotes                     *RemotesContext
-	Worktrees                   *WorktreesContext
-	Submodules                  *SubmodulesContext
-	RemoteBranches              *RemoteBranchesContext
-	ReflogCommits               *ReflogCommitsContext
-	SubCommits                  *SubCommitsContext
-	Stash                       *StashContext
-	Suggestions                 *SuggestionsContext
-	Normal                      *MainContext
-	NormalSecondary             *MainContext
-	Staging                     *PatchExplorerContext
-	StagingSecondary            *PatchExplorerContext
-	CustomPatchBuilder          *PatchExplorerContext
-	CustomPatchBuilderSecondary types.Context
-	MergeConflicts              *MergeConflictsContext
-	Confirmation                *ConfirmationContext
-	Prompt                      *PromptContext
-	CommitMessage               *CommitMessageContext
-	CommitDescription           types.Context
-	CommandLog                  types.Context
+	Global            types.Context
+	Status            types.Context
+	Snake             types.Context
+	Files             *WorkingTreeContext
+	Menu              *MenuContext
+	Branches          *BranchesContext
+	Tags              *TagsContext
+	LocalCommits      *LocalCommitsContext
+	CommitFiles       *CommitFilesContext
+	Remotes           *RemotesContext
+	Worktrees         *WorktreesContext
+	Submodules        *SubmodulesContext
+	RemoteBranches    *RemoteBranchesContext
+	ReflogCommits     *ReflogCommitsContext
+	SubCommits        *SubCommitsContext
+	Stash             *StashContext
+	Suggestions       *SuggestionsContext
+	Normal            *MainContext
+	NormalSecondary   *MainContext
+	MergeConflicts    *MergeConflictsContext
+	Confirmation      *ConfirmationContext
+	Prompt            *PromptContext
+	CommitMessage     *CommitMessageContext
+	CommitDescription types.Context
+	CommandLog        types.Context

 	// display contexts
 	AppStatus     types.Context
@@ -149,10 +137,6 @@ func (self *ContextTree) Flatten() []types.Context {
 		self.CommitDescription,

 		self.MergeConflicts,
-		self.StagingSecondary,
-		self.Staging,
-		self.CustomPatchBuilderSecondary,
-		self.CustomPatchBuilder,
 		self.NormalSecondary,
 		self.Normal,

@@ -1,154 +0,0 @@
-package context
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	deadlock "github.com/sasha-s/go-deadlock"
-)
-
-type PatchExplorerContext struct {
-	*SimpleContext
-	*SearchTrait
-
-	state                  *patch_exploring.State
-	viewTrait              *ViewTrait
-	getIncludedLineIndices func() []int
-	c                      *ContextCommon
-	mutex                  deadlock.Mutex
-
-	// true if we're inside the OnSelectItem callback; in that case we don't want to update the
-	// search result index.
-	inOnSelectItemCallback bool
-}
-
-var (
-	_ types.IPatchExplorerContext = (*PatchExplorerContext)(nil)
-	_ types.ISearchableContext    = (*PatchExplorerContext)(nil)
-)
-
-func NewPatchExplorerContext(
-	view *gocui.View,
-	windowName string,
-	key types.ContextKey,
-
-	getIncludedLineIndices func() []int,
-
-	c *ContextCommon,
-) *PatchExplorerContext {
-	ctx := &PatchExplorerContext{
-		state:                  nil,
-		viewTrait:              NewViewTrait(view),
-		c:                      c,
-		getIncludedLineIndices: getIncludedLineIndices,
-		SimpleContext: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-			View:                       view,
-			WindowName:                 windowName,
-			Key:                        key,
-			Kind:                       types.MAIN_CONTEXT,
-			Focusable:                  true,
-			HasSelectableContent:       true,
-			NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_WIDTH_CHANGES,
-		})),
-		SearchTrait: NewSearchTrait(c),
-	}
-
-	ctx.SetHandleRenderFunc(ctx.OnViewWidthChanged)
-
-	return ctx
-}
-
-func (self *PatchExplorerContext) IsPatchExplorerContext() {}
-
-func (self *PatchExplorerContext) GetState() *patch_exploring.State {
-	return self.state
-}
-
-func (self *PatchExplorerContext) SetState(state *patch_exploring.State) {
-	self.state = state
-}
-
-func (self *PatchExplorerContext) GetViewTrait() types.IViewTrait {
-	return self.viewTrait
-}
-
-func (self *PatchExplorerContext) GetIncludedLineIndices() []int {
-	return self.getIncludedLineIndices()
-}
-
-func (self *PatchExplorerContext) RenderAndFocus() {
-	self.setContent()
-
-	self.FocusSelection()
-	self.c.Render()
-}
-
-func (self *PatchExplorerContext) Render() {
-	self.setContent()
-
-	self.c.Render()
-}
-
-func (self *PatchExplorerContext) setContent() {
-	self.GetView().SetContent(self.GetContentToRender())
-}
-
-func (self *PatchExplorerContext) FocusSelection() {
-	view := self.GetView()
-	state := self.GetState()
-	bufferHeight := view.InnerHeight()
-	_, origin := view.Origin()
-	numLines := view.ViewLinesHeight()
-
-	newOriginY := state.CalculateOrigin(origin, bufferHeight, numLines)
-
-	view.SetOriginY(newOriginY)
-
-	startIdx, endIdx := state.SelectedViewRange()
-	// As far as the view is concerned, we are always selecting a range
-	view.SetRangeSelectStart(startIdx)
-	view.SetCursorY(endIdx - newOriginY)
-
-	if !self.inOnSelectItemCallback {
-		view.SetNearestSearchPosition()
-	}
-}
-
-func (self *PatchExplorerContext) GetContentToRender() string {
-	if self.GetState() == nil {
-		return ""
-	}
-
-	return self.GetState().RenderForLineIndices(self.GetIncludedLineIndices())
-}
-
-func (self *PatchExplorerContext) NavigateTo(selectedLineIdx int) {
-	self.GetState().SetLineSelectMode()
-	self.GetState().SelectLine(selectedLineIdx)
-
-	self.RenderAndFocus()
-}
-
-func (self *PatchExplorerContext) GetMutex() *deadlock.Mutex {
-	return &self.mutex
-}
-
-func (self *PatchExplorerContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
-	return nil
-}
-
-func (self *PatchExplorerContext) OnSearchSelect(selectedLineIdx int) {
-	self.GetMutex().Lock()
-	defer self.GetMutex().Unlock()
-	self.inOnSelectItemCallback = true
-	self.NavigateTo(selectedLineIdx)
-	self.inOnSelectItemCallback = false
-}
-
-func (self *PatchExplorerContext) OnViewWidthChanged() {
-	if state := self.GetState(); state != nil {
-		state.OnViewWidthChanged(self.GetView())
-		self.setContent()
-		self.RenderAndFocus()
-	}
-}
@@ -41,48 +41,6 @@ func NewContextTree(c *ContextCommon) *ContextTree {
 		Suggestions:     NewSuggestionsContext(c),
 		Normal:          NewMainContext(c.Views().Main, "main", NORMAL_MAIN_CONTEXT_KEY, c),
 		NormalSecondary: NewMainContext(c.Views().Secondary, "secondary", NORMAL_SECONDARY_CONTEXT_KEY, c),
-		Staging: NewPatchExplorerContext(
-			c.Views().Staging,
-			"main",
-			STAGING_MAIN_CONTEXT_KEY,
-			func() []int { return nil },
-			c,
-		),
-		StagingSecondary: NewPatchExplorerContext(
-			c.Views().StagingSecondary,
-			"secondary",
-			STAGING_SECONDARY_CONTEXT_KEY,
-			func() []int { return nil },
-			c,
-		),
-		CustomPatchBuilder: NewPatchExplorerContext(
-			c.Views().PatchBuilding,
-			"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)
-				if err != nil {
-					c.Log.Error(err)
-					return nil
-				}
-
-				return includedLineIndices
-			},
-			c,
-		),
-		CustomPatchBuilderSecondary: NewSimpleContext(
-			NewBaseContext(NewBaseContextOpts{
-				Kind:       types.MAIN_CONTEXT,
-				View:       c.Views().PatchBuildingSecondary,
-				WindowName: "secondary",
-				Key:        PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
-				Focusable:  false,
-			}),
-		),
 		MergeConflicts: NewMergeConflictsContext(
 			c,
 		),
@@ -52,8 +52,7 @@ func (gui *Gui) resetHelpersAndControllers() {

 	gpgHelper := helpers.NewGpgHelper(helperCommon)
 	viewHelper := helpers.NewViewHelper(helperCommon, gui.State.Contexts)
-	patchBuildingHelper := helpers.NewPatchBuildingHelper(helperCommon)
-	stagingHelper := helpers.NewStagingHelper(helperCommon)
+	customPatchHelper := helpers.NewCustomPatchHelper(helperCommon)
 	mergeConflictsHelper := helpers.NewMergeConflictsHelper(helperCommon)
 	searchHelper := helpers.NewSearchHelper(helperCommon)

@@ -61,8 +60,6 @@ func (gui *Gui) resetHelpersAndControllers() {
 		helperCommon,
 		refsHelper,
 		rebaseHelper,
-		patchBuildingHelper,
-		stagingHelper,
 		mergeConflictsHelper,
 		worktreeHelper,
 		searchHelper,
@@ -78,7 +75,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 	modeHelper := helpers.NewModeHelper(
 		helperCommon,
 		diffHelper,
-		patchBuildingHelper,
+		customPatchHelper,
 		cherryPickHelper,
 		rebaseHelper,
 		bisectHelper,
@@ -92,8 +89,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 	gui.helpers = &helpers.Helpers{
 		Refs:            refsHelper,
 		Host:            helpers.NewHostHelper(helperCommon),
-		PatchBuilding:   patchBuildingHelper,
-		Staging:         stagingHelper,
+		CustomPatch:     customPatchHelper,
 		Bisect:          bisectHelper,
 		Suggestions:     suggestionsHelper,
 		Files:           helpers.NewFilesHelper(helperCommon),
@@ -183,12 +179,8 @@ func (gui *Gui) resetHelpersAndControllers() {
 	gitFlowController := controllers.NewGitFlowController(common)
 	stashController := controllers.NewStashController(common)
 	commitFilesController := controllers.NewCommitFilesController(common)
-	patchExplorerControllerFactory := controllers.NewPatchExplorerControllerFactory(common)
-	stagingController := controllers.NewStagingController(common, gui.State.Contexts.Staging, gui.State.Contexts.StagingSecondary, false)
-	stagingSecondaryController := controllers.NewStagingController(common, gui.State.Contexts.StagingSecondary, gui.State.Contexts.Staging, true)
 	mainViewController := controllers.NewMainViewController(common, gui.State.Contexts.Normal, gui.State.Contexts.NormalSecondary)
 	secondaryViewController := controllers.NewMainViewController(common, gui.State.Contexts.NormalSecondary, gui.State.Contexts.Normal)
-	patchBuildingController := controllers.NewPatchBuildingController(common)
 	snakeController := controllers.NewSnakeController(common)
 	reflogCommitsController := controllers.NewReflogCommitsController(common)
 	subCommitsController := controllers.NewSubCommitsController(common)
@@ -285,28 +277,6 @@ func (gui *Gui) resetHelpersAndControllers() {
 	)

 	// TODO: add scroll controllers for main panels (need to bring some more functionality across for that e.g. reading more from the currently displayed git command)
-	controllers.AttachControllers(gui.State.Contexts.Staging,
-		stagingController,
-		patchExplorerControllerFactory.Create(gui.State.Contexts.Staging),
-		verticalScrollControllerFactory.Create(gui.State.Contexts.Staging),
-	)
-
-	controllers.AttachControllers(gui.State.Contexts.StagingSecondary,
-		stagingSecondaryController,
-		patchExplorerControllerFactory.Create(gui.State.Contexts.StagingSecondary),
-		verticalScrollControllerFactory.Create(gui.State.Contexts.StagingSecondary),
-	)
-
-	controllers.AttachControllers(gui.State.Contexts.CustomPatchBuilder,
-		patchBuildingController,
-		patchExplorerControllerFactory.Create(gui.State.Contexts.CustomPatchBuilder),
-		verticalScrollControllerFactory.Create(gui.State.Contexts.CustomPatchBuilder),
-	)
-
-	controllers.AttachControllers(gui.State.Contexts.CustomPatchBuilderSecondary,
-		verticalScrollControllerFactory.Create(gui.State.Contexts.CustomPatchBuilderSecondary),
-	)
-
 	controllers.AttachControllers(gui.State.Contexts.MergeConflicts,
 		mergeConflictsController,
 	)
@@ -169,7 +169,7 @@ func (self *CommitDiffActions) removePatchLines(
 	}

 	patchBuilder := self.c.Git().Patch.PatchBuilder
-	previousPaths := self.previousPaths()
+	files := self.filesInDiff()
 	for path, ordinals := range self.c.Helpers().DiffLine.ChangeLineOrdinals(self.customPatchDiff(), lines) {
 		filename := self.patchBuilderPath(path)
 		if filename == "" {
@@ -185,7 +185,7 @@ func (self *CommitDiffActions) removePatchLines(
 		if len(indices) == 0 {
 			continue
 		}
-		if err := patchBuilder.RemoveFileLineRange(filename, previousPaths[filename], indices); err != nil {
+		if err := patchBuilder.RemoveFileLineRange(filename, files.previousPath(filename), indices); err != nil {
 			return err
 		}
 	}
@@ -346,41 +346,78 @@ func (self *CommitDiffActions) togglePatchLines(lines []types.DiffLineInfo) erro
 		return nil
 	}

-	previousPaths := self.previousPaths()
+	files := self.filesInDiff()
 	indicesByPath := map[string][]int{}
+	wholeFileByPath := map[string]bool{}
 	for _, path := range paths {
-		indices, err := patchBuilder.PatchLineIndicesForLines(path, previousPaths[path], linesByPath[path])
+		indices, everyChange, err := patchBuilder.PatchLineIndicesForLines(
+			path, files.previousPath(path), linesByPath[path])
 		if err != nil {
 			return err
 		}
 		indicesByPath[path] = indices
+
+		// Selecting every change of a file the commit adds or deletes is selecting the
+		// file: what the commit did to it is not something its content lines can carry,
+		// so a patch of those alone would move the content and leave the file behind.
+		wholeFileByPath[path] = everyChange && files.isWholeFileOperation(path)
 	}

-	included, err := patchBuilder.GetFileIncLineIndices(paths[0], previousPaths[paths[0]])
+	included, err := patchBuilder.GetFileIncLineIndices(paths[0], files.previousPath(paths[0]))
 	if err != nil {
 		return err
 	}
-	toggle := patchBuilder.AddFileLineRange
-	if first := indicesByPath[paths[0]]; len(first) > 0 && lo.Contains(included, first[0]) {
-		toggle = patchBuilder.RemoveFileLineRange
-	}
+	removing := len(indicesByPath[paths[0]]) > 0 && lo.Contains(included, indicesByPath[paths[0]][0])

 	for _, path := range paths {
 		if len(indicesByPath[path]) == 0 {
 			continue
 		}
-		if err := toggle(path, previousPaths[path], indicesByPath[path]); err != nil {
+		previousPath := files.previousPath(path)
+		var err error
+		switch {
+		case wholeFileByPath[path] && removing:
+			err = patchBuilder.RemoveFile(path, previousPath)
+		case wholeFileByPath[path]:
+			err = patchBuilder.AddFileWhole(path, previousPath)
+		case removing:
+			err = patchBuilder.RemoveFileLineRange(path, previousPath, indicesByPath[path])
+		default:
+			err = patchBuilder.AddFileLineRange(path, previousPath, indicesByPath[path])
+		}
+		if err != nil {
 			return err
 		}
 	}
 	return nil
 }

-// previousPaths says which files of the diff were renamed, and what they were called
-// before. A renamed file's diff only comes out as a rename when git is asked about both
-// of its paths, and its lines are numbered in the file under its old name, so the patch
-// builder has to be told the old path along with them.
-func (self *CommitDiffActions) previousPaths() map[string]string {
+// commitDiffFiles records what the diff a patch is being built from says about each of
+// the files it covers, by the path the diff shows them under.
+type commitDiffFiles map[string]*models.CommitFile
+
+// previousPath says what a file of the diff was called before, and is empty for one
+// that wasn't renamed. A renamed file's diff only comes out as a rename when git is
+// asked about both of its paths, and its lines are numbered in the file under its old
+// name, so the patch builder has to be told the old path along with them.
+func (self commitDiffFiles) previousPath(path string) string {
+	if file, ok := self[path]; ok {
+		return file.PreviousPath
+	}
+	return ""
+}
+
+// isWholeFileOperation reports whether what the commit did to this file is something
+// its diff's content lines don't say: creating it or deleting it, which the file
+// header carries and a patch built from lines alone would leave out.
+func (self commitDiffFiles) isWholeFileOperation(path string) bool {
+	file, ok := self[path]
+	return ok && (file.Added() || file.Deleted())
+}
+
+// filesInDiff asks git which files the diff a patch is being built from covers, and
+// what it does to each.
+func (self *CommitDiffActions) filesInDiff() commitDiffFiles {
 	target := self.target()
 	if target == nil {
 		return nil
@@ -391,13 +428,9 @@ func (self *CommitDiffActions) previousPaths() map[string]string {
 		return nil
 	}

-	previousPaths := map[string]string{}
-	for _, file := range files {
-		if file.PreviousPath != "" {
-			previousPaths[file.Path] = file.PreviousPath
-		}
-	}
-	return previousPaths
+	return lo.SliceToMap(files, func(file *models.CommitFile) (string, *models.CommitFile) {
+		return file.Path, file
+	})
 }

 // patchEndpoints gives the two ends of the diff a patch is built from. They are the ends
@@ -124,8 +124,8 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []
 			Keys:              opts.GetKeys(opts.Config.Universal.GoInto),
 			Handler:           self.withItem(self.enter),
 			GetDisabledReason: self.require(self.singleItemSelected()),
-			Description:       self.c.Tr.EnterCommitFile,
-			Tooltip:           self.c.Tr.EnterCommitFileTooltip,
+			Description:       self.c.Tr.FocusCommitFileDiff,
+			Tooltip:           self.c.Tr.FocusCommitFileDiffTooltip,
 		},
 		{
 			Keys:        opts.GetKeys(opts.Config.Files.ToggleTreeView),
@@ -557,41 +557,15 @@ func (self *CommitFilesController) currentFromToReverseForPatchBuilding() (strin
 }

 func (self *CommitFilesController) enter(node *filetree.CommitFileNode) error {
-	return self.enterCommitFile(node, types.OnFocusOpts{ClickedWindowName: "", ClickedViewLineIdx: -1})
-}
-
-func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode, opts types.OnFocusOpts) error {
 	if node.File == nil {
 		return self.handleToggleCommitFileDirCollapsed(node)
 	}

-	if self.c.UserConfig().Git.DiffContextSize == 0 {
-		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextForCustomPatch,
-			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
-	}
+	return focusMainView(self.c, self.context(), -1)
+}

-	from, to, reverse := self.currentFromToReverseForPatchBuilding()
-	mustDiscardPatch := self.c.Git().Patch.PatchBuilder.Active() && self.c.Git().Patch.PatchBuilder.NewPatchRequired(from, to, reverse)
-	return self.c.ConfirmIf(mustDiscardPatch, types.ConfirmOpts{
-		Title:  self.c.Tr.DiscardPatch,
-		Prompt: self.c.Tr.DiscardPatchConfirm,
-		HandleConfirm: func() error {
-			if mustDiscardPatch {
-				self.c.Git().Patch.PatchBuilder.Reset()
-			}
-
-			if !self.c.Git().Patch.PatchBuilder.Active() {
-				if err := self.startPatchBuilder(); err != nil {
-					return err
-				}
-			}
-
-			self.c.Context().Push(self.c.Contexts().CustomPatchBuilder, opts)
-			self.c.Helpers().PatchBuilding.ShowHunkStagingHint()
-
-			return nil
-		},
-	})
+func (self *CommitFilesController) GetOnDoubleClick() func() error {
+	return self.withItemGraceful(self.enter)
 }

 func (self *CommitFilesController) handleToggleCommitFileDirCollapsed(node *filetree.CommitFileNode) error {
@@ -1,11 +1,9 @@
 package controllers

 import (
-	"errors"
 	"fmt"
 	"math"

-	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

@@ -51,10 +49,6 @@ func (self *ContextLinesController) Context() types.Context {
 }

 func (self *ContextLinesController) Increase() error {
-	if err := self.checkCanChangeContext(); err != nil {
-		return err
-	}
-
 	if self.c.UserConfig().Git.DiffContextSize < math.MaxUint64 {
 		self.c.UserConfig().Git.DiffContextSize++
 	}
@@ -62,10 +56,6 @@ func (self *ContextLinesController) Increase() error {
 }

 func (self *ContextLinesController) Decrease() error {
-	if err := self.checkCanChangeContext(); err != nil {
-		return err
-	}
-
 	if self.c.UserConfig().Git.DiffContextSize > 0 {
 		self.c.UserConfig().Git.DiffContextSize--
 	}
@@ -76,27 +66,11 @@ func (self *ContextLinesController) applyChange() error {
 	self.c.Toast(fmt.Sprintf(self.c.Tr.DiffContextSizeChanged, self.c.UserConfig().Git.DiffContextSize))

 	currentContext := self.c.Context().CurrentSide()
-	switch currentContext.GetKey() {
-	// we make an exception for our staging and patch building contexts because they actually need to refresh their state afterwards.
-	case context.PATCH_BUILDING_MAIN_CONTEXT_KEY:
-		self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.PATCH_BUILDING}})
-	case context.STAGING_MAIN_CONTEXT_KEY, context.STAGING_SECONDARY_CONTEXT_KEY:
-		self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STAGING}})
-	default:
-		// The diff is about to be rendered again with more or less context around
-		// each change, which reads as the lines you were looking at moving up or down
-		// the view; keep them where they are instead.
-		self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().Normal.GetView())
-		self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().NormalSecondary.GetView())
-		currentContext.HandleRenderToMain()
-	}
-	return nil
-}
-
-func (self *ContextLinesController) checkCanChangeContext() error {
-	if self.c.Git().Patch.PatchBuilder.Active() {
-		return errors.New(self.c.Tr.CantChangeContextSizeError)
-	}
-
+	// The diff is about to be rendered again with more or less context around
+	// each change, which reads as the lines you were looking at moving up or down
+	// the view; keep them where they are instead.
+	self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().Normal.GetView())
+	self.c.Helpers().DiffLine.PreserveDiffPositionOnRerender(self.c.Contexts().NormalSecondary.GetView())
+	currentContext.HandleRenderToMain()
 	return nil
 }
@@ -30,7 +30,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
 		{
 			Label:   self.c.Tr.ResetPatch,
 			Tooltip: self.c.Tr.ResetPatchTooltip,
-			OnPress: self.c.Helpers().PatchBuilding.Reset,
+			OnPress: self.c.Helpers().CustomPatch.Reset,
 			Keys:    menuKey('c'),
 		},
 		{
@@ -123,15 +123,7 @@ func (self *CustomPatchOptionsMenuAction) getPatchCommitIndex() int {
 	return -1
 }

-func (self *CustomPatchOptionsMenuAction) returnFocusFromPatchExplorerIfNecessary() {
-	if self.c.Context().Current().GetKey() == self.c.Contexts().CustomPatchBuilder.GetKey() {
-		self.c.Helpers().PatchBuilding.Escape()
-	}
-}
-
 func (self *CustomPatchOptionsMenuAction) handleDeletePatchFromCommit() error {
-	self.returnFocusFromPatchExplorerIfNecessary()
-
 	commits := self.c.Model().Commits
 	commitIndex := self.getPatchCommitIndex()
 	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
@@ -142,8 +134,6 @@ func (self *CustomPatchOptionsMenuAction) handleDeletePatchFromCommit() error {
 }

 func (self *CustomPatchOptionsMenuAction) handleMovePatchToSelectedCommit() error {
-	self.returnFocusFromPatchExplorerIfNecessary()
-
 	commits := self.c.Model().Commits
 	commitIndex := self.getPatchCommitIndex()
 	toCommitIndex := self.c.Contexts().LocalCommits.GetSelectedLineIdx()
@@ -155,8 +145,6 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchToSelectedCommit() erro
 }

 func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error {
-	self.returnFocusFromPatchExplorerIfNecessary()
-
 	mustStash := self.c.Helpers().WorkingTree.IsWorkingTreeDirtyExceptSubmodules()
 	return self.c.ConfirmIf(mustStash, types.ConfirmOpts{
 		Title:  self.c.Tr.MustStashTitle,
@@ -174,8 +162,6 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error
 }

 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
-	self.returnFocusFromPatchExplorerIfNecessary()
-
 	commitIndex := self.getPatchCommitIndex()
 	self.c.Helpers().Commits.OpenCommitMessagePanel(
 		&helpers.OpenCommitMessagePanelOpts{
@@ -209,8 +195,6 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
 }

 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommitBefore() error {
-	self.returnFocusFromPatchExplorerIfNecessary()
-
 	commitIndex := self.getPatchCommitIndex()
 	self.c.Helpers().Commits.OpenCommitMessagePanel(
 		&helpers.OpenCommitMessagePanelOpts{
@@ -244,8 +228,6 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommitBefore() e
 }

 func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error {
-	self.returnFocusFromPatchExplorerIfNecessary()
-
 	affectedUnstagedFiles := self.getAffectedUnstagedFiles()

 	mustStageFiles := len(affectedUnstagedFiles) > 0
@@ -0,0 +1,43 @@
+package controllers
+
+import (
+	"strings"
+
+	"github.com/samber/lo"
+)
+
+// Removes '+' or '-' from the beginning of each line in the diff string, except
+// when both '+' and '-' lines are present, or diff header lines, in which case
+// the diff is returned unchanged. This is useful for copying parts of diffs to
+// the clipboard in order to paste them into code.
+func dropDiffPrefix(diff string) string {
+	lines := strings.Split(strings.TrimRight(diff, "\n"), "\n")
+
+	const (
+		PLUS int = iota
+		MINUS
+		CONTEXT
+		OTHER
+	)
+
+	linesByType := lo.GroupBy(lines, func(line string) int {
+		switch {
+		case strings.HasPrefix(line, "+"):
+			return PLUS
+		case strings.HasPrefix(line, "-"):
+			return MINUS
+		case strings.HasPrefix(line, " "):
+			return CONTEXT
+		}
+		return OTHER
+	})
+
+	hasLinesOfType := func(lineType int) bool { return len(linesByType[lineType]) > 0 }
+
+	keepPrefix := hasLinesOfType(OTHER) || (hasLinesOfType(PLUS) && hasLinesOfType(MINUS))
+	if keepPrefix {
+		return diff
+	}
+
+	return strings.Join(lo.Map(lines, func(line string, _ int) string { return line[1:] + "\n" }), "")
+}
@@ -415,9 +415,7 @@ func (self *FilesController) GetFocusedMainViewDiffSource() types.FocusedMainVie
 }

 func (self *FilesController) GetOnDoubleClick() func() error {
-	return self.withItemGraceful(func(node *filetree.FileNode) error {
-		return self.press([]*filetree.FileNode{node})
-	})
+	return self.enter
 }

 // if we are dealing with a status for which there is no key in this map,
@@ -694,7 +692,7 @@ func (self *FilesController) getSelectedFile() *models.File {
 }

 func (self *FilesController) enter() error {
-	return self.EnterFile(types.OnFocusOpts{ClickedWindowName: "", ClickedViewLineIdx: -1})
+	return self.enterFile(-1)
 }

 func (self *FilesController) collapseAll() error {
@@ -713,7 +711,10 @@ func (self *FilesController) expandAll() error {
 	return nil
 }

-func (self *FilesController) EnterFile(opts types.OnFocusOpts) error {
+// enterFile focuses the diff of the selected file, which is where the commands that
+// act on its lines live. clickedViewLineIdx is the row of the diff a click landed on,
+// or -1 when the diff wasn't clicked.
+func (self *FilesController) enterFile(clickedViewLineIdx int) error {
 	node := self.context().GetSelected()
 	if node == nil {
 		return nil
@@ -739,11 +740,7 @@ func (self *FilesController) EnterFile(opts types.OnFocusOpts) error {
 		return self.switchToMerge()
 	}

-	context := lo.Ternary(opts.ClickedWindowName == "secondary", self.c.Contexts().StagingSecondary, self.c.Contexts().Staging)
-	self.c.Context().Push(context, opts)
-	self.c.Helpers().PatchBuilding.ShowHunkStagingHint()
-
-	return nil
+	return focusMainView(self.c, self.context(), clickedViewLineIdx)
 }

 // conflictResolutionHint formats a conflict description for the main view,
@@ -1534,7 +1531,7 @@ func (self *FilesController) handleStashSave(stashFunc func(message string) erro
 }

 func (self *FilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error {
-	return self.EnterFile(types.OnFocusOpts{ClickedWindowName: "main", ClickedViewLineIdx: opts.Y})
+	return self.enterFile(opts.Y)
 }

 func (self *FilesController) fetch() error {
@@ -0,0 +1,25 @@
+package helpers
+
+import "github.com/jesseduffield/lazygit/pkg/gui/types"
+
+type CustomPatchHelper struct {
+	c *HelperCommon
+}
+
+func NewCustomPatchHelper(c *HelperCommon) *CustomPatchHelper {
+	return &CustomPatchHelper{c: c}
+}
+
+func (self *CustomPatchHelper) Reset() error {
+	self.c.Git().Patch.PatchBuilder.Reset()
+	self.c.Refresh(types.RefreshOptions{
+		Scope: []types.RefreshableView{types.COMMIT_FILES},
+	})
+
+	// Render again so that the pane that was previewing the patch goes with it. The
+	// panel asked to do that is the side panel rather than whichever context has the
+	// focus. Both main panes are rendered by the panel beneath them, so a reset from
+	// within the focused main view has to go through that panel too.
+	self.c.PostRefreshUpdate(self.c.Context().CurrentSide())
+	return nil
+}
@@ -227,7 +227,7 @@ func (self *DiffHelper) OpenDiffToolForRef(selectedRef models.Ref) error {
 // AdjustLineNumber is used to adjust a line number in the diff that's currently
 // being viewed, so that it corresponds to the line number in the actual working
 // copy state of the file. It is used when clicking on a delta hyperlink in a
-// diff, or when pressing `e` in the staging or patch building panels. It works
+// diff, or when pressing `e` in a focused diff. It works
 // by getting a diff of what's being viewed in the main view against the working
 // copy, and then using that diff to adjust the line number.
 // path is the file path of the file being viewed
@@ -238,7 +238,7 @@ func (self *DiffHelper) OpenDiffToolForRef(selectedRef models.Ref) error {
 func (self *DiffHelper) AdjustLineNumber(path string, linenumber int, viewname string) int {
 	switch viewname {

-	case "main", "patchBuilding":
+	case "main":
 		if diffableContext, ok := self.c.Context().CurrentSide().(types.DiffableContext); ok {
 			ref := diffableContext.RefForAdjustingLineNumberInDiff()
 			if len(ref) != 0 {
@@ -249,7 +249,7 @@ func (self *DiffHelper) AdjustLineNumber(path string, linenumber int, viewname s
 		// unstaged changes view of the Files panel; no need to adjust line
 		// numbers in this case

-	case "secondary", "stagingSecondary":
+	case "secondary":
 		return self.adjustLineNumber(linenumber, "--", path)
 	}

@@ -219,8 +219,7 @@ func (self *DiffLineHelper) IsChangeLine(view *gocui.View, viewLineIdx int) bool
 // is shown as one solid block of changes — every row of its diff a change of the same
 // kind, no context — which is what a newly added or deleted file looks like. That is
 // the case where widening the selection to the change block would select the file
-// entire, so hunk mode drops to a single line there instead. It asks of a rendered
-// diff the question patch.Patch.IsSingleHunkForWholeFile asks of a patch.
+// entire, so hunk mode drops to a single line there instead.
 //
 // It says false while the diff is still being read in, since the rows that would
 // answer otherwise — a context line, a change of the other kind — may not have
@@ -70,7 +70,7 @@ func (self *DiffLineHelper) EstablishSelection(mainContext *context.MainContext,
 // there is nothing else to offer. Line by line it is simply the first change line on
 // screen. ok is false when the viewport shows no change at all.
 func (self *DiffLineHelper) changeToSelectOnScreen(view *gocui.View) (int, bool) {
-	if self.c.UserConfig().Gui.UseHunkModeInStagingView {
+	if self.c.UserConfig().Gui.UseHunkModeInDiffView {
 		return self.FirstChangeBlockInView(view)
 	}
 	return self.FirstChangeLineInView(view)
@@ -81,7 +81,7 @@ func (self *DiffLineHelper) changeToSelectOnScreen(view *gocui.View) (int, bool)
 // except over a file shown as one solid block of changes, where it would select the
 // whole file — see IsSingleHunkForWholeFile.
 func (self *DiffLineHelper) hunkModeApplies(view *gocui.View, changeViewLine int) bool {
-	return self.c.UserConfig().Gui.UseHunkModeInStagingView &&
+	return self.c.UserConfig().Gui.UseHunkModeInDiffView &&
 		!self.IsSingleHunkForWholeFile(view, changeViewLine)
 }

@@ -28,8 +28,7 @@ type Helpers struct {
 	MergeConflicts *MergeConflictsHelper
 	CherryPick     *CherryPickHelper
 	Host           *HostHelper
-	PatchBuilding  *PatchBuildingHelper
-	Staging        *StagingHelper
+	CustomPatch    *CustomPatchHelper
 	GPG            *GpgHelper
 	Upstream       *UpstreamHelper
 	AmendHelper    *AmendHelper
@@ -68,8 +67,7 @@ func NewStubHelpers() *Helpers {
 		MergeConflicts:    &MergeConflictsHelper{},
 		CherryPick:        &CherryPickHelper{},
 		Host:              &HostHelper{},
-		PatchBuilding:     &PatchBuildingHelper{},
-		Staging:           &StagingHelper{},
+		CustomPatch:       &CustomPatchHelper{},
 		GPG:               &GpgHelper{},
 		Upstream:          &UpstreamHelper{},
 		AmendHelper:       &AmendHelper{},
@@ -14,7 +14,7 @@ type ModeHelper struct {
 	c *HelperCommon

 	diffHelper                   *DiffHelper
-	patchBuildingHelper          *PatchBuildingHelper
+	customPatchHelper            *CustomPatchHelper
 	cherryPickHelper             *CherryPickHelper
 	mergeAndRebaseHelper         *MergeAndRebaseHelper
 	bisectHelper                 *BisectHelper
@@ -24,7 +24,7 @@ type ModeHelper struct {
 func NewModeHelper(
 	c *HelperCommon,
 	diffHelper *DiffHelper,
-	patchBuildingHelper *PatchBuildingHelper,
+	customPatchHelper *CustomPatchHelper,
 	cherryPickHelper *CherryPickHelper,
 	mergeAndRebaseHelper *MergeAndRebaseHelper,
 	bisectHelper *BisectHelper,
@@ -32,7 +32,7 @@ func NewModeHelper(
 	return &ModeHelper{
 		c:                    c,
 		diffHelper:           diffHelper,
-		patchBuildingHelper:  patchBuildingHelper,
+		customPatchHelper:    customPatchHelper,
 		cherryPickHelper:     cherryPickHelper,
 		mergeAndRebaseHelper: mergeAndRebaseHelper,
 		bisectHelper:         bisectHelper,
@@ -71,9 +71,9 @@ func (self *ModeHelper) Statuses() []ModeStatus {
 				return self.withResetButton(self.c.Tr.BuildingPatch, style.FgYellow.SetBold())
 			},
 			CancelLabel: func() string {
-				return self.c.Tr.ExitCustomPatchBuilder
+				return self.c.Tr.ResetCustomPatch
 			},
-			Reset: self.patchBuildingHelper.Reset,
+			Reset: self.customPatchHelper.Reset,
 		},
 		{
 			IsActive: self.c.Modes().Filtering.Active,
@@ -1,123 +0,0 @@
-package helpers
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-)
-
-type PatchBuildingHelper struct {
-	c *HelperCommon
-}
-
-func NewPatchBuildingHelper(
-	c *HelperCommon,
-) *PatchBuildingHelper {
-	return &PatchBuildingHelper{
-		c: c,
-	}
-}
-
-func (self *PatchBuildingHelper) ShowHunkStagingHint() {
-	if !self.c.AppState.DidShowHunkStagingHint && self.c.UserConfig().Gui.UseHunkModeInStagingView {
-		self.c.AppState.DidShowHunkStagingHint = true
-		self.c.SaveAppStateAndLogError()
-
-		message := fmt.Sprintf(self.c.Tr.HunkStagingHint, self.c.UserConfig().Keybinding.Main.ToggleSelectHunk)
-		self.c.Confirm(types.ConfirmOpts{
-			Prompt: message,
-		})
-	}
-}
-
-// takes us from the patch building panel back to the commit files panel
-func (self *PatchBuildingHelper) Escape() {
-	self.c.Context().Pop()
-}
-
-// kills the custom patch and returns us back to the commit files panel if needed
-func (self *PatchBuildingHelper) Reset() error {
-	self.c.Git().Patch.PatchBuilder.Reset()
-
-	// The patch-building view is the one thing with nothing left to show once the patch is
-	// gone, so it is the one thing left behind. Everywhere else the user is looking at
-	// something of their own — a commit's diff, the working tree's — which is still there.
-	if self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().CustomPatchBuilder.GetKey() {
-		self.Escape()
-	}
-
-	self.c.Refresh(types.RefreshOptions{
-		Scope: []types.RefreshableView{types.COMMIT_FILES},
-	})
-
-	// Render again so that the pane that was previewing the patch goes with it. The
-	// panel asked to do that is the side panel rather than whichever context has the
-	// focus. Both main panes are rendered by the panel beneath them, so a reset from
-	// within the focused main view has to go through that panel too.
-	self.c.PostRefreshUpdate(self.c.Context().CurrentSide())
-	return nil
-}
-
-func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpts) {
-	selectedLineIdx := -1
-	if opts.ClickedWindowName == "main" {
-		selectedLineIdx = opts.ClickedViewLineIdx
-	}
-
-	if !self.c.Git().Patch.PatchBuilder.Active() {
-		self.Escape()
-		return
-	}
-
-	// get diff from commit file that's currently selected
-	file := self.c.Contexts().CommitFiles.GetSelectedFile()
-	if file == nil {
-		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, git_commands.DiffModePlain)
-	if err != nil {
-		return
-	}
-
-	secondaryDiff := self.c.Git().Patch.PatchBuilder.RenderPatchForFile(patch.RenderPatchForFileOpts{
-		Filename:                               file.Path,
-		PreviousPath:                           file.PreviousPath,
-		Plain:                                  false,
-		Reverse:                                false,
-		TurnAddedFilesIntoDiffAgainstEmptyFile: true,
-	})
-
-	context := self.c.Contexts().CustomPatchBuilder
-
-	oldState := context.GetState()
-
-	state := patch_exploring.NewState(diff, selectedLineIdx, context.GetView(), oldState, self.c.UserConfig().Gui.UseHunkModeInStagingView)
-	context.SetState(state)
-	if state == nil {
-		self.Escape()
-		return
-	}
-
-	mainContent := context.GetContentToRender()
-
-	self.c.Contexts().CustomPatchBuilder.FocusSelection()
-
-	self.c.RenderToMainViews(types.RefreshMainOpts{
-		Pair: self.c.MainViewPairs().PatchBuilding,
-		Main: &types.ViewUpdateOpts{
-			Task:  types.NewRenderStringWithoutScrollTask(mainContent),
-			Title: self.c.Tr.Patch,
-		},
-		Secondary: &types.ViewUpdateOpts{
-			Task:  types.NewRenderStringWithoutScrollTask(secondaryDiff),
-			Title: self.c.Tr.CustomPatch,
-		},
-	})
-}
@@ -30,8 +30,6 @@ type RefreshHelper struct {
 	c                    *HelperCommon
 	refsHelper           *RefsHelper
 	mergeAndRebaseHelper *MergeAndRebaseHelper
-	patchBuildingHelper  *PatchBuildingHelper
-	stagingHelper        *StagingHelper
 	mergeConflictsHelper *MergeConflictsHelper
 	worktreeHelper       *WorktreeHelper
 	searchHelper         *SearchHelper
@@ -62,8 +60,6 @@ func NewRefreshHelper(
 	c *HelperCommon,
 	refsHelper *RefsHelper,
 	mergeAndRebaseHelper *MergeAndRebaseHelper,
-	patchBuildingHelper *PatchBuildingHelper,
-	stagingHelper *StagingHelper,
 	mergeConflictsHelper *MergeConflictsHelper,
 	worktreeHelper *WorktreeHelper,
 	searchHelper *SearchHelper,
@@ -72,8 +68,6 @@ func NewRefreshHelper(
 		c:                    c,
 		refsHelper:           refsHelper,
 		mergeAndRebaseHelper: mergeAndRebaseHelper,
-		patchBuildingHelper:  patchBuildingHelper,
-		stagingHelper:        stagingHelper,
 		mergeConflictsHelper: mergeConflictsHelper,
 		worktreeHelper:       worktreeHelper,
 		searchHelper:         searchHelper,
@@ -248,8 +242,6 @@ func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFr

 	var scopeSet *set.Set[types.RefreshableView]
 	if len(options.Scope) == 0 {
-		// not refreshing staging/patch-building unless explicitly requested because we only need
-		// to refresh those while focused.
 		scopeSet = set.NewFromSlice([]types.RefreshableView{
 			types.COMMITS,
 			types.BRANCHES,
@@ -261,7 +253,6 @@ func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFr
 			types.WORKTREES,
 			types.STATUS,
 			types.BISECT_INFO,
-			types.STAGING,
 			types.PULL_REQUESTS,
 		})
 	} else {
@@ -516,37 +507,9 @@ func (self *RefreshHelper) performRefresh(options types.RefreshOptions, calledFr
 		})
 	}

-	if scopeSet.Includes(types.STAGING) {
-		refresh("staging", func() {
-			fileWg.Wait()
-			// Bounce onto the UI thread so this runs after the files
-			// scope's model-update bounce — RefreshStagingPanel reads
-			// Model.Files (via Files.GetSelected) and would otherwise
-			// see the pre-refresh model. Guard on the generation so a
-			// repo switch mid-refresh drops it, like the model bounces.
-			self.onUIThreadUnlessRepoChanged(env, func() {
-				self.stagingHelper.RefreshStagingPanel(types.OnFocusOpts{})
-			})
-		})
-	}
-
-	if scopeSet.Includes(types.PATCH_BUILDING) {
-		refresh("patch building", func() {
-			// Bounce onto the UI thread, like the staging panel above:
-			// RefreshPatchBuildingPanel reads the commit-files selection and
-			// sets the patch view's origin, neither of which may run off the UI
-			// thread. Guard on the generation so a repo switch mid-refresh drops
-			// it, like the model bounces.
-			self.onUIThreadUnlessRepoChanged(env, func() {
-				self.patchBuildingHelper.RefreshPatchBuildingPanel(types.OnFocusOpts{})
-			})
-		})
-	}
-
 	if scopeSet.Includes(types.MERGE_CONFLICTS) {
 		refresh("merge conflicts", func() {
-			// Bounce onto the UI thread, like the staging and patch-building
-			// panels above: RefreshMergeState reads the current context and
+			// Bounce onto the UI thread: RefreshMergeState reads the current context and
 			// renders (or escapes) the merge-conflicts view, none of which may
 			// run off the UI thread.
 			self.onUIThreadUnlessRepoChanged(env, func() {
@@ -676,8 +639,6 @@ func getScopeNames(scopes []types.RefreshableView) []string {
 		types.WORKTREES:       "worktrees",
 		types.STATUS:          "status",
 		types.BISECT_INFO:     "bisect",
-		types.STAGING:         "staging",
-		types.PATCH_BUILDING:  "patchBuilding",
 		types.MERGE_CONFLICTS: "mergeConflicts",
 		types.COMMIT_FILES:    "commitFiles",
 		types.PULL_REQUESTS:   "pullRequests",
@@ -50,7 +50,6 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 			types.REFLOG,
 			types.WORKTREES,
 			types.BISECT_INFO,
-			types.STAGING,
 		}
 		if options.RefreshPullRequests {
 			scope = append(scope, types.PULL_REQUESTS)
@@ -1,128 +0,0 @@
-package helpers
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-)
-
-type StagingHelper struct {
-	c *HelperCommon
-}
-
-func NewStagingHelper(
-	c *HelperCommon,
-) *StagingHelper {
-	return &StagingHelper{
-		c: c,
-	}
-}
-
-// NOTE: used from outside this file
-func (self *StagingHelper) RefreshStagingPanel(focusOpts types.OnFocusOpts) {
-	secondaryFocused := self.secondaryStagingFocused()
-	mainFocused := self.mainStagingFocused()
-
-	// this method could be called when the staging panel is not being used,
-	// in which case we don't want to do anything.
-	if !mainFocused && !secondaryFocused {
-		return
-	}
-
-	mainSelectedLineIdx := -1
-	secondarySelectedLineIdx := -1
-	if focusOpts.ClickedViewLineIdx > 0 {
-		if secondaryFocused {
-			secondarySelectedLineIdx = focusOpts.ClickedViewLineIdx
-		} else {
-			mainSelectedLineIdx = focusOpts.ClickedViewLineIdx
-		}
-	}
-
-	mainContext := self.c.Contexts().Staging
-	secondaryContext := self.c.Contexts().StagingSecondary
-
-	var file *models.File
-	node := self.c.Contexts().Files.GetSelected()
-	if node != nil {
-		file = node.File
-	}
-
-	if file == nil || (!file.HasUnstagedChanges && !file.HasStagedChanges) {
-		self.handleStagingEscape()
-		return
-	}
-
-	mainDiff := self.c.Git().WorkingTree.WorktreeFileDiff(file, git_commands.DiffModePlain, false)
-	secondaryDiff := self.c.Git().WorkingTree.WorktreeFileDiff(file, git_commands.DiffModePlain, true)
-
-	// grabbing locks here and releasing before we finish the function
-	// because pushing say the secondary context could mean entering this function
-	// again, and we don't want to have a deadlock
-	mainContext.GetMutex().Lock()
-	secondaryContext.GetMutex().Lock()
-
-	hunkMode := self.c.UserConfig().Gui.UseHunkModeInStagingView
-	mainContext.SetState(
-		patch_exploring.NewState(mainDiff, mainSelectedLineIdx, mainContext.GetView(), mainContext.GetState(), hunkMode),
-	)
-
-	secondaryContext.SetState(
-		patch_exploring.NewState(secondaryDiff, secondarySelectedLineIdx, secondaryContext.GetView(), secondaryContext.GetState(), hunkMode),
-	)
-
-	mainState := mainContext.GetState()
-	secondaryState := secondaryContext.GetState()
-
-	mainContent := mainContext.GetContentToRender()
-	secondaryContent := secondaryContext.GetContentToRender()
-
-	mainContext.GetMutex().Unlock()
-	secondaryContext.GetMutex().Unlock()
-
-	if mainState == nil && secondaryState == nil {
-		self.handleStagingEscape()
-		return
-	}
-
-	if mainState == nil && !secondaryFocused {
-		self.c.Context().Push(secondaryContext, focusOpts)
-		return
-	}
-
-	if secondaryState == nil && secondaryFocused {
-		self.c.Context().Push(mainContext, focusOpts)
-		return
-	}
-
-	if secondaryFocused {
-		self.c.Contexts().StagingSecondary.FocusSelection()
-	} else {
-		self.c.Contexts().Staging.FocusSelection()
-	}
-
-	self.c.RenderToMainViews(types.RefreshMainOpts{
-		Pair: self.c.MainViewPairs().Staging,
-		Main: &types.ViewUpdateOpts{
-			Task:  types.NewRenderStringWithoutScrollTask(mainContent),
-			Title: self.c.Tr.UnstagedChanges,
-		},
-		Secondary: &types.ViewUpdateOpts{
-			Task:  types.NewRenderStringWithoutScrollTask(secondaryContent),
-			Title: self.c.Tr.StagedChanges,
-		},
-	})
-}
-
-func (self *StagingHelper) handleStagingEscape() {
-	self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})
-}
-
-func (self *StagingHelper) secondaryStagingFocused() bool {
-	return self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().StagingSecondary.GetKey()
-}
-
-func (self *StagingHelper) mainStagingFocused() bool {
-	return self.c.Context().CurrentStatic().GetKey() == self.c.Contexts().Staging.GetKey()
-}
@@ -46,8 +46,8 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 		{
 			Keys:            opts.GetKeys(opts.Config.Universal.TogglePanel),
 			Handler:         self.togglePanel,
-			Description:     self.c.Tr.ToggleStagingView,
-			Tooltip:         self.c.Tr.ToggleStagingViewTooltip,
+			Description:     self.c.Tr.ToggleDiffPane,
+			Tooltip:         self.c.Tr.ToggleDiffPaneTooltip,
 			DisplayOnScreen: true,
 		},
 		{
@@ -117,8 +117,8 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 		{
 			Keys:              opts.GetKeys(opts.Config.Universal.CopyToClipboard),
 			Handler:           self.copySelection,
-			Description:       self.c.Tr.CopySelectedTextToClipboard,
-			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.CopySelectedTextToClipboard),
+			Description:       self.c.Tr.CopySelectedDiffLinesToClipboard,
+			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.CopySelectedDiffLinesToClipboard),
 			GetDisabledReason: self.diffSelectionDisabledReason,
 		},
 		{
@@ -1,277 +0,0 @@
-package controllers
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/samber/lo"
-)
-
-type PatchBuildingController struct {
-	baseController
-	c *ControllerCommon
-}
-
-var _ types.IController = &PatchBuildingController{}
-
-func NewPatchBuildingController(
-	c *ControllerCommon,
-) *PatchBuildingController {
-	return &PatchBuildingController{
-		baseController: baseController{},
-		c:              c,
-	}
-}
-
-func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
-	return []*types.Binding{
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.OpenFile),
-			Handler:     self.OpenFile,
-			Description: self.c.Tr.OpenFile,
-			Tooltip:     self.c.Tr.OpenFileTooltip,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.Edit),
-			Handler:     self.EditFile,
-			Description: self.c.Tr.EditFile,
-			Tooltip:     self.c.Tr.EditFileTooltip,
-		},
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.Select),
-			Handler:         self.ToggleSelectionAndRefresh,
-			Description:     self.c.Tr.ToggleSelectionForPatch,
-			DisplayOnScreen: true,
-		},
-		{
-			Keys:              opts.GetKeys(opts.Config.Universal.Remove),
-			Handler:           self.discardSelection,
-			GetDisabledReason: self.getDisabledReasonForDiscard,
-			Description:       self.c.Tr.RemoveSelectionFromPatch,
-			Tooltip:           self.c.Tr.RemoveSelectionFromPatchTooltip,
-			DisplayOnScreen:   true,
-		},
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.Return),
-			Handler:         self.Escape,
-			Description:     self.c.Tr.ExitCustomPatchBuilder,
-			DescriptionFunc: self.EscapeDescription,
-			DisplayOnScreen: true,
-		},
-	}
-}
-
-func (self *PatchBuildingController) Context() types.Context {
-	return self.c.Contexts().CustomPatchBuilder
-}
-
-func (self *PatchBuildingController) context() types.IPatchExplorerContext {
-	return self.c.Contexts().CustomPatchBuilder
-}
-
-func (self *PatchBuildingController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
-	return []*gocui.ViewMouseBinding{}
-}
-
-func (self *PatchBuildingController) GetOnFocus() func(types.OnFocusOpts) {
-	return func(opts types.OnFocusOpts) {
-		// no need to change wrap on the secondary view because it can't be interacted with
-		self.c.Views().PatchBuilding.Wrap = self.c.UserConfig().Gui.WrapLinesInStagingView
-
-		self.c.Helpers().PatchBuilding.RefreshPatchBuildingPanel(opts)
-	}
-}
-
-func (self *PatchBuildingController) GetOnFocusLost() func(types.OnFocusLostOpts) {
-	return func(opts types.OnFocusLostOpts) {
-		self.context().SetState(nil)
-
-		self.c.Views().PatchBuilding.Wrap = true
-
-		if self.c.Git().Patch.PatchBuilder.IsEmpty() {
-			self.c.Git().Patch.PatchBuilder.Reset()
-		}
-	}
-}
-
-func (self *PatchBuildingController) OpenFile() error {
-	self.context().GetMutex().Lock()
-	defer self.context().GetMutex().Unlock()
-
-	path := self.c.Contexts().CommitFiles.GetSelectedPath()
-
-	if path == "" {
-		return nil
-	}
-
-	return self.c.Helpers().Files.OpenFile(path)
-}
-
-func (self *PatchBuildingController) EditFile() error {
-	self.context().GetMutex().Lock()
-	defer self.context().GetMutex().Unlock()
-
-	path := self.c.Contexts().CommitFiles.GetSelectedPath()
-
-	if path == "" {
-		return nil
-	}
-
-	lineNumber := self.context().GetState().CurrentLineNumber()
-	lineNumber = self.c.Helpers().Diff.AdjustLineNumber(path, lineNumber, self.context().GetViewName())
-	return self.c.Helpers().Files.EditFileAtLine(path, lineNumber)
-}
-
-func (self *PatchBuildingController) ToggleSelectionAndRefresh() error {
-	if err := self.toggleSelection(); err != nil {
-		return err
-	}
-
-	self.c.Refresh(types.RefreshOptions{
-		Scope: []types.RefreshableView{types.PATCH_BUILDING, types.COMMIT_FILES},
-	})
-	return nil
-}
-
-func (self *PatchBuildingController) toggleSelection() error {
-	self.context().GetMutex().Lock()
-	defer self.context().GetMutex().Unlock()
-
-	file := self.c.Contexts().CommitFiles.GetSelectedFile()
-	if file == nil {
-		return nil
-	}
-
-	state := self.context().GetState()
-
-	// Get added/deleted lines in the selected patch range
-	lineIndicesToToggle := state.LineIndicesOfAddedOrDeletedLinesInSelectedPatchRange()
-	if len(lineIndicesToToggle) == 0 {
-		// Only context lines or header lines selected, so nothing to do
-		return nil
-	}
-
-	includedLineIndices, err := self.c.Git().Patch.PatchBuilder.GetFileIncLineIndices(file.Path, file.PreviousPath)
-	if err != nil {
-		return err
-	}
-
-	toggleFunc := self.c.Git().Patch.PatchBuilder.AddFileLineRange
-	firstSelectedChangeLineIsStaged := lo.Contains(includedLineIndices, lineIndicesToToggle[0])
-	if firstSelectedChangeLineIsStaged {
-		toggleFunc = self.c.Git().Patch.PatchBuilder.RemoveFileLineRange
-	}
-
-	// add range of lines to those set for the file
-	if err := toggleFunc(file.Path, file.PreviousPath, lineIndicesToToggle); err != nil {
-		// might actually want to return an error here
-		self.c.Log.Error(err)
-	}
-
-	if state.SelectingRange() {
-		state.SetLineSelectMode()
-	}
-
-	state.SelectNextStageableLineOfSameIncludedState(self.context().GetIncludedLineIndices(), firstSelectedChangeLineIsStaged)
-
-	return nil
-}
-
-func (self *PatchBuildingController) getDisabledReasonForDiscard() *types.DisabledReason {
-	if !self.c.Git().Patch.PatchBuilder.CanRebase {
-		return &types.DisabledReason{Text: self.c.Tr.CanOnlyDiscardFromLocalCommits, ShowErrorInPanel: true}
-	}
-	if self.c.Git().Status.WorkingTreeState().Any() {
-		return &types.DisabledReason{Text: self.c.Tr.CantPatchWhileRebasingError, ShowErrorInPanel: true}
-	}
-	if self.c.UserConfig().Git.DiffContextSize == 0 {
-		text := fmt.Sprintf(self.c.Tr.Actions.NotEnoughContextToRemoveLines,
-			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
-		return &types.DisabledReason{Text: text, ShowErrorInPanel: true}
-	}
-	return nil
-}
-
-func (self *PatchBuildingController) discardSelection() error {
-	prompt := lo.Ternary(self.c.Git().Patch.PatchBuilder.IsEmpty(),
-		self.c.Tr.DiscardLinesFromCommitPrompt,
-		self.c.Tr.DiscardLinesFromCommitPromptWithReset)
-
-	self.c.Confirm(types.ConfirmOpts{
-		Title:  self.c.Tr.DiscardLinesFromCommitTitle,
-		Prompt: prompt,
-		HandleConfirm: func() error {
-			return self.discardSelectionFromCommit()
-		},
-	})
-
-	return nil
-}
-
-func (self *PatchBuildingController) discardSelectionFromCommit() error {
-	// Reset the current patch if there is one.
-	if !self.c.Git().Patch.PatchBuilder.IsEmpty() {
-		self.c.Git().Patch.PatchBuilder.Reset()
-	}
-
-	if err := self.toggleSelection(); err != nil {
-		return err
-	}
-
-	if self.c.Git().Patch.PatchBuilder.IsEmpty() {
-		return nil
-	}
-
-	commits := self.c.Model().Commits
-	commitIndex := self.getPatchCommitIndex()
-	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
-		self.c.LogAction(self.c.Tr.Actions.RemovePatchFromCommit)
-		err := self.c.Git().Patch.DeletePatchesFromCommit(commits, commitIndex)
-		// Escape pops the patch-building context, so run it on the UI thread
-		// before the refresh below.
-		_ = self.c.GocuiGui().OnUIThreadAndWait(func() {
-			self.c.Helpers().PatchBuilding.Escape()
-		})
-		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
-			err, types.RefreshOptions{})
-	})
-}
-
-func (self *PatchBuildingController) getPatchCommitIndex() int {
-	for index, commit := range self.c.Model().Commits {
-		if commit.Hash() == self.c.Git().Patch.PatchBuilder.To {
-			return index
-		}
-	}
-	return -1
-}
-
-func (self *PatchBuildingController) Escape() error {
-	context := self.c.Contexts().CustomPatchBuilder
-	state := context.GetState()
-
-	if state.SelectingRange() || state.SelectingHunkEnabledByUser() {
-		state.SetLineSelectMode()
-		self.c.PostRefreshUpdate(context)
-		return nil
-	}
-
-	self.c.Helpers().PatchBuilding.Escape()
-	return nil
-}
-
-func (self *PatchBuildingController) EscapeDescription() string {
-	context := self.c.Contexts().CustomPatchBuilder
-	if state := context.GetState(); state != nil {
-		if state.SelectingRange() {
-			return self.c.Tr.DismissRangeSelect
-		}
-
-		if state.SelectingHunkEnabledByUser() {
-			return self.c.Tr.SelectLineByLine
-		}
-	}
-
-	return self.c.Tr.ExitCustomPatchBuilder
-}
@@ -1,416 +0,0 @@
-package controllers
-
-import (
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/samber/lo"
-)
-
-type PatchExplorerControllerFactory struct {
-	c *ControllerCommon
-}
-
-func NewPatchExplorerControllerFactory(c *ControllerCommon) *PatchExplorerControllerFactory {
-	return &PatchExplorerControllerFactory{
-		c: c,
-	}
-}
-
-func (self *PatchExplorerControllerFactory) Create(context types.IPatchExplorerContext) *PatchExplorerController {
-	controller := &PatchExplorerController{
-		baseController: baseController{},
-		c:              self.c,
-		context:        context,
-	}
-	controller.dragAutoscroller = helpers.NewDragAutoscroller(
-		self.c.HelperCommon,
-		context,
-		controller.canDragAutoscroll,
-		controller.handleDragAutoscroll,
-	)
-	return controller
-}
-
-type PatchExplorerController struct {
-	baseController
-	c *ControllerCommon
-
-	context           types.IPatchExplorerContext
-	dragAutoscroller  *helpers.DragAutoscroller
-	draggingWithMouse bool
-}
-
-func (self *PatchExplorerController) Context() types.Context {
-	return self.context
-}
-
-func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
-	return []*types.Binding{
-		{
-			Tag:     "navigation",
-			Keys:    opts.GetKeys(opts.Config.Universal.PrevItem),
-			Handler: self.withRenderAndFocus(self.HandlePrevLine),
-		},
-		{
-			Tag:     "navigation",
-			Keys:    opts.GetKeys(opts.Config.Universal.NextItem),
-			Handler: self.withRenderAndFocus(self.HandleNextLine),
-		},
-		{
-			Tag:         "navigation",
-			Keys:        opts.GetKeys(opts.Config.Universal.RangeSelectUp),
-			Handler:     self.withRenderAndFocus(self.HandlePrevLineRange),
-			Description: self.c.Tr.RangeSelectUp,
-		},
-		{
-			Tag:         "navigation",
-			Keys:        opts.GetKeys(opts.Config.Universal.RangeSelectDown),
-			Handler:     self.withRenderAndFocus(self.HandleNextLineRange),
-			Description: self.c.Tr.RangeSelectDown,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Main.PrevHunk),
-			Handler:     self.withRenderAndFocus(self.HandlePrevHunk),
-			Description: self.c.Tr.PrevHunk,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Main.NextHunk),
-			Handler:     self.withRenderAndFocus(self.HandleNextHunk),
-			Description: self.c.Tr.NextHunk,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.ToggleRangeSelect),
-			Handler:     self.withRenderAndFocus(self.HandleToggleSelectRange),
-			Description: self.c.Tr.ToggleRangeSelect,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Main.ToggleSelectHunk),
-			Handler:     self.withRenderAndFocus(self.HandleToggleSelectHunk),
-			Description: self.c.Tr.ToggleSelectHunk,
-			DescriptionFunc: func() string {
-				if state := self.context.GetState(); state != nil && state.SelectingHunk() {
-					return self.c.Tr.SelectLineByLine
-				}
-				return self.c.Tr.SelectHunk
-			},
-			Tooltip:         self.c.Tr.ToggleSelectHunkTooltip,
-			DisplayOnScreen: true,
-		},
-		{
-			Tag:         "navigation",
-			Keys:        opts.GetKeys(opts.Config.Universal.PrevPage),
-			Handler:     self.withRenderAndFocus(self.HandlePrevPage),
-			Description: self.c.Tr.PrevPage,
-		},
-		{
-			Tag:         "navigation",
-			Keys:        opts.GetKeys(opts.Config.Universal.NextPage),
-			Handler:     self.withRenderAndFocus(self.HandleNextPage),
-			Description: self.c.Tr.NextPage,
-		},
-		{
-			Tag:         "navigation",
-			Keys:        opts.GetKeys(opts.Config.Universal.GotoTop),
-			Handler:     self.withRenderAndFocus(self.HandleGotoTop),
-			Description: self.c.Tr.GotoTop,
-		},
-		{
-			Tag:         "navigation",
-			Keys:        opts.GetKeys(opts.Config.Universal.GotoBottom),
-			Description: self.c.Tr.GotoBottom,
-			Handler:     self.withRenderAndFocus(self.HandleGotoBottom),
-		},
-		{
-			Tag:     "navigation",
-			Keys:    opts.GetKeys(opts.Config.Universal.ScrollLeft),
-			Handler: self.withRenderAndFocus(self.HandleScrollLeft),
-		},
-		{
-			Tag:     "navigation",
-			Keys:    opts.GetKeys(opts.Config.Universal.ScrollRight),
-			Handler: self.withRenderAndFocus(self.HandleScrollRight),
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.CopyToClipboard),
-			Handler:     self.withLock(self.CopySelectedToClipboard),
-			Description: self.c.Tr.CopySelectedTextToClipboard,
-		},
-	}
-}
-
-func (self *PatchExplorerController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
-	return []*gocui.ViewMouseBinding{
-		{
-			ViewName: self.context.GetViewName(),
-			Key:      gocui.MouseLeft,
-			Handler: func(opts gocui.ViewMouseBindingOpts) error {
-				if self.isFocused() {
-					return self.withRenderAndFocus(self.HandleMouseDown)()
-				}
-
-				self.c.Context().Push(self.context, types.OnFocusOpts{
-					ClickedWindowName:  self.context.GetWindowName(),
-					ClickedViewLineIdx: opts.Y,
-				})
-
-				return nil
-			},
-		},
-		{
-			ViewName: self.context.GetViewName(),
-			Key:      gocui.MouseLeft,
-			Modifier: gocui.ModMotion,
-			Handler:  self.handleMouseDrag,
-		},
-		{
-			ViewName: self.context.GetViewName(),
-			Key:      gocui.MouseRelease,
-			Handler:  func(gocui.ViewMouseBindingOpts) error { return self.handleDragRelease() },
-		},
-	}
-}
-
-func (self *PatchExplorerController) handleMouseDrag(opts gocui.ViewMouseBindingOpts) error {
-	if err := self.withLock(func() error {
-		self.context.GetState().DragSelectLine(opts.Y)
-		self.renderDragSelection()
-		return nil
-	})(); err != nil {
-		return err
-	}
-
-	self.draggingWithMouse = true
-	originY, _ := self.context.GetViewTrait().ViewPortYBounds()
-	self.dragAutoscroller.Update(opts.Y - originY)
-	return nil
-}
-
-func (self *PatchExplorerController) canDragAutoscroll(int) bool {
-	state := self.context.GetState()
-	return state != nil && state.SelectingRange()
-}
-
-func (self *PatchExplorerController) handleDragAutoscroll(viewIndex int) bool {
-	if !self.canDragAutoscroll(0) {
-		return false
-	}
-
-	if err := self.withLock(func() error {
-		self.context.GetState().DragSelectLine(viewIndex)
-		self.renderDragSelection()
-		return nil
-	})(); err != nil {
-		return false
-	}
-	return true
-}
-
-func (self *PatchExplorerController) renderDragSelection() {
-	view := self.context.GetView()
-	state := self.context.GetState()
-	originY := view.OriginY()
-	startIndex, _ := state.SelectedViewRange()
-	view.SetRangeSelectStart(startIndex)
-	view.SetCursorY(state.GetSelectedViewLineIdx() - originY)
-	self.context.Render()
-}
-
-func (self *PatchExplorerController) handleDragRelease() error {
-	self.draggingWithMouse = false
-	self.dragAutoscroller.Cancel()
-	return nil
-}
-
-func (self *PatchExplorerController) GetOnFocusLost() func(types.OnFocusLostOpts) {
-	return func(types.OnFocusLostOpts) {
-		self.dragAutoscroller.Cancel()
-		if self.draggingWithMouse {
-			self.draggingWithMouse = false
-			self.c.GocuiGui().CancelMouseCapture()
-		}
-	}
-}
-
-func (self *PatchExplorerController) HandlePrevLine() error {
-	before := self.context.GetState().GetSelectedViewLineIdx()
-	self.context.GetState().CycleSelection(false)
-	after := self.context.GetState().GetSelectedViewLineIdx()
-
-	if self.context.GetState().SelectingLine() {
-		checkScrollUp(self.context.GetViewTrait(), self.c.UserConfig(), before, after)
-	}
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleNextLine() error {
-	before := self.context.GetState().GetSelectedViewLineIdx()
-	self.context.GetState().CycleSelection(true)
-	after := self.context.GetState().GetSelectedViewLineIdx()
-
-	if self.context.GetState().SelectingLine() {
-		checkScrollDown(self.context.GetViewTrait(), self.c.UserConfig(), before, after)
-	}
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandlePrevLineRange() error {
-	s := self.context.GetState()
-
-	s.CycleRange(false)
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleNextLineRange() error {
-	s := self.context.GetState()
-
-	s.CycleRange(true)
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandlePrevHunk() error {
-	self.context.GetState().SelectPreviousHunk()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleNextHunk() error {
-	self.context.GetState().SelectNextHunk()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleToggleSelectRange() error {
-	self.context.GetState().ToggleStickySelectRange()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleToggleSelectHunk() error {
-	self.context.GetState().ToggleSelectHunk()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleScrollLeft() error {
-	self.context.GetViewTrait().ScrollLeft()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleScrollRight() error {
-	self.context.GetViewTrait().ScrollRight()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandlePrevPage() error {
-	self.context.GetState().AdjustSelectedLineIdx(-self.context.GetViewTrait().PageDelta())
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleNextPage() error {
-	self.context.GetState().AdjustSelectedLineIdx(self.context.GetViewTrait().PageDelta())
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleGotoTop() error {
-	self.context.GetState().SelectTop()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleGotoBottom() error {
-	self.context.GetState().SelectBottom()
-
-	return nil
-}
-
-func (self *PatchExplorerController) HandleMouseDown() error {
-	self.context.GetState().SelectNewLineForRange(self.context.GetViewTrait().SelectedLineIdx())
-
-	return nil
-}
-
-func (self *PatchExplorerController) CopySelectedToClipboard() error {
-	selected := self.context.GetState().PlainRenderSelected()
-
-	self.c.LogAction(self.c.Tr.Actions.CopySelectedTextToClipboard)
-	if err := self.c.OS().CopyToClipboard(dropDiffPrefix(selected)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Removes '+' or '-' from the beginning of each line in the diff string, except
-// when both '+' and '-' lines are present, or diff header lines, in which case
-// the diff is returned unchanged. This is useful for copying parts of diffs to
-// the clipboard in order to paste them into code.
-func dropDiffPrefix(diff string) string {
-	lines := strings.Split(strings.TrimRight(diff, "\n"), "\n")
-
-	const (
-		PLUS int = iota
-		MINUS
-		CONTEXT
-		OTHER
-	)
-
-	linesByType := lo.GroupBy(lines, func(line string) int {
-		switch {
-		case strings.HasPrefix(line, "+"):
-			return PLUS
-		case strings.HasPrefix(line, "-"):
-			return MINUS
-		case strings.HasPrefix(line, " "):
-			return CONTEXT
-		}
-		return OTHER
-	})
-
-	hasLinesOfType := func(lineType int) bool { return len(linesByType[lineType]) > 0 }
-
-	keepPrefix := hasLinesOfType(OTHER) || (hasLinesOfType(PLUS) && hasLinesOfType(MINUS))
-	if keepPrefix {
-		return diff
-	}
-
-	return strings.Join(lo.Map(lines, func(line string, _ int) string { return line[1:] + "\n" }), "")
-}
-
-func (self *PatchExplorerController) isFocused() bool {
-	return self.c.Context().Current().GetKey() == self.context.GetKey()
-}
-
-func (self *PatchExplorerController) withRenderAndFocus(f func() error) func() error {
-	return self.withLock(func() error {
-		if err := f(); err != nil {
-			return err
-		}
-
-		self.context.RenderAndFocus()
-		return nil
-	})
-}
-
-func (self *PatchExplorerController) withLock(f func() error) func() error {
-	return func() error {
-		self.context.GetMutex().Lock()
-		defer self.context.GetMutex().Unlock()
-
-		if self.context.GetState() == nil {
-			return nil
-		}
-
-		return f()
-	}
-}
@@ -1,358 +0,0 @@
-package controllers
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
-	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-)
-
-type StagingController struct {
-	baseController
-	c *ControllerCommon
-
-	context      types.IPatchExplorerContext
-	otherContext types.IPatchExplorerContext
-
-	// if true, we're dealing with the secondary context i.e. dealing with staged file changes
-	staged bool
-}
-
-var _ types.IController = &StagingController{}
-
-func NewStagingController(
-	c *ControllerCommon,
-	context types.IPatchExplorerContext,
-	otherContext types.IPatchExplorerContext,
-	staged bool,
-) *StagingController {
-	return &StagingController{
-		baseController: baseController{},
-		c:              c,
-		context:        context,
-		otherContext:   otherContext,
-		staged:         staged,
-	}
-}
-
-func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
-	return []*types.Binding{
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.Select),
-			Handler:         self.ToggleStaged,
-			Description:     self.c.Tr.Stage,
-			Tooltip:         self.c.Tr.StageSelectionTooltip,
-			DisplayOnScreen: true,
-		},
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.Remove),
-			Handler:         self.DiscardSelection,
-			Description:     self.c.Tr.DiscardSelection,
-			Tooltip:         self.c.Tr.DiscardSelectionTooltip,
-			DisplayOnScreen: true,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.OpenFile),
-			Handler:     self.OpenFile,
-			Description: self.c.Tr.OpenFile,
-			Tooltip:     self.c.Tr.OpenFileTooltip,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Universal.Edit),
-			Handler:     self.EditFile,
-			Description: self.c.Tr.EditFile,
-			Tooltip:     self.c.Tr.EditFileTooltip,
-		},
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.Return),
-			Handler:         self.Escape,
-			Description:     self.c.Tr.ReturnToFilesPanel,
-			DescriptionFunc: self.EscapeDescription,
-			DisplayOnScreen: true,
-		},
-		{
-			Keys:            opts.GetKeys(opts.Config.Universal.TogglePanel),
-			Handler:         self.TogglePanel,
-			Description:     self.c.Tr.ToggleStagingView,
-			Tooltip:         self.c.Tr.ToggleStagingViewTooltip,
-			DisplayOnScreen: true,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Main.EditSelectHunk),
-			Handler:     self.EditHunkAndRefresh,
-			Description: self.c.Tr.EditHunk,
-			Tooltip:     self.c.Tr.EditHunkTooltip,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Files.CommitChanges),
-			Handler:     self.c.Helpers().WorkingTree.HandleCommitPress,
-			Description: self.c.Tr.Commit,
-			Tooltip:     self.c.Tr.CommitTooltip,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Files.CommitChangesWithoutHook),
-			Handler:     self.c.Helpers().WorkingTree.HandleWIPCommitPress,
-			Description: self.c.Tr.CommitChangesWithoutHook,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Files.CommitChangesWithEditor),
-			Handler:     self.c.Helpers().WorkingTree.HandleCommitEditorPress,
-			Description: self.c.Tr.CommitChangesWithEditor,
-		},
-		{
-			Keys:        opts.GetKeys(opts.Config.Files.FindBaseCommitForFixup),
-			Handler:     self.c.Helpers().FixupHelper.HandleFindBaseCommitForFixupPress,
-			Description: self.c.Tr.FindBaseCommitForFixup,
-			Tooltip:     self.c.Tr.FindBaseCommitForFixupTooltip,
-		},
-	}
-}
-
-func (self *StagingController) Context() types.Context {
-	return self.context
-}
-
-func (self *StagingController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
-	return []*gocui.ViewMouseBinding{}
-}
-
-func (self *StagingController) GetOnFocus() func(types.OnFocusOpts) {
-	return func(opts types.OnFocusOpts) {
-		wrap := self.c.UserConfig().Gui.WrapLinesInStagingView
-		self.c.Views().Staging.Wrap = wrap
-		self.c.Views().StagingSecondary.Wrap = wrap
-
-		self.c.Helpers().Staging.RefreshStagingPanel(opts)
-	}
-}
-
-func (self *StagingController) GetOnFocusLost() func(types.OnFocusLostOpts) {
-	return func(opts types.OnFocusLostOpts) {
-		self.context.SetState(nil)
-
-		if opts.NewContextKey != self.otherContext.GetKey() {
-			self.c.Views().Staging.Wrap = true
-			self.c.Views().StagingSecondary.Wrap = true
-		}
-	}
-}
-
-func (self *StagingController) OpenFile() error {
-	self.context.GetMutex().Lock()
-	defer self.context.GetMutex().Unlock()
-
-	path := self.FilePath()
-
-	if path == "" {
-		return nil
-	}
-
-	return self.c.Helpers().Files.OpenFile(path)
-}
-
-func (self *StagingController) EditFile() error {
-	self.context.GetMutex().Lock()
-	defer self.context.GetMutex().Unlock()
-
-	path := self.FilePath()
-
-	if path == "" {
-		return nil
-	}
-
-	lineNumber := self.context.GetState().CurrentLineNumber()
-	lineNumber = self.c.Helpers().Diff.AdjustLineNumber(path, lineNumber, self.context.GetViewName())
-	return self.c.Helpers().Files.EditFileAtLine(path, lineNumber)
-}
-
-func (self *StagingController) Escape() error {
-	if self.context.GetState().SelectingRange() || self.context.GetState().SelectingHunkEnabledByUser() {
-		self.context.GetState().SetLineSelectMode()
-		self.c.PostRefreshUpdate(self.context)
-		return nil
-	}
-
-	self.c.Context().Pop()
-	return nil
-}
-
-func (self *StagingController) EscapeDescription() string {
-	if state := self.context.GetState(); state != nil {
-		if state.SelectingRange() {
-			return self.c.Tr.DismissRangeSelect
-		}
-
-		if state.SelectingHunkEnabledByUser() {
-			return self.c.Tr.SelectLineByLine
-		}
-	}
-
-	return self.c.Tr.ReturnToFilesPanel
-}
-
-func (self *StagingController) TogglePanel() error {
-	if self.otherContext.GetState() != nil {
-		self.c.Context().Push(self.otherContext, types.OnFocusOpts{})
-	}
-
-	return nil
-}
-
-func (self *StagingController) ToggleStaged() error {
-	if self.c.UserConfig().Git.DiffContextSize == 0 {
-		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextToStage,
-			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
-	}
-
-	return self.applySelectionAndRefresh(self.staged)
-}
-
-func (self *StagingController) DiscardSelection() error {
-	if self.c.UserConfig().Git.DiffContextSize == 0 {
-		return fmt.Errorf(self.c.Tr.Actions.NotEnoughContextToDiscard,
-			self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView)
-	}
-
-	return self.c.ConfirmIf(!self.staged && !self.c.UserConfig().Gui.SkipDiscardChangeWarning,
-		types.ConfirmOpts{
-			Title:         self.c.Tr.DiscardChangeTitle,
-			Prompt:        self.c.Tr.DiscardChangePrompt,
-			HandleConfirm: func() error { return self.applySelectionAndRefresh(true) },
-		})
-}
-
-func (self *StagingController) applySelectionAndRefresh(reverse bool) error {
-	if err := self.applySelection(reverse); err != nil {
-		return err
-	}
-
-	// Block input until the refresh has landed: it rebuilds the staging panel
-	// and moves the selection to the next stageable change, and a quick second
-	// keypress must act on that, not on the stale pre-refresh diff.
-	self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}})
-	return nil
-}
-
-func (self *StagingController) applySelection(reverse bool) error {
-	self.context.GetMutex().Lock()
-	defer self.context.GetMutex().Unlock()
-
-	state := self.context.GetState()
-	path := self.FilePath()
-	if path == "" {
-		return nil
-	}
-
-	firstLineIdx, lastLineIdx := state.SelectedPatchRange()
-	patchToApply := patch.
-		Parse(state.GetDiff()).
-		Transform(patch.TransformOpts{
-			Reverse:             reverse,
-			IncludedLineIndices: patch.ExpandRange(firstLineIdx, lastLineIdx),
-			FileNameOverride:    path,
-		}).
-		FormatPlain()
-
-	if patchToApply == "" {
-		return nil
-	}
-
-	// apply the patch then refresh this panel
-	// create a new temp file with the patch, then call git apply with that patch
-	self.c.LogAction(self.c.Tr.Actions.ApplyPatch)
-	err := self.c.Git().Patch.ApplyPatch(
-		patchToApply,
-		git_commands.ApplyPatchOpts{
-			Reverse: reverse,
-			Cached:  !reverse || self.staged,
-		},
-	)
-	if err != nil {
-		return err
-	}
-
-	if state.SelectingRange() {
-		firstLine, _ := state.SelectedViewRange()
-		state.SelectLine(firstLine)
-	}
-
-	return nil
-}
-
-func (self *StagingController) EditHunkAndRefresh() error {
-	if err := self.editHunk(); err != nil {
-		return err
-	}
-
-	// Block input like applySelectionAndRefresh does; the refresh rebuilds the
-	// staging panel from the post-edit diff.
-	self.c.RefreshBlockingInput(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES, types.STAGING}})
-	return nil
-}
-
-func (self *StagingController) editHunk() error {
-	self.context.GetMutex().Lock()
-	defer self.context.GetMutex().Unlock()
-
-	state := self.context.GetState()
-	path := self.FilePath()
-	if path == "" {
-		return nil
-	}
-
-	hunkStartIdx, hunkEndIdx := state.CurrentHunkBounds()
-	patchText := patch.
-		Parse(state.GetDiff()).
-		Transform(patch.TransformOpts{
-			Reverse:             self.staged,
-			IncludedLineIndices: patch.ExpandRange(hunkStartIdx, hunkEndIdx),
-			FileNameOverride:    path,
-		}).
-		FormatPlain()
-
-	patchFilepath, err := self.c.Git().Patch.SaveTemporaryPatch(patchText)
-	if err != nil {
-		return err
-	}
-
-	lineOffset := 3
-	lineIdxInHunk := state.GetSelectedPatchLineIdx() - hunkStartIdx
-	if err := self.c.Helpers().Files.EditFileAtLineAndWait(patchFilepath, lineIdxInHunk+lineOffset); err != nil {
-		return err
-	}
-
-	editedPatchText, err := self.c.Git().File.Cat(patchFilepath)
-	if err != nil {
-		return err
-	}
-
-	self.c.LogAction(self.c.Tr.Actions.ApplyPatch)
-
-	lineCount := strings.Count(editedPatchText, "\n") + 1
-	newPatchText := patch.
-		Parse(editedPatchText).
-		Transform(patch.TransformOpts{
-			IncludedLineIndices: patch.ExpandRange(0, lineCount),
-			FileNameOverride:    path,
-		}).
-		FormatPlain()
-
-	if err := self.c.Git().Patch.ApplyPatch(
-		newPatchText,
-		git_commands.ApplyPatchOpts{
-			Reverse: self.staged,
-			Cached:  true,
-		},
-	); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (self *StagingController) FilePath() string {
-	return self.c.Contexts().Files.GetSelectedPath()
-}
@@ -71,20 +71,28 @@ func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewM
 }

 func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {
+	return focusMainView(self.c, self.context, -1)
+}
+
+func focusMainView(c *ControllerCommon, source types.Context, clickedLineIdx int) error {
 	// Usually the main pane, but the content can be in the secondary one alone: a file
 	// with nothing but staged changes shows them there.
-	mainViewContext := self.c.Contexts().Normal
-	if self.c.State().GetRepoState().GetMainPanes() == types.SecondaryPaneOnly {
-		mainViewContext = self.c.Contexts().NormalSecondary
+	mainViewContext := c.Contexts().Normal
+	if c.State().GetRepoState().GetMainPanes() == types.SecondaryPaneOnly {
+		mainViewContext = c.Contexts().NormalSecondary
 	}
-	return self.focusMainView(mainViewContext, -1)
+	return focusMainViewPane(c, source, mainViewContext, clickedLineIdx)
 }

 func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext *context.MainContext, clickedLineIdx int) error {
-	mainViewContext.ClearSearchString()
-	self.c.Context().Push(mainViewContext, types.OnFocusOpts{})
+	return focusMainViewPane(self.c, self.context, mainViewContext, clickedLineIdx)
+}

-	if _, ok := self.context.(types.DiffMainViewContext); !ok {
+func focusMainViewPane(c *ControllerCommon, source types.Context, mainViewContext *context.MainContext, clickedLineIdx int) error {
+	mainViewContext.ClearSearchString()
+	c.Context().Push(mainViewContext, types.OnFocusOpts{})
+
+	if _, ok := source.(types.DiffMainViewContext); !ok {
 		return nil
 	}

@@ -93,13 +101,13 @@ func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext *co
 	// is. Now that the user wants to act on it, it is re-rendered as git's own diff — the
 	// panel below decides that for itself, from the same question — and the selection
 	// goes on that instead of on rows we can't place.
-	if self.c.Helpers().DiffLine.MainViewDiffMode() == git_commands.DiffModeRaw {
-		self.c.Helpers().DiffLine.RenderFocusedMainViewAgain(mainViewContext.GetView(), self.context, func() {
-			self.c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
+	if c.Helpers().DiffLine.MainViewDiffMode() == git_commands.DiffModeRaw {
+		c.Helpers().DiffLine.RenderFocusedMainViewAgain(mainViewContext.GetView(), source, func() {
+			c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
 		})
 		return nil
 	}

-	self.c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
+	c.Helpers().DiffLine.EstablishSelection(mainViewContext, clickedLineIdx)
 	return nil
 }
@@ -1,30 +1,10 @@
 package controllers

-import (
-	"errors"
-
-	"github.com/jesseduffield/lazygit/pkg/gui/context"
-	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/samber/lo"
-)
-
 type ToggleWhitespaceAction struct {
 	c *ControllerCommon
 }

 func (self *ToggleWhitespaceAction) Call() error {
-	contextsThatDontSupportIgnoringWhitespace := []types.ContextKey{
-		context.STAGING_MAIN_CONTEXT_KEY,
-		context.STAGING_SECONDARY_CONTEXT_KEY,
-		context.PATCH_BUILDING_MAIN_CONTEXT_KEY,
-	}
-
-	if lo.Contains(contextsThatDontSupportIgnoringWhitespace, self.c.Context().Current().GetKey()) {
-		// Ignoring whitespace is not supported in these views. Let the user
-		// know that it's not going to work in case they try to turn it on.
-		return errors.New(self.c.Tr.IgnoreWhitespaceNotSupportedHere)
-	}
-
 	self.c.UserConfig().Git.IgnoreWhitespaceInDiffView = !self.c.UserConfig().Git.IgnoreWhitespaceInDiffView

 	// You toggle this to see whether what you are looking at is more than
@@ -175,8 +175,6 @@ func (self *guiCommon) RenderToMainViews(opts types.RefreshMainOpts) {
 func (self *guiCommon) MainViewPairs() types.MainViewPairs {
 	return types.MainViewPairs{
 		Normal:         self.gui.normalMainContextPair(),
-		Staging:        self.gui.stagingMainContextPair(),
-		PatchBuilding:  self.gui.patchBuildingMainContextPair(),
 		MergeConflicts: self.gui.mergingMainContextPair(),
 	}
 }
@@ -70,6 +70,10 @@ func (gui *Gui) RefreshMainView(opts *types.ViewUpdateOpts, context types.Contex

 	if mainContext := gui.mainContextForView(view); mainContext != nil {
 		mainContext.SetContentIsDiff(types.ContentIsDiff(opts.Task))
+		// A diff is wrapped as the user asks; anything else a main pane shows is prose
+		// or a log, and reads as badly cut off at the edge of the pane as it would
+		// anywhere else.
+		view.Wrap = !mainContext.ContentIsDiff() || gui.c.UserConfig().Gui.WrapLinesInDiffView
 	}

 	if err := gui.runTaskForView(view, opts.Task); err != nil {
@@ -84,20 +88,6 @@ func (gui *Gui) normalMainContextPair() types.MainContextPair {
 	)
 }

-func (gui *Gui) stagingMainContextPair() types.MainContextPair {
-	return types.NewMainContextPair(
-		gui.State.Contexts.Staging,
-		gui.State.Contexts.StagingSecondary,
-	)
-}
-
-func (gui *Gui) patchBuildingMainContextPair() types.MainContextPair {
-	return types.NewMainContextPair(
-		gui.State.Contexts.CustomPatchBuilder,
-		gui.State.Contexts.CustomPatchBuilderSecondary,
-	)
-}
-
 func (gui *Gui) mergingMainContextPair() types.MainContextPair {
 	return types.NewMainContextPair(
 		gui.State.Contexts.MergeConflicts,
@@ -108,8 +98,6 @@ func (gui *Gui) mergingMainContextPair() types.MainContextPair {
 func (gui *Gui) allMainContextPairs() []types.MainContextPair {
 	return []types.MainContextPair{
 		gui.normalMainContextPair(),
-		gui.stagingMainContextPair(),
-		gui.patchBuildingMainContextPair(),
 		gui.mergingMainContextPair(),
 	}
 }
@@ -1,47 +0,0 @@
-package patch_exploring
-
-func calculateOrigin(currentOrigin int, bufferHeight int, numLines int, firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) int {
-	needToSeeIdx, wantToSeeIdx := getNeedAndWantLineIdx(firstLineIdx, lastLineIdx, selectedLineIdx, mode)
-
-	return calculateNewOriginWithNeededAndWantedIdx(currentOrigin, bufferHeight, numLines, needToSeeIdx, wantToSeeIdx)
-}
-
-// we want to scroll our origin so that the index we need to see is in view
-// and the other index we want to see (e.g. the other side of a line range)
-// is as close to being in view as possible.
-func calculateNewOriginWithNeededAndWantedIdx(currentOrigin int, bufferHeight int, numLines int, needToSeeIdx int, wantToSeeIdx int) int {
-	origin := currentOrigin
-	if needToSeeIdx < currentOrigin || needToSeeIdx >= currentOrigin+bufferHeight {
-		origin = max(min(needToSeeIdx-bufferHeight/2, numLines-bufferHeight), 0)
-	}
-
-	bottom := origin + bufferHeight
-
-	if wantToSeeIdx < origin {
-		requiredChange := origin - wantToSeeIdx
-		allowedChange := bottom - needToSeeIdx
-		return origin - min(requiredChange, allowedChange)
-	} else if wantToSeeIdx >= bottom {
-		requiredChange := wantToSeeIdx + 1 - bottom
-		allowedChange := needToSeeIdx - origin
-		return origin + min(requiredChange, allowedChange)
-	}
-	return origin
-}
-
-func getNeedAndWantLineIdx(firstLineIdx int, lastLineIdx int, selectedLineIdx int, mode selectMode) (int, int) {
-	switch mode {
-	case LINE:
-		return selectedLineIdx, selectedLineIdx
-	case RANGE:
-		if selectedLineIdx == firstLineIdx {
-			return firstLineIdx, lastLineIdx
-		}
-		return lastLineIdx, firstLineIdx
-	case HUNK:
-		return firstLineIdx, lastLineIdx
-	default:
-		// we should never land here
-		panic("unknown mode")
-	}
-}
@@ -1,129 +0,0 @@
-package patch_exploring
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewOrigin(t *testing.T) {
-	type scenario struct {
-		name            string
-		origin          int
-		bufferHeight    int
-		numLines        int
-		firstLineIdx    int
-		lastLineIdx     int
-		selectedLineIdx int
-		selectMode      selectMode
-		expected        int
-	}
-
-	scenarios := []scenario{
-		{
-			name:            "selection above scroll window, enough room to put it in the middle",
-			origin:          250,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    210,
-			lastLineIdx:     210,
-			selectedLineIdx: 210,
-			selectMode:      LINE,
-			expected:        160,
-		},
-		{
-			name:            "selection above scroll window, not enough room to put it in the middle",
-			origin:          50,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    10,
-			lastLineIdx:     10,
-			selectedLineIdx: 10,
-			selectMode:      LINE,
-			expected:        0,
-		},
-		{
-			name:            "selection below scroll window, enough room to put it in the middle",
-			origin:          0,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    150,
-			lastLineIdx:     150,
-			selectedLineIdx: 150,
-			selectMode:      LINE,
-			expected:        100,
-		},
-		{
-			name:            "selection below scroll window, not enough room to put it in the middle",
-			origin:          0,
-			bufferHeight:    100,
-			numLines:        200,
-			firstLineIdx:    199,
-			lastLineIdx:     199,
-			selectedLineIdx: 199,
-			selectMode:      LINE,
-			expected:        100,
-		},
-		{
-			name:            "selection within scroll window",
-			origin:          0,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    50,
-			lastLineIdx:     50,
-			selectedLineIdx: 50,
-			selectMode:      LINE,
-			expected:        0,
-		},
-		{
-			name:            "range ending below scroll window with selection at end of range",
-			origin:          0,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    40,
-			lastLineIdx:     150,
-			selectedLineIdx: 150,
-			selectMode:      RANGE,
-			expected:        50,
-		},
-		{
-			name:            "range ending below scroll window with selection at beginning of range",
-			origin:          0,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    40,
-			lastLineIdx:     150,
-			selectedLineIdx: 40,
-			selectMode:      RANGE,
-			expected:        40,
-		},
-		{
-			name:            "range starting above scroll window with selection at beginning of range",
-			origin:          50,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    40,
-			lastLineIdx:     150,
-			selectedLineIdx: 40,
-			selectMode:      RANGE,
-			expected:        40,
-		},
-		{
-			name:            "hunk extending beyond both bounds of scroll window",
-			origin:          50,
-			bufferHeight:    100,
-			numLines:        500,
-			firstLineIdx:    40,
-			lastLineIdx:     200,
-			selectedLineIdx: 70,
-			selectMode:      HUNK,
-			expected:        40,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.EqualValues(t, s.expected, calculateOrigin(s.origin, s.bufferHeight, s.numLines, s.firstLineIdx, s.lastLineIdx, s.selectedLineIdx, s.selectMode))
-		})
-	}
-}
@@ -1,438 +0,0 @@
-package patch_exploring
-
-import (
-	"strings"
-
-	"github.com/jesseduffield/generics/set"
-	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-)
-
-// State represents the current state of the patch explorer context i.e. when
-// you're staging a file or you're building a patch from an existing commit
-// this struct holds the info about the diff you're interacting with and what's currently selected.
-type State struct {
-	// These are in terms of view lines (wrapped), not patch lines
-	selectedLineIdx   int
-	rangeStartLineIdx int
-	// If a range is sticky, it means we expand the range when we move up or down.
-	// Otherwise, we cancel the range when we move up or down.
-	rangeIsSticky bool
-	diff          string
-	patch         *patch.Patch
-	selectMode    selectMode
-
-	// Array of indices of the wrapped lines indexed by a patch line index
-	viewLineIndices []int
-	// Array of indices of the original patch lines indexed by a wrapped view line index
-	patchLineIndices []int
-
-	// whether the user has switched to hunk mode manually; if hunk mode is on
-	// but this is false, then hunk mode was enabled because the config makes it
-	// on by default.
-	// this makes a difference for whether we want to escape out of hunk mode
-	userEnabledHunkMode bool
-}
-
-// these represent what select mode we're in
-type selectMode int
-
-const (
-	LINE selectMode = iota
-	RANGE
-	HUNK
-)
-
-func NewState(diff string, selectedLineIdx int, view *gocui.View, oldState *State, useHunkModeByDefault bool) *State {
-	if oldState != nil && diff == oldState.diff && selectedLineIdx == -1 {
-		// if we're here then we can return the old state. If selectedLineIdx was not -1
-		// then that would mean we were trying to click and potentially drag a range, which
-		// is why in that case we continue below
-		return oldState
-	}
-
-	patch := patch.Parse(diff)
-
-	if !patch.ContainsChanges() {
-		return nil
-	}
-
-	viewLineIndices, patchLineIndices := wrapPatchLines(diff, view)
-
-	rangeStartLineIdx := 0
-	if oldState != nil {
-		rangeStartLineIdx = oldState.rangeStartLineIdx
-	}
-
-	selectMode := LINE
-	if useHunkModeByDefault && !patch.IsSingleHunkForWholeFile() {
-		selectMode = HUNK
-	}
-
-	userEnabledHunkMode := false
-	if oldState != nil {
-		userEnabledHunkMode = oldState.userEnabledHunkMode
-	}
-
-	// if we have clicked from the outside to focus the main view we'll pass in a non-negative line index so that we can instantly select that line
-	if selectedLineIdx >= 0 {
-		// Clamp to the number of wrapped view lines; index might be out of
-		// bounds if a custom diff renderer is being used which produces more lines
-		selectedLineIdx = min(selectedLineIdx, len(viewLineIndices)-1)
-
-		selectMode = RANGE
-		rangeStartLineIdx = selectedLineIdx
-	} else if oldState != nil {
-		// if we previously had a selectMode of RANGE, we want that to now be line again (or hunk, if that's the default)
-		if oldState.selectMode != RANGE {
-			selectMode = oldState.selectMode
-		}
-		oldPatchLineIdx := oldState.patchLineIndices[oldState.selectedLineIdx]
-		newPatchLineIdx := patch.GetNextChangeIdx(oldPatchLineIdx)
-		// When staging an addition from a consecutive changes block, the unselected deletions get
-		// reordered to appear before the remaining additions in the new diff. This can cause the
-		// cursor to land on a deletion at the same patch line index where the staged addition used
-		// to be. In that case, skip forward past any deletions, then call GetNextChangeIdx from the
-		// first non-deletion position, which correctly lands on the next meaningful change.
-		newLines := patch.Lines()
-		if newPatchLineIdx == oldPatchLineIdx &&
-			oldState.patch.Lines()[oldPatchLineIdx].IsAddition() &&
-			newLines[newPatchLineIdx].IsDeletion() &&
-			patch.HunkOldStartForLine(newPatchLineIdx) == oldState.patch.HunkOldStartForLine(oldPatchLineIdx) {
-			for newPatchLineIdx < len(newLines) && newLines[newPatchLineIdx].IsDeletion() {
-				newPatchLineIdx++
-			}
-			newPatchLineIdx = patch.GetNextChangeIdx(newPatchLineIdx)
-		}
-		selectedLineIdx = viewLineIndices[newPatchLineIdx]
-	} else {
-		selectedLineIdx = viewLineIndices[patch.GetNextChangeIdx(0)]
-	}
-
-	return &State{
-		patch:               patch,
-		selectedLineIdx:     selectedLineIdx,
-		selectMode:          selectMode,
-		rangeStartLineIdx:   rangeStartLineIdx,
-		rangeIsSticky:       false,
-		diff:                diff,
-		viewLineIndices:     viewLineIndices,
-		patchLineIndices:    patchLineIndices,
-		userEnabledHunkMode: userEnabledHunkMode,
-	}
-}
-
-func (s *State) OnViewWidthChanged(view *gocui.View) {
-	if !view.Wrap {
-		return
-	}
-
-	selectedPatchLineIdx := s.patchLineIndices[s.selectedLineIdx]
-	var rangeStartPatchLineIdx int
-	if s.selectMode == RANGE {
-		rangeStartPatchLineIdx = s.patchLineIndices[s.rangeStartLineIdx]
-	}
-	s.viewLineIndices, s.patchLineIndices = wrapPatchLines(s.diff, view)
-	s.selectedLineIdx = s.viewLineIndices[selectedPatchLineIdx]
-	if s.selectMode == RANGE {
-		s.rangeStartLineIdx = s.viewLineIndices[rangeStartPatchLineIdx]
-	}
-}
-
-func (s *State) GetSelectedPatchLineIdx() int {
-	return s.patchLineIndices[s.selectedLineIdx]
-}
-
-func (s *State) GetSelectedViewLineIdx() int {
-	return s.selectedLineIdx
-}
-
-func (s *State) GetDiff() string {
-	return s.diff
-}
-
-func (s *State) ToggleSelectHunk() {
-	if s.selectMode == HUNK {
-		s.selectMode = LINE
-	} else {
-		s.selectMode = HUNK
-		s.userEnabledHunkMode = true
-
-		// If we are not currently on a change line, select the next one (or the
-		// previous one if there is no next one):
-		s.selectedLineIdx = s.viewLineIndices[s.patch.GetNextChangeIdx(
-			s.patchLineIndices[s.selectedLineIdx])]
-	}
-}
-
-func (s *State) ToggleStickySelectRange() {
-	s.ToggleSelectRange(true)
-}
-
-func (s *State) ToggleSelectRange(sticky bool) {
-	if s.SelectingRange() {
-		s.selectMode = LINE
-	} else {
-		s.selectMode = RANGE
-		s.rangeStartLineIdx = s.selectedLineIdx
-		s.rangeIsSticky = sticky
-	}
-}
-
-func (s *State) SetRangeIsSticky(value bool) {
-	s.rangeIsSticky = value
-}
-
-func (s *State) SelectingHunk() bool {
-	return s.selectMode == HUNK
-}
-
-func (s *State) SelectingHunkEnabledByUser() bool {
-	return s.selectMode == HUNK && s.userEnabledHunkMode
-}
-
-func (s *State) SelectingRange() bool {
-	return s.selectMode == RANGE && (s.rangeIsSticky || s.rangeStartLineIdx != s.selectedLineIdx)
-}
-
-func (s *State) SelectingLine() bool {
-	return s.selectMode == LINE
-}
-
-func (s *State) SetLineSelectMode() {
-	s.selectMode = LINE
-}
-
-func (s *State) DismissHunkSelectMode() {
-	if s.SelectingHunk() {
-		s.selectMode = LINE
-	}
-}
-
-// For when you move the cursor without holding shift (meaning if we're in
-// a non-sticky range select, we'll cancel it)
-func (s *State) SelectLine(newSelectedLineIdx int) {
-	if s.selectMode == RANGE && !s.rangeIsSticky {
-		s.selectMode = LINE
-	}
-
-	s.selectLineWithoutRangeCheck(newSelectedLineIdx)
-}
-
-func (s *State) clampLineIdx(lineIdx int) int {
-	return lo.Clamp(lineIdx, 0, len(s.patchLineIndices)-1)
-}
-
-// This just moves the cursor without caring about range select
-func (s *State) selectLineWithoutRangeCheck(newSelectedLineIdx int) {
-	s.selectedLineIdx = s.clampLineIdx(newSelectedLineIdx)
-}
-
-func (s *State) SelectNewLineForRange(newSelectedLineIdx int) {
-	s.rangeStartLineIdx = s.clampLineIdx(newSelectedLineIdx)
-
-	s.selectMode = RANGE
-
-	s.selectLineWithoutRangeCheck(newSelectedLineIdx)
-}
-
-func (s *State) DragSelectLine(newSelectedLineIdx int) {
-	s.selectMode = RANGE
-
-	s.selectLineWithoutRangeCheck(newSelectedLineIdx)
-}
-
-func (s *State) CycleSelection(forward bool) {
-	if s.SelectingHunk() {
-		if forward {
-			s.SelectNextHunk()
-		} else {
-			s.SelectPreviousHunk()
-		}
-	} else {
-		s.CycleLine(forward)
-	}
-}
-
-func (s *State) SelectPreviousHunk() {
-	patchLines := s.patch.Lines()
-	patchLineIdx := s.patchLineIndices[s.selectedLineIdx]
-	nextNonChangeLine := patchLineIdx
-	for nextNonChangeLine >= 0 && patchLines[nextNonChangeLine].IsChange() {
-		nextNonChangeLine--
-	}
-	nextChangeLine := nextNonChangeLine
-	for nextChangeLine >= 0 && !patchLines[nextChangeLine].IsChange() {
-		nextChangeLine--
-	}
-	if nextChangeLine >= 0 {
-		// Now we found a previous hunk, but we're on its last line. Skip to the beginning.
-		for nextChangeLine > 0 && patchLines[nextChangeLine-1].IsChange() {
-			nextChangeLine--
-		}
-		s.selectedLineIdx = s.viewLineIndices[nextChangeLine]
-	}
-}
-
-func (s *State) SelectNextHunk() {
-	patchLines := s.patch.Lines()
-	patchLineIdx := s.patchLineIndices[s.selectedLineIdx]
-	nextNonChangeLine := patchLineIdx
-	for nextNonChangeLine < len(patchLines) && patchLines[nextNonChangeLine].IsChange() {
-		nextNonChangeLine++
-	}
-	nextChangeLine := nextNonChangeLine
-	for nextChangeLine < len(patchLines) && !patchLines[nextChangeLine].IsChange() {
-		nextChangeLine++
-	}
-	if nextChangeLine < len(patchLines) {
-		s.selectedLineIdx = s.viewLineIndices[nextChangeLine]
-	}
-}
-
-func (s *State) CycleLine(forward bool) {
-	change := 1
-	if !forward {
-		change = -1
-	}
-
-	s.SelectLine(s.selectedLineIdx + change)
-}
-
-// This is called when we use shift+arrow to expand the range (i.e. a non-sticky
-// range)
-func (s *State) CycleRange(forward bool) {
-	if !s.SelectingRange() {
-		s.ToggleSelectRange(false)
-	}
-
-	s.SetRangeIsSticky(false)
-
-	change := 1
-	if !forward {
-		change = -1
-	}
-
-	s.selectLineWithoutRangeCheck(s.selectedLineIdx + change)
-}
-
-// returns first and last patch line index of current hunk
-func (s *State) CurrentHunkBounds() (int, int) {
-	hunkIdx := s.patch.HunkContainingLine(s.patchLineIndices[s.selectedLineIdx])
-	start := s.patch.HunkStartIdx(hunkIdx)
-	end := s.patch.HunkEndIdx(hunkIdx)
-	return start, end
-}
-
-func (s *State) selectionRangeForCurrentBlockOfChanges() (int, int) {
-	patchLines := s.patch.Lines()
-	patchLineIdx := s.patchLineIndices[s.selectedLineIdx]
-
-	patchStart := patchLineIdx
-	for patchStart > 0 && patchLines[patchStart-1].IsChange() {
-		patchStart--
-	}
-
-	patchEnd := patchLineIdx
-	for patchEnd < len(patchLines)-1 && patchLines[patchEnd+1].IsChange() {
-		patchEnd++
-	}
-
-	viewStart, viewEnd := s.viewLineIndices[patchStart], s.viewLineIndices[patchEnd]
-
-	// Increase viewEnd in case the last patch line is wrapped to more than one view line.
-	for viewEnd < len(s.patchLineIndices)-1 && s.patchLineIndices[viewEnd] == s.patchLineIndices[viewEnd+1] {
-		viewEnd++
-	}
-
-	return viewStart, viewEnd
-}
-
-func (s *State) SelectedViewRange() (int, int) {
-	switch s.selectMode {
-	case HUNK:
-		return s.selectionRangeForCurrentBlockOfChanges()
-	case RANGE:
-		if s.rangeStartLineIdx > s.selectedLineIdx {
-			return s.selectedLineIdx, s.rangeStartLineIdx
-		}
-		return s.rangeStartLineIdx, s.selectedLineIdx
-	case LINE:
-		return s.selectedLineIdx, s.selectedLineIdx
-	default:
-		// should never happen
-		return 0, 0
-	}
-}
-
-func (s *State) SelectedPatchRange() (int, int) {
-	start, end := s.SelectedViewRange()
-	return s.patchLineIndices[start], s.patchLineIndices[end]
-}
-
-// Returns the line indices of the selected patch range that are changes (i.e. additions or deletions)
-func (s *State) LineIndicesOfAddedOrDeletedLinesInSelectedPatchRange() []int {
-	viewStart, viewEnd := s.SelectedViewRange()
-	patchStart, patchEnd := s.patchLineIndices[viewStart], s.patchLineIndices[viewEnd]
-	lines := s.patch.Lines()
-	indices := []int{}
-	for i := patchStart; i <= patchEnd; i++ {
-		if lines[i].IsChange() {
-			indices = append(indices, i)
-		}
-	}
-	return indices
-}
-
-func (s *State) CurrentLineNumber() int {
-	return s.patch.LineNumberOfLine(s.patchLineIndices[s.selectedLineIdx])
-}
-
-func (s *State) AdjustSelectedLineIdx(change int) {
-	s.DismissHunkSelectMode()
-	s.SelectLine(s.selectedLineIdx + change)
-}
-
-func (s *State) RenderForLineIndices(includedLineIndices []int) string {
-	includedLineIndicesSet := set.NewFromSlice(includedLineIndices)
-	return s.patch.FormatView(patch.FormatViewOpts{
-		IncLineIndices: includedLineIndicesSet,
-	})
-}
-
-func (s *State) PlainRenderSelected() string {
-	firstLineIdx, lastLineIdx := s.SelectedPatchRange()
-	return s.patch.FormatRangePlain(firstLineIdx, lastLineIdx)
-}
-
-func (s *State) SelectBottom() {
-	s.DismissHunkSelectMode()
-	s.SelectLine(len(s.patchLineIndices) - 1)
-}
-
-func (s *State) SelectTop() {
-	s.DismissHunkSelectMode()
-	s.SelectLine(0)
-}
-
-func (s *State) CalculateOrigin(currentOrigin int, bufferHeight int, numLines int) int {
-	firstLineIdx, lastLineIdx := s.SelectedViewRange()
-
-	return calculateOrigin(currentOrigin, bufferHeight, numLines, firstLineIdx, lastLineIdx, s.GetSelectedViewLineIdx(), s.selectMode)
-}
-
-func wrapPatchLines(diff string, view *gocui.View) ([]int, []int) {
-	_, viewLineIndices, patchLineIndices := utils.WrapViewLinesToWidth(
-		view.Wrap, view.Editable, strings.TrimSuffix(diff, "\n"), view.InnerWidth(), view.TabWidth)
-	return viewLineIndices, patchLineIndices
-}
-
-func (s *State) SelectNextStageableLineOfSameIncludedState(includedLines []int, included bool) {
-	_, lastLineIdx := s.SelectedPatchRange()
-	patchLineIdx, found := s.patch.GetNextChangeIdxOfSameIncludedState(lastLineIdx+1, includedLines, included)
-	if found {
-		s.SelectLine(s.viewLineIndices[patchLineIdx])
-	}
-}
@@ -3,9 +3,7 @@ package types
 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
-	"github.com/jesseduffield/lazygit/pkg/gui/patch_exploring"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/sasha-s/go-deadlock"
 )

 type ContextKind int
@@ -292,20 +290,6 @@ type IListContext interface {
 	IndexForGotoBottom() int
 }

-type IPatchExplorerContext interface {
-	Context
-
-	GetState() *patch_exploring.State
-	SetState(*patch_exploring.State)
-	GetIncludedLineIndices() []int
-	RenderAndFocus()
-	Render()
-	GetContentToRender() string
-	NavigateTo(selectedLineIdx int)
-	GetMutex() *deadlock.Mutex
-	IsPatchExplorerContext() // used for type switch
-}
-
 type IViewTrait interface {
 	FocusPoint(yIdx int, scrollIntoView bool)
 	SetRangeSelectStart(yIdx int)
@@ -441,5 +425,4 @@ type IContextMgr interface {
 	AllList() []IListContext
 	AllFilterable() []IFilterableContext
 	AllSearchable() []ISearchableContext
-	AllPatchExplorer() []IPatchExplorerContext
 }
@@ -16,8 +16,6 @@ const (
 	WORKTREES
 	STATUS
 	SUBMODULES
-	STAGING
-	PATCH_BUILDING
 	MERGE_CONFLICTS
 	COMMIT_FILES
 	// not actually views. Will refactor this later
@@ -31,8 +31,6 @@ const (
 type MainViewPairs struct {
 	Normal         MainContextPair
 	MergeConflicts MainContextPair
-	Staging        MainContextPair
-	PatchBuilding  MainContextPair
 }

 type ViewUpdateOpts struct {
@@ -15,13 +15,9 @@ type Views struct {
 	Commits        *gocui.View
 	Stash          *gocui.View

-	Main                   *gocui.View
-	Secondary              *gocui.View
-	Staging                *gocui.View
-	StagingSecondary       *gocui.View
-	PatchBuilding          *gocui.View
-	PatchBuildingSecondary *gocui.View
-	MergeConflicts         *gocui.View
+	Main           *gocui.View
+	Secondary      *gocui.View
+	MergeConflicts *gocui.View

 	Options           *gocui.View
 	Confirmation      *gocui.View
@@ -41,10 +41,6 @@ func (gui *Gui) orderedViewNameMappings() []viewNameMapping {
 		{viewPtr: &gui.Views.SubCommits, name: "subCommits"},
 		{viewPtr: &gui.Views.CommitFiles, name: "commitFiles"},

-		{viewPtr: &gui.Views.Staging, name: "staging"},
-		{viewPtr: &gui.Views.StagingSecondary, name: "stagingSecondary"},
-		{viewPtr: &gui.Views.PatchBuilding, name: "patchBuilding"},
-		{viewPtr: &gui.Views.PatchBuildingSecondary, name: "patchBuildingSecondary"},
 		{viewPtr: &gui.Views.MergeConflicts, name: "mergeConflicts"},
 		{viewPtr: &gui.Views.Secondary, name: "secondary"},
 		{viewPtr: &gui.Views.Main, name: "main"},
@@ -106,16 +102,12 @@ func (gui *Gui) createAllViews() error {
 	gui.Views.Search.Frame = false
 	gui.Views.Search.Editor = gocui.EditorFunc(gui.searchEditor)

-	for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.Staging, gui.Views.StagingSecondary, gui.Views.PatchBuilding, gui.Views.PatchBuildingSecondary, gui.Views.MergeConflicts} {
+	for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.MergeConflicts} {
 		view.Wrap = true
 		view.UnderlineHyperLinksOnlyOnHover = true
 		view.AutoRenderHyperLinks = true
 	}

-	gui.Views.Staging.Wrap = true
-	gui.Views.StagingSecondary.Wrap = true
-	gui.Views.PatchBuilding.Wrap = true
-	gui.Views.PatchBuildingSecondary.Wrap = true
 	gui.Views.MergeConflicts.Wrap = false
 	gui.Views.Limit.Wrap = true

@@ -237,19 +229,15 @@ func (gui *Gui) configureViewProperties() {
 	gui.Views.Submodules.Title = gui.c.Tr.SubmodulesTitle
 	gui.Views.Tags.Title = gui.c.Tr.TagsTitle
 	gui.Views.Files.Title = gui.c.Tr.FilesTitle
-	gui.Views.PatchBuilding.Title = gui.c.Tr.Patch
-	gui.Views.PatchBuildingSecondary.Title = gui.c.Tr.CustomPatch
 	gui.Views.MergeConflicts.Title = gui.c.Tr.MergeConflictsTitle
 	gui.Views.Limit.Title = gui.c.Tr.NotEnoughSpace
 	gui.Views.Status.Title = gui.c.Tr.StatusTitle
-	gui.Views.Staging.Title = gui.c.Tr.UnstagedChanges
-	gui.Views.StagingSecondary.Title = gui.c.Tr.StagedChanges
 	gui.Views.CommitMessage.Title = gui.c.Tr.CommitSummary
 	gui.Views.CommitDescription.Title = gui.c.Tr.CommitDescriptionTitle
 	gui.Views.Extras.Title = gui.c.Tr.CommandLog
 	gui.Views.Snake.Title = gui.c.Tr.SnakeTitle

-	for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.Staging, gui.Views.StagingSecondary, gui.Views.PatchBuilding, gui.Views.PatchBuildingSecondary, gui.Views.MergeConflicts} {
+	for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.MergeConflicts} {
 		view.Title = gui.c.Tr.DiffTitle
 		view.CanScrollPastBottom = gui.c.UserConfig().Gui.ScrollPastBottom
 		view.TabWidth = gui.c.UserConfig().Gui.TabWidth
@@ -21,7 +21,6 @@ type TranslationSet struct {
 	EasterEgg                             string
 	UnstagedChanges                       string
 	StagedChanges                         string
-	StagingTitle                          string
 	MergingTitle                          string
 	NormalTitle                           string
 	LogTitle                              string
@@ -313,14 +312,13 @@ type TranslationSet struct {
 	NothingToSelectInDiff                 string
 	SelectLineByLine                      string
 	ToggleSelectHunkTooltip               string
-	HunkStagingHint                       string
 	ToggleSelectionForPatch               string
 	RemoveSelectionFromPatch              string
 	RemoveSelectionFromPatchTooltip       string
 	EditHunk                              string
 	EditHunkTooltip                       string
-	ToggleStagingView                     string
-	ToggleStagingViewTooltip              string
+	ToggleDiffPane                        string
+	ToggleDiffPaneTooltip                 string
 	ReturnToFilesPanel                    string
 	FastForward                           string
 	FastForwardTooltip                    string
@@ -360,7 +358,6 @@ type TranslationSet struct {
 	CommitMenuTitle                       string
 	RemotesTitle                          string
 	RemoteBranchesTitle                   string
-	PatchBuildingTitle                    string
 	InformationTitle                      string
 	SecondaryTitle                        string
 	ReflogCommitsTitle                    string
@@ -564,9 +561,9 @@ type TranslationSet struct {
 	PatchOptionsTitle                     string
 	NoPatchError                          string
 	EmptyPatchError                       string
-	EnterCommitFile                       string
-	EnterCommitFileTooltip                string
-	ExitCustomPatchBuilder                string
+	FocusCommitFileDiff                   string
+	FocusCommitFileDiffTooltip            string
+	ResetCustomPatch                      string
 	ExitFocusedMainView                   string
 	EnterUpstream                         string
 	InvalidUpstream                       string
@@ -736,7 +733,7 @@ type TranslationSet struct {
 	CopyTagToClipboard                    string
 	CopyPathToClipboard                   string
 	CommitPrefixPatternError              string
-	CopySelectedTextToClipboard           string
+	CopySelectedDiffLinesToClipboard      string
 	SelectedDiffLinesCopiedToast          string
 	SelectionNotFoundInDiffToast          string
 	NoFilesStagedTitle                    string
@@ -822,7 +819,6 @@ type TranslationSet struct {
 	ToggleWhitespaceInDiffView               string
 	ToggleWhitespaceInDiffViewTooltip        string
 	IgnoreWhitespaceDiffViewSubTitle         string
-	IgnoreWhitespaceNotSupportedHere         string
 	IncreaseContextInDiffView                string
 	IncreaseContextInDiffViewTooltip         string
 	DecreaseContextInDiffView                string
@@ -864,7 +860,6 @@ type TranslationSet struct {
 	SortOrderPrompt                          string
 	SortCommits                              string
 	SortCommitsTooltip                       string
-	CantChangeContextSizeError               string
 	CantChangeRenameThresholdError           string
 	OpenCommitInBrowser                      string
 	ViewBisectOptions                        string
@@ -1186,15 +1181,6 @@ const englishNonReloadableConfigWarning = `The following config settings were ch

 {{configs}}`

-const englishHunkStagingHint = `Hunk selection mode is now the default for staging. If you want to stage individual lines, press '%s' to switch to line-by-line mode.
-
-If you prefer to use line-by-line mode by default (like in earlier lazygit versions), add
-
-gui:
-  useHunkModeInStagingView: false
-
-to your lazygit config.`
-
 // exporting this so we can use it in tests
 func EnglishTranslationSet() *TranslationSet {
 	return &TranslationSet{
@@ -1208,7 +1194,6 @@ func EnglishTranslationSet() *TranslationSet {
 		EasterEgg:                            "Easter egg",
 		UnstagedChanges:                      "Unstaged changes",
 		StagedChanges:                        "Staged changes",
-		StagingTitle:                         "Main panel (staging)",
 		MergingTitle:                         "Main panel (merging)",
 		NormalTitle:                          "Main panel (normal)",
 		LogTitle:                             "Log",
@@ -1491,8 +1476,8 @@ func EnglishTranslationSet() *TranslationSet {
 		ExpandAll:                            "Expand all files",
 		ExpandAllTooltip:                     "Expand all directories in the file tree",
 		DisabledInFlatView:                   "Not available in flat view",
-		FileEnter:                            `Stage lines / Collapse directory`,
-		FileEnterTooltip:                     "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.",
+		FileEnter:                            `Focus file diff / Collapse directory`,
+		FileEnterTooltip:                     "If the selected item is a file, focus its diff so you can act on individual hunks or lines. If it is a directory, collapse or expand it.",
 		StageSelectionTooltip:                `Toggle selection staged / unstaged.`,
 		DiscardSelection:                     `Discard`,
 		DiscardSelectionTooltip:              "When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change.",
@@ -1503,14 +1488,13 @@ func EnglishTranslationSet() *TranslationSet {
 		SelectHunk:                           "Select hunks",
 		SelectLineByLine:                     "Select line-by-line",
 		ToggleSelectHunkTooltip:              "Toggle line-by-line vs. hunk selection mode.",
-		HunkStagingHint:                      englishHunkStagingHint,
 		ToggleSelectionForPatch:              `Toggle lines in patch`,
 		RemoveSelectionFromPatch:             `Remove lines from commit`,
 		RemoveSelectionFromPatchTooltip:      "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.",
 		EditHunk:                             `Edit hunk`,
 		EditHunkTooltip:                      "Edit selected hunk in external editor.",
-		ToggleStagingView:                    "Switch view",
-		ToggleStagingViewTooltip:             "Switch to other view (staged/unstaged changes).",
+		ToggleDiffPane:                       "Switch diff pane",
+		ToggleDiffPaneTooltip:                "Switch to the other focused diff pane.",
 		ReturnToFilesPanel:                   `Return to files panel`,
 		FastForward:                          `Fast-forward`,
 		FastForwardTooltip:                   "Fast-forward selected branch from its upstream. If the branch has diverged from its upstream because the upstream branch was rewritten, and it has no commits of its own, it is reset to its upstream instead. This needs reflogs to be enabled; a bare repository doesn't keep them by default (core.logAllRefUpdates).",
@@ -1548,7 +1532,6 @@ func EnglishTranslationSet() *TranslationSet {
 		CommitMenuTitle:                      "Commit Menu",
 		RemotesTitle:                         "Remotes",
 		RemoteBranchesTitle:                  "Remote branches",
-		PatchBuildingTitle:                   "Main panel (patch building)",
 		InformationTitle:                     "Information",
 		SecondaryTitle:                       "Secondary",
 		ReflogCommitsTitle:                   "Reflog",
@@ -1759,9 +1742,9 @@ func EnglishTranslationSet() *TranslationSet {
 		PatchOptionsTitle:                    "Patch options",
 		NoPatchError:                         "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines",
 		EmptyPatchError:                      "Patch is still empty. Add some files or lines to your patch first.",
-		EnterCommitFile:                      "Enter file / Toggle directory collapsed",
-		EnterCommitFileTooltip:               "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.",
-		ExitCustomPatchBuilder:               `Exit custom patch builder`,
+		FocusCommitFileDiff:                  "Focus file diff / Toggle directory",
+		FocusCommitFileDiffTooltip:           "If a file is selected, focus its diff so you can act on individual lines. If it is a directory, collapse or expand it.",
+		ResetCustomPatch:                     `Reset custom patch`,
 		ExitFocusedMainView:                  "Exit back to side panel",
 		EnterUpstream:                        `Enter upstream as '<remote> <branchname>'`,
 		InvalidUpstream:                      "Invalid upstream. Must be in the format '<remote> <branchname>'",
@@ -1928,7 +1911,7 @@ func EnglishTranslationSet() *TranslationSet {
 		CopyBranchNameToClipboard:                "Copy branch name to clipboard",
 		CopyTagToClipboard:                       "Copy tag to clipboard",
 		CopyPathToClipboard:                      "Copy path to clipboard",
-		CopySelectedTextToClipboard:              "Copy selected text to clipboard",
+		CopySelectedDiffLinesToClipboard:         "Copy selected diff lines to clipboard",
 		SelectedDiffLinesCopiedToast:             "Selected diff lines copied to clipboard",
 		SelectionNotFoundInDiffToast:             "Nothing in the selection could be found in the diff",
 		CommitPrefixPatternError:                 "Error in commitPrefix pattern",
@@ -2014,7 +1997,6 @@ func EnglishTranslationSet() *TranslationSet {
 		ToggleWhitespaceInDiffView:               "Toggle whitespace",
 		ToggleWhitespaceInDiffViewTooltip:        "Toggle whether or not whitespace changes are shown in the diff view.\n\nThe default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'.",
 		IgnoreWhitespaceDiffViewSubTitle:         "(ignoring whitespace)",
-		IgnoreWhitespaceNotSupportedHere:         "Ignoring whitespace is not supported in this view",
 		IncreaseContextInDiffView:                "Increase diff context size",
 		IncreaseContextInDiffViewTooltip:         "Increase the amount of the context shown around changes in the diff view.\n\nThe default can be changed in the config file with the key 'git.diffContextSize'.",
 		DecreaseContextInDiffView:                "Decrease diff context size",
@@ -2054,7 +2036,6 @@ func EnglishTranslationSet() *TranslationSet {
 		SortBasedOnReflog:                        "(based on reflog)",
 		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",
@@ -239,7 +239,7 @@ func (self *ViewDriver) ContainsLines(matchers ...*TextMatcher) *ViewDriver {
 		expectedContent := expectedContentFromMatchers(matchers)

 		return false, fmt.Sprintf(
-			"Expected the following to be contained in the staging panel:\n-----\n%s\n-----\nBut got:\n-----\n%s\n-----\nSelected range: %d-%d",
+			"Expected the following lines to be contained in the selected range:\n-----\n%s\n-----\nBut got:\n-----\n%s\n-----\nSelected range: %d-%d",
 			expectedContent,
 			content,
 			startIdx,
@@ -34,10 +34,6 @@ func (self *Views) regularView(viewName string) *ViewDriver {
 	}
 }

-func (self *Views) patchExplorerViewByName(viewName string) *ViewDriver {
-	return self.regularView(viewName)
-}
-
 func (self *Views) MergeConflicts() *ViewDriver {
 	return self.regularView("mergeConflicts")
 }
@@ -102,24 +98,6 @@ func (self *Views) Stash() *ViewDriver {
 	return self.regularView("stash")
 }

-func (self *Views) Staging() *ViewDriver {
-	return self.patchExplorerViewByName("staging")
-}
-
-func (self *Views) StagingSecondary() *ViewDriver {
-	return self.patchExplorerViewByName("stagingSecondary")
-}
-
-func (self *Views) PatchBuilding() *ViewDriver {
-	return self.patchExplorerViewByName("patchBuilding")
-}
-
-func (self *Views) PatchBuildingSecondary() *ViewDriver {
-	// this is not a patch explorer view because you can't actually focus it: it
-	// just renders content
-	return self.regularView("patchBuildingSecondary")
-}
-
 func (self *Views) Menu() *ViewDriver {
 	return self.regularView("menu")
 }
@@ -133,7 +133,7 @@ var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("multiLineFile")).
 			PressEnter()

-		t.Views().PatchBuilding().
+		t.Views().Main().
 			IsFocused().
 			SelectedLine(
 				Contains("+this file has"),
@@ -10,7 +10,7 @@ var StageRangeOfLines = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("myfile", "1st\n2nd\n3rd\n4th\n5th\n6th\n")
@@ -20,9 +20,10 @@ var StageRangeOfLines = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Files().
 			IsFocused().
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		t.Views().Staging().
+		t.Views().Main().
+			IsFocused().
 			Content(
 				Contains("-1st\n-2nd\n+1st changed\n+2nd changed\n 3rd\n 4th\n-5th\n+5th changed\n 6th"),
 			).
@@ -28,25 +28,25 @@ var Staged = NewIntegrationTest(NewIntegrationTestArgs{
 			).
 			SelectNextItem().
 			PressPrimaryAction(). // stage the file
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		t.Views().StagingSecondary().
+		t.Views().Secondary().
 			IsFocused().
 			Tap(func() {
 				// we start with both lines having been staged
-				t.Views().StagingSecondary().Content(Contains("+myfile content"))
-				t.Views().StagingSecondary().Content(Contains("+with a second line"))
-				t.Views().Staging().Content(DoesNotContain("+myfile content"))
-				t.Views().Staging().Content(DoesNotContain("+with a second line"))
+				t.Views().Secondary().Content(Contains("+myfile content"))
+				t.Views().Secondary().Content(Contains("+with a second line"))
+				t.Views().Main().Content(DoesNotContain("+myfile content"))
+				t.Views().Main().Content(DoesNotContain("+with a second line"))
 			}).
 			// unstage the selected line
 			PressPrimaryAction().
 			Tap(func() {
 				// the line should have been moved to the main view
-				t.Views().StagingSecondary().Content(DoesNotContain("+myfile content"))
-				t.Views().StagingSecondary().Content(Contains("+with a second line"))
-				t.Views().Staging().Content(Contains("+myfile content"))
-				t.Views().Staging().Content(DoesNotContain("+with a second line"))
+				t.Views().Secondary().Content(DoesNotContain("+myfile content"))
+				t.Views().Secondary().Content(Contains("+with a second line"))
+				t.Views().Main().Content(Contains("+myfile content"))
+				t.Views().Main().Content(DoesNotContain("+with a second line"))
 			}).
 			Press(keys.Files.CommitChanges)

@@ -58,10 +58,9 @@ var Staged = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains(commitMessage),
 			)

-		t.Views().StagingSecondary().
-			IsEmpty()
+		t.Views().Secondary().IsInvisible()

-		t.Views().Staging().
+		t.Views().Main().
 			IsFocused().
 			Content(Contains("+myfile content")).
 			Content(DoesNotContain("+with a second line"))
@@ -34,23 +34,23 @@ var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
 			).
 			SelectNextItem().
 			PressPrimaryAction().
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

 		// we start with both lines having been staged
-		t.Views().StagingSecondary().Content(
+		t.Views().Secondary().Content(
 			Contains("+myfile content").Contains("+with a second line"),
 		)
-		t.Views().Staging().Content(
+		t.Views().Main().Content(
 			DoesNotContain("+myfile content").DoesNotContain("+with a second line"),
 		)

 		// unstage the selected line
-		t.Views().StagingSecondary().
+		t.Views().Secondary().
 			IsFocused().
 			PressPrimaryAction().
 			Tap(func() {
 				// the line should have been moved to the main view
-				t.Views().Staging().Content(Contains("+myfile content").DoesNotContain("+with a second line"))
+				t.Views().Main().Content(Contains("+myfile content").DoesNotContain("+with a second line"))
 			}).
 			Content(DoesNotContain("+myfile content").Contains("+with a second line")).
 			Press(keys.Files.CommitChangesWithoutHook)
@@ -63,10 +63,9 @@ var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains(commitMessage),
 			)

-		t.Views().StagingSecondary().
-			IsEmpty()
+		t.Views().Secondary().IsInvisible()

-		t.Views().Staging().
+		t.Views().Main().
 			IsFocused().
 			Content(Contains("+myfile content")).
 			Content(DoesNotContain("+with a second line"))
@@ -27,20 +27,20 @@ var Unstaged = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("myfile2"),
 			).
 			SelectNextItem().
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		t.Views().Staging().
+		t.Views().Main().
 			IsFocused().
 			Tap(func() {
-				t.Views().StagingSecondary().Content(DoesNotContain("+myfile content"))
-				t.Views().Staging().SelectedLine(Equals("+myfile content"))
+				t.Views().Secondary().Content(DoesNotContain("+myfile content"))
+				t.Views().Main().SelectedLine(Equals("+myfile content"))
 			}).
 			// stage the first line
 			PressPrimaryAction().
 			Tap(func() {
-				t.Views().Staging().Content(DoesNotContain("+myfile content")).
+				t.Views().Main().Content(DoesNotContain("+myfile content")).
 					SelectedLine(Equals("+with a second line"))
-				t.Views().StagingSecondary().Content(Contains("+myfile content"))
+				t.Views().Secondary().Content(Contains("+myfile content"))
 			}).
 			Press(keys.Files.CommitChanges)

@@ -52,8 +52,6 @@ var Unstaged = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains(commitMessage),
 			)

-		t.Views().Staging().IsFocused()
-
-		// TODO: assert that the staging panel has been refreshed (it currently does not get correctly refreshed)
+		t.Views().Main().IsFocused()
 	},
 })
@@ -22,7 +22,7 @@ var CustomPatch = NewIntegrationTest(NewIntegrationTestArgs{
 	IsDemo:       true,
 	SetupConfig: func(cfg *config.AppConfig) {
 		setDefaultDemoConfig(cfg)
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateNCommitsWithRandomMessages(30)
@@ -54,7 +54,7 @@ var CustomPatch = NewIntegrationTest(NewIntegrationTestArgs{
 					Wait(1000).
 					PressEnter().
 					Tap(func() {
-						t.Views().PatchBuilding().
+						t.Views().Main().
 							IsFocused().
 							NavigateToLine(Contains("TODO")).
 							Wait(500).
@@ -58,7 +58,7 @@ var StageLines = NewIntegrationTest(NewIntegrationTestArgs{
 			IsFocused().
 			PressEnter()

-		t.Views().Staging().
+		t.Views().Main().
 			IsFocused().
 			Press(keys.Universal.ToggleRangeSelect).
 			PressFast(keys.Universal.NextItem).
@@ -71,19 +71,7 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{
 			FilterOrSearch("grape").
 			Lines(
 				Equals("A grape").IsSelected(),
-			).
-			PressEnter()
-
-		t.Views().PatchBuilding().
-			IsFocused().
-			FilterOrSearch("newline").
-			SelectedLine(Contains("No newline at end of file")).
-			PressEscape(). // cancel search
-			Tap(func() {
-				t.Views().Search().IsInvisible()
-			}).
-			// escape to commit-files view
-			PressEscape()
+			)

 		t.Views().CommitFiles().
 			IsFocused().
@@ -10,7 +10,7 @@ var AdvanceAfterStagingShiftsLineNumbers = NewIntegrationTest(NewIntegrationTest
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "1\n2\n3\n4\n5\n6\n7\n8\n")
@@ -1,15 +1,17 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var Apply = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Apply a custom patch",
+var ApplyCustomPatch = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Apply a custom patch built from a branch commit's focused diff",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("branch-a")
 		shell.CreateFileAndAdd("file1", "first line\n")
@@ -18,7 +20,6 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.NewBranch("branch-b")
 		shell.UpdateFileAndAdd("file1", "first line\nsecond line\n")
 		shell.Commit("update")
-
 		shell.Checkout("branch-a")
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
@@ -44,12 +45,15 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("M file1").IsSelected(),
 			).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+second line")).
 			PressPrimaryAction()

 		t.Views().Information().Content(Contains("Building patch"))
-
 		t.Views().Secondary().Content(Contains("second line"))
-
 		t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`))

 		t.Views().Files().
@@ -57,8 +61,6 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("file1").IsSelected(),
 			)
-
-		t.Views().Secondary().
-			Content(Contains("second line"))
+		t.Views().Secondary().Content(Contains("second line"))
 	},
 })
@@ -1,15 +1,17 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Apply a custom patch in reverse",
+var ApplyCustomPatchInReverse = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Apply a custom patch built from a focused commit diff in reverse",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "file1 content\n")
 		shell.CreateFileAndAdd("file2", "file2 content\n")
@@ -30,13 +32,15 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
 				Equals("  A file1"),
 				Equals("  A file2"),
 			).
-			SelectNextItem().
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+file1 content")).
 			PressPrimaryAction()

 		t.Views().Information().Content(Contains("Building patch"))
-
 		t.Views().Secondary().Content(Contains("+file1 content"))
-
 		t.Common().SelectPatchOption(Contains("Apply patch in reverse"))

 		t.Views().Files().
@@ -44,8 +48,6 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("D").Contains("file1").IsSelected(),
 			)
-
-		t.Views().Secondary().
-			Content(Contains("-file1 content"))
+		t.Views().Secondary().Content(Contains("-file1 content"))
 	},
 })
@@ -1,15 +1,17 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Apply a custom patch in reverse, resulting in a conflict",
+var ApplyCustomPatchInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Apply a multi-file custom patch in reverse when one file conflicts",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "file1 content\n")
 		shell.CreateFileAndAdd("file2", "file2 content\n")
@@ -38,21 +40,17 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 				Equals("  M file1"),
 				Equals("  M file2"),
 			).
-			SelectNextItem().
-			// Add both files to the patch; the first will conflict, the second won't
-			PressPrimaryAction().
-			Tap(func() {
-				t.Views().Information().Content(Contains("Building patch"))
+			Press(keys.Universal.FocusMainView)

-				t.Views().Secondary().Content(
-					Contains("+more file1 content"))
-			}).
-			SelectNextItem().
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+more file1 content")).
+			Press(keys.Universal.ToggleRangeSelect).
+			NavigateToLine(Contains("+more file2 content")).
 			PressPrimaryAction()

-		t.Views().Secondary().Content(
-			Contains("+more file1 content").Contains("+more file2 content"))
-
+		t.Views().Information().Content(Contains("Building patch"))
+		t.Views().Secondary().Content(Contains("+more file1 content").Contains("+more file2 content"))
 		t.Common().SelectPatchOption(Contains("Apply patch in reverse"))

 		t.ExpectPopup().Alert().
@@ -87,12 +85,10 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 				Equals("  M  file1").IsSelected(),
 				Equals("  M  file2"),
 			)
-
-		t.Views().Secondary().
-			ContainsLines(
-				Contains(" file1 content"),
-				Contains("-more file1 content"),
-				Contains("-even more file1"),
-			)
+		t.Views().Secondary().ContainsLines(
+			Contains(" file1 content"),
+			Contains("-more file1 content"),
+			Contains("-even more file1"),
+		)
 	},
 })
@@ -1,15 +1,17 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var ApplyWithModifiedFileNoConflict = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Apply a custom patch, with a modified file in the working tree that does not conflict with the patch",
+var ApplyCustomPatchWithModifiedFile = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Apply a custom patch alongside a non-conflicting working-tree change",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("branch-a")
 		shell.CreateFileAndAdd("file1", "1\n2\n3\n")
@@ -45,12 +47,15 @@ var ApplyWithModifiedFileNoConflict = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Equals("M file1").IsSelected(),
 			).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+4")).
 			PressPrimaryAction()

 		t.Views().Information().Content(Contains("Building patch"))
-
 		t.Views().Secondary().Content(Contains("3\n+4"))
-
 		t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`))

 		t.ExpectPopup().Confirmation().Title(Equals("Must stage files")).
@@ -62,8 +67,6 @@ var ApplyWithModifiedFileNoConflict = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Equals("M  file1").IsSelected(),
 			)
-
-		t.Views().Secondary().
-			Content(Contains("-1\n+11\n 2\n 3\n+4"))
+		t.Views().Secondary().Content(Contains("-1\n+11\n 2\n 3\n+4"))
 	},
 })
@@ -1,15 +1,17 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var ApplyWithModifiedFileConflict = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Apply a custom patch, with a modified file in the working tree that conflicts with the patch",
+var ApplyCustomPatchWithModifiedFileConflict = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Apply a custom patch that conflicts with a working-tree change",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.NewBranch("branch-a")
 		shell.CreateFileAndAdd("file1", "1\n2\n3\n")
@@ -45,12 +47,17 @@ var ApplyWithModifiedFileConflict = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Equals("M file1").IsSelected(),
 			).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("-1")).
+			Press(keys.Universal.ToggleRangeSelect).
+			Press(keys.Universal.NextItem).
 			PressPrimaryAction()

 		t.Views().Information().Content(Contains("Building patch"))
-
 		t.Views().Secondary().Content(Contains("-1\n+11\n"))
-
 		t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`))

 		t.ExpectPopup().Confirmation().Title(Equals("Must stage files")).
@@ -10,7 +10,7 @@ var BuildPatchFromACommitsDiff = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n")
@@ -10,7 +10,7 @@ var BuildPatchFromAReflogEntry = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n")
@@ -10,7 +10,7 @@ var BuildPatchFromAWholeCommitsDiff = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = true
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = true
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n")
@@ -0,0 +1,114 @@
+package main_view
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var BuildPatchWithMixedSelections = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Build a custom patch from a whole file, a hunk, individual lines, and a range",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("hunk-file", "1a\n1b\n1c\n1d\n1e\n1f\n1g\n1h\n1i\n1j\n1k\n1l\n1m\n1n\n1o\n1p\n1q\n1r\n1s\n1t\n1u\n1v\n1w\n1x\n1y\n1z\n")
+		shell.Commit("first commit")
+
+		shell.UpdateFileAndAdd("hunk-file", "aa\n1b\ncc\n1d\n1e\n1f\n1g\n1h\n1i\n1j\n1k\n1l\n1m\n1n\n1o\n1p\n1q\n1r\n1s\ntt\nuu\nvv\n1w\n1x\n1y\n1z\n")
+		shell.CreateFileAndAdd("line-file", "2a\n2b\n2c\n2d\n2e\n2f\n2g\n2h\n2i\n2j\n2k\n2l\n2m\n2n\n2o\n2p\n2q\n2r\n2s\n2t\n2u\n2v\n2w\n2x\n2y\n2z\n")
+		shell.CreateFileAndAdd("direct-file", "direct file content")
+		shell.Commit("second commit")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("second commit").IsSelected(),
+				Contains("first commit"),
+			).
+			PressEnter()
+
+		// The side panel remains the way to put an entire file operation into a patch.
+		t.Views().CommitFiles().
+			IsFocused().
+			Lines(
+				Equals("▼ /").IsSelected(),
+				Contains("direct-file"),
+				Contains("hunk-file"),
+				Contains("line-file"),
+			).
+			SelectNextItem().
+			PressPrimaryAction()
+
+		t.Views().Information().Content(Contains("Building patch"))
+		t.Views().Secondary().Content(Contains("direct file content"))
+
+		// Add the first modification of hunk-file as one change block.
+		t.Views().CommitFiles().
+			NavigateToLine(Contains("hunk-file")).
+			Press(keys.Universal.FocusMainView)
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("-1a")).
+			Press(keys.Main.ToggleSelectHunk).
+			SelectedLines(
+				Contains("-1a"),
+				Contains("+aa"),
+			).
+			PressPrimaryAction().
+			PressEscape().
+			PressEscape()
+
+		// Build line-file's part from one line, a range, and another line.
+		t.Views().CommitFiles().
+			IsFocused().
+			NavigateToLine(Contains("line-file")).
+			Press(keys.Universal.FocusMainView)
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+2a")).
+			PressPrimaryAction().
+			NavigateToLine(Contains("+2c")).
+			Press(keys.Universal.ToggleRangeSelect).
+			NavigateToLine(Contains("+2e")).
+			PressPrimaryAction().
+			NavigateToLine(Contains("+2g")).
+			PressPrimaryAction().
+			PressEscape()
+
+		t.Views().Secondary().ContainsLines(
+			// direct-file patch
+			Contains(`diff --git a/direct-file b/direct-file`),
+			Contains(`index`),
+			Contains(`--- a/direct-file`),
+			Contains(`+++ b/direct-file`),
+			Contains(`@@ -0,0 +1 @@`),
+			Contains(`+direct file content`),
+			Contains(`\ No newline at end of file`),
+			// hunk-file patch
+			Contains(`diff --git a/hunk-file b/hunk-file`),
+			Contains(`index`),
+			Contains(`--- a/hunk-file`),
+			Contains(`+++ b/hunk-file`),
+			Contains(`@@ -1,4 +1,4 @@`),
+			Contains(`-1a`),
+			Contains(`+aa`),
+			Contains(` 1b`),
+			Contains(` 1c`),
+			Contains(` 1d`),
+			// line-file patch
+			Contains(`diff --git a/line-file b/line-file`),
+			Contains(`index`),
+			Contains(`--- a/line-file`),
+			Contains(`+++ b/line-file`),
+			Contains(`@@ -0,0 +1,5 @@`),
+			Contains(`+2a`),
+			Contains(`+2c`),
+			Contains(`+2d`),
+			Contains(`+2e`),
+			Contains(`+2g`),
+		)
+	},
+})
@@ -0,0 +1,54 @@
+package main_view
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var ChangeContextSizeWhileBuildingPatch = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Change diff context size while building a custom patch, then add another line",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+		config.GetUserConfig().Git.DiffContextSize = 1
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n")
+		shell.Commit("first commit")
+		shell.UpdateFileAndAdd("file1", "ONE\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nTEN\n")
+		shell.Commit("second commit")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("second commit").IsSelected(),
+				Contains("first commit"),
+			).
+			PressEnter()
+
+		t.Views().CommitFiles().
+			IsFocused().
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("-one")).
+			PressPrimaryAction().
+			Press(keys.Universal.IncreaseContextInDiffView).
+			Tap(func() {
+				t.ExpectToast(Equals("Changed diff context size to 2"))
+			}).
+			NavigateToLine(Contains("-ten")).
+			PressPrimaryAction()
+
+		t.Views().Secondary().Content(
+			Contains("-one").Contains("-ten"),
+		)
+		t.Views().Main().MarkedLines(
+			Contains("-one"),
+			Contains("-ten"),
+		)
+	},
+})
@@ -1,12 +1,12 @@
-package staging
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var DiffChangeScreenMode = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Change the staged changes screen mode",
+var ChangeScreenModeInFocusedDiff = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Enlarge the focused diff, which leaves the pane showing the other side of the file behind",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig:  func(config *config.AppConfig) {},
@@ -16,32 +16,30 @@ var DiffChangeScreenMode = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Files().
 			Focus().
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		t.Views().Staging().
+		t.Views().Main().
 			IsFocused().
 			PressPrimaryAction().
 			Title(Equals("Unstaged changes")).
 			Content(Contains("+second line").DoesNotContain("+first line")).
 			PressTab()

-		t.Views().StagingSecondary().
+		t.Views().Secondary().
 			IsFocused().
 			Title(Equals("Staged changes")).
 			Content(Contains("+first line").DoesNotContain("+second line")).
 			Press(keys.Universal.NextScreenMode).
 			Tap(func() {
-				t.Views().AppStatus().
-					IsInvisible()
-				t.Views().Staging().
-					IsVisible()
+				// Half screen: the side panels are gone, the two diff panes are not.
+				t.Views().AppStatus().IsInvisible()
+				t.Views().Main().IsVisible()
 			}).
 			Press(keys.Universal.NextScreenMode).
 			Tap(func() {
-				t.Views().AppStatus().
-					IsInvisible()
-				t.Views().Staging().
-					IsInvisible()
+				// Full screen: the focused pane has the window to itself.
+				t.Views().AppStatus().IsInvisible()
+				t.Views().Main().IsInvisible()
 			})
 	},
 })
@@ -10,7 +10,7 @@ var ClickSelectsDiffLine = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n")
@@ -10,7 +10,7 @@ var CommitFromMainView = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n")
@@ -10,7 +10,7 @@ var CopyRowsThatAreNoDiffLine = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
 		cfg.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard"
 		// A renderer that states which line of the file each row of its diff shows, and
 		// ends with a row of its own that shows none. It ignores its input and prints
@@ -19,7 +19,7 @@ var CopySelectedDiffLines = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = true
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = true
 		// Emulate the clipboard by writing to a file.
 		cfg.GetUserConfig().OS.CopyToClipboardCmd = "printf '%s' {{text}} > clipboard"
 		// A renderer that decorates every line of a diff's body, so that what is on
@@ -10,7 +10,7 @@ var CustomPatchGoesThroughTheDiffRenderer = NewIntegrationTest(NewIntegrationTes
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
 		// A renderer that announces the metadata protocol — so that focusing the main
 		// view keeps its output — and says who it is above the diff it passes through.
 		cfg.GetUserConfig().Git.DiffRenderers = []config.DiffRendererConfig{
@@ -1,4 +1,4 @@
-package staging
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
@@ -6,10 +6,12 @@ import (
 )

 var DiscardAllChanges = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Discard all changes of a file in the staging panel, then assert we land in the staging panel of the next file",
+	Description:  "Discard all changes of a file from the focused main view, then land on the next file's diff",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(cfg *config.AppConfig) {
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\n")
 		shell.CreateFileAndAdd("file2", "1\n2\n")
@@ -27,30 +29,25 @@ var DiscardAllChanges = NewIntegrationTest(NewIntegrationTestArgs{
 				Equals("   M file2"),
 			).
 			SelectNextItem().
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		t.Views().Staging().
+		t.Views().Main().
 			IsFocused().
-			Press(keys.Main.ToggleSelectHunk).
 			SelectedLines(Contains("+three")).
-			// discard the line
 			Press(keys.Universal.Remove).
 			Tap(func() {
 				t.Common().ConfirmDiscardLines()
 			}).
 			SelectedLines(Contains("+four")).
-			// discard the other line
 			Press(keys.Universal.Remove).
 			Tap(func() {
 				t.Common().ConfirmDiscardLines()
+			})

-				// because there are no more changes in file1 we switch to file2
-				t.Views().Files().
-					Lines(
-						Equals(" M file2"),
-					)
-			}).
-			// assert we are still in the staging panel, but now looking at the changes of the other file
+		t.Views().Files().Lines(
+			Equals(" M file2"),
+		)
+		t.Views().Main().
 			IsFocused().
 			SelectedLines(Contains("+3"))
 	},
@@ -10,7 +10,7 @@ var DiscardDiffLines = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\n")
@@ -10,7 +10,7 @@ var DiscardFromACommitOnlyWhereItCanBeRewritten = NewIntegrationTest(NewIntegrat
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n")
@@ -1,18 +1,19 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var DiscardLinesFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Discard specific lines from a commit using the 'd' shortcut in the patch building view",
+var DiscardLineFromAddedFileInCommit = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Discard one line from an added file in a commit",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("first commit")
-
 		shell.CreateFileAndAdd("file1", "1st line\n2nd line\n3rd line\n")
 		shell.Commit("commit to remove from")
 	},
@@ -30,15 +31,11 @@ var DiscardLinesFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("A file1").IsSelected(),
 			).
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		// Select the second line (+2nd line) and press 'd' to remove it
-		t.Views().PatchBuilding().
+		t.Views().Main().
 			IsFocused().
-			SelectNextItem().
-			SelectedLines(
-				Contains("+2nd line"),
-			).
+			NavigateToLine(Contains("+2nd line")).
 			Press(keys.Universal.Remove)

 		t.ExpectPopup().Confirmation().
@@ -46,18 +43,11 @@ var DiscardLinesFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Equals("Are you sure you want to discard the selected lines from this commit?")).
 			Confirm()

-		// After the rebase, we should be back at the commit files view
-		// and the commit should now only contain the 1st and 3rd lines
-		t.Views().CommitFiles().
+		t.Views().Main().
 			IsFocused().
-			Lines(
-				Contains("A file1").IsSelected(),
-			).
-			PressEscape()
-
-		t.Views().Main().ContainsLines(
-			Equals("+1st line"),
-			Equals("+3rd line"),
-		)
+			ContainsLines(
+				Equals("+1st line"),
+				Equals("+3rd line"),
+			)
 	},
 })
@@ -10,7 +10,7 @@ var DiscardLinesFromACommit = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n")
@@ -14,7 +14,7 @@ var DragRangeWithAutoscroll = NewIntegrationTest(NewIntegrationTestArgs{
 	Width:        120,
 	Height:       30,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		fileContent := "base\n"
@@ -10,7 +10,7 @@ var DragSelectsDiffLineRange = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = true
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = true
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n")
@@ -1,15 +1,16 @@
-package patch_building
+package main_view

 import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )

-var EditLineInPatchBuildingPanel = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Edit a line in the patch building panel; make sure we end up on the right line",
+var EditHistoricalDiffLine = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Edit a historical diff line at its current working-tree line number",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 		config.GetUserConfig().OS.EditAtLine = "echo {{filename}}:{{line}} > edit-command"
 	},
 	SetupRepo: func(shell *Shell) {
@@ -34,9 +35,9 @@ var EditLineInPatchBuildingPanel = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("A file.txt").IsSelected(),
 			).
-			PressEnter()
+			Press(keys.Universal.FocusMainView)

-		t.Views().PatchBuilding().
+		t.Views().Main().
 			IsFocused().
 			Content(Contains("+4\n+5\n+6")).
 			NavigateToLine(Contains("+5")).
@@ -10,7 +10,7 @@ var EditHunkInFocusedDiff = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(cfg *config.AppConfig) {
-		cfg.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		cfg.GetUserConfig().Gui.UseHunkModeInDiffView = false
 		// Stand in for the editor: record the line it was pointed at, outside the
 		// repo so that the files panel keeps saying what the test is about, then
 		// write a patch that stages something neither side of the diff says. That
@@ -10,7 +10,7 @@ var EditSelectedDiffLine = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 		config.GetUserConfig().OS.EditAtLine = "echo {{filename}}:{{line}} > edit-command"
 		config.GetUserConfig().OS.Edit = "echo {{filename}} > edit-command"
 	},
@@ -0,0 +1,69 @@
+package main_view
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var EnterAndDoubleClickFocusFileDiff = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Enter and double-click focus a file's diff in the main view",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("file1", "base\n")
+		shell.Commit("add file")
+		shell.UpdateFile("file1", "changed\n")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("file1").IsSelected(),
+			).
+			PressEnter()
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("-base")).
+			PressEscape()
+
+		t.Views().Files().
+			IsFocused().
+			Click(3, 0).
+			Click(3, 0)
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("-base")).
+			PressEscape()
+
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("add file").IsSelected(),
+			).
+			PressEnter()
+
+		t.Views().CommitFiles().
+			IsFocused().
+			Lines(
+				Contains("file1").IsSelected(),
+			).
+			PressEnter()
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+base")).
+			PressEscape()
+
+		t.Views().CommitFiles().
+			IsFocused().
+			Click(3, 0).
+			Click(3, 0)
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(Contains("+base"))
+	},
+})
@@ -10,7 +10,7 @@ var EscapeDismissesSelection = NewIntegrationTest(NewIntegrationTestArgs{
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
-		config.GetUserConfig().Gui.UseHunkModeInStagingView = false
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n")
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stefan Haller	e14177523c	Rename ctrl+o description to "Copy selected diff lines to clipboard" In the staging panel it used to copy the selected text verbatim, but in the focused main view it copies the diff lines (that's also what the toast says), and now that the staging panel is gone, we can change the text to make it more specific.	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	4fdeb2645b	Remove the last staging-panel language from tests Generic range assertions and migrated commit tests should describe the views they still exercise. Drop stale explorer wording so failures and test intent no longer point contributors at UI that does not exist. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	e576b39e26	Document line actions in the focused diff Users no longer enter separate staging or patch-building panels. Describe file entry, pane switching, staging, and custom patch construction where those actions now happen, and remove the deleted package from the developer guide. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandClaude Opus 5	fd4e89ce1b	Let wrapLinesInDiffView govern the two main panes Working in a diff used to mean the staging view, and this option said whether the long lines there were wrapped. The main view does that work now, and the option has had nothing to govern since the staging view went away. Both panes wrap whatever they are given. Make the option their wrap setting instead. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	dabf112c8d	Name diff options after the view that now uses them Hunk defaults and wrapping no longer belong to a staging panel. Rename both public keys with automatic migration, and remove panel-era English strings so config, UI, schema, and generated docs describe the surviving interface. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	c3680ebc5b	Allow context changes while building a custom patch The focused diff addresses patch lines by identity, so changing how much context is rendered cannot invalidate an active patch. Remove the explorer era refusal and prove that another line can still be toggled correctly after the rerender. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	9e5b73b09c	Remove the staging and patch-building panel shells Nothing routes to the explorer contexts after line actions and file entry moved into the normal main pair. Delete their contexts, views, main-pair wiring, discovery API, test drivers, and selection-state package so the surviving diff view is the only implementation. Their names go from the contexts a custom command may bind to as well, so that a config still naming one is reported as the config error it now is rather than taken as a context we simply failed to find. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	e163c59893	Remove the explorer behavior behind the retired panels Focused main views now own selection, staging, patch construction, copying, and context-size rerenders. Remove the parallel controller/helper stack and its refresh scopes, while retaining custom-patch reset as mode behavior. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandClaude Opus 5	f937814c8d	Move the diff-copy helper out of the explorer controller The next commit deletes the controller this lives in, while the helper itself is still wanted: it is what makes a copied selection paste straight into code. Move it first, so that the deletion is a deletion. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	d510f5ae1b	Open file diffs in the focused main view Enter and double-click should take users to the diff where line actions now live, whether the file belongs to the working tree or a commit. Share the existing focus, raw-fallback, and selection setup while retaining directory, submodule, and conflict-specific behavior. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	c23253857a	Move the last explorer workflows onto the focused diff Historical file removal and the staging/custom-patch demos still entered the old panels even though their line actions already exist in the main diff. Preserve their prompts, timing, and downstream results while changing only the interaction surface. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	8933f8485e	Drop test steps owned by the retiring explorers The generic filter and range-selection suites already exercise their state machines on surviving views, while focused-diff tests own range selection and drag autoscroll. Remove only the repetitions that enter an explorer, along with the staging-panel screen-mode test whose UI no longer survives. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan Haller	8a0c28af20	Migrate range select tests to focused main view	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	7d792ecf13	Exercise commit and stash flows through the focused diff Line staging remains part of several broader workflows: committing staged and unstaged changes, bypassing hooks, and stashing only the staged part of a file. Drive those selections through the main diff pair while preserving their commit, focus, and exact stash-content assertions. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	4591cdb685	Build mixed custom patches from the focused diff The broad regression for combining a whole file, a hunk, a range, and individual lines must survive the patch-building panel. Keep the side panel for the explicit whole-file operation and drive every content selection through the commit's focused diff. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	6c98bcfb38	Keep partial rename patches on the focused diff Selecting a rename's content changes must remain distinct from selecting the file operation itself. Build and remove that partial patch through the focused commit diff, and keep asserting that the rename stays in its source commit after the content change is taken out. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	e59185bdc7	Manage patch lifetime from the focused diff Removing a whole or partial patch from its source commit, and replacing a patch when the user selects another commit, must not depend on entering a patch-building panel. Keep those state transitions covered through the diff that now owns patch selection. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	115e25e43c	Build applied patches from the focused diff Applying and reverse-applying custom patches must keep their staging, dirty-worktree, and conflict behavior after the patch-building panel is removed. Select the source lines in commit diffs while retaining every assertion about the resulting working tree and conflict resolution. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	c966efe1f3	Keep historical diff actions off the explorers Editing a line whose working-tree position shifted, discarding part of an added file, and giving up a patch by escaping are all behavior worth retaining. Drive them through the focused commit diff so their coverage no longer depends on the patch-building panel. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	835d15bf53	Move partial-patch destination tests onto the commit diff Line-level patch moves must keep their behavior for added and deleted files, adjacent additions, stacked branches, and conflicting earlier destinations. Select those lines directly in the focused diff so only the intended changes move and file-level metadata stays with the source when appropriate. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	94e5f8ea2d	Move whole-patch destination tests onto the commit diff Moving a complete patch must preserve each file operation whether its destination is a new commit before or after the source, or an existing commit earlier or later in history. Build those patches as ranges over the focused diff so the coverage survives removal of directory toggling in the patch builder. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	03e1d37492	Keep patch-move conflict coverage on the focused diff Conflict and dirty-worktree handling happen after a custom patch is built, but their tests must no longer rely on either explorer to build it. Select whole and partial patches in the commit diff while preserving the rebase-conflict and stash-restoration assertions. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	5f9c71bfef	Move index-operation edge cases onto the focused diff Patch movement still needs coverage for partial modifications, adjacent additions, custom diff settings, and selections spanning files after the patch-building panel goes away. Drive each through diff-line identities while keeping the resulting commit and index assertions unchanged. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	6e43038b4b	Preserve whole-file operations for added and deleted files A focused diff must replace the patch builder's whole-file toggle without losing file creation or deletion metadata. Ordinary modifications and renames must remain line-level selections even when every changed content line is selected. Ask the patch builder's canonical raw diff whether it consists of one hunk containing only additions or only deletions and no context. Use the whole-file operation only when the selection also covers every change. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	0091757e18	Expose the missing whole-file semantics in the focused diff The patch-building panel could move an added file as a file, while selecting every visible change through the focused diff currently moves only its content and leaves the empty file behind. Keep the intended index state beside the current one so the replacement flow demonstrates that gap before it is fixed. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	d3c234860e	Exercise patch-move selection recovery through the diff The commit rewrite triggered by moving a custom patch must keep the user's place without relying on the patch-building panel. Build the patch and leave the affected range selected in the focused diff so the regression test follows the UI that survives this branch. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	0a5d1bce55	Keep whole-file discard coverage on the surviving diff view Removing the staging panel must not lose the handoff that happens when a file's final change disappears. Drive that behavior through the focused main view so the test continues to require focus and selection to follow the files panel onto the next diff. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandGitHub Copilot	89d94b8989	Let focused diff tests own shared staging behavior Keeping the same staging interactions covered through the explorer would pin the suite to the panel that this branch removes. The focused main view now owns line, range, hunk, navigation, search, context-size, and rapid-input coverage. Co-Authored-By: GitHub Copilot <copilot@github.com>	2026-10-01 17:28:30 +02:00
Stefan HallerandClaude Opus 5	5db5a61f09	Remove the hint about hunk selection being the default The hint was raised on entering the staging panel, once, to explain that the selection mode there had changed and how to get the old one back. That panel is gone, and with it the moment the hint was tied to; what is left is a string nothing prints and a flag nothing reads. The advice it carried is not lost: the option it names is documented, and the key that switches modes is on screen while a diff is focused. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-10-01 17:28:30 +02:00