Add a menu of the diff's files to jump to one directly

n and N step through the files of a multi-file diff one at a time, which is a long way to the far end of a commit touching a hundred files. Bind ctrl+g to a menu of the diff's files, in the order the diff shows them and by the paths the repo knows them by; picking one goes to where its diff begins, exactly where stepping to it with n would have left you. The menu filters as you type, so the file you have in mind is a few characters away however many the commit touches. The key works in the panel the diff belongs to as well as in the diff itself. A commit is read from the commits panel, so being able to jump from there saves focusing the diff and leaving it again for the next commit; the diff scrolls to the file and the focus stays in the panel. It is ctrl+g rather than f because a key that works in every panel has to be free in all of them, and f is fetch in the files panel and fixup in the commits panel. The command applies only while the main view is showing a diff, and is left out of the keybindings menu where it isn't: over a branch's commit log, or while a conflicted file has given the main section over to the merge conflicts view. The diff is read to the end before the menu is built, as searching it does: a file below the part that has been read is in neither the list nor the view. Each item names its file rather than the row that file begins at, so that a diff re-rendered while the menu is up is jumped into at the row the file begins at now. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Move where a jump lands into the diff line helper
2026-09-28 10:16:22 -04:00 · 2026-09-27 18:26:56 +02:00 · 2026-09-27 18:26:56 +02:00 · 2026-09-27 18:26:56 +02:00 · 2026-09-27 18:26:56 +02:00 · 2026-09-27 18:26:56 +02:00
53 changed files with 1935 additions and 317 deletions
@@ -697,6 +697,7 @@ keybinding:
      - "4"
      - "5"
    focusMainView: "0"
+    jumpToFile: <ctrl+g>
    nextMatch: "n"
    prevMatch: "N"
    startSearch: /
@@ -938,6 +939,8 @@ It is used, for example, when pasting a commit message into the commit message p

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

+You can also open a line in your editor with the mouse: alt-click or shift-click it. Both modifiers do the same thing, because some terminals only support one or the other. The click leaves the focus and the selection where they are, so it works while you are reading a diff from another panel, or while a popup is open.
+
 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.

 ```yaml
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Prev screen mode |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Cancel |  |
 | `` ? `` | Open keybindings menu |  |
 | `` <ctrl+s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -234,6 +235,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Go to next hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -316,6 +319,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Go to next hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 前の画面モード |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | キャンセル |  |
 | `` ? `` | キーバインディングメニューを開く |  |
 | `` <ctrl+s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |
@@ -203,6 +204,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 次のハンクに移動 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | サイドパネルに戻る |  |
 | `` c `` | コミット | ステージされた変更をコミットします。 |
 | `` w `` | pre-commitフックなしで変更をコミット |  |
@@ -293,6 +296,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 次のハンクに移動 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | サイドパネルに戻る |  |
 | `` c `` | コミット | ステージされた変更をコミットします。 |
 | `` w `` | pre-commitフックなしで変更をコミット |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 이전 스크린 모드 |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | 취소 |  |
 | `` ? `` | 매뉴 열기 |  |
 | `` <ctrl+s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -95,6 +96,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -188,6 +191,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 다음 hunk를 선택 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | 커밋 변경내용 | 스테이징된 변경 사항 커밋. |
 | `` w `` | Commit changes without pre-commit hook |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Vorige scherm modus |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Annuleren |  |
 | `` ? `` | Open menu |  |
 | `` <ctrl+s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -242,6 +243,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
@@ -316,6 +319,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Selecteer de volgende hunk |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit veranderingen | Commit gestagede wijzigingen. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Poprzedni tryb ekranu |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Anuluj |  |
 | `` ? `` | Otwórz menu przypisań klawiszy |  |
 | `` <ctrl+s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |
@@ -110,6 +111,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
 | `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
@@ -211,6 +214,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Idź do następnego fragmentu |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Zatwierdź zmiany zatwierdzone. |
 | `` w `` | Zatwierdź zmiany bez hooka pre-commit |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Modo de tela anterior |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Cancelar |  |
 | `` ? `` | Abrir o menu de atalhos do teclado |  |
 | `` <ctrl+s> `` | Ver opções de filtro | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -246,6 +247,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Ir para o próximo trecho |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Submeter mudanças em staging |
 | `` w `` | Fazer commit de alterações sem pré-commit |  |
@@ -325,6 +328,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Ir para o próximo trecho |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Commit | Submeter mudanças em staging |
 | `` w `` | Fazer commit de alterações sem pré-commit |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | Предыдущий режим экрана |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | Отменить |  |
 | `` ? `` | Открыть меню |  |
 | `` <ctrl+s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |
@@ -85,6 +86,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Выбрать следующую часть |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Сохранить изменения | Commit staged changes. |
 | `` w `` | Закоммитить изменения без предварительного хука коммита |  |
@@ -110,6 +113,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | Выбрать следующую часть |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | Exit back to side panel |  |
 | `` c `` | Сохранить изменения | Commit staged changes. |
 | `` w `` | Закоммитить изменения без предварительного хука коммита |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 上一屏模式 |  |
 | `` \| `` | Cycle diff renderers | Choose the next renderer in the list of configured diff renderers. |
 | `` \ `` | Cycle diff renderers (reverse) | Choose the previous renderer in the list of configured diff renderers. |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 打开菜单 |  |
 | `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
@@ -281,6 +282,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 选择下一个区块 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到侧边面板 |  |
 | `` c `` | 提交变更 | 提交暂存文件 |
 | `` w `` | 提交变更而无需预先提交钩子 |  |
@@ -322,6 +325,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 选择下一个区块 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到侧边面板 |  |
 | `` c `` | 提交变更 | 提交暂存文件 |
 | `` w `` | 提交变更而无需预先提交钩子 |  |
@@ -24,6 +24,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` _ `` | 上一個螢幕模式 |  |
 | `` \| `` | 切換差異渲染器 | 選擇已設定的差異渲染器清單中的下一個渲染器。 |
 | `` \ `` | 切換差異渲染器（反向） | 選擇已設定的差異渲染器清單中的上一個渲染器。 |
+| `` <ctrl+g> `` | Jump to file in diff | Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel. |
 | `` <esc> `` | 取消 |  |
 | `` ? `` | 開啟選單 |  |
 | `` <ctrl+s> `` | 檢視篩選路徑選項 | 檢視用於過濾提交日誌的選項，以便僅顯示與過濾器匹配的提交。 |
@@ -70,6 +71,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 選擇下一段 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到側邊面板 |  |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
@@ -344,6 +347,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 | `` <right>, l `` | 選擇下一段 |  |
 | `` N `` | Go to previous file |  |
 | `` n `` | Go to next file |  |
+| `` <ctrl+g> `` | Jump to file |  |
+| `` G `` | Open pull request at selected line | Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found. |
 | `` <esc> `` | 退出回到側邊面板 |  |
 | `` c `` | 提交變更 | 提交暫存區變更 |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
@@ -511,6 +511,7 @@ type KeybindingUniversalConfig struct {
 	PrevBlockAlt2     Keybinding   `yaml:"prevBlock-alt2"`
 	JumpToBlock       []Keybinding `yaml:"jumpToBlock"`
 	FocusMainView     Keybinding   `yaml:"focusMainView"`
+	JumpToFile        Keybinding   `yaml:"jumpToFile"`
 	NextMatch         Keybinding   `yaml:"nextMatch"`
 	PrevMatch         Keybinding   `yaml:"prevMatch"`
 	StartSearch       Keybinding   `yaml:"startSearch"`
@@ -1037,6 +1038,7 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
 				NextBlockAlt2:                     Keybinding{"<tab>"},
 				JumpToBlock:                       []Keybinding{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}},
 				FocusMainView:                     Keybinding{"0"},
+				JumpToFile:                        Keybinding{"<ctrl+g>"},
 				NextMatch:                         Keybinding{"n"},
 				PrevMatch:                         Keybinding{"N"},
 				StartSearch:                       Keybinding{"/"},
@@ -32,3 +32,37 @@ func TestMouseReleaseDoesNotBreakDoubleClickDetection(t *testing.T) {

 	assert.Equal(t, []bool{false, true}, doubleClicks)
 }
+
+func TestASwallowedClickIsNoHalfOfADoubleClick(t *testing.T) {
+	t.Cleanup(resetMouseState)
+	resetMouseState()
+	g := newTestGui(t)
+	view, _ := g.SetView("list", 0, 0, 20, 10, 0)
+	doubleClicks := []bool{}
+	g.SetViewClickBinding(&ViewMouseBinding{
+		ViewName: "list",
+		Key:      MouseLeft,
+		Handler: func(opts ViewMouseBindingOpts) error {
+			doubleClicks = append(doubleClicks, opts.IsDoubleClick)
+			return nil
+		},
+	})
+
+	press := gocuiEventFromTcellEvent(
+		tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonPrimary, tcell.ModNone))
+	release := gocuiEventFromTcellEvent(
+		tcell.NewEventMouse(view.x0+1, view.y0+1, tcell.ButtonNone, tcell.ModNone))
+
+	// A click the client rejects, as it does for one landing behind a popup panel.
+	g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return false }
+	assert.NoError(t, g.onKey(&press))
+	assert.NoError(t, g.onKey(&release))
+	assert.Empty(t, doubleClicks)
+
+	// The same spot clicked again once clicks are accepted. It is a click of its
+	// own, not the second half of the one that nothing acted on.
+	g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return true }
+	assert.NoError(t, g.onKey(&press))
+
+	assert.Equal(t, []bool{false}, doubleClicks)
+}
@@ -64,8 +64,8 @@ func TestFlushContentOnly_SkipsUntaintedViews(t *testing.T) {
 	assert.True(t, status.IsTainted(), "status view should be tainted after SetContent")
 	assert.False(t, main.IsTainted(), "main view should not be tainted (was not modified)")

-	// flushContentOnly should succeed and clear status tainted flag
-	assert.NoError(t, g.flushContentOnly(g.views))
+	// flushContentOnly should clear status tainted flag
+	g.flushContentOnly(g.views)

 	assert.False(t, status.IsTainted(), "status view should not be tainted after flushContentOnly")
 	assert.False(t, main.IsTainted(), "main view should not be tainted after flushContentOnly")
@@ -76,11 +76,28 @@ func TestFlushContentOnly_WritesCorrectContent(t *testing.T) {
 	status, _ := setupViews(t, g)

 	status.SetContent("Fetching |")
-	assert.NoError(t, g.flushContentOnly(g.views))
+	g.flushContentOnly(g.views)

 	assert.Equal(t, "Fetching |", status.Buffer())
 }

+func TestForceFlushViewsContentOnlyDrawsLineFlash(t *testing.T) {
+	g := newTestGui(t)
+	_, main := setupViews(t, g)
+	main.Highlight = true
+	main.SelBgColor = ColorBlue
+	main.SelectedLineColorWidth = 2
+	main.FocusPoint(0, 0, false)
+
+	main.SetLineFlash(0)
+	g.ForceFlushViewsContentOnly(g.Views())
+
+	for x := main.x0 + 1; x <= main.x0+2; x++ {
+		_, style, _ := Screen.Get(x, main.y0+1)
+		assert.True(t, style.HasReverse(), "selection-bar cell at x=%d should flash", x)
+	}
+}
+
 func TestProcessEvent_ContentOnlyEvent_SkipsTaintedCheck(t *testing.T) {
 	g := newTestGui(t)
 	status, main := setupViews(t, g)
@@ -231,7 +248,7 @@ func TestFlushContentOnly_DoesNotOverdrawHigherZViews(t *testing.T) {
 	assert.False(t, popup.IsTainted(), "popup should not be tainted")

 	// flushContentOnly is what spinner ticks ultimately invoke.
-	assert.NoError(t, g.flushContentOnly(g.views))
+	g.flushContentOnly(g.views)

 	assert.Equal(t, "P", cellAt(21, 9),
 		"popup region must still show popup content after flushContentOnly; "+
@@ -279,7 +296,7 @@ func TestFlushContentOnly_RedrawsTransitivelyOverlappingViews(t *testing.T) {
 	assert.False(t, b.IsTainted())
 	assert.False(t, c.IsTainted())

-	assert.NoError(t, g.flushContentOnly(g.views))
+	g.flushContentOnly(g.views)

 	// a redrawn (direct).
 	assert.Equal(t, "X", cellAt(5, 5), "a should be redrawn (tainted)")
@@ -91,6 +91,14 @@ type ViewMouseBinding struct {

 	// must be a mouse key
 	Key KeyName
+
+	// If true, this binding is dispatched before ShouldHandleMouseEvent is
+	// consulted, so it fires even when a popup panel is focused and the click
+	// lands on a view other than that panel (which is normally swallowed). This
+	// is the same early phase that hyperlink clicks are handled in; use it for
+	// clicks that must stay live behind a popup, e.g. opening a diff line in the
+	// editor from the main view behind the commit-message panel.
+	HandleWhenPopupPanelFocused bool
 }

 type ViewMouseBindingOpts struct {
@@ -413,13 +421,12 @@ func (g *Gui) Size() (x, y int) {
 // corner of the terminal. It checks if the position is valid and applies
 // the given colors.
 // Should only be used if you know that the given rune is not part of a grapheme cluster.
-func (g *Gui) SetRune(x, y int, ch rune, fgColor, bgColor Attribute) error {
+func (g *Gui) SetRune(x, y int, ch rune, fgColor, bgColor Attribute) {
 	if x < 0 || y < 0 || x >= g.maxX || y >= g.maxY {
 		// swallowing error because it's not that big of a deal
-		return nil
+		return
 	}
 	tcellSetCell(x, y, string(ch), fgColor, bgColor, g.outputMode)
-	return nil
 }

 // SetView creates a new view with its top-left corner at (x0, y0)
@@ -1189,7 +1196,8 @@ func (g *Gui) processEvent() error {
 	contentOnly = contentOnly && remainingContentOnly

 	if contentOnly {
-		return g.flushContentOnly(g.views)
+		g.flushContentOnly(g.views)
+		return nil
 	}
 	return g.flush()
 }
@@ -1290,7 +1298,7 @@ func (g *Gui) onResize() {
 }

 // drawFrameEdges draws the horizontal and vertical edges of a view.
-func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) error {
+func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) {
 	runeH, runeV := '─', '│'
 	if len(v.FrameRunes) >= 2 {
 		runeH, runeV = v.FrameRunes[0], v.FrameRunes[1]
@@ -1301,14 +1309,10 @@ func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) error {
 			continue
 		}
 		if v.y0 > -1 && v.y0 < g.maxY {
-			if err := g.SetRune(x, v.y0, runeH, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.SetRune(x, v.y0, runeH, fgColor, bgColor)
 		}
 		if v.y1 > -1 && v.y1 < g.maxY {
-			if err := g.SetRune(x, v.y1, runeH, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.SetRune(x, v.y1, runeH, fgColor, bgColor)
 		}
 	}

@@ -1318,19 +1322,14 @@ func (g *Gui) drawFrameEdges(v *View, fgColor, bgColor Attribute) error {
 			continue
 		}
 		if v.x0 > -1 && v.x0 < g.maxX {
-			if err := g.SetRune(v.x0, y, runeV, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.SetRune(v.x0, y, runeV, fgColor, bgColor)
 		}
 		if v.x1 > -1 && v.x1 < g.maxX {
 			runeToPrint := calcScrollbarRune(showScrollbar, realScrollbarStart, realScrollbarEnd, y, runeV)

-			if err := g.SetRune(v.x1, y, runeToPrint, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.SetRune(v.x1, y, runeToPrint, fgColor, bgColor)
 		}
 	}
-	return nil
 }

 func calcScrollbarRune(
@@ -1430,17 +1429,13 @@ func corner(v *View, directions byte) rune {
 }

 // drawFrameCorners draws the corners of the view.
-func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) error {
+func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) {
 	if v.y0 == v.y1 {
 		if !g.SupportOverlaps && v.x0 >= 0 && v.x1 >= 0 && v.y0 >= 0 && v.x0 < g.maxX && v.x1 < g.maxX && v.y0 < g.maxY {
-			if err := g.SetRune(v.x0, v.y0, '╶', fgColor, bgColor); err != nil {
-				return err
-			}
-			if err := g.SetRune(v.x1, v.y0, '╴', fgColor, bgColor); err != nil {
-				return err
-			}
+			g.SetRune(v.x0, v.y0, '╶', fgColor, bgColor)
+			g.SetRune(v.x1, v.y0, '╴', fgColor, bgColor)
 		}
-		return nil
+		return
 	}

 	runeTL, runeTR, runeBL, runeBR := '┌', '┐', '└', '┘'
@@ -1461,18 +1456,15 @@ func (g *Gui) drawFrameCorners(v *View, fgColor, bgColor Attribute) error {

 	for _, c := range corners {
 		if c.x >= 0 && c.y >= 0 && c.x < g.maxX && c.y < g.maxY {
-			if err := g.SetRune(c.x, c.y, c.ch, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.SetRune(c.x, c.y, c.ch, fgColor, bgColor)
 		}
 	}
-	return nil
 }

 // drawTitle draws the title of the view.
-func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) error {
+func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) {
 	if v.y0 < 0 || v.y0 >= g.maxY {
-		return nil
+		return
 	}

 	tabs := v.Tabs
@@ -1508,9 +1500,7 @@ func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) error {

 	x := v.x0 + 2
 	for _, ch := range prefix {
-		if err := g.SetRune(x, v.y0, ch, fgColor, bgColor); err != nil {
-			return err
-		}
+		g.SetRune(x, v.y0, ch, fgColor, bgColor)
 		x += uniseg.StringWidth(string(ch))
 	}
 	for i, ch := range str {
@@ -1533,64 +1523,55 @@ func (g *Gui) drawTitle(v *View, fgColor, bgColor Attribute) error {
 				currentFgColor &= ^AttrBold
 			}
 		}
-		if err := g.SetRune(x, v.y0, ch, currentFgColor, currentBgColor); err != nil {
-			return err
-		}
+		g.SetRune(x, v.y0, ch, currentFgColor, currentBgColor)
 		x += uniseg.StringWidth(string(ch))
 	}
-	return nil
 }

 // drawSubtitle draws the subtitle of the view.
-func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) error {
+func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) {
 	if v.y0 < 0 || v.y0 >= g.maxY {
-		return nil
+		return
 	}

 	start := v.x1 - 5 - uniseg.StringWidth(v.Subtitle)
 	if start < v.x0 {
-		return nil
+		return
 	}
 	x := start
 	for _, ch := range v.Subtitle {
 		if x >= v.x1 {
 			break
 		}
-		if err := g.SetRune(x, v.y0, ch, fgColor, bgColor); err != nil {
-			return err
-		}
+		g.SetRune(x, v.y0, ch, fgColor, bgColor)
 		x += uniseg.StringWidth(string(ch))
 	}
-	return nil
 }

 // drawListFooter draws the footer of a list view, showing something like '1 of 10'
-func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) error {
+func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) {
 	if len(v.buf.lines) == 0 {
-		return nil
+		return
 	}

 	message := v.Footer

 	if v.y1 < 0 || v.y1 >= g.maxY {
-		return nil
+		return
 	}

 	start := v.x1 - 1 - uniseg.StringWidth(message)
 	if start < v.x0 {
-		return nil
+		return
 	}
 	x := start
 	for _, ch := range message {
 		if x >= v.x1 {
 			break
 		}
-		if err := g.SetRune(x, v.y1, ch, fgColor, bgColor); err != nil {
-			return err
-		}
+		g.SetRune(x, v.y1, ch, fgColor, bgColor)
 		x += uniseg.StringWidth(string(ch))
 	}
-	return nil
 }

 // flush updates the gui, re-drawing frames and buffers.
@@ -1618,40 +1599,35 @@ func (g *Gui) flush() error {
 		}
 	}
 	for _, v := range g.views {
-		if err := g.draw(v); err != nil {
-			return err
-		}
+		g.draw(v)
 	}

 	Screen.Show()
 	return nil
 }

-// Redraws only tainted views and skips the layout pass.
+// Redraws only dirty views and skips the layout pass.
 // tcell's cell-level dirty tracking ensures only
 // actually-changed cells are emitted to the terminal.
-// Will also redraw any views that overlap tainted views
-func (g *Gui) flushContentOnly(views []*View) error {
+// Will also redraw any views that overlap dirty views.
+func (g *Gui) flushContentOnly(views []*View) {
 	// The screen must not be touched while suspended (see Suspend).
 	if g.isSuspended() {
-		return nil
+		return
 	}

 	for _, v := range viewsToRedrawContentOnly(views) {
-		if err := g.draw(v); err != nil {
-			return err
-		}
+		g.draw(v)
 	}

 	Screen.Show()
-	return nil
 }

 func viewsToRedrawContentOnly(views []*View) []*View {
 	redrawIndexes := set.New[int]()

 	for i, v := range views {
-		if !v.IsTainted() && !redrawIndexes.Includes(i) {
+		if !v.NeedsRedraw() && !redrawIndexes.Includes(i) {
 			continue
 		}

@@ -1681,11 +1657,11 @@ func (g *Gui) ForceLayoutAndRedraw() error {
 	return g.flush()
 }

-// Redraws only tainted views outside of the normal main
+// Redraws only dirty views outside of the normal main
 // loop, without a layout pass. Useful during longer operations that block the
 // main thread, e.g. to update a spinner in a status view.
-func (g *Gui) ForceFlushViewsContentOnly(views []*View) error {
-	return g.flushContentOnly(views)
+func (g *Gui) ForceFlushViewsContentOnly(views []*View) {
+	g.flushContentOnly(views)
 }

 // hasFocus reports whether a view is drawn as focused. Views that are embedded
@@ -1703,9 +1679,9 @@ func outermostView(v *View) *View {
 }

 // draw manages the cursor and calls the draw function of a view.
-func (g *Gui) draw(v *View) error {
+func (g *Gui) draw(v *View) {
 	if !v.Visible || v.y1 < v.y0 || v.x1 < v.x0 {
-		return nil
+		return
 	}

 	if g.Cursor {
@@ -1744,30 +1720,18 @@ func (g *Gui) draw(v *View) error {
 			}
 		}

-		if err := g.drawFrameEdges(v, frameColor, bgColor); err != nil {
-			return err
-		}
-		if err := g.drawFrameCorners(v, frameColor, bgColor); err != nil {
-			return err
-		}
+		g.drawFrameEdges(v, frameColor, bgColor)
+		g.drawFrameCorners(v, frameColor, bgColor)
 		if v.Title != "" || len(v.Tabs) > 0 {
-			if err := g.drawTitle(v, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.drawTitle(v, fgColor, bgColor)
 		}
 		if v.Subtitle != "" {
-			if err := g.drawSubtitle(v, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.drawSubtitle(v, fgColor, bgColor)
 		}
 		if v.Footer != "" && g.ShowListFooter {
-			if err := g.drawListFooter(v, fgColor, bgColor); err != nil {
-				return err
-			}
+			g.drawListFooter(v, fgColor, bgColor)
 		}
 	}
-
-	return nil
 }

 // onKey manages key-press events. A keybinding handler is called when
@@ -1851,6 +1815,25 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 			}
 		}

+		var mouseOpts ViewMouseBindingOpts
+		if IsMouseKey(ev.Key) {
+			mouseOpts = ViewMouseBindingOpts{
+				X: newX, Y: newY, Key: ev.Key.KeyName(),
+				IsDoubleClick: g.isDoubleClick(newX, newY, ev.Key.KeyName(), v),
+			}
+
+			// Dispatch bindings that opt into firing while a popup panel is focused
+			// before the gate below gets a chance to reject the click.
+			matched, err := g.execMouseKeybindings(v, ev, mouseOpts, true)
+			if err != nil {
+				return err
+			}
+			if matched {
+				g.recordClickInfo(newX, newY, ev.Key.KeyName(), v)
+				return nil
+			}
+		}
+
 		if g.ShouldHandleMouseEvent != nil {
 			if !g.ShouldHandleMouseEvent(v, ev.Key.KeyName()) {
 				// Give clients a chance to reject clicks, for example clicks in inactive views
@@ -1858,11 +1841,21 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 				break
 			}
 		}
-		if ev.Key.KeyName() == MouseLeft && ev.Key.Mod()&ModMotion == 0 {
+		// Bindings match modifiers exactly, so a gesture with a keyboard modifier held
+		// is a gesture of its own, and the bindings that act on a plain click pass it
+		// by. It therefore has to leave the view as it found it: the cursor stays where
+		// the selection is (a list view draws its selection at the cursor), and no
+		// mouse capture begins for a drag that no binding will extend. ModMotion comes
+		// from the mouse rather than the keyboard, and every drag carries it, so it is
+		// masked out here.
+		gestureIsModified := ev.Key.Mod()&^ModMotion != ModNone
+
+		if ev.Key.KeyName() == MouseLeft && ev.Key.Mod() == ModNone {
 			g.captureMouse(v)
 		}

-		if !IsMouseScrollKey(ev.Key.KeyName()) && ev.Key.KeyName() != MouseRelease {
+		if !IsMouseScrollKey(ev.Key.KeyName()) && ev.Key.KeyName() != MouseRelease &&
+			!gestureIsModified {
 			cursorX, cursorY := newCx, newCy
 			// A captured drag can report positions outside the view; keep the
 			// view cursor inside its bounds in that case. Handlers still get
@@ -1900,9 +1893,8 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 		}

 		if IsMouseKey(ev.Key) {
-			isDoubleClick := g.recordClickInfo(newX, newY, ev.Key.KeyName(), v)
-			opts := ViewMouseBindingOpts{X: newX, Y: newY, Key: ev.Key.KeyName(), IsDoubleClick: isDoubleClick}
-			matched, err := g.execMouseKeybindings(v, ev, opts)
+			g.recordClickInfo(newX, newY, ev.Key.KeyName(), v)
+			matched, err := g.execMouseKeybindings(v, ev, mouseOpts, false)
 			if err != nil {
 				return err
 			}
@@ -1934,43 +1926,49 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
 	return nil
 }

-// remember the information for this click, and return true if it was a double click
-func (g *Gui) recordClickInfo(x, y int, key KeyName, v *View) bool {
+// isDoubleClick reports whether this click follows one just like it, closely
+// enough in time to count as a double click.
+func (g *Gui) isDoubleClick(x, y int, key KeyName, v *View) bool {
+	return g.lastClick != nil &&
+		!IsMouseScrollKey(key) &&
+		key != MouseRelease &&
+		x == g.lastClick.x &&
+		y == g.lastClick.y &&
+		key == g.lastClick.key &&
+		v.Name() == g.lastClick.viewName &&
+		time.Now().Before(g.lastClick.time.Add(DOUBLE_CLICK_THRESHOLD))
+}
+
+// recordClickInfo remembers this click as the one a following click is compared
+// against. Only the clicks that reach a binding are recorded, so a click the
+// client rejects leaves double-click detection where it was.
+func (g *Gui) recordClickInfo(x, y int, key KeyName, v *View) {
 	if IsMouseScrollKey(key) {
 		g.lastClick = nil
-		return false
+		return
 	}
 	// A release ends a gesture but is not a click of its own; it must leave
 	// the click info of the press that started it alone, or no double click
 	// could ever be detected.
 	if key == MouseRelease {
-		return false
+		return
 	}

-	clickInfo := &clickInfo{
+	g.lastClick = &clickInfo{
 		x:        x,
 		y:        y,
 		key:      key,
 		viewName: v.Name(),
 		time:     time.Now(),
 	}
-
-	isDoubleClick := g.lastClick != nil &&
-		clickInfo.x == g.lastClick.x &&
-		clickInfo.y == g.lastClick.y &&
-		clickInfo.key == g.lastClick.key &&
-		clickInfo.viewName == g.lastClick.viewName &&
-		clickInfo.time.Before(g.lastClick.time.Add(DOUBLE_CLICK_THRESHOLD))
-
-	g.lastClick = clickInfo
-	return isDoubleClick
 }

-func (g *Gui) execMouseKeybindings(view *View, ev *GocuiEvent, opts ViewMouseBindingOpts) (bool, error) {
+func (g *Gui) execMouseKeybindings(view *View, ev *GocuiEvent, opts ViewMouseBindingOpts, handleWhenPopupPanelFocused bool) (bool, error) {
 	isMatch := func(binding *ViewMouseBinding) bool {
 		return binding.ViewName == view.Name() &&
 			ev.Key.KeyName() == binding.Key &&
-			ev.Key.Mod() == binding.Modifier
+			ev.Key.Mod() == binding.Modifier &&
+			binding.HandleWhenPopupPanelFocused == handleWhenPopupPanelFocused
 	}

 	// first pass looks for ones that match the focused view
@@ -2145,6 +2143,9 @@ func (g *Gui) Suspend() error {
 		return errors.New("Already suspended")
 	}

+	for _, view := range g.views {
+		view.ClearLineFlash()
+	}
 	g.suspended = true

 	if err := g.screen.Suspend(); err != nil {
@@ -0,0 +1,46 @@
+package gocui
+
+import (
+	"testing"
+
+	"github.com/gdamore/tcell/v3"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAModifiedClickNoBindingWantsLeavesTheViewAlone(t *testing.T) {
+	t.Cleanup(resetMouseState)
+	resetMouseState()
+	g := newTestGui(t)
+	view, _ := g.SetView("list", 0, 0, 20, 10, 0)
+
+	clicks := 0
+	g.SetViewClickBinding(&ViewMouseBinding{
+		ViewName: "list",
+		Key:      MouseLeft,
+		Handler: func(ViewMouseBindingOpts) error {
+			clicks++
+			return nil
+		},
+	})
+
+	click := func(y int, modifier tcell.ModMask) {
+		for _, button := range []tcell.ButtonMask{tcell.ButtonPrimary, tcell.ButtonNone} {
+			event := gocuiEventFromTcellEvent(
+				tcell.NewEventMouse(view.x0+1, y, button, modifier))
+			assert.NoError(t, g.onKey(&event))
+		}
+	}
+
+	// A plain click is the binding's, and moves the cursor it acts on.
+	click(view.y0+4, tcell.ModNone)
+	assert.Equal(t, 1, clicks)
+	assert.Equal(t, 3, view.CursorY())
+
+	// An alt-click is nobody's here, bindings matching modifiers exactly. It has to
+	// leave the cursor where the selection is, or a list view would draw its
+	// selection on a line its owner never selected.
+	click(view.y0+8, tcell.ModAlt)
+	assert.Equal(t, 1, clicks)
+	assert.Equal(t, 3, view.CursorY())
+	assert.Nil(t, g.mouseCapture, "and no drag begins for it either")
+}
@@ -0,0 +1,49 @@
+package gocui
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOnlyBindingsThatOptedInFireBehindAFocusedPopup(t *testing.T) {
+	g := newTestGui(t)
+	_, _ = g.SetView("main", 0, 0, 20, 10, 0)
+
+	fired := []string{}
+	g.SetViewClickBinding(&ViewMouseBinding{
+		ViewName:                    "main",
+		Key:                         MouseLeft,
+		Modifier:                    ModAlt,
+		HandleWhenPopupPanelFocused: true,
+		Handler: func(ViewMouseBindingOpts) error {
+			fired = append(fired, "opted in")
+			return nil
+		},
+	})
+	g.SetViewClickBinding(&ViewMouseBinding{
+		ViewName: "main",
+		Key:      MouseLeft,
+		Handler: func(ViewMouseBindingOpts) error {
+			fired = append(fired, "ordinary")
+			return nil
+		},
+	})
+
+	// This is how a client reports that a popup panel has the focus and the click
+	// landed on a view behind it.
+	g.ShouldHandleMouseEvent = func(*View, KeyName) bool { return false }
+
+	assert.NoError(t, g.onKey(&GocuiEvent{
+		Type: eventMouse, MouseX: 3, MouseY: 4,
+		Key: NewKey(MouseLeft, "", ModAlt),
+	}))
+	assert.Equal(t, []string{"opted in"}, fired)
+
+	assert.NoError(t, g.onKey(&GocuiEvent{
+		Type: eventMouse, MouseX: 3, MouseY: 4,
+		Key: NewKey(MouseLeft, "", ModNone),
+	}))
+	assert.Equal(t, []string{"opted in"}, fired,
+		"a binding that didn't opt in must still be swallowed")
+}
@@ -18,7 +18,7 @@ func TestFlushIsNoOpWhileSuspended(t *testing.T) {
 		flush func(g *Gui) error
 	}{
 		{"flush", func(g *Gui) error { return g.flush() }},
-		{"flushContentOnly", func(g *Gui) error { return g.flushContentOnly(g.views) }},
+		{"flushContentOnly", func(g *Gui) error { g.flushContentOnly(g.views); return nil }},
 	}

 	for _, tc := range tests {
@@ -67,3 +67,14 @@ func TestResumeSchedulesRedraw(t *testing.T) {
 	assert.Equal(t, eventResize, ev.Type,
 		"resuming must schedule a redraw; without one the screen stays blank until the next event arrives")
 }
+
+func TestSuspendClearsLineFlashes(t *testing.T) {
+	g := newTestGui(t)
+	v, err := g.SetView("main", 0, 0, 20, 10, 0)
+	assert.ErrorIs(t, err, ErrUnknownView)
+	v.SetLineFlash(3)
+
+	assert.NoError(t, g.Suspend())
+	assert.Equal(t, -1, v.lineFlashY)
+	assert.NoError(t, g.Resume())
+}
@@ -209,6 +209,7 @@ const (

 var (
 	lastMouseKey tcell.ButtonMask = tcell.ButtonNone
+	lastMouseMod tcell.ModMask    = tcell.ModNone
 	dragState                     = NOT_DRAGGING
 	lastX                         = 0
 	lastY                         = 0
@@ -377,6 +378,12 @@ func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent {
 		if button != tcell.ButtonNone && lastMouseKey == tcell.ButtonNone {
 			newButtonPress = true
 			lastMouseKey = button
+			// The keyboard modifiers held at press time apply to the whole gesture:
+			// the press, every drag event, and the release. Snapshotting them here
+			// keeps a modified press from producing events that match unmodified
+			// bindings, and ignores modifier changes while the button is held.
+			lastMouseMod = tev.Modifiers()
+			mouseMod = Modifier(lastMouseMod)
 			switch button {
 			case tcell.ButtonPrimary:
 				mouseKey = MouseLeft
@@ -402,7 +409,8 @@ func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent {
 				case tcell.ButtonMiddle:
 				default:
 				}
-				mouseMod = ModNone
+				mouseMod = Modifier(lastMouseMod)
+				lastMouseMod = tcell.ModNone
 				lastMouseKey = tcell.ButtonNone
 			}
 		default:
@@ -433,10 +441,10 @@ func gocuiEventFromTcellEvent(tev tcell.Event) GocuiEvent {
 				// reaches drag bindings instead of being delivered with the
 				// default MouseRelease key.
 				dragState = DRAGGING
-				mouseMod = ModMotion
+				mouseMod = Modifier(lastMouseMod) | ModMotion
 				mouseKey = MouseLeft
 			case DRAGGING:
-				mouseMod = ModMotion
+				mouseMod = Modifier(lastMouseMod) | ModMotion
 				mouseKey = MouseLeft
 			}
 		}
@@ -36,21 +36,55 @@ func TestMouseReleaseAfterDragIsMouseEvent(t *testing.T) {
 	assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName())
 }

-func TestMouseReleaseDoesNotKeepPressModifiers(t *testing.T) {
+func TestWholeGestureCarriesPressModifiers(t *testing.T) {
 	t.Cleanup(resetMouseState)
 	resetMouseState()

-	gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModAlt))
-	gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt))
+	pressEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModAlt))
+	dragEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt))
 	releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonNone, tcell.ModAlt))

+	assert.Equal(t, eventMouse, pressEvent.Type)
+	assert.Equal(t, MouseLeft, pressEvent.Key.KeyName())
+	assert.Equal(t, ModAlt, pressEvent.Key.Mod())
+	assert.Equal(t, eventMouse, dragEvent.Type)
+	assert.Equal(t, MouseLeft, dragEvent.Key.KeyName())
+	assert.Equal(t, ModAlt|ModMotion, dragEvent.Key.Mod())
 	assert.Equal(t, eventMouse, releaseEvent.Type)
 	assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName())
+	assert.Equal(t, ModAlt, releaseEvent.Key.Mod())
+}
+
+func TestModifierChangesWhileButtonHeldAreIgnored(t *testing.T) {
+	t.Cleanup(resetMouseState)
+	resetMouseState()
+
+	gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModNone))
+	dragEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonPrimary, tcell.ModAlt))
+	releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 3, tcell.ButtonNone, tcell.ModAlt))
+
+	assert.Equal(t, ModMotion, dragEvent.Key.Mod())
 	assert.Equal(t, ModNone, releaseEvent.Key.Mod())
 }

+func TestModifiedClickWithoutDragCarriesModifierOnPressAndRelease(t *testing.T) {
+	t.Cleanup(resetMouseState)
+	resetMouseState()
+
+	pressEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonPrimary, tcell.ModShift))
+	releaseEvent := gocuiEventFromTcellEvent(tcell.NewEventMouse(1, 2, tcell.ButtonNone, tcell.ModShift))
+
+	assert.Equal(t, eventMouse, pressEvent.Type)
+	assert.Equal(t, MouseLeft, pressEvent.Key.KeyName())
+	assert.Equal(t, ModShift, pressEvent.Key.Mod())
+	assert.Equal(t, eventMouse, releaseEvent.Type)
+	assert.Equal(t, MouseRelease, releaseEvent.Key.KeyName())
+	assert.Equal(t, ModShift, releaseEvent.Key.Mod())
+}
+
 func resetMouseState() {
 	lastMouseKey = tcell.ButtonNone
+	lastMouseMod = tcell.ModNone
 	dragState = NOT_DRAGGING
 	lastX = 0
 	lastY = 0
@@ -80,18 +80,27 @@ type View struct {
 	// a user starts a range select and then moves the cursor up.
 	rangeSelectStartY int

+	// The view line whose selection-width bar is temporarily reversed. A value
+	// of -1 means that no line is flashing.
+	lineFlashY int
+
 	// readBuffer is used for storing unread bytes
 	readBuffer []byte

 	// tained is true if the viewLines must be updated
 	tainted bool

+	// needsRedraw is true if the view's current state has not been drawn to the
+	// screen yet. A tainted view always needs a redraw, but draw-only state can
+	// require one without invalidating viewLines.
+	needsRedraw bool
+
 	// firstDirtyLine is the index of the lowest line in `lines` that has been
-	// written to or highlighted since viewLines was last refreshed, and whose
-	// cached wrapping (lineType.wrappedCells) may therefore be stale. Lines
-	// below it are unchanged and can reuse their cached wrapping instead of
-	// being re-wrapped, which keeps refreshViewLinesIfNeeded cheap while
-	// scrolling appends new lines to a long buffer.
+	// written to since viewLines was last refreshed, and whose cached wrapping
+	// (lineType.wrappedCells) may therefore be stale. Lines below it are
+	// unchanged and can reuse their cached wrapping instead of being
+	// re-wrapped, which keeps refreshViewLinesIfNeeded cheap while scrolling
+	// appends new lines to a long buffer.
 	firstDirtyLine int

 	// the last position that the mouse was hovering over; nil if the mouse is outside of
@@ -274,11 +283,18 @@ type pos struct {
 // a view whose size has changed, whose content is the same but has to be wrapped
 // afresh, call RewrapContent instead.
 func (v *View) clearViewLines() {
-	v.tainted = true
+	v.markViewLinesDirty()
 	v.viewLines = nil
 	v.clearHover()
 }

+// markViewLinesDirty records that the cached viewLines no longer represent the
+// view's buffer or wrapping, so both rebuilding and redrawing are required.
+func (v *View) markViewLinesDirty() {
+	v.tainted = true
+	v.needsRedraw = true
+}
+
 // RewrapContent wraps the view's content for the size the view has now, and puts
 // the positions into that content — the scroll offset, the cursor, a range's
 // anchor — back on the lines they were on. They are all view lines, which count
@@ -793,11 +809,13 @@ func NewView(name string, x0, y0, x1, y1 int, mode OutputMode) *View {
 		Frame:             true,
 		Editor:            DefaultEditor,
 		tainted:           true,
+		needsRedraw:       true,
 		outMode:           mode,
 		buf:               &viewBuffer{ei: newEscapeInterpreter(mode)},
 		searcher:          &searcher{},
 		TextArea:          &TextArea{},
 		rangeSelectStartY: -1,
+		lineFlashY:        -1,
 		TabWidth:          4,
 	}

@@ -949,6 +967,10 @@ func (v *View) setCharacter(x, y int, ch string, fgColor, bgColor Attribute, isW
 		fgColor |= AttrUnderline
 	}

+	if v.lineFlashY == v.oy+y && (v.SelectedLineColorWidth == 0 || x < v.SelectedLineColorWidth) {
+		fgColor ^= AttrReverse
+	}
+
 	// Don't display empty characters
 	if ch == "" {
 		ch = " "
@@ -1169,7 +1191,7 @@ func (v *View) write(p []byte) {
 		return
 	}

-	v.tainted = true
+	v.markViewLinesDirty()
 	// write only ever touches lines from v.buf.wy onwards, so any cached wrapping
 	// below that stays valid.
 	v.firstDirtyLine = min(v.firstDirtyLine, v.buf.wy)
@@ -1604,7 +1626,7 @@ func (v *View) SwapInOffscreenRender() {
 	}
 	v.buf = v.offscreen
 	v.offscreen = nil
-	v.tainted = true
+	v.markViewLinesDirty()
 	v.clearHover()
 }

@@ -1768,6 +1790,12 @@ func (v *View) IsTainted() bool {
 	return v.tainted
 }

+func (v *View) NeedsRedraw() bool {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()
+	return v.needsRedraw
+}
+
 // draw re-draws the view's contents.
 func (v *View) draw(isWindowFocused bool) {
 	v.writeMutex.Lock()
@@ -1776,6 +1804,7 @@ func (v *View) draw(isWindowFocused bool) {
 	if !v.Visible {
 		return
 	}
+	defer func() { v.needsRedraw = false }()

 	v.clearRunes()

@@ -1900,8 +1929,8 @@ func (v *View) refreshViewLinesIfNeeded() {
 		// Reuse the previously wrapped result for lines that haven't changed
 		// since the last refresh (i.e. below firstDirtyLine) and were wrapped at
 		// the current width. Wrapping is expensive and this loop runs on every
-		// scroll event, so only the lines that were actually just read (or
-		// re-highlighted) should be wrapped afresh.
+		// scroll event, so only the lines that were actually just read should
+		// be wrapped afresh.
 		if line.wrappedCells == nil || line.wrappedColumns != wrap || i >= v.firstDirtyLine {
 			line.wrappedCells = lineWrap(line.cells, wrap)
 			line.wrappedColumns = wrap
@@ -2295,28 +2324,22 @@ func applySelTextColor(fgColor, selTextColor Attribute) Attribute {
 	return fgColor | selTextColor&AttrStyleBits
 }

-// SetHighlight toggles highlighting of separate lines, for custom lists
-// or multiple selection in views.
-func (v *View) SetHighlight(y int, on bool) {
-	if y < 0 || y >= len(v.buf.lines) {
-		return
-	}
+// SetLineFlash temporarily marks a view line without moving or changing the
+// selection. The caller owns the lifetime and clears it with ClearLineFlash.
+func (v *View) SetLineFlash(viewLine int) {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()

-	cells := make([]cell, 0, len(v.buf.lines[y].cells))
-	for _, c := range v.buf.lines[y].cells {
-		if on {
-			c.bgColor = v.SelBgColor
-			c.fgColor = v.SelFgColor
-		} else {
-			c.bgColor = v.BgColor
-			c.fgColor = v.FgColor
-		}
-		cells = append(cells, c)
-	}
-	v.tainted = true
-	v.firstDirtyLine = min(v.firstDirtyLine, y)
-	v.buf.lines[y].cells = cells
-	v.clearHover()
+	v.lineFlashY = viewLine
+	v.needsRedraw = true
+}
+
+func (v *View) ClearLineFlash() {
+	v.writeMutex.Lock()
+	defer v.writeMutex.Unlock()
+
+	v.lineFlashY = -1
+	v.needsRedraw = true
 }

 func lineWrap(line []cell, columns int) [][]cell {
@@ -1093,6 +1093,32 @@ func TestSelectedLinesOfWrappedContent(t *testing.T) {
 	assert.Equal(t, []string{"a line that wraps"}, v.SelectedLines())
 }

+func TestLineFlashReversesTheSelectionBarWithoutChangingSelection(t *testing.T) {
+	WithSimulationScreen(t, 14, 6)
+
+	v := NewView("name", 0, 0, 11, 5, OutputNormal)
+	v.Highlight = true
+	v.SelBgColor = ColorBlue
+	v.SelectedLineColorWidth = 2
+	v.writeString("one\ntwo\nthree\n")
+	v.FocusPoint(0, 1, false)
+	v.SetLineFlash(1)
+	v.draw(true)
+
+	for x := 1; x <= 2; x++ {
+		_, style, _ := Screen.Get(x, 2)
+		assert.True(t, style.HasReverse(), "selection-bar cell at (%d, 2) should flash", x)
+	}
+	_, style, _ := Screen.Get(3, 2)
+	assert.False(t, style.HasReverse(), "the flash should stop after the selection bar")
+	assert.Equal(t, "two", v.SelectedLine(), "flashing should not change the selection")
+
+	v.ClearLineFlash()
+	v.draw(true)
+	_, style, _ = Screen.Get(1, 2)
+	assert.False(t, style.HasReverse(), "clearing should remove the flash")
+}
+
 // Resizing a view throws away the wrapping of its content and wraps it again for
 // the new width, which moves every line of it to a different view line. The
 // positions into the view count view lines, so they all have to come along.
@@ -19,16 +19,36 @@ type CommitFilesContext struct {
 }

 var (
-	_ types.IListContext        = (*CommitFilesContext)(nil)
-	_ types.DiffableContext     = (*CommitFilesContext)(nil)
-	_ types.IFilterableContext  = (*CommitFilesContext)(nil)
-	_ types.DiffMainViewContext = (*CommitFilesContext)(nil)
+	_ types.IListContext           = (*CommitFilesContext)(nil)
+	_ types.DiffableContext        = (*CommitFilesContext)(nil)
+	_ types.IFilterableContext     = (*CommitFilesContext)(nil)
+	_ types.DiffMainViewContext    = (*CommitFilesContext)(nil)
+	_ types.PullRequestDiffContext = (*CommitFilesContext)(nil)
 )

 func (self *CommitFilesContext) GetDiffMainViewType() types.DiffMainViewType {
 	return types.DiffMainViewTypePatchBuilding
 }

+// BranchForPullRequest asks the panel this one was entered from: the files are a
+// commit's, and which branch's pull request that commit is up for review in is known
+// there rather than here.
+func (self *CommitFilesContext) BranchForPullRequest() string {
+	if parent, ok := self.GetParentContext().(types.PullRequestDiffContext); ok {
+		return parent.BranchForPullRequest()
+	}
+	return ""
+}
+
+// CommitsForPullRequest asks the panel this one was entered from as well: the files
+// listed here are those of the commits selected there.
+func (self *CommitFilesContext) CommitsForPullRequest() ([]*models.Commit, string) {
+	if parent, ok := self.GetParentContext().(types.PullRequestDiffContext); ok {
+		return parent.CommitsForPullRequest()
+	}
+	return nil, ""
+}
+
 func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
 	viewModel := filetree.NewCommitFileTreeViewModel(
 		func() []*models.CommitFile { return c.Model().CommitFiles },
@@ -31,16 +31,70 @@ type commitDropIndicator struct {
 }

 var (
-	_ types.IListContext        = (*LocalCommitsContext)(nil)
-	_ types.DiffableContext     = (*LocalCommitsContext)(nil)
-	_ types.ISearchableContext  = (*LocalCommitsContext)(nil)
-	_ types.DiffMainViewContext = (*LocalCommitsContext)(nil)
+	_ types.IListContext           = (*LocalCommitsContext)(nil)
+	_ types.DiffableContext        = (*LocalCommitsContext)(nil)
+	_ types.ISearchableContext     = (*LocalCommitsContext)(nil)
+	_ types.DiffMainViewContext    = (*LocalCommitsContext)(nil)
+	_ types.PullRequestDiffContext = (*LocalCommitsContext)(nil)
 )

 func (self *LocalCommitsContext) GetDiffMainViewType() types.DiffMainViewType {
 	return types.DiffMainViewTypePatchBuilding
 }

+// BranchForPullRequest returns the checked-out branch: this panel shows its commits,
+// so a pull request for it is where they are up for review.
+func (self *LocalCommitsContext) BranchForPullRequest() string {
+	return self.ListContextTrait.c.Model().CheckedOutBranch
+}
+
+func (self *LocalCommitsContext) CommitsForPullRequest() ([]*models.Commit, string) {
+	selectedCommits, _, _ := self.GetSelectedItems()
+	commits := commitsShownInDiff(selectedCommits, self.GetSelected(), self.GetSelectedRefRangeForDiffFiles())
+	return commits, pullRequestBaseForCommits(self.GetCommits(), commits)
+}
+
+// commitsShownInDiff returns the commits whose combined diff a panel listing a branch's
+// commits renders into the main view: the selected range where it has a range to diff,
+// and the commit at the cursor otherwise. The panel hands the same two to
+// DiffHelper.GetUpdateTaskForRenderingCommitsDiff, so anything acting on the diff on
+// screen acts on the commits that diff is of.
+func commitsShownInDiff(
+	selectedCommits []*models.Commit, commitAtCursor *models.Commit, refRange *types.RefRange,
+) []*models.Commit {
+	if refRange != nil {
+		return selectedCommits
+	}
+	if commitAtCursor == nil {
+		return nil
+	}
+	return []*models.Commit{commitAtCursor}
+}
+
+// pullRequestBaseForCommits returns the hash of the commit the diff of the given commits
+// starts after: the parent of the oldest of them. A pull request holds only the commits
+// of the branch that are pushed, so a parent that isn't pushed is none of its own. The
+// diff then starts where the pull request itself does, and "" says so.
+func pullRequestBaseForCommits(allCommits []*models.Commit, commits []*models.Commit) string {
+	if len(commits) == 0 {
+		return ""
+	}
+
+	oldest := commits[len(commits)-1]
+	if oldest.IsFirstCommit() {
+		return ""
+	}
+
+	parentHash := oldest.Parents()[0]
+	parentIsInPullRequest := lo.ContainsBy(allCommits, func(commit *models.Commit) bool {
+		return commit.Hash() == parentHash && commit.Status == models.StatusPushed
+	})
+	if !parentIsInPullRequest {
+		return ""
+	}
+	return parentHash
+}
+
 func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 	dropIndicator := &commitDropIndicator{insertionIndex: -1}
 	viewModel := NewLocalCommitsViewModel(
@@ -4,8 +4,12 @@ import (
 	"testing"
 	"time"

+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 )

@@ -51,3 +55,101 @@ func TestAddMovingCommitsIndicator(t *testing.T) {
 		},
 	}, items)
 }
+
+func TestCommitsShownInDiff(t *testing.T) {
+	hashPool := &utils.StringPool{}
+	newer := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "newer"})
+	older := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "older"})
+	selected := []*models.Commit{newer, older}
+
+	scenarios := []struct {
+		name           string
+		selectedCommit *models.Commit
+		refRange       *types.RefRange
+		expected       []*models.Commit
+	}{
+		{
+			name:           "a range is diffed as a whole",
+			selectedCommit: newer,
+			refRange:       &types.RefRange{From: older, To: newer},
+			expected:       selected,
+		},
+		{
+			name:           "without a range to diff, only the commit at the cursor is",
+			selectedCommit: newer,
+			expected:       []*models.Commit{newer},
+		},
+		{
+			name: "nothing is diffed while nothing is selected",
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			assert.Equal(t, s.expected, commitsShownInDiff(selected, s.selectedCommit, s.refRange))
+		})
+	}
+}
+
+func TestPullRequestBaseForCommits(t *testing.T) {
+	hashPool := &utils.StringPool{}
+	commit := func(hash string, parent string, status models.CommitStatus) *models.Commit {
+		return models.NewCommit(hashPool, models.NewCommitOpts{
+			Hash:    hash,
+			Parents: lo.Ternary(parent == "", []string{}, []string{parent}),
+			Status:  status,
+		})
+	}
+
+	// A branch of three pushed commits whose tip was amended, on top of a commit that
+	// is in a main branch already, as the panel lists them: newest first.
+	amended := commit("amended", "third", models.StatusUnpushed)
+	third := commit("third", "second", models.StatusPushed)
+	second := commit("second", "first", models.StatusPushed)
+	first := commit("first", "merged", models.StatusPushed)
+	merged := commit("merged", "ancient", models.StatusMerged)
+	ancient := commit("ancient", "", models.StatusMerged)
+	allCommits := []*models.Commit{amended, third, second, first, merged, ancient}
+
+	scenarios := []struct {
+		name     string
+		commits  []*models.Commit
+		expected string
+	}{
+		{
+			name:     "a single commit starts after its parent",
+			commits:  []*models.Commit{second},
+			expected: "first",
+		},
+		{
+			name:     "a range starts after the parent of its oldest commit",
+			commits:  []*models.Commit{third, second},
+			expected: "first",
+		},
+		{
+			name:    "the pull request's first commit starts where the pull request does",
+			commits: []*models.Commit{first},
+		},
+		{
+			name:    "so does a range reaching down to it",
+			commits: []*models.Commit{third, second, first},
+		},
+		{
+			name:    "and so does the first commit of the repository",
+			commits: []*models.Commit{ancient},
+		},
+		{
+			name:    "a parent the panel doesn't list is none of the pull request's",
+			commits: []*models.Commit{commit("elsewhere", "unlisted", models.StatusPushed)},
+		},
+		{
+			name: "nothing is shown",
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			assert.Equal(t, s.expected, pullRequestBaseForCommits(allCommits, s.commits))
+		})
+	}
+}
@@ -21,16 +21,33 @@ type SubCommitsContext struct {
 }

 var (
-	_ types.IListContext        = (*SubCommitsContext)(nil)
-	_ types.DiffableContext     = (*SubCommitsContext)(nil)
-	_ types.ISearchableContext  = (*SubCommitsContext)(nil)
-	_ types.DiffMainViewContext = (*SubCommitsContext)(nil)
+	_ types.IListContext           = (*SubCommitsContext)(nil)
+	_ types.DiffableContext        = (*SubCommitsContext)(nil)
+	_ types.ISearchableContext     = (*SubCommitsContext)(nil)
+	_ types.DiffMainViewContext    = (*SubCommitsContext)(nil)
+	_ types.PullRequestDiffContext = (*SubCommitsContext)(nil)
 )

 func (self *SubCommitsContext) GetDiffMainViewType() types.DiffMainViewType {
 	return types.DiffMainViewTypePatchBuilding
 }

+// BranchForPullRequest returns the branch this panel was entered from, whose commits it
+// shows. The panel is also entered from a tag, a remote branch and the reflog, none of
+// which a pull request is made from.
+func (self *SubCommitsContext) BranchForPullRequest() string {
+	if branch, ok := self.GetRef().(*models.Branch); ok {
+		return branch.Name
+	}
+	return ""
+}
+
+func (self *SubCommitsContext) CommitsForPullRequest() ([]*models.Commit, string) {
+	selectedCommits, _, _ := self.GetSelectedItems()
+	commits := commitsShownInDiff(selectedCommits, self.GetSelected(), self.GetSelectedRefRangeForDiffFiles())
+	return commits, pullRequestBaseForCommits(self.GetCommits(), commits)
+}
+
 func NewSubCommitsContext(
 	c *ContextCommon,
 ) *SubCommitsContext {
@@ -208,7 +208,7 @@ func (self *BranchesController) GetOnRenderToMain() func() {
 				rendererTask := types.NewRunDiffRendererTask(cmdObj.GetCmd())
 				task = rendererTask

-				pr, ok := self.c.Model().PullRequestsMap[branch.Name]
+				pr, ok := self.c.Helpers().Host.PullRequestForBranch(branch.Name)
 				if ok && presentation.ShouldShowPrForBranch(pr, branch.Name, self.c.UserConfig()) {
 					rendererTask.Prefix = presentation.FormatPullRequestHeader(pr, self.c.Tr)
 					rendererTask.Prefix += strings.Repeat("─", self.c.Contexts().Normal.GetView().InnerWidth()) + "\n"
@@ -462,7 +462,7 @@ func (self *BranchesController) handleCreatePullRequestMenu(selectedBranch *mode

 func (self *BranchesController) getPullRequestURL() (string, error) {
 	branch := self.context().GetSelected()
-	if pr, ok := self.c.Model().PullRequestsMap[branch.Name]; ok {
+	if pr, ok := self.c.Helpers().Host.PullRequestForBranch(branch.Name); ok {
 		return pr.Url, nil
 	}

@@ -855,15 +855,11 @@ func (self *BranchesController) branchIsReal(branch *models.Branch) *types.Disab
 }

 func (self *BranchesController) branchHasPR(branch *models.Branch) *types.DisabledReason {
-	if _, ok := self.c.Model().PullRequestsMap[branch.Name]; !ok {
-		return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true}
-	}
-
-	return nil
+	return self.c.Helpers().Host.NoPullRequestDisabledReason(branch.Name)
 }

 func (self *BranchesController) openPRInBrowser(branch *models.Branch) error {
-	pr, ok := self.c.Model().PullRequestsMap[branch.Name]
+	pr, ok := self.c.Helpers().Host.PullRequestForBranch(branch.Name)
 	if !ok {
 		// Should be guarded against by the DisabledReason check, but be defensive in case
 		// PullRequestsMap was updated concurrently by a background refresh
@@ -2,8 +2,6 @@ package controllers

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

 	"github.com/jesseduffield/generics/set"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
@@ -443,11 +441,7 @@ func (self *CommitDiffActions) patchEndpoints(target *commitDiffTarget) (string,
 // patchBuilderPath turns the absolute path a diff line carries into the repo-relative
 // one the patch builder keys a file by, and "" for a path that is no file of this repo.
 func (self *CommitDiffActions) patchBuilderPath(path string) string {
-	relativePath, err := filepath.Rel(self.c.Git().RepoPaths.WorktreePath(), path)
-	if err != nil || strings.HasPrefix(relativePath, "..") {
-		return ""
-	}
-	return filepath.ToSlash(relativePath)
+	return repoRelativePath(self.c.Git().RepoPaths.WorktreePath(), path)
 }

 // indexOfTargetCommit finds the commit the diff belongs to among the commits of the
@@ -2,6 +2,7 @@ package controllers

 import (
 	"path"
+	"path/filepath"
 	"strings"

 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
@@ -130,3 +131,14 @@ func isInDir(path string, dir string) bool {
 	// "." is the root item, which contains every file
 	return dir == "." || strings.HasPrefix(path, dir+"/")
 }
+
+// repoRelativePath turns the absolute path a diff line carries into the one git speaks
+// of the file: relative to the worktree, with forward slashes. It is "" for a path that
+// is no file of this repo, which a diff renderer's own naming of a line can produce.
+func repoRelativePath(worktreePath string, absolutePath string) string {
+	relativePath, err := filepath.Rel(worktreePath, absolutePath)
+	if err != nil || strings.HasPrefix(relativePath, "..") {
+		return ""
+	}
+	return filepath.ToSlash(relativePath)
+}
@@ -3,6 +3,7 @@ package controllers
 import (
 	"strconv"

+	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -74,6 +75,14 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
 			Description:       self.c.Tr.CycleDiffRenderersReverse,
 			Tooltip:           self.c.Tr.CycleDiffRenderersReverseTooltip,
 		},
+		{
+			Keys:            opts.GetKeys(opts.Config.Universal.JumpToFile),
+			Handler:         opts.Guards.NoPopupPanel(self.jumpToFileInDiff),
+			Description:     self.c.Tr.JumpToFileInDiff,
+			DescriptionFunc: self.jumpToFileInDiffDescription,
+			Tooltip:         self.c.Tr.JumpToFileInDiffTooltip,
+			OpensMenu:       true,
+		},
 		{
 			Keys:              opts.GetKeys(opts.Config.Universal.Return),
 			Handler:           self.escape,
@@ -206,6 +215,58 @@ func (self *GlobalController) canCycleDiffRenderers() *types.DisabledReason {
 	return nil
 }

+// jumpToFileInDiff offers the files of the diff the main section is showing in a menu,
+// and scrolls that pane to the file picked. The panel the user is in keeps the focus;
+// they are reading the diff from there, and the next commit or file to read is picked
+// there too.
+func (self *GlobalController) jumpToFileInDiff() error {
+	pane := self.diffPane()
+	if pane == nil {
+		return nil
+	}
+
+	return self.c.Helpers().DiffLine.OpenJumpToFileMenu(pane, self.c.Tr.JumpToFileInDiff)
+}
+
+// jumpToFileInDiffDescription qualifies the command's description so that it is listed
+// only where it applies. A command with no description is left out of the keybindings
+// menu.
+//
+// It doesn't apply where the main section is showing content that is no diff of the
+// panel's — a branch's commit log, the status dashboard, a message. Nor does it while
+// the focus is in one of the panes, which bind the key themselves; the menu would
+// otherwise offer it twice there, once for the pane and once among the global keys.
+//
+// The static Description stays as it is: the cheatsheets are generated from that, and
+// they document what a key does rather than when it applies.
+func (self *GlobalController) jumpToFileInDiffDescription() string {
+	_, focusIsInAPane := self.c.Context().Current().(*context.MainContext)
+	if focusIsInAPane || self.diffPane() == nil {
+		return ""
+	}
+	return self.c.Tr.JumpToFileInDiff
+}
+
+// diffPane returns the pane of the main section showing the diff of the panel the user
+// is in, and nil when neither of them is showing one. A pane is cleared as it is
+// emptied, so a pane that says it is showing a diff is showing one. Its window also has
+// to be showing the pane. Resolving a conflicted file puts the merge conflicts view
+// there instead, and the pane behind it goes on holding the diff it last rendered.
+//
+// Where both panes show a diff — the unstaged and staged sides of a file — the answer
+// is the upper one, the pane the keys for scrolling the section act on.
+func (self *GlobalController) diffPane() *context.MainContext {
+	for _, pane := range []*context.MainContext{
+		self.c.Contexts().Normal, self.c.Contexts().NormalSecondary,
+	} {
+		onScreen := self.c.Helpers().Window.GetContextForWindow(pane.GetWindowName()) == pane
+		if onScreen && pane.ContentIsDiff() {
+			return pane
+		}
+	}
+	return nil
+}
+
 func (self *GlobalController) createOptionsMenu() error {
 	return (&OptionsMenuAction{c: self.c}).Call()
 }
@@ -0,0 +1,70 @@
+package helpers
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/samber/lo"
+)
+
+// OpenJumpToFileMenu offers the files of the diff the given pane is showing in a menu,
+// so that one of them can be gone to directly rather than by stepping through the diff
+// a file at a time. Picking one goes to where that file's diff begins, the way stepping
+// to it with next-file does: the selection moves there in a focused pane, and an
+// unfocused one scrolls the file to the top.
+//
+// The diff is read to the end before the menu is built: a file below the part of it that
+// has been read so far is in neither the list nor the view, and reaching the far end of
+// a long diff is what the menu is for.
+func (self *DiffLineHelper) OpenJumpToFileMenu(pane types.DiffPaneContext, title string) error {
+	manager := self.c.GetViewBufferManagerForView(pane.GetView())
+	if manager == nil {
+		return nil
+	}
+	manager.ReadToEnd(func() {
+		self.c.OnUIThread(func() error { return self.showJumpToFileMenu(pane, title) })
+	})
+	return nil
+}
+
+// showJumpToFileMenu offers the diff's files by the paths git names them by. Each item
+// names its file rather than the row that file begins at, so that a diff re-rendered
+// while the menu is up is jumped into at the row the file begins at now.
+//
+// A menu offering the one file of a single-file diff would be a menu with nothing to
+// choose, so it says what it found instead. It says it here rather than as the key's
+// disabled reason because how many files there are is only known once the diff has been
+// read to the end, which is too much to do for every keypress that asks whether a key
+// applies.
+func (self *DiffLineHelper) showJumpToFileMenu(pane types.DiffPaneContext, title string) error {
+	view := pane.GetView()
+	files := self.FilesInDiff(view)
+	if len(files) == 0 {
+		return nil
+	}
+	if len(files) == 1 {
+		self.c.ErrorToast(self.c.Tr.DisabledMenuItemPrefix + self.c.Tr.OnlyOneFileInDiff)
+		return nil
+	}
+
+	worktreePath := self.c.Git().RepoPaths.WorktreePath()
+	menuItems := lo.Map(files, func(path string, _ int) *types.MenuItem {
+		label := repoRelativePath(worktreePath, path)
+		if label == "" {
+			label = path
+		}
+		return &types.MenuItem{
+			Label: label,
+			OnPress: func() error {
+				if target, ok := self.StartOfFileInDiff(view, path); ok {
+					self.PlaceNavigationTarget(pane, target, true)
+				}
+				return nil
+			},
+		}
+	})
+
+	return self.c.Menu(types.CreateMenuOptions{
+		Title:           title,
+		Items:           menuItems,
+		FilterAsYouType: true,
+	})
+}
@@ -162,11 +162,19 @@ func (self *selectedDiffLines) covers(info types.DiffLineInfo) bool {
 func repoRelativePaths(worktreePath string, paths []string) []string {
 	relPaths := make([]string, 0, len(paths))
 	for _, path := range paths {
-		relPath, err := filepath.Rel(worktreePath, path)
-		if err != nil || strings.HasPrefix(relPath, "..") {
-			continue
+		if relPath := repoRelativePath(worktreePath, path); relPath != "" {
+			relPaths = append(relPaths, relPath)
 		}
-		relPaths = append(relPaths, filepath.ToSlash(relPath))
 	}
 	return relPaths
 }
+
+// repoRelativePath turns one such path into the repo-relative one, and is "" for a path
+// that lies outside the worktree.
+func repoRelativePath(worktreePath string, path string) string {
+	relPath, err := filepath.Rel(worktreePath, path)
+	if err != nil || strings.HasPrefix(relPath, "..") {
+		return ""
+	}
+	return filepath.ToSlash(relPath)
+}
@@ -79,16 +79,26 @@ func (self *DiffLineHelper) ChangeLineOrdinals(
 // while the diff's text names the trees where an ordinary diff has git's a/ and b/
 // prefixes and so needs nothing.
 func (self *DiffLineHelper) inRepoTerms(view *gocui.View, infos []types.DiffLineInfo) []types.DiffLineInfo {
+	toRepoTerms := self.repoTermsMapper(view)
+	return lo.Map(infos, func(info types.DiffLineInfo, _ int) types.DiffLineInfo {
+		info.Path = toRepoTerms(info.Path)
+		return info
+	})
+}
+
+// repoTermsMapper returns how a path recovered from view is brought into the repo's
+// terms, for the callers that have a path rather than a whole identity to bring. The
+// mapping is worked out once, per view rather than per path.
+func (self *DiffLineHelper) repoTermsMapper(view *gocui.View) func(string) string {
 	if !self.ShowsCustomPatch(view) {
-		return infos
+		return func(path string) string { return path }
 	}

 	worktreePath := self.c.Git().RepoPaths.WorktreePath()
 	treesDir := self.c.Git().Patch.PatchBuilder.TempDir()
-	return lo.Map(infos, func(info types.DiffLineInfo, _ int) types.DiffLineInfo {
-		info.Path = repoPathOfTreePath(info.Path, treesDir, worktreePath)
-		return info
-	})
+	return func(path string) string {
+		return repoPathOfTreePath(path, treesDir, worktreePath)
+	}
 }

 // repoPathOfTreePath maps a path under one of the trees the custom patch was materialized
@@ -336,62 +346,98 @@ func (self *DiffLineHelper) AdjacentFile(view *gocui.View, anchorViewLine int, f
 	return view.ViewLineForBufferLine(target)
 }

-// filePaths resolves view's rendered diff to the path each buffer line belongs to,
-// empty for a row whose identity couldn't be recovered.
+// FilesInDiff lists the files of view's (possibly multi-file) rendered diff, in the
+// order it shows them, by the paths of the repo's files. It is what a menu offering to
+// jump between them is built from; jumping to one of them goes to StartOfFileInDiff.
+func (self *DiffLineHelper) FilesInDiff(view *gocui.View) []string {
+	return lo.Map(fileStarts(self.filePaths(view)),
+		func(start diffFileStart, _ int) string { return start.path })
+}
+
+// StartOfFileInDiff returns the view line the given file's section of view's rendered
+// diff begins at. That is the row file navigation lands on, so jumping to a file from a
+// menu and stepping to it with next-file land in the same place. ok is false for a file
+// the diff doesn't show, e.g. because it was re-rendered since the file was listed.
+func (self *DiffLineHelper) StartOfFileInDiff(view *gocui.View, path string) (int, bool) {
+	start, ok := lo.Find(fileStarts(self.filePaths(view)), func(start diffFileStart) bool {
+		return start.path == path
+	})
+	if !ok {
+		return 0, false
+	}
+	return view.ViewLineForBufferLine(start.row)
+}
+
+// filePaths resolves view's rendered diff to the path each buffer line belongs to, in
+// the repo's terms, and empty for a row whose identity couldn't be recovered. Naming the
+// files the way the rest of the queries name them means a row of the custom patch's
+// preview belongs to the repo's file rather than to the copy of it in the tree the patch
+// was materialized into, so that both halves of a change belong to the same file however
+// the diff renderer states them.
 func (self *DiffLineHelper) filePaths(view *gocui.View) []string {
 	resolved := self.resolveDiffLines(view.DiffLineContents())
+	toRepoTerms := self.repoTermsMapper(view)
 	paths := make([]string, len(resolved))
 	for i, row := range resolved {
 		if row.ok {
-			paths[i] = row.info.Path
+			paths[i] = toRepoTerms(row.info.Path)
 		}
 	}
 	return paths
 }

-// fileStart finds, in a diff whose lines carry the file path they belong to (empty for
-// a row no backend could place), the first located row of the file adjacent to `from`
-// in the given direction — the row file navigation lands on. It is the pure index
-// arithmetic behind AdjacentFile.
+// diffFileStart is where one file of a diff begins: the path of the file, and the row
+// of the diff its section starts at.
+type diffFileStart struct {
+	path string
+	row  int
+}
+
+// fileStarts finds, in a diff whose lines carry the file path they belong to (empty for
+// a row no backend could place), where each file of it begins, in the order the diff
+// shows them.
 //
-// A file is identified by its path, so we look for where the path changes, skipping
-// rows that carry none: those are the blank separator rows between files, or the
-// header rows of a diff renderer that doesn't state which file its headers belong to.
-// So the landing row is the file's header wherever the source says so — a parseable
-// buffer, or a renderer that tags its headers — and the file's first content line
-// otherwise, which is an accepted degradation.
+// A file is identified by its path, and the rows showing it are consecutive, so a path
+// differing from the one before it begins a file. Rows carrying no path are passed over:
+// those are the blank separator rows between files, or the header rows of a diff
+// renderer that doesn't state which file its headers belong to. So a file begins at its
+// header wherever the source says so (a parseable buffer, or a renderer that tags its
+// headers), and at its first content line otherwise, which is an accepted degradation.
+func fileStarts(paths []string) []diffFileStart {
+	starts := []diffFileStart{}
+	previousPath := ""
+	for row, path := range paths {
+		if path == "" || path == previousPath {
+			continue
+		}
+		previousPath = path
+		starts = append(starts, diffFileStart{path: path, row: row})
+	}
+	return starts
+}
+
+// fileStart returns where the file adjacent to `from` in the given direction begins —
+// the row file navigation lands on. It is the pure index arithmetic behind AdjacentFile.
+// ok is false at the first or last file of the diff.
 func fileStart(paths []string, from int, forward bool) (int, bool) {
 	anchorPath, ok := anchorFilePath(paths, from)
 	if !ok {
 		return 0, false
 	}

-	if forward {
-		for i := from; i < len(paths); i++ {
-			if paths[i] != "" && paths[i] != anchorPath {
-				return i, true
-			}
-		}
+	starts := fileStarts(paths)
+	_, anchor, ok := lo.FindIndexOf(starts, func(start diffFileStart) bool {
+		return start.path == anchorPath
+	})
+	if !ok {
 		return 0, false
 	}

-	// Walk back past the current file (its rows and any unlocated ones) to the previous
-	// file's last located row, then back over that whole file, landing on its first.
-	i := from
-	for i >= 0 && (paths[i] == "" || paths[i] == anchorPath) {
-		i--
-	}
-	if i < 0 {
+	target := anchor + lo.Ternary(forward, 1, -1)
+	if target < 0 || target >= len(starts) {
 		return 0, false
 	}
-	prevPath := paths[i]
-	for i > 0 && (paths[i-1] == "" || paths[i-1] == prevPath) {
-		i--
-	}
-	for paths[i] != prevPath {
-		i++
-	}
-	return i, true
+	return starts[target].row, true
 }

 // anchorFilePath returns the path of the file the anchor sits in: the first row at or
@@ -48,6 +48,41 @@ func TestChangeBlockStart(t *testing.T) {
 	}
 }

+func TestFileStarts(t *testing.T) {
+	scenarios := []struct {
+		name     string
+		paths    []string
+		expected []diffFileStart
+	}{
+		{
+			name:     "a parseable diff begins each file at its header",
+			paths:    []string{"a", "a", "a", "b", "b"},
+			expected: []diffFileStart{{path: "a", row: 0}, {path: "b", row: 3}},
+		},
+		{
+			name:     "a diff whose headers carry no path begins each file at its first content line",
+			paths:    []string{"", "", "a", "a", "", "", "b", "b"},
+			expected: []diffFileStart{{path: "a", row: 2}, {path: "b", row: 6}},
+		},
+		{
+			name:     "an unlocated row within a file doesn't begin another one",
+			paths:    []string{"a", "", "a", "b"},
+			expected: []diffFileStart{{path: "a", row: 0}, {path: "b", row: 3}},
+		},
+		{
+			name:     "a diff with no located rows shows no files",
+			paths:    []string{"", ""},
+			expected: []diffFileStart{},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			assert.Equal(t, s.expected, fileStarts(s.paths))
+		})
+	}
+}
+
 func TestFileStart(t *testing.T) {
 	// A parseable two-file diff: every row carries its file's path, headers included,
 	// as the buffer parser reports it.
@@ -7,9 +7,9 @@ import (
 	"github.com/samber/lo"
 )

-// Putting a selection in the focused main view: where it starts out, and how it is
-// widened to a whole change block. Both are answered from what the view is showing,
-// as recovered by the queries next door.
+// Putting a selection in the focused main view: where it starts out, where a jump
+// leaves it, and how it is widened to a whole change block. All three are answered
+// from what the view is showing, as recovered by the queries next door.

 // EstablishSelection turns on the focused main view's selection once the view has
 // been focused. clickedViewLine is the view line a click pointed at, or -1 for
@@ -63,6 +63,66 @@ func (self *DiffLineHelper) EstablishSelection(mainContext *context.MainContext,
 	self.ShowSelectionAtLine(view, target, false)
 }

+// PlaceNavigationTarget moves the pane's selection to the row a jump found, bringing
+// it on screen if it isn't already. With no selection to move — a pane that isn't
+// focused, or one showing a diff with nothing selectable in it — the row goes to the
+// top of the view instead, that being all a jump can do there.
+//
+// alignTop asks for the target to become the view's top line, so that everything that
+// begins there is on screen. It only applies to a target the view has to scroll to: a
+// jump to something already on screen leaves the view alone, there being nothing to
+// gain from moving what the user is looking at. In hunk mode what ends up selected is
+// the first change block at or below the target, which a large context size can put
+// further down than a screenful; the selection is then scrolled into view as any other
+// jump's is, and the alignment gives way to that.
+func (self *DiffLineHelper) PlaceNavigationTarget(
+	pane types.DiffPaneContext, target int, alignTop bool,
+) {
+	view := pane.GetView()
+	if !view.Highlight {
+		view.SetOrigin(0, target)
+		return
+	}
+	if alignTop {
+		self.scrollTargetToTop(pane, target)
+	}
+	// Jumping to another block or file moves the cursor without shift held, so a
+	// range that grows only while shift is held collapses rather than stretching all
+	// the way to the target. A sticky range stretches instead; this is the point of
+	// being sticky.
+	self.CollapseNonStickyRange(pane)
+	if pane.DiffSelectState().Mode == types.DiffSelectModeHunk {
+		self.SelectChangeBlock(pane, target, true)
+		return
+	}
+	// Line mode leaves a single-line selection at the target; an active range extends
+	// to it, the anchor being untouched.
+	self.ShowSelectionAtLine(view, target, true)
+}
+
+// scrollTargetToTop scrolls the given row of the diff to the top of the view, leaving
+// the view where it is when that row is on screen already. The last screenful of the
+// diff is as far as it goes, so that the view doesn't scroll past the end of what it is
+// showing.
+func (self *DiffLineHelper) scrollTargetToTop(pane types.DiffPaneContext, target int) {
+	view := pane.GetView()
+	originY, height := pane.GetViewTrait().ViewPortYBounds()
+	if target >= originY && target < originY+height {
+		return
+	}
+	view.SetOriginY(min(target, max(0, view.ViewLinesHeight()-height)))
+}
+
+// CollapseNonStickyRange drops a range that only grows while shift is held back to a
+// single line at the cursor.
+func (self *DiffLineHelper) CollapseNonStickyRange(pane types.DiffPaneContext) {
+	sel := pane.DiffSelectState()
+	if sel.Mode == types.DiffSelectModeRange && !sel.RangeIsSticky {
+		sel.Mode = types.DiffSelectModeLine
+		pane.GetView().CancelRangeSelect()
+	}
+}
+
 // changeToSelectOnScreen returns the change line keyboard focus establishes the
 // selection on. In hunk mode that is the first block that begins on screen, so that
 // the block being offered up is one the user can see the extent of, falling back to a
@@ -2,9 +2,12 @@ package helpers

 import (
 	"github.com/jesseduffield/lazygit/pkg/commands/hosting_service"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )

-// this helper just wraps our hosting_service package
+// this helper wraps our hosting_service package, and answers what we know about the
+// repo's pull requests on it

 type HostHelper struct {
 	c *HelperCommon
@@ -18,6 +21,24 @@ func NewHostHelper(
 	}
 }

+// PullRequestForBranch returns the pull request the given local branch is the head of,
+// and false where it has none. That covers knowing of no pull requests at all: the repo
+// may not be on GitHub, or the answer may not have arrived yet.
+func (self *HostHelper) PullRequestForBranch(branchName string) (*models.GithubPullRequest, bool) {
+	pr, ok := self.c.Model().PullRequestsMap[branchName]
+	return pr, ok
+}
+
+// NoPullRequestDisabledReason disables a command that acts on a branch's pull request
+// while that branch has none.
+func (self *HostHelper) NoPullRequestDisabledReason(branchName string) *types.DisabledReason {
+	if _, ok := self.PullRequestForBranch(branchName); !ok {
+		return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true}
+	}
+
+	return nil
+}
+
 func (self *HostHelper) GetPullRequestURL(from string, to string) (string, error) {
 	mgr, err := self.getHostingServiceMgr()
 	if err != nil {
@@ -667,15 +667,11 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
 }

 func (self *LocalCommitsController) checkedOutBranchHasPR() *types.DisabledReason {
-	branch := self.c.Model().CheckedOutBranch
-	if _, ok := self.c.Model().PullRequestsMap[branch]; !ok {
-		return &types.DisabledReason{Text: self.c.Tr.NoPullRequestForBranch, ShowErrorInPanel: true}
-	}
-	return nil
+	return self.c.Helpers().Host.NoPullRequestDisabledReason(self.c.Model().CheckedOutBranch)
 }

 func (self *LocalCommitsController) openPRInBrowser() error {
-	pr, ok := self.c.Model().PullRequestsMap[self.c.Model().CheckedOutBranch]
+	pr, ok := self.c.Helpers().Host.PullRequestForBranch(self.c.Model().CheckedOutBranch)
 	if !ok {
 		// Should be guarded against by the DisabledReason check, but be defensive in case
 		// PullRequestsMap was updated concurrently by a background refresh
@@ -1,6 +1,13 @@
 package controllers

 import (
+	"crypto/sha256"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
@@ -15,10 +22,13 @@ type MainViewController struct {
 	context      *context.MainContext
 	otherContext *context.MainContext

-	dragAutoscroller  *helpers.DragAutoscroller
-	draggingWithMouse bool
+	dragAutoscroller    *helpers.DragAutoscroller
+	draggingWithMouse   bool
+	lineFlashGeneration uint64
 }

+const editedLineFlashDuration = 200 * time.Millisecond
+
 var _ types.IController = &MainViewController{}

 func NewMainViewController(
@@ -149,6 +159,23 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.NextFileInDiff),
 			GetDisabledReason: self.diffSelectionDisabledReason,
 		},
+		{
+			Keys:              opts.GetKeys(opts.Config.Universal.JumpToFile),
+			Handler:           self.openJumpToFileMenu,
+			Description:       self.c.Tr.JumpToFile,
+			DescriptionFunc:   self.diffSelectionDescriptionText(self.c.Tr.JumpToFile),
+			GetDisabledReason: self.diffSelectionDisabledReason,
+			OpensMenu:         true,
+			DisplayOnScreen:   true,
+		},
+		{
+			Keys:              opts.GetKeys(opts.Config.Commits.OpenPullRequestInBrowser),
+			Handler:           self.openPullRequestAtSelectedLine,
+			Description:       self.c.Tr.OpenPullRequestAtSelectedLine,
+			DescriptionFunc:   self.pullRequestDescription(self.c.Tr.OpenPullRequestAtSelectedLine),
+			GetDisabledReason: self.openPullRequestDisabledReason,
+			Tooltip:           self.c.Tr.OpenPullRequestAtSelectedLineTooltip,
+		},
 		{
 			Keys:            opts.GetKeys(opts.Config.Universal.Return),
 			Handler:         self.escape,
@@ -241,6 +268,20 @@ func (self *MainViewController) GetMouseKeybindings(opts types.KeybindingsOpts)
 			Key:      gocui.MouseRelease,
 			Handler:  self.onDragRelease,
 		},
+		{
+			ViewName:                    self.context.GetViewName(),
+			Key:                         gocui.MouseLeft,
+			Modifier:                    gocui.ModAlt,
+			Handler:                     self.editClickedLine,
+			HandleWhenPopupPanelFocused: true,
+		},
+		{
+			ViewName:                    self.context.GetViewName(),
+			Key:                         gocui.MouseLeft,
+			Modifier:                    gocui.ModShift,
+			Handler:                     self.editClickedLine,
+			HandleWhenPopupPanelFocused: true,
+		},
 	}
 }

@@ -308,17 +349,22 @@ func (self *MainViewController) isDiffView() bool {
 	return self.diffMainViewType() != types.DiffMainViewTypeNone
 }

+// sidePanelBeneath returns the side panel this pane is showing the content of, and nil
+// when there is none. The IsInStack guard is essential: NextInStack panics for a context
+// that isn't in the stack, and GetKeybindings (which leads here) also runs for off-stack
+// panes — at startup and while generating the cheatsheets, where the stack is empty.
+func (self *MainViewController) sidePanelBeneath() types.Context {
+	if !self.c.Context().IsInStack(self.context) {
+		return nil
+	}
+	return self.c.Context().NextInStack(self.context)
+}
+
 // diffMainViewType reports what the diff in the focused main view belongs to, taken
 // from the side panel beneath it, or DiffMainViewTypeNone when this pane isn't on the
-// stack or has no diff panel beneath it. The IsInStack guard is essential:
-// NextInStack panics for a context that isn't in the stack, and GetKeybindings (which
-// leads here) also runs for off-stack panes — at startup and while generating the
-// cheatsheets, where the stack is empty.
+// stack or has no diff panel beneath it.
 func (self *MainViewController) diffMainViewType() types.DiffMainViewType {
-	if !self.c.Context().IsInStack(self.context) {
-		return types.DiffMainViewTypeNone
-	}
-	if diffContext, ok := self.c.Context().NextInStack(self.context).(types.DiffMainViewContext); ok {
+	if diffContext, ok := self.sidePanelBeneath().(types.DiffMainViewContext); ok {
 		return diffContext.GetDiffMainViewType()
 	}
 	return types.DiffMainViewTypeNone
@@ -328,10 +374,7 @@ func (self *MainViewController) diffMainViewType() types.DiffMainViewType {
 // hand out the diff it rendered there. nil when this pane isn't on the stack, or the
 // panel beneath shows no diff.
 func (self *MainViewController) diffSource() types.FocusedMainViewDiffSource {
-	if !self.c.Context().IsInStack(self.context) {
-		return nil
-	}
-	sidePanel := self.c.Context().NextInStack(self.context)
+	sidePanel := self.sidePanelBeneath()
 	if sidePanel == nil {
 		return nil
 	}
@@ -418,6 +461,19 @@ func (self *MainViewController) diffActionDescription(staging string, patchBuild
 	}
 }

+// pullRequestDescription describes a command that acts on the pull request of the
+// branch the diff belongs to. Over a diff that belongs to no branch (the working tree's,
+// a stash entry's) it describes it as nothing; this keeps the command out of the
+// keybindings menu there.
+func (self *MainViewController) pullRequestDescription(description string) func() string {
+	return self.diffSelectionDescription(func() string {
+		if self.pullRequestBranch() == "" {
+			return ""
+		}
+		return description
+	})
+}
+
 // copySelection copies the selected diff lines to the clipboard — not as the diff
 // renderer drew them, but as they read in the diff itself, which is both what you meant
 // to copy and the only form a renderer can't have mangled. A selection that is all
@@ -509,11 +565,90 @@ func (self *MainViewController) discardSelectionDisabledReason() *types.Disabled
 	return nil
 }

+// openPullRequestDisabledReason disables opening a line in the pull request where the
+// pull request has no view of what is on screen. The branch may have no pull request,
+// and the pane may be showing a diff that is not the commit's own: a diff against
+// another ref, or the custom patch, whose lines sit at the numbers the patch gives them
+// rather than the commit's.
+func (self *MainViewController) openPullRequestDisabledReason() *types.DisabledReason {
+	if reason := self.diffSelectionDisabledReason(); reason != nil {
+		return reason
+	}
+	if self.c.Modes().Diffing.Active() {
+		return &types.DisabledReason{Text: self.c.Tr.NotAvailableInDiffingMode}
+	}
+	if self.c.Helpers().DiffLine.ShowsCustomPatch(self.context.GetView()) {
+		return &types.DisabledReason{Text: self.c.Tr.NotAvailableForCustomPatch}
+	}
+	if reason := self.c.Helpers().Host.NoPullRequestDisabledReason(self.pullRequestBranch()); reason != nil {
+		return reason
+	}
+	return self.commitsOutsidePullRequestDisabledReason()
+}
+
+// commitsOutsidePullRequestDisabledReason disables opening a line of a diff whose
+// commits the pull request doesn't hold: it holds the commits of its branch that are on
+// the remote, so an unpushed commit is none of its own, and neither is one that is in a
+// main branch already and so from before the branch. Asked for such a commit, its pages
+// say they can't find it.
+func (self *MainViewController) commitsOutsidePullRequestDisabledReason() *types.DisabledReason {
+	commits, _ := self.pullRequestCommits()
+	if lo.EveryBy(commits, func(commit *models.Commit) bool {
+		return commit.Status == models.StatusPushed
+	}) {
+		return nil
+	}
+
+	if len(commits) == 1 {
+		return &types.DisabledReason{Text: self.c.Tr.CommitNotInPullRequest}
+	}
+	return &types.DisabledReason{Text: self.c.Tr.CommitsNotInPullRequest}
+}
+
 func (self *MainViewController) onClickInAlreadyFocusedView(opts gocui.ViewMouseBindingOpts) error {
 	self.selectClickedDiffLine(opts.Y)
 	return nil
 }

+func (self *MainViewController) editClickedLine(opts gocui.ViewMouseBindingOpts) error {
+	var flashGeneration uint64
+	err := self.editDiffLine(opts.Y, func() {
+		self.lineFlashGeneration++
+		flashGeneration = self.lineFlashGeneration
+		self.context.GetView().SetLineFlash(self.lineToFlash(opts.Y))
+		self.c.GocuiGui().ForceFlushViewsContentOnly(self.c.GocuiGui().Views())
+	})
+	if flashGeneration != 0 {
+		time.AfterFunc(editedLineFlashDuration, func() {
+			self.c.OnUIThreadContentOnlyBackground(func() error {
+				if self.lineFlashGeneration == flashGeneration {
+					self.context.GetView().ClearLineFlash()
+				}
+				return nil
+			})
+		})
+	}
+	return err
+}
+
+// lineToFlash returns the view line to flash for an edit of the line clicked at the
+// given one. The editor is sent to where that line begins, so a long line wrapped over
+// several view lines is flashed at the first of them. If the editor wraps the line too,
+// its cursor ends up on the flashed line. When the line begins above the top of the
+// viewport, the clicked line is flashed, as the only part of the line on screen.
+func (self *MainViewController) lineToFlash(clickedViewLine int) int {
+	view := self.context.GetView()
+	bufferLine, ok := view.BufferLineForViewLine(clickedViewLine)
+	if !ok {
+		return clickedViewLine
+	}
+	firstViewLine, ok := view.ViewLineForBufferLine(bufferLine)
+	if !ok || firstViewLine < view.OriginY() {
+		return clickedViewLine
+	}
+	return firstViewLine
+}
+
 func (self *MainViewController) onClickInOtherViewOfMainViewPair(opts gocui.ViewMouseBindingOpts) error {
 	// Carry the select mode over from the pane we're leaving, so that clicking into
 	// the other pane keeps hunk mode even the first time we enter it — its own mode
@@ -712,50 +847,12 @@ func (self *MainViewController) prevFile() error {
 	return nil
 }

-// placeNavigationTarget moves the selection to the row a jump found, bringing it on
-// screen if it isn't already.
-//
-// alignTop asks for the target to become the view's top line, so that everything that
-// begins there is on screen. It only applies to a target the view has to scroll to: a
-// jump to something already on screen leaves the view alone, there being nothing to
-// gain from moving what the user is looking at. In hunk mode what ends up selected is
-// the first change block at or below the target, which a large context size can put
-// further down than a screenful; the selection is then scrolled into view as any other
-// jump's is, and the alignment gives way to that.
 func (self *MainViewController) placeNavigationTarget(target int, alignTop bool) {
-	v := self.context.GetView()
-	if !v.Highlight {
-		v.SetOrigin(0, target)
-		return
-	}
-	if alignTop {
-		self.scrollTargetToTop(target)
-	}
-	// Jumping to another block or file moves the cursor without shift held, so a
-	// range that grows only while shift is held collapses rather than stretching all
-	// the way to the target. A sticky range stretches instead; this is the point of
-	// being sticky.
-	self.collapseNonStickyRange()
-	if self.diffSelectState().Mode == types.DiffSelectModeHunk {
-		self.selectHunkAround(target, true)
-		return
-	}
-	// Line mode leaves a single-line selection at the target; an active range extends
-	// to it, the anchor being untouched.
-	self.c.Helpers().DiffLine.ShowSelectionAtLine(v, target, true)
+	self.c.Helpers().DiffLine.PlaceNavigationTarget(self.context, target, alignTop)
 }

-// scrollTargetToTop scrolls the given row of the diff to the top of the view, leaving
-// the view where it is when that row is on screen already. The last screenful of the
-// diff is as far as it goes, so that the view doesn't scroll past the end of what it is
-// showing.
-func (self *MainViewController) scrollTargetToTop(target int) {
-	view := self.context.GetView()
-	originY, height := self.context.GetViewTrait().ViewPortYBounds()
-	if target >= originY && target < originY+height {
-		return
-	}
-	view.SetOriginY(min(target, max(0, view.ViewLinesHeight()-height)))
+func (self *MainViewController) openJumpToFileMenu() error {
+	return self.c.Helpers().DiffLine.OpenJumpToFileMenu(self.context, self.c.Tr.JumpToFile)
 }

 // moveCursor moves the selection cursor by delta view lines (negative = up), with the
@@ -787,17 +884,7 @@ func (self *MainViewController) collapseForLineMove() {
 		self.context.GetView().CancelRangeSelect()
 		return
 	}
-	self.collapseNonStickyRange()
-}
-
-// collapseNonStickyRange drops a range that only grows while shift is held back to a
-// single line at the cursor.
-func (self *MainViewController) collapseNonStickyRange() {
-	sel := self.diffSelectState()
-	if sel.Mode == types.DiffSelectModeRange && !sel.RangeIsSticky {
-		sel.Mode = types.DiffSelectModeLine
-		self.context.GetView().CancelRangeSelect()
-	}
+	self.c.Helpers().DiffLine.CollapseNonStickyRange(self.context)
 }

 // adjustSelection moves the selection by delta view lines, for the plain up/down and
@@ -966,11 +1053,17 @@ func (self *MainViewController) editLine() error {
 	if !view.Highlight {
 		return nil
 	}
+	return self.editDiffLine(view.SelectedLineIdx(), nil)
+}

-	info, ok := self.c.Helpers().DiffLine.GetDiffLineInfo(view, view.SelectedLineIdx())
+func (self *MainViewController) editDiffLine(viewLine int, beforeEdit func()) error {
+	info, ok := self.c.Helpers().DiffLine.GetDiffLineInfo(self.context.GetView(), viewLine)
 	if !ok {
 		return nil
 	}
+	if beforeEdit != nil {
+		beforeEdit()
+	}

 	// A file-header row points at the file as a whole rather than at a line in it, so
 	// it opens the file without jumping anywhere — as pressing edit on a file in a side
@@ -985,6 +1078,104 @@ func (self *MainViewController) editLine() error {
 	return self.c.Helpers().Files.EditFileAtLine(info.Path, lineNumber)
 }

+// openPullRequestAtSelectedLine opens the pull request of the branch whose commit the
+// main view is showing the diff of, at the line the selection is on, so that the line
+// can be commented on there.
+func (self *MainViewController) openPullRequestAtSelectedLine() error {
+	pr, ok := self.c.Helpers().Host.PullRequestForBranch(self.pullRequestBranch())
+	if !ok {
+		// Guarded against by the disabled reason, but a refresh in the background may
+		// have taken the pull request away since it was asked.
+		return errors.New(self.c.Tr.NoPullRequestForBranch)
+	}
+
+	commits, baseHash := self.pullRequestCommits()
+	if len(commits) == 0 {
+		return nil
+	}
+
+	view := self.context.GetView()
+	info, ok := self.c.Helpers().DiffLine.GetDiffLineInfo(view, view.SelectedLineIdx())
+	if !ok {
+		return nil
+	}
+	relativePath := repoRelativePath(self.c.Git().RepoPaths.WorktreePath(), info.Path)
+	if relativePath == "" {
+		return nil
+	}
+
+	self.c.LogAction(self.c.Tr.Actions.OpenPullRequest)
+	url := githubPullRequestLineURL(pr.Url, githubCommitRange(commits, baseHash), relativePath, info)
+	return self.c.OS().OpenLink(url)
+}
+
+// pullRequestBranch returns the branch whose pull request would show the diff in this
+// pane, as the panel beneath names it, and "" where no pull request shows it.
+func (self *MainViewController) pullRequestBranch() string {
+	prContext, ok := self.sidePanelBeneath().(types.PullRequestDiffContext)
+	if !ok {
+		return ""
+	}
+	return prContext.BranchForPullRequest()
+}
+
+// pullRequestCommits returns the commits whose diff the pane is showing, and the commit
+// that diff starts after, as the panel beneath names them. The diff's line numbers are
+// the ones the pull request's page for those commits shows.
+func (self *MainViewController) pullRequestCommits() ([]*models.Commit, string) {
+	prContext, ok := self.sidePanelBeneath().(types.PullRequestDiffContext)
+	if !ok {
+		return nil, ""
+	}
+	return prContext.CommitsForPullRequest()
+}
+
+// githubPullRequestLineURL builds the URL of a line of a file, in the diff a pull request
+// shows for the given commits. The file is named by the SHA-256 of its path as git spells
+// it, and the line by which side of the diff it is on.
+//
+// GitHub documents none of this; the form was read off the URLs its own pages carry (see
+// https://github.com/orgs/community/discussions/55764).
+func githubPullRequestLineURL(
+	prURL string, commitRange string, relativePath string, info types.DiffLineInfo,
+) string {
+	pathHash := sha256.Sum256([]byte(relativePath))
+	anchor := "diff-" + hex.EncodeToString(pathHash[:]) + githubDiffLineSuffix(info)
+	return fmt.Sprintf("%s/changes/%s#%s", prURL, commitRange, anchor)
+}
+
+// githubCommitRange names the commits a pull request is to show the diff of: a single
+// commit by its hash, and a range of them as the commit the diff starts after, then the
+// commit it ends at. A range that starts where the pull request itself does names BASE
+// as the commit it starts after, the keyword its pages use for the commit the pull
+// request was opened against; naming that commit by its hash gets a page that says it
+// can't find those commits.
+func githubCommitRange(commits []*models.Commit, baseHash string) string {
+	newest := commits[0].Hash()
+	if len(commits) == 1 {
+		return newest
+	}
+	if baseHash == "" {
+		baseHash = "BASE"
+	}
+	return baseHash + ".." + newest
+}
+
+// githubDiffLineSuffix names a line within a file's diff: R for the new version of the
+// file, L for the old one, which is where a deleted line is found. Some rows are no line
+// of the file at all (the header naming it, or a marker like "\ No newline at end of
+// file"); those name none, and the anchor points at the file itself.
+func githubDiffLineSuffix(info types.DiffLineInfo) string {
+	switch info.Type {
+	case types.DiffLineDeleted:
+		return fmt.Sprintf("L%d", info.OldLine)
+	case types.DiffLineAdded, types.DiffLineContext, types.DiffLineHunkHeader:
+		return fmt.Sprintf("R%d", info.NewLine)
+	default:
+		return ""
+	}
+}
+
 func (self *MainViewController) openSearch() error {
 	if manager := self.c.GetViewBufferManagerForView(self.context.GetView()); manager != nil {
 		manager.ReadToEnd(func() {
@@ -0,0 +1,115 @@
+package controllers
+
+import (
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGithubPullRequestLineURL(t *testing.T) {
+	const prURL = "https://github.com/jesseduffield/lazygit/pull/1234"
+	const commitHash = "1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b"
+
+	// The anchor names the file by the SHA-256 of its repo-relative path, taken over
+	// exactly those bytes: no leading slash, no trailing newline, forward slashes.
+	const fileHash = "067980d6efc4249367ceb61b0d93a00bca100a0ddb6d4a72b6dbb0eb9d3825cc" // "dir/file1"
+
+	scenarios := []struct {
+		name     string
+		path     string
+		info     types.DiffLineInfo
+		expected string
+	}{
+		{
+			name:     "an added line is on the right side of the diff",
+			path:     "dir/file1",
+			info:     types.DiffLineInfo{Type: types.DiffLineAdded, NewLine: 12},
+			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "R12",
+		},
+		{
+			name: "a deleted line is on the left side, at the line it sat on",
+			path: "dir/file1",
+			// A deletion's NewLine is only where it sits in the new version of the
+			// file; the line it is, is the old one.
+			info:     types.DiffLineInfo{Type: types.DiffLineDeleted, NewLine: 12, OldLine: 34},
+			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "L34",
+		},
+		{
+			name:     "a context line is on the right side too",
+			path:     "dir/file1",
+			info:     types.DiffLineInfo{Type: types.DiffLineContext, NewLine: 7, OldLine: 5},
+			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "R7",
+		},
+		{
+			name:     "a hunk header points at the first line of its hunk",
+			path:     "dir/file1",
+			info:     types.DiffLineInfo{Type: types.DiffLineHunkHeader, NewLine: 20},
+			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash + "R20",
+		},
+		{
+			name:     "the header naming a file points at the file alone",
+			path:     "dir/file1",
+			info:     types.DiffLineInfo{Type: types.DiffLineFileHeader},
+			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash,
+		},
+		{
+			name:     "a row that is no line of the file points at the file alone",
+			path:     "dir/file1",
+			info:     types.DiffLineInfo{Type: types.DiffLineOther},
+			expected: prURL + "/changes/" + commitHash + "#diff-" + fileHash,
+		},
+		{
+			name: "a file at the root of the repo",
+			path: "file1",
+			info: types.DiffLineInfo{Type: types.DiffLineAdded, NewLine: 1},
+			expected: prURL + "/changes/" + commitHash +
+				"#diff-c147efcfc2d7ea666a9e4f5187b115c90903f0fc896a56df9a6ef5d8f3fc9f31R1",
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			assert.Equal(t, s.expected, githubPullRequestLineURL(prURL, commitHash, s.path, s.info))
+		})
+	}
+}
+
+func TestGithubCommitRange(t *testing.T) {
+	hashPool := &utils.StringPool{}
+	newest := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "newest"})
+	oldest := models.NewCommit(hashPool, models.NewCommitOpts{Hash: "oldest"})
+
+	scenarios := []struct {
+		name     string
+		commits  []*models.Commit
+		baseHash string
+		expected string
+	}{
+		{
+			name:     "a single commit is named on its own",
+			commits:  []*models.Commit{newest},
+			baseHash: "parent",
+			expected: "newest",
+		},
+		{
+			name:     "a range is named as the commits it lies between",
+			commits:  []*models.Commit{newest, oldest},
+			baseHash: "parent",
+			expected: "parent..newest",
+		},
+		{
+			name:     "a range starting where the pull request does lies above BASE",
+			commits:  []*models.Commit{newest, oldest},
+			expected: "BASE..newest",
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.name, func(t *testing.T) {
+			assert.Equal(t, s.expected, githubCommitRange(s.commits, s.baseHash))
+		})
+	}
+}
@@ -2,7 +2,6 @@ package controllers

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

 	"github.com/jesseduffield/generics/set"
@@ -262,11 +261,11 @@ func (self *WorkingTreeDiffActions) applyDiffLineSelection(
 // fileForDiffLinePath maps the absolute path a diff line carries to the working tree
 // file it belongs to, or nil for a path that is no file of this repo's working tree.
 func (self *WorkingTreeDiffActions) fileForDiffLinePath(path string) *models.File {
-	relativePath, err := filepath.Rel(self.c.Git().RepoPaths.WorktreePath(), path)
-	if err != nil {
+	relativePath := repoRelativePath(self.c.Git().RepoPaths.WorktreePath(), path)
+	if relativePath == "" {
 		return nil
 	}
-	return self.context().FileTreeViewModel.GetFile(filepath.ToSlash(relativePath))
+	return self.context().FileTreeViewModel.GetFile(relativePath)
 }

 // applyDiffLines applies the given change lines of one file — a line, a hunk, a range —
@@ -51,34 +51,40 @@ func (self *GuiDriver) PressKeysRapidly(keyStrs ...string) {
 }

 func (self *GuiDriver) Click(x, y int) {
+	self.ClickWithModifier(x, y, gocui.ModNone)
+}
+
+// ClickWithModifier clicks with a keyboard modifier held down for the whole
+// gesture, as a terminal reports it.
+func (self *GuiDriver) ClickWithModifier(x, y int, modifier gocui.Modifier) {
 	self.CheckAllToastsAcknowledged()

-	self.replayMouseEvent(x, y, tcell.ButtonPrimary)
-	self.replayMouseEvent(x, y, tcell.ButtonNone)
+	self.replayMouseEvent(x, y, tcell.ButtonPrimary, modifier)
+	self.replayMouseEvent(x, y, tcell.ButtonNone, modifier)
 }

 func (self *GuiDriver) ClickAndHold(x, y int) {
 	self.CheckAllToastsAcknowledged()
-	self.replayMouseEvent(x, y, tcell.ButtonPrimary)
+	self.replayMouseEvent(x, y, tcell.ButtonPrimary, gocui.ModNone)
 }

 // MouseMove reports the mouse at a new position with the left button still
 // held down, i.e. a drag movement. (No test needs pointer motion without a
 // button held, so that variant doesn't exist.)
 func (self *GuiDriver) MouseMove(x, y int) {
-	self.replayMouseEvent(x, y, tcell.ButtonPrimary)
+	self.replayMouseEvent(x, y, tcell.ButtonPrimary, gocui.ModNone)
 }

 func (self *GuiDriver) ScrollWheelDown(x, y int) {
-	self.replayMouseEvent(x, y, tcell.WheelDown)
+	self.replayMouseEvent(x, y, tcell.WheelDown, gocui.ModNone)
 }

 func (self *GuiDriver) MouseRelease(x, y int) {
-	self.replayMouseEvent(x, y, tcell.ButtonNone)
+	self.replayMouseEvent(x, y, tcell.ButtonNone, gocui.ModNone)
 }

 func (self *GuiDriver) MouseReleaseWithoutWaiting(x, y int) {
-	self.replayMouseEventWithoutWaiting(x, y, tcell.ButtonNone)
+	self.replayMouseEventWithoutWaiting(x, y, tcell.ButtonNone, gocui.ModNone)
 }

 func (self *GuiDriver) WaitUntilIdle() {
@@ -89,14 +95,16 @@ func (self *GuiDriver) OnUIThreadAndWait(f func()) {
 	_ = self.gui.g.OnUIThreadAndWait(f)
 }

-func (self *GuiDriver) replayMouseEvent(x, y int, buttons tcell.ButtonMask) {
-	self.replayMouseEventWithoutWaiting(x, y, buttons)
+func (self *GuiDriver) replayMouseEvent(x, y int, buttons tcell.ButtonMask, modifier gocui.Modifier) {
+	self.replayMouseEventWithoutWaiting(x, y, buttons, modifier)
 	self.waitTillIdle()
 }

-func (self *GuiDriver) replayMouseEventWithoutWaiting(x, y int, buttons tcell.ButtonMask) {
+func (self *GuiDriver) replayMouseEventWithoutWaiting(
+	x, y int, buttons tcell.ButtonMask, modifier gocui.Modifier,
+) {
 	self.gui.g.ReplayMouseEvent(gocui.NewTcellMouseEventWrapper(
-		tcell.NewEventMouse(x, y, buttons, 0),
+		tcell.NewEventMouse(x, y, buttons, tcell.ModMask(modifier)),
 		0,
 	))
 }
@@ -1,6 +1,7 @@
 package types

 import (
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -213,6 +214,29 @@ const (
 	DiffMainViewTypePatchBuilding
 )

+// PullRequestDiffContext is implemented by the side panel contexts that show, in
+// their focused main view, the diff of a commit of a branch: the commits panel and
+// the sub-commits panel, and the commit files panel entered from either of them. A
+// pull request for that branch has a view of that commit, so a line of the diff can
+// be pointed at in it. A panel showing a diff that no pull request has a view of (the
+// working tree's, a stash entry's, a reflog entry's) doesn't implement this.
+type PullRequestDiffContext interface {
+	Context
+
+	// BranchForPullRequest returns the local branch whose pull request would show
+	// the diff in the main view, and "" where no branch does: the panel may have
+	// nothing selected, HEAD may be detached, or what was drilled into may be a tag
+	// or a remote branch rather than a local one.
+	BranchForPullRequest() string
+
+	// CommitsForPullRequest returns the commits whose combined diff the main view is
+	// showing, newest first as the panel lists them, together with the hash of the
+	// commit that diff starts after: the parent of the oldest of them, where the
+	// pull request has that parent as one of its own commits, and "" where the diff
+	// starts where the pull request itself does.
+	CommitsForPullRequest() ([]*models.Commit, string)
+}
+
 // DiffPaneContext is one of the two panes the main section can show, as the thing
 // that holds a diff with a selection in it. The panels that act on such a selection
 // are handed the pane it was made in, and speak to it through this.
@@ -293,6 +293,8 @@ type TranslationSet struct {
 	UnsupportedGitService                 string
 	CopyPullRequestURL                    string
 	OpenPullRequestInBrowser              string
+	OpenPullRequestAtSelectedLine         string
+	OpenPullRequestAtSelectedLineTooltip  string
 	NoPullRequestForBranch                string
 	NoBranchOnRemote                      string
 	Fetch                                 string
@@ -310,6 +312,10 @@ type TranslationSet struct {
 	ToggleSelectHunk                      string
 	SelectHunk                            string
 	NothingToSelectInDiff                 string
+	NotAvailableInDiffingMode             string
+	NotAvailableForCustomPatch            string
+	CommitNotInPullRequest                string
+	CommitsNotInPullRequest               string
 	SelectLineByLine                      string
 	ToggleSelectHunkTooltip               string
 	ToggleSelectionForPatch               string
@@ -410,6 +416,10 @@ type TranslationSet struct {
 	NextHunk                              string
 	PrevFileInDiff                        string
 	NextFileInDiff                        string
+	JumpToFile                            string
+	JumpToFileInDiff                      string
+	JumpToFileInDiffTooltip               string
+	OnlyOneFileInDiff                     string
 	PrevConflict                          string
 	NextConflict                          string
 	SelectPrevHunk                        string
@@ -1467,6 +1477,8 @@ func EnglishTranslationSet() *TranslationSet {
 		CreatePullRequest:                    `Create pull request`,
 		CopyPullRequestURL:                   `Copy pull request URL to clipboard`,
 		OpenPullRequestInBrowser:             `Open pull request in browser`,
+		OpenPullRequestAtSelectedLine:        `Open pull request at selected line`,
+		OpenPullRequestAtSelectedLineTooltip: "Open the branch's pull request in your browser, at the line the selection is on, so that you can comment on it there. Only pull requests on GitHub are found.",
 		NoPullRequestForBranch:               `No pull request found for this branch`,
 		NoBranchOnRemote:                     `This branch doesn't exist on remote. You need to push it to remote first.`,
 		Fetch:                                `Fetch`,
@@ -1485,6 +1497,10 @@ func EnglishTranslationSet() *TranslationSet {
 		DismissRangeSelect:                   "Dismiss range select",
 		ToggleSelectHunk:                     "Toggle hunk selection",
 		NothingToSelectInDiff:                "There is nothing to select here",
+		NotAvailableInDiffingMode:            "Not available in diffing mode",
+		NotAvailableForCustomPatch:           "Not available for the custom patch",
+		CommitNotInPullRequest:               "This commit is not part of the pull request",
+		CommitsNotInPullRequest:              "Not all of these commits are part of the pull request",
 		SelectHunk:                           "Select hunks",
 		SelectLineByLine:                     "Select line-by-line",
 		ToggleSelectHunkTooltip:              "Toggle line-by-line vs. hunk selection mode.",
@@ -1590,6 +1606,10 @@ func EnglishTranslationSet() *TranslationSet {
 		NextHunk:                             "Go to next hunk",
 		PrevFileInDiff:                       "Go to previous file",
 		NextFileInDiff:                       "Go to next file",
+		JumpToFile:                           "Jump to file",
+		JumpToFileInDiff:                     "Jump to file in diff",
+		JumpToFileInDiffTooltip:              "Pick one of the files of the diff shown in the main view, and scroll the main view to it. The focus stays in this panel.",
+		OnlyOneFileInDiff:                    "There is only one file in this diff",
 		PrevConflict:                         "Previous conflict",
 		NextConflict:                         "Next conflict",
 		SelectPrevHunk:                       "Previous hunk",
@@ -6,6 +6,7 @@ import (
 	"time"

 	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/gocui"
 	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
 )

@@ -60,6 +61,12 @@ func (self *TestDriver) click(x, y int) {
 	self.Wait(self.inputDelay)
 }

+func (self *TestDriver) clickWithModifier(x, y int, modifier gocui.Modifier, what string) {
+	self.SetCaption(fmt.Sprintf("%s-clicking %d, %d", what, x, y))
+	self.gui.ClickWithModifier(x, y, modifier)
+	self.Wait(self.inputDelay)
+}
+
 func (self *TestDriver) clickAndHold(x, y int) {
 	self.SetCaption(fmt.Sprintf("Clicking and holding %d, %d", x, y))
 	self.mouseX, self.mouseY = x, y
@@ -47,6 +47,10 @@ func (self *fakeGuiDriver) Click(x, y int) {
 	self.clickedCoordinates = append(self.clickedCoordinates, coordinate{x: x, y: y})
 }

+func (self *fakeGuiDriver) ClickWithModifier(x, y int, modifier gocui.Modifier) {
+	self.clickedCoordinates = append(self.clickedCoordinates, coordinate{x: x, y: y})
+}
+
 func (self *fakeGuiDriver) ClickAndHold(x, y int) {
 	self.heldCoordinates = append(self.heldCoordinates, coordinate{x: x, y: y})
 }
@@ -200,6 +204,8 @@ func TestViewDriverPointerCoordinates(t *testing.T) {

 	viewDriver.
 		Click(1, 2).
+		AltClick(2, 3).
+		ShiftClick(4, 5).
 		FocusInAndClick(3, 4).
 		ClickAndHold(5, 6).
 		MouseMove(7, 8).
@@ -207,11 +213,13 @@ func TestViewDriverPointerCoordinates(t *testing.T) {
 		MouseMoveToView(targetViewDriver, 10, 11).
 		ScrollWheelDown()

-	assert.Equal(t, []coordinate{{12, 23}, {14, 25}}, guiDriver.clickedCoordinates)
+	assert.Equal(t,
+		[]coordinate{{12, 23}, {13, 24}, {15, 26}, {14, 25}},
+		guiDriver.clickedCoordinates)
 	assert.Equal(t, []coordinate{{16, 27}}, guiDriver.heldCoordinates)
 	assert.Equal(t, []coordinate{{18, 29}, {20, 30}, {51, 62}}, guiDriver.movedCoordinates)
 	assert.Equal(t, []coordinate{{11, 21}}, guiDriver.scrolledCoordinates)
-	assert.Equal(t, 7, guiDriver.onUIThreadCallCount)
+	assert.Equal(t, 9, guiDriver.onUIThreadCallCount)
 }

 func TestFailingFixture(t *testing.T) {
@@ -725,6 +725,25 @@ func (self *ViewDriver) Click(x, y int) *ViewDriver {
 	return self
 }

+// AltClick and ShiftClick click with a modifier held down. Both modifiers are
+// bound to the same gestures, because no single one of them reaches lazygit in
+// every terminal.
+func (self *ViewDriver) AltClick(x, y int) *ViewDriver {
+	offsetX, offsetY, _ := self.viewGeometry()
+
+	self.t.clickWithModifier(offsetX+1+x, offsetY+1+y, gocui.ModAlt, "Alt")
+
+	return self
+}
+
+func (self *ViewDriver) ShiftClick(x, y int) *ViewDriver {
+	offsetX, offsetY, _ := self.viewGeometry()
+
+	self.t.clickWithModifier(offsetX+1+x, offsetY+1+y, gocui.ModShift, "Shift")
+
+	return self
+}
+
 func (self *ViewDriver) FocusInAndClick(x, y int) *ViewDriver {
 	offsetX, offsetY, _ := self.viewGeometry()

@@ -0,0 +1,66 @@
+package main_view
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var EditClickedDiffLine = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Alt- or shift-click a line of the main view's diff to open it in the editor, without focusing the view",
+	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) {
+		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\nfour\nfive\n")
+		shell.Commit("one")
+
+		shell.UpdateFile("file1", "one\ntwo\nTHREE\nfour\nfive\n")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused()
+
+		// The click points at the line itself, so the main view can stay unfocused
+		// and unselected. You read a diff where it is and click into it.
+		t.Views().Main().
+			AltClick(0, 8).
+			Tap(func() {
+				t.FileSystem().FileContent("edit-command", Contains("/repo/file1:3\n"))
+			}).
+			SelectionIsHidden()
+
+		t.Views().Files().
+			IsFocused()
+
+		// Shift-click is bound to the same thing, since neither modifier reaches
+		// lazygit in every terminal. A context line names a line of the file like any
+		// other row.
+		t.Views().Main().
+			ShiftClick(0, 9).
+			Tap(func() {
+				t.FileSystem().FileContent("edit-command", Contains("/repo/file1:4\n"))
+			})
+
+		// A popup taking the focus swallows clicks on the views behind it. This one
+		// stays live, so a diff can still be read and clicked into while a popup is
+		// up.
+		t.Views().Files().
+			Press(keys.Universal.Remove)
+
+		t.Views().Menu().
+			IsFocused()
+
+		t.Views().Main().
+			AltClick(0, 6).
+			Tap(func() {
+				t.FileSystem().FileContent("edit-command", Contains("/repo/file1:2\n"))
+			})
+
+		t.Views().Menu().
+			IsFocused().
+			Press(keys.Universal.Return)
+	},
+})
@@ -0,0 +1,155 @@
+package main_view
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var JumpToAFileOfTheDiff = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Jump to a file of a commit's diff by picking it from a menu of the diff's files",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	// A short terminal, so that the first file's diff is longer than the part of the
+	// diff that has been read when the menu asks which files there are.
+	Width:  100,
+	Height: 20,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
+	SetupRepo: func(shell *Shell) {
+		lines := make([]string, 600)
+		for i := range lines {
+			lines[i] = fmt.Sprintf("line%03d", i+1)
+		}
+		shell.CreateFileAndAdd("aaa.txt", strings.Join(lines, "\n")+"\n")
+		shell.CreateFileAndAdd("ccc.txt", "one\n")
+		shell.CreateFileAndAdd("dir/bbb.txt", "one\n")
+		// Another long one at the end, so that the file jumped to below has a diff
+		// under it to scroll past and ends up at the top of the view.
+		shell.CreateFileAndAdd("zzz.txt", strings.Join(lines, "\n")+"\n")
+		shell.Commit("one")
+
+		shell.UpdateFileAndAdd("ccc.txt", "two\n")
+		shell.Commit("two")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		// A menu offering the one file of a single-file diff would be a menu with
+		// nothing to choose, so it says what it found instead.
+		t.Views().Commits().
+			Focus().
+			SelectedLine(Contains("two")).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectionIsActive().
+			Press(keys.Universal.JumpToFile)
+
+		t.ExpectToast(Contains("There is only one file in this diff"))
+
+		t.Views().Main().
+			IsFocused().
+			Press(keys.Universal.Return)
+
+		t.Views().Commits().
+			IsFocused().
+			SelectNextItem().
+			SelectedLine(Contains("one")).
+			Press(keys.Universal.FocusMainView)
+
+		// Every file of the diff is offered, in the order the diff shows them and by
+		// the path the repo knows them by, including the ones below the part of the
+		// diff that has been read.
+		t.Views().Main().
+			IsFocused().
+			SelectionIsActive().
+			Press(keys.Universal.JumpToFile)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Jump to file")).
+			Lines(
+				Equals("aaa.txt"),
+				Equals("ccc.txt"),
+				Equals("dir/bbb.txt"),
+				Equals("zzz.txt"),
+				Equals("Cancel"),
+			).
+			Select(Equals("dir/bbb.txt")).
+			Confirm()
+
+		// The file lands where stepping to it with next-file would leave it: selected,
+		// and at the top of the view.
+		t.Views().Main().
+			IsFocused().
+			TopVisibleLine(Contains("diff --git a/dir/bbb.txt b/dir/bbb.txt")).
+			SelectedLines(
+				Contains("diff --git a/dir/bbb.txt b/dir/bbb.txt"),
+			).
+			Press(keys.Universal.JumpToFile)
+
+		// The menu filters as you type, which is the point of it for a diff of many
+		// files.
+		t.ExpectPopup().Menu().
+			Title(Equals("Jump to file")).
+			Filter("ccc").
+			Lines(
+				Equals("ccc.txt"),
+			).
+			Confirm()
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(
+				Contains("diff --git a/ccc.txt b/ccc.txt"),
+			).
+			Press(keys.Universal.Return)
+
+		// The panel the diff belongs to offers the same menu, so that a file can be
+		// jumped to without focusing the diff and having to come back out of it.
+		t.Views().Commits().
+			IsFocused().
+			SelectedLine(Contains("one")).
+			Press(keys.Universal.JumpToFile)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Jump to file in diff")).
+			Select(Equals("zzz.txt")).
+			Confirm()
+
+		// Only the diff moves: it goes to the top of the file, while the panel keeps
+		// the focus and its selection.
+		t.Views().Commits().
+			IsFocused().
+			SelectedLine(Contains("one"))
+
+		t.Views().Main().
+			TopVisibleLine(Contains("diff --git a/zzz.txt b/zzz.txt"))
+
+		// A panel showing something else in the main view — a branch's commit log —
+		// doesn't offer the menu at all, rather than offering it disabled.
+		t.Views().Branches().
+			Focus().
+			Press(keys.Universal.OptionMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Keybindings")).
+			Tap(func() {
+				t.Views().Menu().Content(DoesNotContain("Jump to file"))
+			}).
+			Cancel()
+
+		t.Views().Commits().
+			Focus().
+			Press(keys.Universal.OptionMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Keybindings")).
+			Tap(func() {
+				t.Views().Menu().Content(Contains("Jump to file in diff"))
+			}).
+			Cancel()
+	},
+})
@@ -0,0 +1,74 @@
+package main_view
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
+)
+
+var JumpToAFileOnlyOverADiff = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "The menu of the diff's files is offered only while the main view is showing a diff",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shared.CreateMergeConflictFiles(shell)
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		// A commit shows its diff in the main view, so the menu is offered over it.
+		t.Views().Commits().
+			Focus().
+			NavigateToLine(Contains("original")).
+			Press(keys.Universal.OptionMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Keybindings")).
+			Tap(func() {
+				t.Views().Menu().Content(Contains("Jump to file in diff"))
+			}).
+			Cancel()
+
+		// The pane binds the same key itself, so the global one isn't offered on top of
+		// the pane's while the pane has the focus.
+		t.Views().Commits().
+			IsFocused().
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			Press(keys.Universal.OptionMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Keybindings")).
+			Tap(func() {
+				t.Views().Menu().
+					Content(Contains("Jump to file")).
+					Content(DoesNotContain("Jump to file in diff"))
+			}).
+			Cancel()
+
+		t.Views().Main().
+			IsFocused().
+			Press(keys.Universal.Return)
+
+		// Working through a conflicted file gives the main section over to the merge
+		// conflicts view, which is no diff to jump around in. The pane behind it goes
+		// on holding the diff it last rendered, so it is the view on screen that
+		// decides.
+		t.Views().Files().
+			Focus().
+			NavigateToLine(Contains("UU file1")).
+			PressEnter()
+
+		t.Views().MergeConflicts().
+			IsFocused().
+			Press(keys.Universal.OptionMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Keybindings")).
+			Tap(func() {
+				t.Views().Menu().Content(DoesNotContain("Jump to file"))
+			}).
+			Cancel()
+	},
+})
@@ -11,6 +11,7 @@ var NoSelectionOverAConflictHint = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	SetupConfig: func(config *config.AppConfig) {
 		config.GetUserConfig().Gui.ShowFileTree = false
+		config.GetUserConfig().OS.EditAtLine = "echo {{filename}}:{{line}} > edit-command"
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.RunShellCommand(`echo 1 > foo && echo 1 > bar`)
@@ -47,6 +48,20 @@ var NoSelectionOverAConflictHint = NewIntegrationTest(NewIntegrationTestArgs{
 			PressPrimaryAction().
 			Tap(func() {
 				t.ExpectToast(Contains("There is nothing to select here"))
+			}).
+			// A pane with nothing to select still has lines to point at. A modified
+			// click names its own line rather than acting on the selection, so it
+			// opens the file there. The file is in the working tree for a conflict
+			// like this one, holding the modified side; you may want to copy a piece
+			// of it elsewhere before resolving the conflict by deleting the file.
+			//
+			// The cursor moves where a plain click points even here, so the assertion
+			// below says which row the modified click then lands on.
+			Click(0, 17).
+			SelectedLine(Contains("+2")).
+			AltClick(0, 17).
+			Tap(func() {
+				t.FileSystem().FileContent("edit-command", Contains("/repo/bar:1\n"))
 			})
 	},
 })
@@ -0,0 +1,105 @@
+package main_view
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var OpenPullRequestOnlyOverACommitsDiff = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Opening a diff line in the pull request is offered over a commit's own diff, and refused over the other diffs the main view shows",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Gui.UseHunkModeInDiffView = false
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("file1", "one\ntwo\nthree\n")
+		shell.Commit("first commit")
+
+		shell.UpdateFileAndAdd("file1", "one\nTWO\nthree\n")
+		shell.Commit("second commit")
+
+		shell.UpdateFile("file1", "one\nTWO\nTHREE\n")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		// The working tree's diff is no commit of a branch, so no pull request has a
+		// view of it and the command isn't offered there at all.
+		t.Views().Files().
+			Focus().
+			SelectedLine(Contains("file1")).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			Press(keys.Universal.OptionMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Keybindings")).
+			Tap(func() {
+				// The command is bound right below the one asserted here, so a menu
+				// showing that one would be showing this one too if it had it.
+				t.Views().Menu().
+					Content(Contains("Go to next file")).
+					Content(DoesNotContain("Open pull request at selected line"))
+			}).
+			Cancel()
+
+		// Over a commit's diff it is offered, and says so where the branch has no pull
+		// request to open.
+		t.Views().Commits().
+			Focus().
+			SelectedLine(Contains("second commit")).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectedLines(
+				Contains("-two"),
+			).
+			Press(keys.Commits.OpenPullRequestInBrowser)
+
+		t.ExpectPopup().Alert().
+			Title(Equals("Error")).
+			Content(Contains("No pull request found for this branch")).
+			Confirm()
+
+		// The pane previewing the custom patch shows the patch's lines at the numbers
+		// the patch gives them, which are not the ones the pull request shows.
+		t.Views().Main().
+			IsFocused().
+			PressPrimaryAction().
+			Press(keys.Universal.TogglePanel)
+
+		t.Views().Secondary().
+			IsFocused().
+			SelectedLines(
+				Contains("-two"),
+			).
+			Press(keys.Commits.OpenPullRequestInBrowser)
+
+		t.ExpectToast(Contains("Not available for the custom patch"))
+
+		// In diffing mode the main view shows a diff against another ref rather than
+		// the commit's own, and the pull request has no view of that either.
+		t.Views().Commits().
+			Focus().
+			Press(keys.Universal.DiffingMenu)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Diffing")).
+			Select(MatchesRegexp(`Diff \w+`)).
+			Confirm()
+
+		t.Views().Commits().
+			SelectNextItem().
+			SelectedLine(Contains("first commit")).
+			Press(keys.Universal.FocusMainView)
+
+		t.Views().Main().
+			IsFocused().
+			SelectionIsActive().
+			Press(keys.Commits.OpenPullRequestInBrowser)
+
+		t.ExpectToast(Contains("Not available in diffing mode"))
+	},
+})
@@ -390,6 +390,7 @@ var tests = []*components.IntegrationTest{
 	main_view.DiscardLinesFromACommit,
 	main_view.DragRangeWithAutoscroll,
 	main_view.DragSelectsDiffLineRange,
+	main_view.EditClickedDiffLine,
 	main_view.EditHistoricalDiffLine,
 	main_view.EditHunkInFocusedDiff,
 	main_view.EditSelectedDiffLine,
@@ -403,6 +404,8 @@ var tests = []*components.IntegrationTest{
 	main_view.FocusLeavesAnAlwaysSplitEmptyPane,
 	main_view.FocusReturnsWhenSplitCollapses,
 	main_view.HideSelectionWhenChangesVanish,
+	main_view.JumpToAFileOfTheDiff,
+	main_view.JumpToAFileOnlyOverADiff,
 	main_view.KeepAWrappedLineCoveredAcrossARerender,
 	main_view.KeepBothHalvesOfAChangeSelected,
 	main_view.KeepPositionByTheVisibleEndOfASelection,
@@ -441,6 +444,7 @@ var tests = []*components.IntegrationTest{
 	main_view.NoSelectionOverACommitLog,
 	main_view.NoSelectionOverAConflictHint,
 	main_view.NoSelectionWhenNoChanges,
+	main_view.OpenPullRequestOnlyOverACommitsDiff,
 	main_view.PatchMarksFollowARendererSwitch,
 	main_view.PatchMarksShowWhileTheDiffIsFocused,
 	main_view.RangeSelectDiffLines,
@@ -28,6 +28,9 @@ type GuiDriver interface {
 	// user typing faster than lazygit processes the input.
 	PressKeysRapidly(...string)
 	Click(int, int)
+	// Click with a keyboard modifier held down, for the gestures that only exist
+	// as a modified click.
+	ClickWithModifier(int, int, gocui.Modifier)
 	ClickAndHold(int, int)
 	MouseMove(int, int)
 	MouseRelease(int, int)
@@ -3128,6 +3128,20 @@
          ],
          "default": "0"
        },
+        "jumpToFile": {
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            }
+          ],
+          "default": "\u003cctrl+g\u003e"
+        },
        "nextMatch": {
          "oneOf": [
            {
Author	SHA1	Message	Date
Stefan HallerandClaude Opus 5	164e65ceee	Add a menu of the diff's files to jump to one directly n and N step through the files of a multi-file diff one at a time, which is a long way to the far end of a commit touching a hundred files. Bind ctrl+g to a menu of the diff's files, in the order the diff shows them and by the paths the repo knows them by; picking one goes to where its diff begins, exactly where stepping to it with n would have left you. The menu filters as you type, so the file you have in mind is a few characters away however many the commit touches. The key works in the panel the diff belongs to as well as in the diff itself. A commit is read from the commits panel, so being able to jump from there saves focusing the diff and leaving it again for the next commit; the diff scrolls to the file and the focus stays in the panel. It is ctrl+g rather than f because a key that works in every panel has to be free in all of them, and f is fetch in the files panel and fixup in the commits panel. The command applies only while the main view is showing a diff, and is left out of the keybindings menu where it isn't: over a branch's commit log, or while a conflicted file has given the main section over to the merge conflicts view. The diff is read to the end before the menu is built, as searching it does: a file below the part that has been read is in neither the list nor the view. Each item names its file rather than the row that file begins at, so that a diff re-rendered while the menu is up is jumped into at the row the file begins at now. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	61382b8d37	Move where a jump lands into the diff line helper Where a focus or a click puts the focused main view's selection is worked out in the diff line helper; where a jump puts it is worked out on the main view controller, though it is the same question about the same pane. A jump asked for from anywhere else — from a panel below the pane, or from a click on a link in the diff — has no way to reach that answer. Move it over. The controller keeps placeNavigationTarget as the short way to say it for the jumps it makes itself. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	d2543bd7ae	Ask a diff where each of its files begins File navigation works out where the neighbouring file begins by walking the rows itself, forwards or, more laboriously, backwards. A menu of the diff's files needs the same rows, all of them at once. Extract fileStarts, which answers that for the whole diff, and have navigation pick its neighbour out of the answer. The two then agree on where a file begins by construction, and the walk backwards over a file goes away. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	2bf39e0f0c	Name the file a diff row belongs to in the repo's terms The identity of a row is reported in the repo's terms already: the pane previewing the custom patch shows a diff of the two trees the patch was materialized into, and the paths of those trees are mapped back to the repo's files before anything sees them. Asking which file a row belongs to, which file navigation does, was the one query that skipped that step and answered with the tree's path. Pull the mapping out of inRepoTerms so that it can be applied to a bare path, and put filePaths through it. A menu listing the files of the diff will want to show them by name; where a renderer states the path of each side of a change, this also has both halves belong to one file rather than to the two trees. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	83450db146	Open the selected diff line in the branch's pull request Reading a change in lazygit and saying something about it on GitHub means finding the line again in the browser: open the pull request, find the commit, find the file, scroll to the line. The line is already under the cursor here. Bind G in the focused main view, the key the commits panel opens the pull request with, to open it at the line the selection is on. The URL names the commits whose diff is on screen, so that the line numbers of the diff are the ones the page shows, the file by the SHA-256 of its repo-relative path, and the line by the side of the diff it is on: R for the new version of the file, L for the old one, where a deleted line is. GitHub documents none of that; the form was read off the URLs its own pages carry. One commit is named by its hash. A range of them is named by the commit the range starts after and the commit it ends at, the form the chooser above a pull request's files uses. The commit a range starts after is the parent of its oldest commit; where the range starts where the pull request itself does, that parent is none of the pull request's own commits, and the keyword BASE stands for it. Which branch's pull request that is depends on the panel beneath: the checked-out branch below the commits panel, the branch drilled into below the sub-commits panel, and whichever of those the commit files panel was entered from. Panels showing a diff that no pull request has a view of don't answer, and the command isn't offered over their diffs at all. Neither is it offered over a diff that is not the commit's own, where the line numbers on screen are not the ones the page shows: a diff against another ref in diffing mode, and the custom patch, whose lines sit at the numbers the patch gives them. A pull request holds only the commits of its branch that are pushed, and its pages say they can't find any other commit. So the command refuses where a commit of the diff is not one of the pull request's. Amend a commit in the middle of the branch, and the diffs of the commits below it still open; the ones above it sit on hashes the remote doesn't have. A commit from before the branch, in a main branch already, is refused too. Only GitHub pull requests are known, since that is where the pull request data comes from. The whole path can't be exercised headlessly: no pull request reaches the model without a GitHub token, so the test covers where the command is offered and the three reasons it refuses. The URL is unit-tested instead, both the anchor of a line and the way the commits are named. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	8842f17186	Ask for the panel beneath the focused main view in one place Two questions the pane answers from the panel beneath it each reach for it themselves, guard included. Opening a line in a pull request needs it twice more, for the branch and for the commit. Extract sidePanelBeneath, which is also where the guard against asking for the panel beneath an off-stack pane now belongs. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	3603883e83	Name a diff line's file in the repo's terms in one place A diff line carries the absolute path of its file, and both panels acting on such a line turn it into the repo-relative one git speaks themselves. Opening a line in a pull request needs that path too, to name the file to GitHub by it. Extract repoRelativePath, and have both panels use it. The files panel gains the check for a path outside the repo that the other one had; a path it used to pass on matches no file of the working tree either. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	c0efca5ae6	Ask one place whether a branch has a pull request Two panels offer a branch's pull request today, and each looks it up in the model's map itself and builds the same disabled reason from the same string. The focused main view is about to offer a line of the diff in that pull request, which would make three. Put the lookup and the disabled reason on the host helper, beside the pull request URL it already builds, and have both panels ask it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00
Stefan Haller	020991cab8	Acknowledge editor clicks in the diff Non-suspending graphical editors can take a moment to reach the foreground, leaving a modified click with no visible response. Briefly reverse the clicked row's selection bar after launching the editor so the registered action is apparent. Arm the flash only for a resolved diff row, keep newer clicks safe from stale timers, and rely on suspension to clear the transient state before terminal editors take over.	2026-09-27 18:26:56 +02:00
Stefan Haller	c3ff41f726	Give views a transient line flash Actions that hand control to another application need visible acknowledgement without moving a view's cursor or replacing renderer colors. Reverse the narrow selection bar independently of selection state, and clear transient flashes whenever the terminal UI suspends.	2026-09-27 18:26:56 +02:00
Stefan Haller	25d5e782d8	Open a clicked diff line in the editor Clickable renderer gutters are small and unavailable on some diff rows. Make the whole row an editor target without changing focus or selection, including while a popup is focused. Use both Alt and Shift because terminal mouse protocols do not deliver either modifier consistently across Ghostty, iTerm2, and VS Code.	2026-09-27 18:26:56 +02:00
Stefan Haller	7f238de1ea	Keep mouse gesture modifiers stable Bindings match modifiers exactly, so a modified press must not turn into an unmodified drag or release halfway through the gesture. Capture the press-time modifiers once and carry them until the button is released. This also makes unbound modified clicks no-ops instead of silently invoking plain-click behavior.	2026-09-27 18:26:56 +02:00
Stefan Haller	64ebdf4b79	Share diff-line editing with mouse actions The selected-line keybinding and a modified click need the same path from a rendered diff row to the editor. Give that operation an explicit view-line argument before adding the mouse gesture.	2026-09-27 18:26:56 +02:00
Stefan Haller	39de93797b	Let mouse bindings work behind focused popups Mouse events on views behind a popup are normally swallowed before their bindings can run. Add an explicit early-dispatch opt-in for actions that should remain live there, matching the phase where hyperlink clicks already run.	2026-09-27 18:26:56 +02:00
Stefan Haller	79ab37ff35	Separate redraws from view-line invalidation A view can need repainting even when its cached wrapping is still valid. Track that state independently so content-only flushes do not overload tainted, whose only job is to request a viewLines rebuild.	2026-09-27 18:26:56 +02:00
Stefan Haller	a4ce26eb2d	Remove unused per-line highlighting View.SetHighlight has no production callers.	2026-09-27 18:26:56 +02:00
Stefan HallerandClaude Opus 5	acba0641fc	Cleanup: remove error return value from Gui.SetRune, Gui.draw() et al These always returned nil. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-27 18:26:56 +02:00