Check for skipping pre-commit hooks in more situations

Add integration tests for skipping pre-commit hooks
2024-04-27 08:48:21 +02:00 · 2024-04-27 08:47:54 +02:00
393 changed files with 10902 additions and 23004 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -6,7 +6,7 @@
 * [ ] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
 * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide)
 * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
-* [ ] Docs have been updated if necessary
+* [ ] Docs (specifically `docs/Config.md`) have been updated if necessary
 * [ ] You've read through your own file changes for silly mistakes etc

 <!--
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -3,7 +3,7 @@ name: Continuous Delivery
 on:
  push:
    tags:
-      - "v*"
+      - 'v*'

 jobs:
  goreleaser:
@@ -16,7 +16,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-          go-version: 1.22.x
+          go-version: 1.21.x
      - name: Run goreleaser
        uses: goreleaser/goreleaser-action@v4
        with:
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: Continuous Integration

 env:
-  GO_VERSION: 1.22
+  GO_VERSION: 1.21

 on:
  push:
@@ -32,7 +32,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-          go-version: 1.22.x
+          go-version: 1.21.x
      - name: Test code
        # we're passing -short so that we skip the integration tests, which will be run in parallel below
        run: |
@@ -89,7 +89,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-          go-version: 1.22.x
+          go-version: 1.21.x
      - name: Print git version
        run: git --version
      - name: Test code
@@ -115,7 +115,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-          go-version: 1.22.x
+          go-version: 1.21.x
      - name: Build linux binary
        run: |
          GOOS=linux go build
@@ -142,7 +142,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-          go-version: 1.22.x
+          go-version: 1.21.x
      - name: Check Vendor Directory
        # ensure our vendor directory matches up with our go modules
        run: |
@@ -168,11 +168,11 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v4
        with:
-          go-version: 1.22.x
+          go-version: 1.21.x
      - name: Lint
        uses: golangci/golangci-lint-action@v3.7.0
        with:
-          version: v1.58
+          version: latest
      - name: errors
        run: golangci-lint run
        if: ${{ failure() }}
@@ -188,17 +188,11 @@ jobs:
  upload-coverage:
    # List all jobs that produce coverage files
    needs: [unit-tests, integration-tests]
-    if: github.event.pull_request.head.repo.full_name == github.repository
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@v3

-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.22.x
-
      - name: Download all coverage artifacts
        uses: actions/download-artifact@v3
        with:
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -14,15 +14,10 @@ linters:
    - exhaustive
    - makezero
    - nakedret
-    - copyloopvar
+    # - goconst # TODO: enable and fix issues
  fast: false

 linters-settings:
-  copyloopvar:
-    # Check all assigning the loop variable to another variable.
-    # Default: false
-    # If true, an assignment like `a := x` will be detected as an error.
-    check-alias: true
  exhaustive:
    default-signifies-exhaustive: true
  staticcheck:
@@ -35,5 +30,5 @@ linters-settings:
    max-func-lines: 0

 run:
-  go: '1.22'
+  go: '1.21'
  timeout: 10m
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -154,7 +154,31 @@ If you want to trigger a debug session from VSCode, you can use the following sn

 ## Profiling

-If you want to investigate what's contributing to CPU or memory usage, see [this separate document](docs/dev/Profiling.md).
+If you want to investigate what's contributing to CPU usage you can add the following to the top of the `main()` function in `main.go`
+
+```go
+import "runtime/pprof"
+
+func main() {
+	f, err := os.Create("cpu.prof")
+	if err != nil {
+		log.Fatal("could not create CPU profile: ", err)
+	}
+	defer f.Close()
+	if err := pprof.StartCPUProfile(f); err != nil {
+		log.Fatal("could not start CPU profile: ", err)
+	}
+	defer pprof.StopCPUProfile()
+	...
+```
+
+Then run lazygit, and afterwards, from your terminal, run:
+
+```sh
+go tool pprof --web cpu.prof
+```
+
+That should open an application which allows you to view the breakdown of CPU usage.

 ## Testing

--- a/2
+++ b/2
@@ -2,7 +2,7 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh

-FROM golang:1.22 as build
+FROM golang:1.21 as build
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY go.mod go.sum ./
 RUN go mod download
--- a/4
+++ b/4
@@ -38,10 +38,6 @@ generate:
 format:
 	gofumpt -l -w .

-.PHONY: lint
-lint:
-	golangci-lint run
-
 # For more details about integration test, see https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md.
 .PHONY: integration-test-tui
 integration-test-tui:
--- a/README.md
+++ b/README.md
--- a/cmd/i18n/main.go
+++ b/cmd/i18n/main.go
@@ -1,26 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"log"
-	"os"
-
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-)
-
-func saveLanguageFileToJson(tr *i18n.TranslationSet, filepath string) error {
-	jsonData, err := json.MarshalIndent(tr, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	jsonData = append(jsonData, '\n')
-	return os.WriteFile(filepath, jsonData, 0o644)
-}
-
-func main() {
-	err := saveLanguageFileToJson(i18n.EnglishTranslationSet(), "en.json")
-	if err != nil {
-		log.Fatal(err)
-	}
-}
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -29,580 +29,267 @@ to the top of your config file or via [Visual Studio Code settings.json config][

 ## Default

-<!-- START CONFIG YAML: AUTOMATICALLY GENERATED with `go generate ./..., DO NOT UPDATE MANUALLY -->
 ```yaml
-# Config relating to the Lazygit UI
 gui:
-  # The number of lines you scroll by when scrolling the main window
-  scrollHeight: 2
-
-  # If true, allow scrolling past the bottom of the content in the main window
-  scrollPastBottom: true
-
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#scroll-off-margin
-  scrollOffMargin: 2
-
-  # One of: 'margin' (default) | 'jump'
-  scrollOffBehavior: margin
-
-  # If true, capture mouse events.
-  # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
-  mouseEvents: true
-
-  # If true, do not show a warning when discarding changes in the staging view.
-  skipDiscardChangeWarning: false
-
-  # If true, do not show warning when applying/popping the stash
-  skipStashWarning: false
-
-  # If true, do not show a warning when attempting to commit without any staged files; instead stage all unstaged files.
-  skipNoStagedFilesWarning: false
-
-  # If true, do not show a warning when rewording a commit via an external editor
-  skipRewordInEditorWarning: false
-
-  # Fraction of the total screen width to use for the left side section. You may want to pick a small number (e.g. 0.2) if you're using a narrow screen, so that you can see more of the main section.
-  # Number from 0 to 1.0.
-  sidePanelWidth: 0.3333
-
-  # If true, increase the height of the focused side window; creating an accordion effect.
+  # stuff relating to the UI
+  windowSize: 'normal' # one of 'normal' | 'half' | 'full' default is 'normal'
+  scrollHeight: 2 # how many lines you scroll by
+  scrollPastBottom: true # enable scrolling past the bottom
+  scrollOffMargin: 2 # how many lines to keep before/after the cursor when it reaches the top/bottom of the view; see 'Scroll-off Margin' section below
+  scrollOffBehavior: 'margin' # one of 'margin' | 'jump'; see 'Scroll-off Margin' section below
+  sidePanelWidth: 0.3333 # number from 0 to 1
  expandFocusedSidePanel: false
-
-  # The weight of the expanded side panel, relative to the other panels. 2 means
-  # twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.
-  expandedSidePanelWeight: 2
-
-  # Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split.
-  # Options are:
-  # - 'horizontal': split the window horizontally
-  # - 'vertical': split the window vertically
-  # - 'flexible': (default) split the window horizontally if the window is wide enough, otherwise split vertically
-  mainPanelSplitMode: flexible
-
-  # How the window is split when in half screen mode (i.e. after hitting '+' once).
-  # Possible values:
-  # - 'left': split the window horizontally (side panel on the left, main view on the right)
-  # - 'top': split the window vertically (side panel on top, main view below)
-  enlargedSideViewLocation: left
-
-  # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
-  language: auto
-
-  # Format used when displaying time e.g. commit time.
-  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
-  timeFormat: 02 Jan 06
-
-  # Format used when displaying time if the time is less than 24 hours ago.
-  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
-  shortTimeFormat: 3:04PM
-
-  # Config relating to colors and styles.
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes
+  mainPanelSplitMode: 'flexible' # one of 'horizontal' | 'flexible' | 'vertical'
+  enlargedSideViewLocation: 'left' # one of 'left' | 'top'
+  language: 'auto' # one of 'auto' | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
+  timeFormat: '02 Jan 06' # https://pkg.go.dev/time#Time.Format
+  shortTimeFormat: '3:04PM'
  theme:
-    # Border color of focused window
    activeBorderColor:
      - green
      - bold
-
-    # Border color of non-focused windows
    inactiveBorderColor:
-      - default
-
-    # Border color of focused window when searching in that window
+      - white
    searchingActiveBorderColor:
      - cyan
      - bold
-
-    # Color of keybindings help text in the bottom line
    optionsTextColor:
      - blue
-
-    # Background color of selected line.
-    # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
    selectedLineBgColor:
-      - blue
-
-    # Background color of selected line when view doesn't have focus.
-    inactiveViewSelectedLineBgColor:
-      - bold
-
-    # Foreground color of copied commit
-    cherryPickedCommitFgColor:
-      - blue
-
-    # Background color of copied commit
+      - blue # set to `default` to have no background colour
    cherryPickedCommitBgColor:
      - cyan
-
-    # Foreground color of marked base commit (for rebase)
-    markedBaseCommitFgColor:
+    cherryPickedCommitFgColor:
      - blue
-
-    # Background color of marked base commit (for rebase)
-    markedBaseCommitBgColor:
-      - yellow
-
-    # Color for file with unstaged changes
    unstagedChangesColor:
      - red
-
-    # Default text color
    defaultFgColor:
      - default
-
-  # Config relating to the commit length indicator
  commitLength:
-    # If true, show an indicator of commit message length
    show: true
-
-  # If true, show the '5 of 20' footer at the bottom of list views
-  showListFooter: true
-
-  # If true, display the files in the file views as a tree. If false, display the files as a flat list.
-  # This can be toggled from within Lazygit with the '~' key, but that will not change the default.
-  showFileTree: true
-
-  # If true, show a random tip in the command log when Lazygit starts
+  mouseEvents: true
+  skipDiscardChangeWarning: false
+  skipStashWarning: false
+  showFileTree: true # for rendering changes files in a tree format
+  showListFooter: true # for seeing the '5 of 20' message in list panels
  showRandomTip: true
-
-  # If true, show the command log
+  showBranchCommitHash: false # show commit hashes alongside branch names
+  showBottomLine: true # for hiding the bottom information line (unless it has important information to tell you)
+  showPanelJumps: true # for showing the jump-to-panel keybindings as panel subtitles
  showCommandLog: true
-
-  # If true, show the bottom line that contains keybinding info and useful buttons. If false, this line will be hidden except to display a loader for an in-progress action.
-  showBottomLine: true
-
-  # If true, show jump-to-window keybindings in window titles.
-  showPanelJumps: true
-
-  # Deprecated: use nerdFontsVersion instead
-  showIcons: false
-
-  # Nerd fonts version to use.
-  # One of: '2' | '3' | empty string (default)
-  # If empty, do not show icons.
-  nerdFontsVersion: ""
-
-  # If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
-  showFileIcons: true
-
-  # Whether to show full author names or their shortened form in the commit graph.
-  # One of 'auto' (default) | 'full' | 'short'
-  # If 'auto', initials will be shown in small windows, and full names - in larger ones.
-  commitAuthorFormat: auto
-
-  # Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
-  commitHashLength: 8
-
-  # If true, show commit hashes alongside branch names in the branches view.
-  showBranchCommitHash: false
-
-  # Whether to show the divergence from the base branch in the branches view.
-  # One of: 'none' | 'onlyArrow'  | 'arrowAndNumber'
-  showDivergenceFromBaseBranch: none
-
-  # Height of the command log view
+  showIcons: false # deprecated: use nerdFontsVersion instead
+  nerdFontsVersion: "" # nerd fonts version to use ("2" or "3"); empty means don't show nerd font icons
+  showFileIcons: true # for hiding file icons in the file views
  commandLogSize: 8
-
-  # Whether to split the main window when viewing file changes.
-  # One of: 'auto' | 'always'
-  # If 'auto', only split the main window when a file has both staged and unstaged changes
-  splitDiff: auto
-
-  # Default size for focused window. Window size can be changed from within Lazygit with '+' and '_' (but this won't change the default).
-  # One of: 'normal' (default) | 'half' | 'full'
-  windowSize: normal
-
-  # Window border style.
-  # One of 'rounded' (default) | 'single' | 'double' | 'hidden'
-  border: rounded
-
-  # If true, show a seriously epic explosion animation when nuking the working tree.
-  animateExplosion: true
-
-  # Whether to stack UI components on top of each other.
-  # One of 'auto' (default) | 'always' | 'never'
-  portraitMode: auto
-
-  # How things are filtered when typing '/'.
-  # One of 'substring' (default) | 'fuzzy'
-  filterMode: substring
-
-  # Config relating to the spinner.
+  splitDiff: 'auto' # one of 'auto' | 'always'
+  skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor
+  border: 'rounded' # one of 'single' | 'double' | 'rounded' | 'hidden'
+  animateExplosion: true # shows an explosion animation when nuking the working tree
+  portraitMode: 'auto' # one of 'auto' | 'never' | 'always'
+  filterMode: 'substring' # one of 'substring' | 'fuzzy'; see 'Filtering' section below
  spinner:
-    # The frames of the spinner animation.
-    frames:
-      - '|'
-      - /
-      - '-'
-      - \
-
-    # The "speed" of the spinner in milliseconds.
-    rate: 50
-
-  # Status panel view.
-  # One of 'dashboard' (default) | 'allBranchesLog'
-  statusPanelView: dashboard
-
-# Config relating to git
+    frames: ['|', '/', '-', '\\']
+    rate: 50 # spinner rate in milliseconds
+  statusPanelView: 'dashboard' # one of 'dashboard' | 'allBranchesLog'
 git:
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
  paging:
-    # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
    colorArg: always
-
-    # e.g.
-    # diff-so-fancy
-    # delta --dark --paging=never
-    # ydiff -p cat -s --wrap --width={{columnWidth}}
-    pager: ""
-
-    # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
    useConfig: false
-
-    # e.g. 'difft --color=always'
-    externalDiffCommand: ""
-
-  # Config relating to committing
  commit:
-    # If true, pass '--signoff' flag when committing
    signOff: false
-
-    # Automatic WYSIWYG wrapping of the commit message as you type
-    autoWrapCommitMessage: true
-
-    # If autoWrapCommitMessage is true, the width to wrap to
-    autoWrapWidth: 72
-
-  # Config relating to merging
+    autoWrapCommitMessage: true # automatic WYSIWYG wrapping of the commit message as you type
+    autoWrapWidth: 72 # if autoWrapCommitMessage is true, the width to wrap to
  merging:
-    # If true, run merges in a subprocess so that if a commit message is required, Lazygit will not hang
-    # Only applicable to unix users.
+    # only applicable to unix users
    manualCommit: false
-
-    # Extra args passed to `git merge`, e.g. --no-ff
-    args: ""
-
-  # list of branches that are considered 'main' branches, used when displaying commits
-  mainBranches:
-    - master
-    - main
-
-  # Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP'
-  skipHookPrefix: WIP
-
-  # If true, periodically fetch from remote
-  autoFetch: true
-
-  # If true, periodically refresh files and submodules
-  autoRefresh: true
-
-  # If true, pass the --all arg to git fetch
-  fetchAll: true
-
-  # Command used when displaying the current branch git log in the main window
-  branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
-
-  # Command used to display git log of all branches in the main window
-  allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
-
-  # If true, do not spawn a separate process when using GPG
-  overrideGpg: false
-
-  # If true, do not allow force pushes
-  disableForcePushing: false
-
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
-  commitPrefix:
-    # pattern to match on. E.g. for 'feature/AB-123' to match on the AB-123 use "^\\w+\\/(\\w+-\\w+).*"
-    pattern: ""
-
-    # Replace directive. E.g. for 'feature/AB-123' to start the commit message with 'AB-123 ' use "[$1] "
-    replace: ""
-
-  # If true, parse emoji strings in commit messages e.g. render :rocket: as 🚀
-  # (This should really be under 'gui', not 'git')
-  parseEmoji: false
-
-  # Config for showing the log in the commits view
+    # extra args passed to `git merge`, e.g. --no-ff
+    args: ''
  log:
-    # One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'
-    # 'topo-order' makes it easier to read the git log graph, but commits may not
-    # appear chronologically. See https://git-scm.com/docs/
+    # one of date-order, author-date-order, topo-order or default.
+    # topo-order makes it easier to read the git log graph, but commits may not
+    # appear chronologically. See https://git-scm.com/docs/git-log#_commit_ordering
    #
    # Deprecated: Configure this with `Log menu -> Commit sort order` (<c-l> in the commits window by default).
-    order: topo-order
-
-    # This determines whether the git graph is rendered in the commits panel
-    # One of 'always' | 'never' | 'when-maximised'
+    order: 'topo-order'
+    # one of always, never, when-maximised
+    # this determines whether the git graph is rendered in the commits panel
    #
    # Deprecated: Configure this with `Log menu -> Show git graph` (<c-l> in the commits window by default).
-    showGraph: always
-
-    # displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
+    showGraph: 'always'
+    # displays the whole git graph by default in the commits panel (equivalent to passing the `--all` argument to `git log`)
    showWholeGraph: false
-
-  # When copying commit hashes to the clipboard, truncate them to this
-  # length. Set to 40 to disable truncation.
-  truncateCopiedCommitHashesTo: 12
-
-  # If true and if if `gh` is installed and on version >=2, we will use `gh` to display pull requests against branches.
-  enableGithubCli: true
-
-# Periodic update checks
-update:
-  # One of: 'prompt' (default) | 'background' | 'never'
-  method: prompt
-
-  # Period in days between update checks
-  days: 14
-
-# Background refreshes
-refresher:
-  # File/submodule refresh interval in seconds.
-  # Auto-refresh can be disabled via option 'git.autoRefresh'.
-  refreshInterval: 10
-
-  # Re-fetch interval in seconds.
-  # Auto-fetch can be disabled via option 'git.autoFetch'.
-  fetchInterval: 60
-
-# If true, show a confirmation popup before quitting Lazygit
-confirmOnQuit: false
-
-# If true, exit Lazygit when the user presses escape in a context where there is nothing to cancel/close
-quitOnTopLevelReturn: false
-
-# Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc
+  skipHookPrefix: WIP
+  # The main branches. We colour commits green if they belong to one of these branches,
+  # so that you can easily see which commits are unique to your branch (coloured in yellow)
+  mainBranches: [master, main]
+  autoFetch: true
+  autoRefresh: true
+  fetchAll: true # Pass --all flag when running git fetch. Set to false to fetch only origin (or the current branch's upstream remote if there is one)
+  branchLogCmd: 'git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --'
+  allBranchesLogCmd: 'git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium'
+  overrideGpg: false # prevents lazygit from spawning a separate process when using GPG
+  disableForcePushing: false
+  parseEmoji: false
+  truncateCopiedCommitHashesTo: 12 # When copying commit hashes to the clipboard, truncate them to this length. Set to 40 to disable truncation.
 os:
-  # Command for editing a file. Should contain "{{filename}}".
-  edit: ""
-
-  # Command for editing a file at a given line number. Should contain
-  # "{{filename}}", and may optionally contain "{{line}}".
-  editAtLine: ""
-
-  # Same as EditAtLine, except that the command needs to wait until the
-  # window is closed.
-  editAtLineAndWait: ""
-
-  # For opening a directory in an editor
-  openDirInEditor: ""
-
-  # A built-in preset that sets all of the above settings. Supported presets
-  # are defined in the getPreset function in editor_presets.go.
-  editPreset: ""
-
-  # Command for opening a file, as if the file is double-clicked. Should
-  # contain "{{filename}}", but doesn't support "{{line}}".
-  open: ""
-
-  # Command for opening a link. Should contain "{{link}}".
-  openLink: ""
-
-  # EditCommand is the command for editing a file.
-  # Deprecated: use Edit instead. Note that semantics are different:
-  # EditCommand is just the command itself, whereas Edit contains a
-  # "{{filename}}" variable.
-  editCommand: ""
-
-  # EditCommandTemplate is the command template for editing a file
-  # Deprecated: use EditAtLine instead.
-  editCommandTemplate: ""
-
-  # OpenCommand is the command for opening a file
-  # Deprecated: use Open instead.
-  openCommand: ""
-
-  # OpenLinkCommand is the command for opening a link
-  # Deprecated: use OpenLink instead.
-  openLinkCommand: ""
-
-  # CopyToClipboardCmd is the command for copying to clipboard.
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
-  copyToClipboardCmd: ""
-
-  # ReadFromClipboardCmd is the command for reading the clipboard.
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
-  readFromClipboardCmd: ""
-
-# If true, don't display introductory popups upon opening Lazygit.
+  copyToClipboardCmd: '' # See 'Custom Command for Copying to Clipboard' section
+  editPreset: '' # see 'Configuring File Editing' section
+  edit: ''
+  editAtLine: ''
+  editAtLineAndWait: ''
+  open: ''
+  openLink: ''
+refresher:
+  refreshInterval: 10 # File/submodule refresh interval in seconds. Auto-refresh can be disabled via option 'git.autoRefresh'.
+  fetchInterval: 60 # Re-fetch interval in seconds. Auto-fetch can be disabled via option 'git.autoFetch'.
+update:
+  method: prompt # can be: prompt | background | never
+  days: 14 # how often an update is checked for
+confirmOnQuit: false
+# determines whether hitting 'esc' will quit the application when there is nothing to cancel/close
+quitOnTopLevelReturn: false
 disableStartupPopups: false
-
-# What to do when opening Lazygit outside of a git repo.
-# - 'prompt': (default) ask whether to initialize a new repo or open in the most recent repo
-# - 'create': initialize a new repo
-# - 'skip': open most recent repo
-# - 'quit': exit Lazygit
-notARepository: prompt
-
-# If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit.
-promptToReturnFromSubprocess: true
-
-# Keybindings
+notARepository: 'prompt' # one of: 'prompt' | 'create' | 'skip' | 'quit'
+promptToReturnFromSubprocess: true # display confirmation when subprocess terminates
 keybinding:
  universal:
-    quit: q
-    quit-alt1: <c-c>
-    return: <esc>
-    quitWithoutChangingDirectory: Q
-    togglePanel: <tab>
-    prevItem: <up>
-    nextItem: <down>
-    prevItem-alt: k
-    nextItem-alt: j
-    prevPage: ','
-    nextPage: .
-    scrollLeft: H
-    scrollRight: L
-    gotoTop: <
-    gotoBottom: '>'
-    toggleRangeSelect: v
-    rangeSelectDown: <s-down>
-    rangeSelectUp: <s-up>
-    prevBlock: <left>
-    nextBlock: <right>
-    prevBlock-alt: h
-    nextBlock-alt: l
-    nextBlock-alt2: <tab>
-    prevBlock-alt2: <backtab>
-    jumpToBlock:
-      - "1"
-      - "2"
-      - "3"
-      - "4"
-      - "5"
-    nextMatch: "n"
-    prevMatch: "N"
-    startSearch: /
-    optionMenu: <disabled>
-    optionMenu-alt1: '?'
-    select: <space>
-    goInto: <enter>
-    confirm: <enter>
-    confirmInEditor: <a-enter>
-    remove: d
-    new: "n"
-    edit: e
-    openFile: o
-    scrollUpMain: <pgup>
-    scrollDownMain: <pgdown>
-    scrollUpMain-alt1: K
-    scrollDownMain-alt1: J
-    scrollUpMain-alt2: <c-u>
-    scrollDownMain-alt2: <c-d>
+    quit: 'q'
+    quit-alt1: '<c-c>' # alternative/alias of quit
+    return: '<esc>' # return to previous menu, will quit if there's nowhere to return
+    quitWithoutChangingDirectory: 'Q'
+    togglePanel: '<tab>' # goto the next panel
+    prevItem: '<up>' # go one line up
+    nextItem: '<down>' # go one line down
+    prevItem-alt: 'k' # go one line up
+    nextItem-alt: 'j' # go one line down
+    prevPage: ',' # go to next page in list
+    nextPage: '.' # go to previous page in list
+    gotoTop: '<' # go to top of list
+    gotoBottom: '>' # go to bottom of list
+    scrollLeft: 'H' # scroll left within list view
+    scrollRight: 'L' # scroll right within list view
+    prevBlock: '<left>' # goto the previous block / panel
+    nextBlock: '<right>' # goto the next block / panel
+    prevBlock-alt: 'h' # goto the previous block / panel
+    nextBlock-alt: 'l' # goto the next block / panel
+    jumpToBlock: ['1', '2', '3', '4', '5'] # goto the Nth block / panel
+    nextMatch: 'n'
+    prevMatch: 'N'
+    optionMenu: <disabled> # show help menu
+    optionMenu-alt1: '?' # show help menu
+    select: '<space>'
+    goInto: '<enter>'
+    openRecentRepos: '<c-r>'
+    confirm: '<enter>'
+    remove: 'd'
+    new: 'n'
+    edit: 'e'
+    openFile: 'o'
+    scrollUpMain: '<pgup>' # main panel scroll up
+    scrollDownMain: '<pgdown>' # main panel scroll down
+    scrollUpMain-alt1: 'K' # main panel scroll up
+    scrollDownMain-alt1: 'J' # main panel scroll down
+    scrollUpMain-alt2: '<c-u>' # main panel scroll up
+    scrollDownMain-alt2: '<c-d>' # main panel scroll down
    executeCustomCommand: ':'
-    createRebaseOptionsMenu: m
-
-    # 'Files' appended for legacy reasons
-    pushFiles: P
-
-    # 'Files' appended for legacy reasons
-    pullFiles: p
-    refresh: R
-    createPatchOptionsMenu: <c-p>
+    createRebaseOptionsMenu: 'm'
+    pushFiles: 'P'
+    pullFiles: 'p'
+    refresh: 'R'
+    createPatchOptionsMenu: '<c-p>'
    nextTab: ']'
    prevTab: '['
-    nextScreenMode: +
-    prevScreenMode: _
-    undo: z
-    redo: <c-z>
-    filteringMenu: <c-s>
-    diffingMenu: W
-    diffingMenu-alt: <c-e>
-    copyToClipboard: <c-o>
-    openRecentRepos: <c-r>
-    submitEditorText: <enter>
+    nextScreenMode: '+'
+    prevScreenMode: '_'
+    undo: 'z'
+    redo: '<c-z>'
+    filteringMenu: '<c-s>'
+    diffingMenu: 'W'
+    diffingMenu-alt: '<c-e>' # deprecated
+    copyToClipboard: '<c-o>'
+    submitEditorText: '<enter>'
    extrasMenu: '@'
-    toggleWhitespaceInDiffView: <c-w>
+    toggleWhitespaceInDiffView: '<c-w>'
    increaseContextInDiffView: '}'
    decreaseContextInDiffView: '{'
-    openDiffTool: <c-t>
+    toggleRangeSelect: 'v'
+    rangeSelectUp: '<s-up>'
+    rangeSelectDown: '<s-down>'
  status:
-    checkForUpdate: u
-    recentRepos: <enter>
-    allBranchesLogGraph: a
+    checkForUpdate: 'u'
+    recentRepos: '<enter>'
  files:
-    commitChanges: c
-    commitChangesWithoutHook: w
-    amendLastCommit: A
-    commitChangesWithEditor: C
-    findBaseCommitForFixup: <c-f>
-    confirmDiscard: x
-    ignoreFile: i
-    refreshFiles: r
-    stashAllChanges: s
-    viewStashOptions: S
-    toggleStagedAll: a
-    viewResetOptions: D
-    fetch: f
+    commitChanges: 'c'
+    commitChangesWithoutHook: 'w' # commit changes without pre-commit hook
+    amendLastCommit: 'A'
+    commitChangesWithEditor: 'C'
+    findBaseCommitForFixup: '<c-f>'
+    confirmDiscard: 'x'
+    ignoreFile: 'i'
+    refreshFiles: 'r'
+    stashAllChanges: 's'
+    viewStashOptions: 'S'
+    toggleStagedAll: 'a' # stage/unstage all
+    viewResetOptions: 'D'
+    fetch: 'f'
    toggleTreeView: '`'
-    openMergeTool: M
-    openStatusFilter: <c-b>
-    copyFileInfoToClipboard: "y"
+    openMergeTool: 'M'
+    openStatusFilter: '<c-b>'
  branches:
-    createPullRequest: o
-    viewPullRequestOptions: O
-    copyPullRequestURL: <c-y>
-    checkoutBranchByName: c
-    forceCheckoutBranch: F
-    rebaseBranch: r
-    renameBranch: R
-    mergeIntoCurrentBranch: M
-    viewGitFlowOptions: i
-    fastForward: f
-    createTag: T
-    pushTag: P
-    setUpstream: u
-    fetchRemote: f
-    sortOrder: s
-  worktrees:
-    viewWorktreeOptions: w
+    createPullRequest: 'o'
+    viewPullRequestOptions: 'O'
+    checkoutBranchByName: 'c'
+    forceCheckoutBranch: 'F'
+    rebaseBranch: 'r'
+    renameBranch: 'R'
+    mergeIntoCurrentBranch: 'M'
+    viewGitFlowOptions: 'i'
+    fastForward: 'f' # fast-forward this branch from its upstream
+    createTag: 'T'
+    pushTag: 'P'
+    setUpstream: 'u' # set as upstream of checked-out branch
+    fetchRemote: 'f'
  commits:
-    squashDown: s
-    renameCommit: r
-    renameCommitWithEditor: R
-    viewResetOptions: g
-    markCommitAsFixup: f
-    createFixupCommit: F
-    squashAboveCommits: S
-    moveDownCommit: <c-j>
-    moveUpCommit: <c-k>
-    amendToCommit: A
-    resetCommitAuthor: a
-    pickCommit: p
-    revertCommit: t
-    cherryPickCopy: C
-    pasteCommits: V
-    markCommitAsBaseForRebase: B
-    tagCommit: T
-    checkoutCommit: <space>
-    resetCherryPick: <c-R>
-    copyCommitAttributeToClipboard: "y"
-    openLogMenu: <c-l>
-    openInBrowser: o
-    viewBisectOptions: b
-    startInteractiveRebase: i
-  amendAttribute:
-    resetAuthor: a
-    setAuthor: A
-    addCoAuthor: c
+    squashDown: 's'
+    renameCommit: 'r'
+    renameCommitWithEditor: 'R'
+    viewResetOptions: 'g'
+    markCommitAsFixup: 'f'
+    createFixupCommit: 'F' # create fixup commit for this commit
+    squashAboveCommits: 'S'
+    moveDownCommit: '<c-j>' # move commit down one
+    moveUpCommit: '<c-k>' # move commit up one
+    amendToCommit: 'A'
+    amendAttributeMenu: 'a'
+    pickCommit: 'p' # pick commit (when mid-rebase)
+    revertCommit: 't'
+    cherryPickCopy: 'C'
+    pasteCommits: 'V'
+    tagCommit: 'T'
+    checkoutCommit: '<space>'
+    resetCherryPick: '<c-R>'
+    copyCommitMessageToClipboard: '<c-y>'
+    openLogMenu: '<c-l>'
+    viewBisectOptions: 'b'
  stash:
-    popStash: g
-    renameStash: r
+    popStash: 'g'
+    renameStash: 'r'
  commitFiles:
-    checkoutCommitFile: c
+    checkoutCommitFile: 'c'
  main:
-    toggleSelectHunk: a
-    pickBothHunks: b
-    editSelectHunk: E
+    toggleSelectHunk: 'a'
+    pickBothHunks: 'b'
  submodules:
-    init: i
-    update: u
-    bulkMenu: b
+    init: 'i'
+    update: 'u'
+    bulkMenu: 'b'
  commitMessage:
-    commitMenu: <c-o>
+    commitMenu: '<c-o>'
+  amendAttribute:
+    addCoAuthor: 'c'
+    resetAuthor: 'a'
+    setAuthor: 'A'
 ```
-<!-- END CONFIG YAML -->

 ## Platform Defaults

@@ -627,7 +314,7 @@ os:
  open: 'open {{filename}}'
 ```

-## Custom Command for Copying to and Pasting from Clipboard
+## Custom Command for Copying to Clipboard
 ```yaml
 os:
  copyToClipboardCmd: ''
@@ -640,12 +327,6 @@ os:
  copyToClipboardCmd: printf "\033]52;c;$(printf {{text}} | base64)\a" > /dev/tty
 ```

-A custom command for reading from the clipboard can be set using
-```yaml
-os:
-  readFromClipboardCmd: ''
-```
-It is used, for example, when pasting a commit message into the commit message panel. The command is supposed to output the clipboard content to stdout.

 ## Configuring File Editing

@@ -867,15 +548,6 @@ Example:
 - Branch name: feature/AB-123
 - Commit message: [AB-123] Adding feature

-```yaml
-git:
-  commitPrefix:
-    pattern: "^\\w+\\/(\\w+-\\w+).*"
-    replace: '[$1] '
-```
-
-If you want repository-specific prefixes, you can map them with `commitPrefixes`. If you have both `commitPrefixes` defined and an entry in `commitPrefixes` for the current repo, the `commitPrefixes` entry is given higher precedence. Repository folder names must be an exact match.
-
 ```yaml
 git:
  commitPrefixes:
--- a/docs/Custom_Command_Keybindings.md
+++ b/docs/Custom_Command_Keybindings.md
@@ -59,7 +59,6 @@ For a given custom command, here are the allowed fields:
 | description | Label for the custom command when displayed in the keybindings menu | no |
 | stream | Whether you want to stream the command's output to the Command Log panel | no |
 | showOutput | Whether you want to show the command's output in a popup within Lazygit | no |
-| outputTitle | The title to display in the popup panel if showOutput is true. If left unset, the command will be used as the title. | no |
 | after | Actions to take after the command has completed | no |

 Here are the options for the `after` key:
@@ -306,7 +305,7 @@ SelectedWorktree
 CheckedOutBranch
 ```

-To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/gui/services/custom_commands/models.go) (all the modelling lives in the same file).
+To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/commands/models/file.go) (all the modelling lives in the same directory). Note that the custom commands feature does not guarantee backwards compatibility (until we hit Lazygit version 1.0 of course) which means a field you're accessing on an object may no longer be available from one release to the next. Typically however, all you'll need is `{{.SelectedFile.Name}}`, `{{.SelectedLocalCommit.Hash}}` and `{{.SelectedLocalBranch.Name}}`. In the future we will likely introduce a tighter interface that exposes a limited set of fields for each model.

 ## Keybinding collisions

--- a/docs/Fixup_Commits.md
+++ b/docs/Fixup_Commits.md
@@ -56,10 +56,22 @@ base commit in the Commits view automatically. From there, you can either press
 shift-F to create a fixup commit for it, or shift-A to amend your changes into
 the commit if you haven't published your branch yet.

-If you have many modifications in your working copy, it is a good idea to stage
-related changes that are meant to go into the same fixup commit; if no changes
-are staged, ctrl-f works on all unstaged modifications, and then it might show
-an error if it finds multiple different base commits. If you are interested in
-what the command does to do its magic, and how you can help it work better, you
-may want to read the [design document](dev/Find_Base_Commit_For_Fixup_Design.md)
-that describes this.
+This command works in many cases, and when it does it almost feels like magic,
+but it's important to understand its limitations because it doesn't always work.
+The way it works is that it looks at the deleted lines of your current
+modifications, blames them to find out which commit those lines come from, and
+if they all come from the same commit, it selects it. So here are cases where it
+doesn't work:
+
+- Your current diff has only added lines, but no deleted lines. In this case
+  there's no way for lazygit to know which commit you want to add them to.
+- The deleted lines belong to multiple different commits. In this case you can
+  help lazygit by staging a set of files or hunks that all belong to the same
+  commit; if some changes are staged, the ctrl-f command works only on those.
+- The found commit is already on master; in this case, lazygit refuses to select
+  it, because it doesn't make sense to create fixups for it, let alone amend to
+  it.
+
+To sum it up: the command works great if you are changing code again that you
+changed or added earlier in the same branch. This is a common enough case to
+make the command useful.
--- a/docs/Stacked_Branches.md
+++ b/docs/Stacked_Branches.md
@@ -13,6 +13,6 @@ includes interactive rebases, so for example amending a commit in the first
 branch of the stack will "just work" in the sense that it keeps the other
 branches properly stacked onto it.

-Lazygit visualizes the individual branch heads in the stack by marking them with a
+Lazygit visualizes the invidual branch heads in the stack by marking them with a
 cyan asterisk (or a cyan branch symbol if you are using [nerd
 fonts](Config.md#display-nerd-fonts-icons)).
--- a/docs/dev/Find_Base_Commit_For_Fixup_Design.md
+++ b/docs/dev/Find_Base_Commit_For_Fixup_Design.md
@@ -1,229 +0,0 @@
-# About the mechanics of lazygit's "Find base commit for fixup" command
-
-## Background
-
-Lazygit has a command called "Find base commit for fixup" that helps with
-creating fixup commits. (It is bound to "ctrl-f" by default, and I'll call it
-simply "the ctrl-f command" throughout the rest of this text for brevity.)
-
-It's a heuristic that needs to make a few assumptions; it tends to work well in
-practice if users are aware of its limitations. The user-facing side of the
-topic is explained [here](../Fixup_Commits.md). In this document we describe how
-it works internally, and the design decisions behind it.
-
-It is also interesting to compare it to the standalone tool
-[git-absorb](https://github.com/tummychow/git-absorb) which does a very similar
-thing, but made different decisions in some cases. We'll explore these
-differences in this document.
-
-## Design goals
-
-I'll start with git-absorb's design goals (my interpretation, since I can't
-speak for git-absorb's maintainer of course): its main goal seems to be minimum
-user interaction required. The idea is that you have a PR in review, the
-reviewer requested a bunch of changes, you make all these changes, so you have a
-working copy with lots of modified files, and then you fire up git-absorb and it
-creates all the necessary fixup commits automatically with no further user
-intervention.
-
-While this sounds attractive, it conflicts with ctrl-f's main design goal, which
-is to support creating high-quality fixups. My philosophy is that fixup commits
-should have the same high quality standards as normal commits; in particular:
-
- they should be atomic. This means that multiple diff hunks that belong
-  together to form one logical change should be in the same fixup commit. (Not
-  always possible if the logical change needs to be fixed up into several
-  different base commits.)
- they should be minimal. Every fixup commit should ideally contain only one
-  logical change, not several unrelated ones.
-
-Why is this important? Because fixup commits are mainly a tool for reviewing (if
-they weren't, you might as well squash the changes into their base commits right
-away). And reviewing fixup commits is easier if they are well-structured, just
-like normal commits.
-
-The only way to achieve this with git-absorb is to set the `oneFixupPerCommit`
-config option (for the first goal), and then manually stage the changes that
-belong together (for the second). This is close to what you have to do with
-ctrl-f, with one exception that we'll get to below.
-
-But ctrl-f enforces this by refusing to do the job if the staged hunks belong to
-more than one base commit. Git-absorb will happily create multiple fixup commits
-in this case; ctrl-f doesn't, to enforce that you pay attention to how you group
-the changes. There's another reason for this behavior: ctrl-f doesn't create
-fixup commits itself (unlike git-absorb), instead it just selects the found base
-commit so that the user can decide whether to amend the changes right in, or
-create a fixup commit from there (both are single-key commands in lazygit). And
-lazygit doesn't support non-contiguous multiselections of commits, but even if
-it did, it wouldn't help much in this case.
-
-## The mechanics
-
-### General approach
-
-Git-absorb uses a relatively simple approach, and the benefit is of course that
-it is easy to understand: it looks at every diff hunk separately, and for every
-hunk it looks at all commits (starting from the newest one backwards) to find
-the earliest commit that the change can be amended to without conflicts.
-
-It is important to realize that "diff hunk" doesn't necessarily mean what you
-see in the diff view. Git-absorb and ctrl-f both use a context of 0 when diffing
-your code, so they often see more and smaller hunks than users do. For example,
-moving a line of code down by one line is a single hunk for users, but it's two
-separate hunks for git-absorb and ctrl-f; one for deleting the line at the old
-place, and another one for adding the line at the new place, even if it's only
-one line further down.
-
-From this, it follows that there's one big problem with git-absorb's approach:
-when moving code, it doesn't realize that the two related hunks of deleting the
-code from the old place and inserting it at the new place belong together, and
-often it will manage to create a fixup commit for the first hunk, but leave the
-other hunk in your working copy as "don't know what to do with this". As an
-example, suppose your PR is adding a line of code to an existing function, maybe
-one that declares a new variable, and a reviewer suggests to move this line down
-a bit, closer to where some other related variables are declared. Moving the
-line down results in two diff hunks (from the perspective of git-absorb and
-ctrl-f, as they both use a context of 0 when diffing), and when looking at the
-second diff hunk in isolation there's no way to find a base commit in your PR
-for it, because the surrounding code is already on main.
-
-To solve this, the ctrl-f command makes a distinction between hunks that have
-deleted lines and hunks that have only added lines. If the whole diff contains
-any hunks that have deleted lines, it uses only those hunks to determine the
-base commit, and then assumes that all the hunks that have only added lines
-belong into the same commit. This nicely solves the above example of moving
-code, but also other examples such as the following:
-
-<details>
-<summary>Click to show example</summary>
-
-Suppose you have a PR in which you added the following function:
-
-```go
-func findCommit(hash string) (*models.Commit, int, bool) {
-	for i, commit := range self.c.Model().Commits {
-		if commit.Hash == hash {
-			return commit, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-```
-
-A reviewer suggests to replace the manual `for` loop with a call to
-`lo.FindIndexOf` since that's less code and more idiomatic. So your modification
-is this:
-
-```diff
--- a/my_file.go
-+++ b/my_file.go
-@@ -12,2 +12,3 @@ import (
- 	"github.com/jesseduffield/lazygit/pkg/utils"
-+	"github.com/samber/lo"
- 	"golang.org/x/sync/errgroup"
-@@ -308,9 +309,5 @@ func (self *FixupHelper) blameAddedLines(addedLineHunks []*hunk) ([]string, erro
- func findCommit(hash string) (*models.Commit, int, bool) {
-	for i, commit := range self.c.Model().Commits {
-		if commit.Hash == hash {
-			return commit, i, true
-		}
-	}
-
-	return nil, -1, false
-+	return lo.FindIndexOf(self.c.Model().Commits, func(commit *models.Commit) bool {
-+		return commit.Hash == hash
-+	})
- }
-```
-
-If we were to look at these two hunks separately, we'd easily find the base
-commit for the second one, but we wouldn't find the one for the first hunk
-because the imports around the added import have been on main for a long time.
-In fact, git-absorb leaves this hunk in the working copy because it doesn't know
-what to do with it.
-
-</details>
-
-Only if there are no hunks with deleted lines does ctrl-f look at the hunks with
-only added lines and determines the base commit for them. This solves cases like
-adding a comment above a function that you added in your PR.
-
-The downside of this more complicated approach is that it relies on the user
-staging related hunks correctly. However, in my experience this is easy to do
-and not very error-prone, as long as users are aware of this behavior. Lazygit
-tries to help making them aware of it by showing a warning whenever there are
-hunks with only added lines in addition to hunks with deleted lines.
-
-### Finding the base commit for a given hunk
-
-As explained above, git-absorb finds the base commit by walking the commits
-backwards until it finds one that conflicts with the hunk, and then the found
-base commit is the one just before that one. This works reliably, but it is
-slow.
-
-Ctrl-f uses a different approach that is usually much faster, but should always
-yield the same result. Again, it makes a distinction between hunks with deleted
-lines and hunks with only added lines. For hunks with deleted lines it performs
-a line range blame for all the deleted lines (e.g. `git blame -L42,+3 --
-filename`), and if the result is the same for all deleted lines, then that's the
-base commit; otherwise it returns an error.
-
-For hunks with only added lines, it gets a little more complicated. We blame the
-single lines just before and just after the hunk (I'll ignore the edge cases of
-either of those not existing because the hunk is at the beginning or end of the
-file; read the code to see how we handle these cases). If the blame result is
-the same for both, then that's the base commit. This is the case of adding a
-line in the middle of a block of code that was added in the PR. Otherwise, the
-base commit is the more recent of the two (and in this case it doesn't matter if
-the other one is an earlier commit in the current branch, or a possibly very old
-commit that's already on main). This covers the common case of adding a comment
-to a function that was added in the PR, but also adding another line at the end
-of a block of code that was added in the base commit.
-
-It's interesting to discuss what "more recent" means here. You could say if
-commit A is an ancestor of commit B (or in other words, A is reachable from B)
-then B is the more recent one. And if none of the two commits is reachable from
-the other, you have an error case because it's unclear which of the two should
-be considered the base commit. The scenario in which this happens is a commit
-history like this:
-
-```
-      C---D
-     /     \
-A---B---E---F---G
-```
-
-where, for instance, D and E are the two blame results.
-
-Unfortunately, determining the ancestry relationship between two commits using
-git commands is a bit expensive and not totally straightforward. Fortunately,
-it's not necessary in lazygit because lazygit has the most recent 300 commits
-cached in memory, and can simply search its linear list of commits to see which
-one is closer to the beginning of the list. If only one of the two commits is
-found within those 300 commits, then that's the more recent one; if neither is
-found, we assume that both commits are on main and error out. In the merge
-scenario pictured above, we arbitrarily return one of the two commits (this will
-depend on the log order), but that's probably fine as this scenario should be
-extremely rare in practice; in most cases, feature branches are simply linear.
-
-### Knowing where to stop searching
-
-Git-absorb needs to know when to stop walking backwards searching for commits,
-since it doesn't make sense to create fixups for commits that are already on
-main. However, it doesn't know where the current branch ends and main starts, so
-it needs to rely on user input for this. By default it searches the most recent
-10 commits, but this can be overridden with a config setting. In longer branches
-this is often not enough for finding the base commit; but setting it to a higher
-value causes the command to take longer to complete when the base commit can't
-be found.
-
-Lazygit doesn't have this problem. For a given blame result it needs to
-determine whether that commit is already on main, and if it can find the commit
-in its cached list of the first 300 commits it can get that information from
-there, because lazygit knows what the user's configured main branches are
-(`master` and `main` by default, but it could also include branches like `devel`
-or `1.0-hotfixes`), and so it can tell for each commit whether it's contained in
-one of those main branches. And if it can't find it among the first 300 commits,
-it assumes the commit already on main, on the assumption that no feature branch
-has more than 300 commits.
--- a/docs/dev/Profiling.md
+++ b/docs/dev/Profiling.md
@@ -1,69 +0,0 @@
-# Profiling Lazygit
-
-If you want to investigate what's contributing to CPU or memory usage, start
-lazygit with the `-profile` command line flag. This tells it to start an
-integrated web server that listens for profiling requests.
-
-## Save profile data
-
-### CPU
-
-While lazygit is running with the `-profile` flag, perform a CPU profile and
-save it to a file by running this command in another terminal window:
-
-```sh
-curl -o cpu.out http://127.0.0.1:6060/debug/pprof/profile
-```
-
-By default, it profiles for 30 seconds. To change the duration, use
-
-```sh
-curl -o cpu.out 'http://127.0.0.1:6060/debug/pprof/profile?seconds=60'
-```
-
-### Memory
-
-To save a heap profile (containing information about all memory allocated so
-far since startup), use
-
-```sh
-curl -o mem.out http://127.0.0.1:6060/debug/pprof/heap
-```
-
-Sometimes it can be useful to get a delta log, i.e. to see how memory usage
-developed from one point in time to another. For that, use
-
-```sh
-curl -o mem.out 'http://127.0.0.1:6060/debug/pprof/heap?seconds=20'
-```
-
-This will log the memory usage difference between now and 20 seconds later, so
-it gives you 20 seconds to perform the action in lazygit that you are interested
-in measuring.
-
-## View profile data
-
-To display the profile data, you can either use speedscope.app, or the pprof
-tool that comes with go. I prefer the former because it has a nicer UI and is a
-little more powerful; however, I have seen cases where it wasn't able to load a
-profile for some reason, in which case it's good to have the pprof tool as a
-fallback.
-
-### Speedscope.app
-
-Go to https://www.speedscope.app/ in your browser, and drag the saved profile
-onto the browser window. Refer to [the
-documentation](https://github.com/jlfwong/speedscope?tab=readme-ov-file#usage)
-for how to navigate the data.
-
-### Pprof tool
-
-To view a profile that you saved as `cpu.out`, use
-
-```sh
-go tool pprof -http=:8080 cpu.out
-```
-
-By default this shows the graph view, which I don't find very useful myself.
-Choose "Flame Graph" from the View menu to show a much more useful
-representation of the data.
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -4,5 +4,3 @@
 * [Busy/Idle Tracking](./Busy.md)
 * [Integration Tests](../../pkg/integration/README.md)
 * [Demo Recordings](./Demo_Recordings.md)
-* [Find base commit for fixup design](Find_Base_Commit_For_Fixup_Design.md)
-* [Profiling](Profiling.md)
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -80,7 +80,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
 | `` b `` | View bisect options |  |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | Reword | Reword the selected commit's message. |
 | `` R `` | Reword with editor |  |
 | `` d `` | Drop | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/docs/keybindings/Keybindings_ja.md
+++ b/docs/keybindings/Keybindings_ja.md
@@ -97,7 +97,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <c-r> `` | Reset copied (cherry-picked) commits selection |  |
 | `` b `` | View bisect options |  |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | コミットメッセージを変更 | Reword the selected commit's message. |
 | `` R `` | エディタでコミットメッセージを編集 |  |
 | `` d `` | コミットを削除 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/docs/keybindings/Keybindings_ko.md
+++ b/docs/keybindings/Keybindings_ko.md
@@ -260,7 +260,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  |
 | `` b `` | Bisect 옵션 보기 |  |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | 커밋메시지 변경 | Reword the selected commit's message. |
 | `` R `` | 에디터에서 커밋메시지 수정 |  |
 | `` d `` | 커밋 삭제 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -143,7 +143,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  |
 | `` b `` | View bisect options |  |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | Hernoem commit | Reword the selected commit's message. |
 | `` R `` | Hernoem commit met editor |  |
 | `` d `` | Verwijder commit | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/docs/keybindings/Keybindings_ru.md
+++ b/docs/keybindings/Keybindings_ru.md
@@ -144,7 +144,7 @@ _Связки клавиш_
 | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  |
 | `` b `` | Просмотреть параметры бинарного поиска |  |
 | `` s `` | Объединить коммиты (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита (Fixup)  | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита (Fixup)  | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | Перефразировать коммит | Reword the selected commit's message. |
 | `` R `` | Переписать коммит с помощью редактора |  |
 | `` d `` | Удалить коммит | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/docs/keybindings/Keybindings_zh-CN.md
+++ b/docs/keybindings/Keybindings_zh-CN.md
@@ -141,7 +141,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` <c-r> `` | 重置已拣选（复制）的提交 |  |
 | `` b `` | 查看二分查找选项 |  |
 | `` s `` | 压缩 | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | 修正（fixup） | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | 修正（fixup） | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | 改写提交 | Reword the selected commit's message. |
 | `` R `` | 使用编辑器重命名提交 |  |
 | `` d `` | 删除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/docs/keybindings/Keybindings_zh-TW.md
+++ b/docs/keybindings/Keybindings_zh-TW.md
@@ -166,7 +166,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 | `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  |
 | `` b `` | 查看二分選項 |  |
 | `` s `` | 壓縮 (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
-| `` f `` | 修復 (Fixup) | Meld the selected commit into the commit below it. Similar to squash, but the selected commit's message will be discarded. |
+| `` f `` | 修復 (Fixup) | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
 | `` r `` | 改寫提交 | Reword the selected commit's message. |
 | `` R `` | 使用編輯器改寫提交 |  |
 | `` d `` | 刪除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
--- a/go.mod
+++ b/go.mod
@@ -1,23 +1,21 @@
 module github.com/jesseduffield/lazygit

-go 1.22
+go 1.21

 require (
 	github.com/adrg/xdg v0.4.0
 	github.com/atotto/clipboard v0.1.4
 	github.com/aybabtme/humanlog v0.4.1
-	github.com/cli/go-gh/v2 v2.9.0
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 	github.com/creack/pty v1.1.11
 	github.com/gdamore/tcell/v2 v2.7.4
 	github.com/go-errors/errors v1.5.1
 	github.com/gookit/color v1.4.2
-	github.com/iancoleman/orderedmap v0.3.0
 	github.com/imdario/mergo v0.3.11
 	github.com/integrii/flaggy v1.4.0
 	github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
 	github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
-	github.com/jesseduffield/gocui v0.3.1-0.20240628061234-aed9e133e65b
+	github.com/jesseduffield/gocui v0.3.1-0.20240418080333-8cd33929c513
 	github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
@@ -39,7 +37,6 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
 	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8
-	golang.org/x/sync v0.7.0
 	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -47,7 +44,6 @@ require (
 require (
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cli/safeexec v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/fatih/color v1.9.0 // indirect
@@ -64,8 +60,8 @@ require (
 	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-colorable v0.1.11 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/onsi/ginkgo v1.10.3 // indirect
 	github.com/onsi/gomega v1.7.1 // indirect
@@ -75,10 +71,10 @@ require (
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -59,10 +59,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cli/go-gh/v2 v2.9.0 h1:D3lTjEneMYl54M+WjZ+kRPrR5CEJ5BHS05isBPOV3LI=
-github.com/cli/go-gh/v2 v2.9.0/go.mod h1:MeRoKzXff3ygHu7zP+NVTT+imcHW6p3tpuxHAzRM2xE=
-github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
-github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
@@ -175,8 +171,6 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
-github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -192,8 +186,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T
 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20240628061234-aed9e133e65b h1:oxCq0DvR2GMGf4UaoaASb0nQK/fJMQW3c3PNCLWCjS8=
-github.com/jesseduffield/gocui v0.3.1-0.20240628061234-aed9e133e65b/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
+github.com/jesseduffield/gocui v0.3.1-0.20240418080333-8cd33929c513 h1:Y1bw5iItrsDCumATc/rklIJ/6K+68ieiWZJedhrNuXo=
+github.com/jesseduffield/gocui v0.3.1-0.20240418080333-8cd33929c513/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
@@ -232,14 +226,13 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
@@ -331,9 +324,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -406,8 +398,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -429,8 +421,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20170407050850-f3918c30c5c2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -473,21 +463,21 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
+golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -497,9 +487,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
--- a/pkg/app/app_test.go
+++ b/pkg/app/app_test.go
@@ -1,47 +0,0 @@
-package app
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIsValidGhVersion(t *testing.T) {
-	type scenario struct {
-		versionStr     string
-		expectedResult bool
-	}
-
-	scenarios := []scenario{
-		{
-			"",
-			false,
-		},
-		{
-			`gh version 1.0.0 (2020-08-23)
-			https://github.com/cli/cli/releases/tag/v1.0.0`,
-			false,
-		},
-		{
-			`gh version 2.0.0 (2021-08-23)
-			https://github.com/cli/cli/releases/tag/v2.0.0`,
-			true,
-		},
-		{
-			`gh version 1.1.0 (2021-10-14)
-			https://github.com/cli/cli/releases/tag/v1.1.0
-
-			A new release of gh is available: 1.1.0 → v2.2.0
-			To upgrade, run: brew update && brew upgrade gh
-			https://github.com/cli/cli/releases/tag/v2.2.0`,
-			false,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.versionStr, func(t *testing.T) {
-			result := isGhVersionValid(s.versionStr)
-			assert.Equal(t, result, s.expectedResult)
-		})
-	}
-}
--- a/pkg/app/entry_point.go
+++ b/pkg/app/entry_point.go
@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"log"
-	"net/http"
-	_ "net/http/pprof"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -32,7 +30,6 @@ type cliArgs struct {
 	PrintVersionInfo   bool
 	Debug              bool
 	TailLogs           bool
-	Profile            bool
 	PrintDefaultConfig bool
 	PrintConfigDir     bool
 	UseConfigDir       string
@@ -148,14 +145,6 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		return
 	}

-	if cliArgs.Profile {
-		go func() {
-			if err := http.ListenAndServe("localhost:6060", nil); err != nil {
-				log.Fatal(err)
-			}
-		}()
-	}
-
 	parsedGitArg := parseGitArg(cliArgs.GitArg)

 	Run(appConfig, common, appTypes.NewStartArgs(cliArgs.FilterPath, parsedGitArg, integrationTest))
@@ -182,9 +171,6 @@ func parseCliArgsAndEnvVars() *cliArgs {
 	tailLogs := false
 	flaggy.Bool(&tailLogs, "l", "logs", "Tail lazygit logs (intended to be used when `lazygit --debug` is called in a separate terminal tab)")

-	profile := false
-	flaggy.Bool(&profile, "", "profile", "Start the profiler and serve it on http port 6060. See CONTRIBUTING.md for more info.")
-
 	printDefaultConfig := false
 	flaggy.Bool(&printDefaultConfig, "c", "config", "Print the default config")

@@ -216,7 +202,6 @@ func parseCliArgsAndEnvVars() *cliArgs {
 		PrintVersionInfo:   printVersionInfo,
 		Debug:              debug,
 		TailLogs:           tailLogs,
-		Profile:            profile,
 		PrintDefaultConfig: printDefaultConfig,
 		PrintConfigDir:     printConfigDir,
 		UseConfigDir:       useConfigDir,
--- a/pkg/cheatsheet/generate.go
+++ b/pkg/cheatsheet/generate.go
@@ -51,10 +51,7 @@ func GetKeybindingsDir() string {
 }

 func generateAtDir(cheatsheetDir string) {
-	translationSetsByLang, err := i18n.GetTranslationSets()
-	if err != nil {
-		log.Fatal(err)
-	}
+	translationSetsByLang := i18n.GetTranslationSets()
 	mConfig := config.NewDummyAppConfig()

 	for lang := range translationSetsByLang {
--- a/pkg/cheatsheet/generate_test.go
+++ b/pkg/cheatsheet/generate_test.go
@@ -262,7 +262,7 @@ func TestGetBindingSections(t *testing.T) {

 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
-			actual := getBindingSections(test.bindings, tr)
+			actual := getBindingSections(test.bindings, &tr)
 			assert.EqualValues(t, test.expected, actual)
 		})
 	}
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -38,8 +38,6 @@ type GitCommand struct {
 	Worktree    *git_commands.WorktreeCommands
 	Version     *git_commands.GitVersion
 	RepoPaths   *git_commands.RepoPaths
-	GitHub         *git_commands.GitHubCommands
-	HostingService *git_commands.HostingService

 	Loaders Loaders
 }
@@ -135,10 +133,8 @@ func NewGitCommandAux(
 	bisectCommands := git_commands.NewBisectCommands(gitCommon)
 	worktreeCommands := git_commands.NewWorktreeCommands(gitCommon)
 	blameCommands := git_commands.NewBlameCommands(gitCommon)
-	gitHubCommands := git_commands.NewGitHubCommand(gitCommon)
-	hostingServiceCommands := git_commands.NewHostingServiceCommand(gitCommon)

-	branchLoader := git_commands.NewBranchLoader(cmn, gitCommon, cmd, branchCommands.CurrentBranchInfo, configCommands)
+	branchLoader := git_commands.NewBranchLoader(cmn, cmd, branchCommands.CurrentBranchInfo, configCommands)
 	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
 	commitLoader := git_commands.NewCommitLoader(cmn, cmd, statusCommands.RebaseMode, gitCommon)
 	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
@@ -168,8 +164,6 @@ func NewGitCommandAux(
 		WorkingTree: workingTreeCommands,
 		Worktree:    worktreeCommands,
 		Version:     version,
-		GitHub:         gitHubCommands,
-		HostingService: hostingServiceCommands,
 		Loaders: Loaders{
 			BranchLoader:       branchLoader,
 			CommitFileLoader:   commitFileLoader,
--- a/pkg/commands/git_commands/branch_loader.go
+++ b/pkg/commands/git_commands/branch_loader.go
@@ -5,7 +5,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"time"

 	"github.com/jesseduffield/generics/set"
 	"github.com/jesseduffield/go-git/v5/config"
@@ -15,7 +14,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 	"golang.org/x/exp/slices"
-	"golang.org/x/sync/errgroup"
 )

 // context:
@@ -42,7 +40,6 @@ type BranchInfo struct {
 // BranchLoader returns a list of Branch objects for the current repo
 type BranchLoader struct {
 	*common.Common
-	*GitCommon
 	cmd                  oscommands.ICmdObjBuilder
 	getCurrentBranchInfo func() (BranchInfo, error)
 	config               BranchLoaderConfigCommands
@@ -50,14 +47,12 @@ type BranchLoader struct {

 func NewBranchLoader(
 	cmn *common.Common,
-	gitCommon *GitCommon,
 	cmd oscommands.ICmdObjBuilder,
 	getCurrentBranchInfo func() (BranchInfo, error),
 	config BranchLoaderConfigCommands,
 ) *BranchLoader {
 	return &BranchLoader{
 		Common:               cmn,
-		GitCommon:            gitCommon,
 		cmd:                  cmd,
 		getCurrentBranchInfo: getCurrentBranchInfo,
 		config:               config,
@@ -65,14 +60,8 @@ func NewBranchLoader(
 }

 // Load the list of branches for the current repo
-func (self *BranchLoader) Load(reflogCommits []*models.Commit,
-	mainBranches *MainBranches,
-	oldBranches []*models.Branch,
-	loadBehindCounts bool,
-	onWorker func(func() error),
-	renderFunc func(),
-) ([]*models.Branch, error) {
-	branches := self.obtainBranches(self.version.IsAtLeast(2, 22, 0))
+func (self *BranchLoader) Load(reflogCommits []*models.Commit) ([]*models.Branch, error) {
+	branches := self.obtainBranches()

 	if self.AppState.LocalBranchSortOrder == "recency" {
 		reflogBranches := self.obtainReflogBranches(reflogCommits)
@@ -130,109 +119,12 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit,
 			branch.UpstreamRemote = match.Remote
 			branch.UpstreamBranch = match.Merge.Short()
 		}
-
-		// If the branch already existed, take over its BehindBaseBranch value
-		// to reduce flicker
-		if oldBranch, found := lo.Find(oldBranches, func(b *models.Branch) bool {
-			return b.Name == branch.Name
-		}); found {
-			branch.BehindBaseBranch.Store(oldBranch.BehindBaseBranch.Load())
-		}
-	}
-
-	if loadBehindCounts && self.UserConfig.Gui.ShowDivergenceFromBaseBranch != "none" {
-		onWorker(func() error {
-			return self.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, renderFunc)
-		})
 	}

 	return branches, nil
 }

-func (self *BranchLoader) GetBehindBaseBranchValuesForAllBranches(
-	branches []*models.Branch,
-	mainBranches *MainBranches,
-	renderFunc func(),
-) error {
-	mainBranchRefs := mainBranches.Get()
-	if len(mainBranchRefs) == 0 {
-		return nil
-	}
-
-	t := time.Now()
-	errg := errgroup.Group{}
-
-	for _, branch := range branches {
-		errg.Go(func() error {
-			baseBranch, err := self.GetBaseBranch(branch, mainBranches)
-			if err != nil {
-				return err
-			}
-			behind := 0 // prime it in case something below fails
-			if baseBranch != "" {
-				output, err := self.cmd.New(
-					NewGitCmd("rev-list").
-						Arg("--left-right").
-						Arg("--count").
-						Arg(fmt.Sprintf("%s...%s", branch.FullRefName(), baseBranch)).
-						ToArgv(),
-				).DontLog().RunWithOutput()
-				if err != nil {
-					return err
-				}
-				// The format of the output is "<ahead>\t<behind>"
-				aheadBehindStr := strings.Split(strings.TrimSpace(output), "\t")
-				if len(aheadBehindStr) == 2 {
-					if value, err := strconv.Atoi(aheadBehindStr[1]); err == nil {
-						behind = value
-					}
-				}
-			}
-			branch.BehindBaseBranch.Store(int32(behind))
-			return nil
-		})
-	}
-
-	err := errg.Wait()
-	self.Log.Debugf("time to get behind base branch values for all branches: %s", time.Since(t))
-	renderFunc()
-	return err
-}
-
-// Find the base branch for the given branch (i.e. the main branch that the
-// given branch was forked off of)
-//
-// Note that this function may return an empty string even if the returned error
-// is nil, e.g. when none of the configured main branches exist. This is not
-// considered an error condition, so callers need to check both the returned
-// error and whether the returned base branch is empty (and possibly react
-// differently in both cases).
-func (self *BranchLoader) GetBaseBranch(branch *models.Branch, mainBranches *MainBranches) (string, error) {
-	mergeBase := mainBranches.GetMergeBase(branch.FullRefName())
-	if mergeBase == "" {
-		return "", nil
-	}
-
-	output, err := self.cmd.New(
-		NewGitCmd("for-each-ref").
-			Arg("--contains").
-			Arg(mergeBase).
-			Arg("--format=%(refname)").
-			Arg(mainBranches.Get()...).
-			ToArgv(),
-	).DontLog().RunWithOutput()
-	if err != nil {
-		return "", err
-	}
-	trimmedOutput := strings.TrimSpace(output)
-	split := strings.Split(trimmedOutput, "\n")
-	if len(split) == 0 || split[0] == "" {
-		return "", nil
-	}
-	return split[0], nil
-}
-
-func (self *BranchLoader) obtainBranches(canUsePushTrack bool) []*models.Branch {
+func (self *BranchLoader) obtainBranches() []*models.Branch {
 	output, err := self.getRawBranches()
 	if err != nil {
 		panic(err)
@@ -255,7 +147,7 @@ func (self *BranchLoader) obtainBranches(canUsePushTrack bool) []*models.Branch
 		}

 		storeCommitDateAsRecency := self.AppState.LocalBranchSortOrder != "recency"
-		return obtainBranch(split, storeCommitDateAsRecency, canUsePushTrack), true
+		return obtainBranch(split, storeCommitDateAsRecency), true
 	})
 }

@@ -291,31 +183,23 @@ var branchFields = []string{
 	"refname:short",
 	"upstream:short",
 	"upstream:track",
-	"push:track",
 	"subject",
 	"objectname",
 	"committerdate:unix",
 }

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

 	name := strings.TrimPrefix(fullName, "heads/")
-	aheadForPull, behindForPull, gone := parseUpstreamInfo(upstreamName, track)
-	var aheadForPush, behindForPush string
-	if canUsePushTrack {
-		aheadForPush, behindForPush, _ = parseUpstreamInfo(upstreamName, pushTrack)
-	} else {
-		aheadForPush, behindForPush = aheadForPull, behindForPull
-	}
+	pushables, pullables, gone := parseUpstreamInfo(upstreamName, track)

 	recency := ""
 	if storeCommitDateAsRecency {
@@ -325,16 +209,14 @@ func obtainBranch(split []string, storeCommitDateAsRecency bool, canUsePushTrack
 	}

 	return &models.Branch{
-		Name:          name,
-		Recency:       recency,
-		AheadForPull:  aheadForPull,
-		BehindForPull: behindForPull,
-		AheadForPush:  aheadForPush,
-		BehindForPush: behindForPush,
-		UpstreamGone:  gone,
-		Head:          headMarker == "*",
-		Subject:       subject,
-		CommitHash:    commitHash,
+		Name:         name,
+		Recency:      recency,
+		Pushables:    pushables,
+		Pullables:    pullables,
+		UpstreamGone: gone,
+		Head:         headMarker == "*",
+		Subject:      subject,
+		CommitHash:   commitHash,
 	}
 }

@@ -350,10 +232,10 @@ func parseUpstreamInfo(upstreamName string, track string) (string, string, bool)
 		return "?", "?", true
 	}

-	ahead := parseDifference(track, `ahead (\d+)`)
-	behind := parseDifference(track, `behind (\d+)`)
+	pushables := parseDifference(track, `ahead (\d+)`)
+	pullables := parseDifference(track, `behind (\d+)`)

-	return ahead, behind, false
+	return pushables, pullables, false
 }

 func parseDifference(track string, regexStr string) string {
--- a/pkg/commands/git_commands/branch_loader_test.go
+++ b/pkg/commands/git_commands/branch_loader_test.go
@@ -25,101 +25,89 @@ func TestObtainBranch(t *testing.T) {
 	scenarios := []scenario{
 		{
 			testName:                 "TrimHeads",
-			input:                    []string{"", "heads/a_branch", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"", "heads/a_branch", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
+				Name:       "a_branch",
+				Pushables:  "?",
+				Pullables:  "?",
+				Head:       false,
+				Subject:    "subject",
+				CommitHash: "123",
 			},
 		},
 		{
 			testName:                 "NoUpstream",
-			input:                    []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
+				Name:       "a_branch",
+				Pushables:  "?",
+				Pullables:  "?",
+				Head:       false,
+				Subject:    "subject",
+				CommitHash: "123",
 			},
 		},
 		{
 			testName:                 "IsHead",
-			input:                    []string{"*", "a_branch", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"*", "a_branch", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          true,
-				Subject:       "subject",
-				CommitHash:    "123",
+				Name:       "a_branch",
+				Pushables:  "?",
+				Pullables:  "?",
+				Head:       true,
+				Subject:    "subject",
+				CommitHash: "123",
 			},
 		},
 		{
 			testName:                 "IsBehindAndAhead",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "[behind 2, ahead 3]", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				AheadForPull:  "3",
-				BehindForPull: "2",
-				AheadForPush:  "3",
-				BehindForPush: "2",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
+				Name:       "a_branch",
+				Pushables:  "3",
+				Pullables:  "2",
+				Head:       false,
+				Subject:    "subject",
+				CommitHash: "123",
 			},
 		},
 		{
 			testName:                 "RemoteBranchIsGone",
-			input:                    []string{"", "a_branch", "a_remote/a_branch", "[gone]", "[gone]", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "a_remote/a_branch", "[gone]", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: false,
 			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				UpstreamGone:  true,
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
+				Name:         "a_branch",
+				UpstreamGone: true,
+				Pushables:    "?",
+				Pullables:    "?",
+				Head:         false,
+				Subject:      "subject",
+				CommitHash:   "123",
 			},
 		},
 		{
 			testName:                 "WithCommitDateAsRecency",
-			input:                    []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
+			input:                    []string{"", "a_branch", "", "", "subject", "123", timeStamp},
 			storeCommitDateAsRecency: true,
 			expectedBranch: &models.Branch{
-				Name:          "a_branch",
-				Recency:       "2h",
-				AheadForPull:  "?",
-				BehindForPull: "?",
-				AheadForPush:  "?",
-				BehindForPush: "?",
-				Head:          false,
-				Subject:       "subject",
-				CommitHash:    "123",
+				Name:       "a_branch",
+				Recency:    "2h",
+				Pushables:  "?",
+				Pullables:  "?",
+				Head:       false,
+				Subject:    "subject",
+				CommitHash: "123",
 			},
 		},
 	}

 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
-			branch := obtainBranch(s.input, s.storeCommitDateAsRecency, true)
+			branch := obtainBranch(s.input, s.storeCommitDateAsRecency)
 			assert.EqualValues(t, s.expectedBranch, branch)
 		})
 	}
--- a/pkg/commands/git_commands/branch_test.go
+++ b/pkg/commands/git_commands/branch_test.go
@@ -41,6 +41,7 @@ func TestBranchGetCommitDifferences(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildBranchCommands(commonDeps{runner: s.runner})
 			pushables, pullables := instance.GetCommitDifferences("HEAD", "@{u}")
@@ -88,6 +89,7 @@ func TestBranchDeleteBranch(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildBranchCommands(commonDeps{runner: s.runner})

@@ -148,6 +150,7 @@ func TestBranchMerge(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t).
 				ExpectGitArgs(s.expected, "", nil)
@@ -187,6 +190,7 @@ func TestBranchCheckout(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildBranchCommands(commonDeps{runner: s.runner})
 			s.test(instance.Checkout("test", CheckoutOptions{Force: s.force}))
@@ -275,6 +279,7 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildBranchCommands(commonDeps{runner: s.runner})
 			s.test(instance.CurrentBranchInfo())
--- a/pkg/commands/git_commands/commit.go
+++ b/pkg/commands/git_commands/commit.go
@@ -22,7 +22,13 @@ func NewCommitCommands(gitCommon *GitCommon) *CommitCommands {

 // ResetAuthor resets the author of the topmost commit
 func (self *CommitCommands) ResetAuthor() error {
+	message, err := self.GetCommitMessage("HEAD")
+	if err != nil {
+		return err
+	}
+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
 	cmdArgs := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
 		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--reset-author").
 		ToArgv()

@@ -31,7 +37,14 @@ func (self *CommitCommands) ResetAuthor() error {

 // Sets the commit's author to the supplied value. Value is expected to be of the form 'Name <Email>'
 func (self *CommitCommands) SetAuthor(value string) error {
+	message, err := self.GetCommitMessage("HEAD")
+	if err != nil {
+		return err
+	}
+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
+
 	cmdArgs := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
 		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--author="+value).
 		ToArgv()

@@ -47,7 +60,10 @@ func (self *CommitCommands) AddCoAuthor(hash string, author string) error {

 	message = AddCoAuthorToMessage(message, author)

+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
+
 	cmdArgs := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
 		Arg("--allow-empty", "--amend", "--only", "-m", message).
 		ToArgv()

@@ -100,11 +116,15 @@ func (self *CommitCommands) CommitCmdObj(summary string, description string) osc
 }

 func (self *CommitCommands) RewordLastCommitInEditorCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("commit").Arg("--allow-empty", "--amend", "--only").ToArgv())
+
+	return self.cmd.New(NewGitCmd("commit").
+		// TODO: how to decide if we should add --no-verify if we're using the editor?
+		Arg("--allow-empty", "--amend", "--only").ToArgv())
 }

 func (self *CommitCommands) RewordLastCommitInEditorWithMessageFileCmdObj(tmpMessageFile string) oscommands.ICmdObj {
 	return self.cmd.New(NewGitCmd("commit").
+		// TODO: how to decide if we should add --no-verify if we're using the editor?
 		Arg("--allow-empty", "--amend", "--only", "--edit", "--file="+tmpMessageFile).ToArgv())
 }

@@ -120,7 +140,10 @@ func (self *CommitCommands) CommitInEditorWithMessageFileCmdObj(tmpMessageFile s
 func (self *CommitCommands) RewordLastCommit(summary string, description string) error {
 	messageArgs := self.commitMessageArgs(summary, description)

+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
+
 	cmdArgs := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(summary, skipHookPrefix), "--no-verify").
 		Arg("--allow-empty", "--amend", "--only").
 		Arg(messageArgs...).
 		ToArgv()
@@ -248,7 +271,15 @@ func (self *CommitCommands) AmendHead() error {
 }

 func (self *CommitCommands) AmendHeadCmdObj() oscommands.ICmdObj {
+	message, err := self.GetCommitMessage("HEAD")
+	if err != nil {
+		// TODO: what to do here? we can't return err
+		// return err
+	}
+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
+
 	cmdArgs := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
 		Arg("--amend", "--no-edit", "--allow-empty").
 		ToArgv()

--- a/pkg/commands/git_commands/commit_loader.go
+++ b/pkg/commands/git_commands/commit_loader.go
@@ -35,6 +35,11 @@ type CommitLoader struct {
 	readFile      func(filename string) ([]byte, error)
 	walkFiles     func(root string, fn filepath.WalkFunc) error
 	dotGitDir     string
+	// List of main branches that exist in the repo.
+	// We use these to obtain the merge base of the branch.
+	// When nil, we're yet to obtain the list of existing main branches.
+	// When an empty slice, we've obtained the list and it's empty.
+	mainBranches []string
 	*GitCommon
 }

@@ -51,6 +56,7 @@ func NewCommitLoader(
 		getRebaseMode: getRebaseMode,
 		readFile:      os.ReadFile,
 		walkFiles:     filepath.Walk,
+		mainBranches:  nil,
 		GitCommon:     gitCommon,
 	}
 }
@@ -66,7 +72,6 @@ type GetCommitsOptions struct {
 	All bool
 	// If non-empty, show divergence from this ref (left-right log)
 	RefToShowDivergenceFrom string
-	MainBranches            *MainBranches
 }

 // GetCommits obtains the commits of the current branch
@@ -103,9 +108,9 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
 	go utils.Safe(func() {
 		defer wg.Done()

-		ancestor = opts.MainBranches.GetMergeBase(opts.RefName)
+		ancestor = self.getMergeBase(opts.RefName)
 		if opts.RefToShowDivergenceFrom != "" {
-			remoteAncestor = opts.MainBranches.GetMergeBase(opts.RefToShowDivergenceFrom)
+			remoteAncestor = self.getMergeBase(opts.RefToShowDivergenceFrom)
 		}
 	})

@@ -206,11 +211,11 @@ func (self *CommitLoader) extractCommitFromLine(line string, showDivergence bool
 	authorEmail := split[3]
 	extraInfo := strings.TrimSpace(split[4])
 	parentHashes := split[5]
+	message := split[6]
 	divergence := models.DivergenceNone
 	if showDivergence {
-		divergence = lo.Ternary(split[6] == "<", models.DivergenceLeft, models.DivergenceRight)
+		divergence = lo.Ternary(split[7] == "<", models.DivergenceLeft, models.DivergenceRight)
 	}
-	message := split[7]

 	tags := []string{}

@@ -344,8 +349,6 @@ func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) []*mod
 	for _, t := range todos {
 		if t.Command == todo.UpdateRef {
 			t.Msg = t.Ref
-		} else if t.Command == todo.Exec {
-			t.Msg = t.ExecCommand
 		} else if t.Commit == "" {
 			// Command does not have a commit associated, skip
 			continue
@@ -468,6 +471,84 @@ func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
 	}
 }

+func (self *CommitLoader) getMergeBase(refName string) string {
+	if self.mainBranches == nil {
+		self.mainBranches = self.getExistingMainBranches()
+	}
+
+	if len(self.mainBranches) == 0 {
+		return ""
+	}
+
+	// We pass all configured main branches to the merge-base call; git will
+	// return the base commit for the closest one.
+
+	output, err := self.cmd.New(
+		NewGitCmd("merge-base").Arg(refName).Arg(self.mainBranches...).
+			ToArgv(),
+	).DontLog().RunWithOutput()
+	if err != nil {
+		// If there's an error, it must be because one of the main branches that
+		// used to exist when we called getExistingMainBranches() was deleted
+		// meanwhile. To fix this for next time, throw away our cache.
+		self.mainBranches = nil
+	}
+	return ignoringWarnings(output)
+}
+
+func (self *CommitLoader) getExistingMainBranches() []string {
+	var existingBranches []string
+	var wg sync.WaitGroup
+
+	mainBranches := self.UserConfig.Git.MainBranches
+	existingBranches = make([]string, len(mainBranches))
+
+	for i, branchName := range mainBranches {
+		wg.Add(1)
+		i := i
+		branchName := branchName
+		go utils.Safe(func() {
+			defer wg.Done()
+
+			// Try to determine upstream of local main branch
+			if ref, err := self.cmd.New(
+				NewGitCmd("rev-parse").Arg("--symbolic-full-name", branchName+"@{u}").ToArgv(),
+			).DontLog().RunWithOutput(); err == nil {
+				existingBranches[i] = strings.TrimSpace(ref)
+				return
+			}
+
+			// If this failed, a local branch for this main branch doesn't exist or it
+			// has no upstream configured. Try looking for one in the "origin" remote.
+			ref := "refs/remotes/origin/" + branchName
+			if err := self.cmd.New(
+				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
+			).DontLog().Run(); err == nil {
+				existingBranches[i] = ref
+				return
+			}
+
+			// If this failed as well, try if we have the main branch as a local
+			// branch. This covers the case where somebody is using git locally
+			// for something, but never pushing anywhere.
+			ref = "refs/heads/" + branchName
+			if err := self.cmd.New(
+				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
+			).DontLog().Run(); err == nil {
+				existingBranches[i] = ref
+			}
+		})
+	}
+
+	wg.Wait()
+
+	existingBranches = lo.Filter(existingBranches, func(branch string, _ int) bool {
+		return branch != ""
+	})
+
+	return existingBranches
+}
+
 func ignoringWarnings(commandOutput string) string {
 	trimmedOutput := strings.TrimSpace(commandOutput)
 	split := strings.Split(trimmedOutput, "\n")
@@ -524,4 +605,4 @@ func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
 	return self.cmd.New(cmdArgs).DontLog()
 }

-const prettyFormat = `--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s`
+const prettyFormat = `--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m`
--- a/pkg/commands/git_commands/commit_loader_test.go
+++ b/pkg/commands/git_commands/commit_loader_test.go
@@ -15,16 +15,16 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-var commitsOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode
-b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164|1640824515|Jesse Duffield|jessedduffield@gmail.com|origin/better-tests|e94e8fc5b6fab4cb755f|>|fix logging
-e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c|1640823749|Jesse Duffield|jessedduffield@gmail.com|tag: 123, tag: 456|d8084cd558925eb7c9c3|>|refactor
-d8084cd558925eb7c9c38afeed5725c21653ab90|1640821426|Jesse Duffield|jessedduffield@gmail.com||65f910ebd85283b5cce9|>|WIP
-65f910ebd85283b5cce9bf67d03d3f1a9ea3813a|1640821275|Jesse Duffield|jessedduffield@gmail.com||26c07b1ab33860a1a759|>|WIP
-26c07b1ab33860a1a7591a0638f9925ccf497ffa|1640750752|Jesse Duffield|jessedduffield@gmail.com||3d4470a6c072208722e5|>|WIP
-3d4470a6c072208722e5ae9a54bcb9634959a1c5|1640748818|Jesse Duffield|jessedduffield@gmail.com||053a66a7be3da43aacdc|>|WIP
-053a66a7be3da43aacdc7aa78e1fe757b82c4dd2|1640739815|Jesse Duffield|jessedduffield@gmail.com||985fe482e806b172aea4|>|refactoring the config struct`, "|", "\x00", -1)
+var commitsOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|better typing for rebase mode
+b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164|1640824515|Jesse Duffield|jessedduffield@gmail.com|origin/better-tests|e94e8fc5b6fab4cb755f|fix logging
+e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c|1640823749|Jesse Duffield|jessedduffield@gmail.com|tag: 123, tag: 456|d8084cd558925eb7c9c3|refactor
+d8084cd558925eb7c9c38afeed5725c21653ab90|1640821426|Jesse Duffield|jessedduffield@gmail.com||65f910ebd85283b5cce9|WIP
+65f910ebd85283b5cce9bf67d03d3f1a9ea3813a|1640821275|Jesse Duffield|jessedduffield@gmail.com||26c07b1ab33860a1a759|WIP
+26c07b1ab33860a1a7591a0638f9925ccf497ffa|1640750752|Jesse Duffield|jessedduffield@gmail.com||3d4470a6c072208722e5|WIP
+3d4470a6c072208722e5ae9a54bcb9634959a1c5|1640748818|Jesse Duffield|jessedduffield@gmail.com||053a66a7be3da43aacdc|WIP
+053a66a7be3da43aacdc7aa78e1fe757b82c4dd2|1640739815|Jesse Duffield|jessedduffield@gmail.com||985fe482e806b172aea4|refactoring the config struct`, "|", "\x00", -1)

-var singleCommitOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode`, "|", "\x00", -1)
+var singleCommitOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|better typing for rebase mode`, "|", "\x00", -1)

 func TestGetCommits(t *testing.T) {
 	type scenario struct {
@@ -46,7 +46,7 @@ func TestGetCommits(t *testing.T) {
 			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
 			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -58,7 +58,7 @@ func TestGetCommits(t *testing.T) {
 			opts:       GetCommitsOptions{RefName: "refs/heads/mybranch", RefForPushedStatus: "refs/heads/mybranch", IncludeRebaseCommits: false},
 			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"merge-base", "refs/heads/mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "refs/heads/mybranch", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+				ExpectGitArgs([]string{"log", "refs/heads/mybranch", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -73,7 +73,7 @@ func TestGetCommits(t *testing.T) {
 				// here it's seeing which commits are yet to be pushed
 				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
 				// here it's actually getting all the commits in a formatted form, one per line
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, commitsOutput, nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, commitsOutput, nil).
 				// here it's testing which of the configured main branches have an upstream
 				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "master@{u}"}, "refs/remotes/origin/master", nil).       // this one does
 				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "main@{u}"}, "", errors.New("error")).                   // this one doesn't, so it checks origin instead
@@ -210,7 +210,7 @@ func TestGetCommits(t *testing.T) {
 				// here it's seeing which commits are yet to be pushed
 				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
 				// here it's actually getting all the commits in a formatted form, one per line
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, singleCommitOutput, nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, singleCommitOutput, nil).
 				// here it's testing which of the configured main branches exist; neither does
 				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "master@{u}"}, "", errors.New("error")).
 				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/master"}, "", errors.New("error")).
@@ -247,7 +247,7 @@ func TestGetCommits(t *testing.T) {
 				// here it's seeing which commits are yet to be pushed
 				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
 				// here it's actually getting all the commits in a formatted form, one per line
-				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, singleCommitOutput, nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, singleCommitOutput, nil).
 				// here it's testing which of the configured main branches exist
 				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "master@{u}"}, "refs/remotes/origin/master", nil).
 				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "main@{u}"}, "", errors.New("error")).
@@ -283,7 +283,7 @@ func TestGetCommits(t *testing.T) {
 			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
 			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -295,7 +295,7 @@ func TestGetCommits(t *testing.T) {
 			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", FilterPath: "src"},
 			runner: oscommands.NewFakeRunner(t).
 				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
-				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%m%x00%s", "--abbrev=40", "--follow", "--no-show-signature", "--", "src"}, "", nil),
+				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s%x00%m", "--abbrev=40", "--follow", "--no-show-signature", "--", "src"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -303,15 +303,15 @@ func TestGetCommits(t *testing.T) {
 	}

 	for _, scenario := range scenarios {
+		scenario := scenario
 		t.Run(scenario.testName, func(t *testing.T) {
 			common := utils.NewDummyCommon()
 			common.AppState = &config.AppState{}
 			common.AppState.GitLogOrder = scenario.logOrder
-			cmd := oscommands.NewDummyCmdObjBuilder(scenario.runner)

 			builder := &CommitLoader{
 				Common:        common,
-				cmd:           cmd,
+				cmd:           oscommands.NewDummyCmdObjBuilder(scenario.runner),
 				getRebaseMode: func() (enums.RebaseMode, error) { return scenario.rebaseMode, nil },
 				dotGitDir:     ".git",
 				readFile: func(filename string) ([]byte, error) {
@@ -323,9 +323,7 @@ func TestGetCommits(t *testing.T) {
 			}

 			common.UserConfig.Git.MainBranches = scenario.mainBranches
-			opts := scenario.opts
-			opts.MainBranches = NewMainBranches(scenario.mainBranches, cmd)
-			commits, err := builder.GetCommits(opts)
+			commits, err := builder.GetCommits(scenario.opts)

 			assert.Equal(t, scenario.expectedCommits, commits)
 			assert.Equal(t, scenario.expectedError, err)
--- a/pkg/commands/git_commands/commit_test.go
+++ b/pkg/commands/git_commands/commit_test.go
@@ -30,6 +30,7 @@ func TestCommitRewordCommit(t *testing.T) {
 		},
 	}
 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})

@@ -99,6 +100,7 @@ func TestCommitCommitCmdObj(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			userConfig.Git.Commit.SignOff = s.configSignoff
@@ -134,6 +136,7 @@ func TestCommitCommitEditorCmdObj(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			userConfig.Git.Commit.SignOff = s.configSignoff
@@ -168,6 +171,7 @@ func TestCommitCreateFixupCommit(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})
 			s.test(instance.CreateFixupCommit(s.hash))
@@ -217,6 +221,7 @@ func TestCommitCreateAmendCommit(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})
 			err := instance.CreateAmendCommit(s.originalSubject, s.newSubject, s.newDescription, s.includeFileChanges)
@@ -280,6 +285,7 @@ func TestCommitShowCmdObj(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			userConfig.Git.Paging.ExternalDiffCommand = s.extDiffCmd
@@ -328,6 +334,7 @@ func TestGetCommitMsg(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{
 				runner: oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"-c", "log.showsignature=false", "log", "--format=%B", "--max-count=1", "deadbeef"}, s.input, nil),
@@ -367,6 +374,7 @@ func TestGetCommitMessageFromHistory(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})

--- a/pkg/commands/git_commands/diff.go
+++ b/pkg/commands/git_commands/diff.go
@@ -1,10 +1,6 @@
 package git_commands

-import (
-	"fmt"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-)
+import "github.com/jesseduffield/lazygit/pkg/commands/oscommands"

 type DiffCommands struct {
 	*GitCommon
@@ -17,16 +13,10 @@ func NewDiffCommands(gitCommon *GitCommon) *DiffCommands {
 }

 func (self *DiffCommands) DiffCmdObj(diffArgs []string) oscommands.ICmdObj {
-	extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
-	useExtDiff := extDiffCmd != ""
-
 	return self.cmd.New(
 		NewGitCmd("diff").
 			Config("diff.noprefix=false").
-			ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
-			ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
-			Arg("--submodule").
-			Arg(fmt.Sprintf("--color=%s", self.UserConfig.Git.Paging.ColorArg)).
+			Arg("--submodule", "--no-ext-diff", "--color").
 			Arg(diffArgs...).
 			Dir(self.repoPaths.worktreePath).
 			ToArgv(),
--- a/pkg/commands/git_commands/file_loader_test.go
+++ b/pkg/commands/git_commands/file_loader_test.go
@@ -172,6 +172,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)

--- a/pkg/commands/git_commands/flow_test.go
+++ b/pkg/commands/git_commands/flow_test.go
@@ -23,6 +23,7 @@ func TestStartCmdObj(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildFlowCommands(commonDeps{})

@@ -68,6 +69,7 @@ func TestFinishCmdObj(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildFlowCommands(commonDeps{
 				gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),
--- a/pkg/commands/git_commands/github.go
+++ b/pkg/commands/git_commands/github.go
@@ -1,436 +0,0 @@
-package git_commands
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/cli/go-gh/v2/pkg/auth"
-	gogit "github.com/jesseduffield/go-git/v5"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/samber/lo"
-	"golang.org/x/sync/errgroup"
-)
-
-type GitHubCommands struct {
-	*GitCommon
-}
-
-func NewGitHubCommand(gitCommon *GitCommon) *GitHubCommands {
-	return &GitHubCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-// https://github.com/cli/cli/issues/2300
-func (self *GitHubCommands) BaseRepo() error {
-	cmdArgs := NewGitCmd("config").
-		Arg("--local", "--get-regexp", ".gh-resolved").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().Run()
-}
-
-// Ex: git config --local --add "remote.origin.gh-resolved" "jesseduffield/lazygit"
-func (self *GitHubCommands) SetBaseRepo(repository string) (string, error) {
-	cmdArgs := NewGitCmd("config").
-		Arg("--local", "--add", "remote.origin.gh-resolved", repository).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-}
-
-type Response struct {
-	Data RepositoryQuery `json:"data"`
-}
-
-type RepositoryQuery struct {
-	Repository map[string]PullRequest `json:"repository"`
-}
-
-type PullRequest struct {
-	Edges []PullRequestEdge `json:"edges"`
-}
-
-type PullRequestEdge struct {
-	Node PullRequestNode `json:"node"`
-}
-
-type PullRequestNode struct {
-	Title               string                `json:"title"`
-	HeadRefName         string                `json:"headRefName"`
-	Number              int                   `json:"number"`
-	Url                 string                `json:"url"`
-	HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"`
-	State               string                `json:"state"`
-}
-
-type GithubRepositoryOwner struct {
-	Login string `json:"login"`
-}
-
-func fetchPullRequestsQuery(branches []string, owner string, repo string) string {
-	var queries []string
-	for i, branch := range branches {
-		// We're making a sub-query per branch, and arbitrarily labelling each subquery
-		// as a1, a2, etc.
-		fieldName := fmt.Sprintf("a%d", i+1)
-		// TODO: scope down by remote too if we can (right now if you search for master, you can get multiple results back, and all from forks)
-		queries = append(queries, fmt.Sprintf(`%s: pullRequests(first: 1, headRefName: "%s") {
-      edges {
-        node {
-          title
-          headRefName
-          state
-          number
-          url
-          headRepositoryOwner {
-            login
-          }
-        }
-      }
-    }`, fieldName, branch))
-	}
-
-	queryString := fmt.Sprintf(`{
-  repository(owner: "%s", name: "%s") {
-    %s
-  }
-}`, owner, repo, strings.Join(queries, "\n"))
-
-	return queryString
-}
-
-// FetchRecentPRs fetches recent pull requests using GraphQL.
-func (self *GitHubCommands) FetchRecentPRs(branches []string) ([]*models.GithubPullRequest, error) {
-	repoOwner, repoName, err := self.GetBaseRepoOwnerAndName()
-	if err != nil {
-		return nil, err
-	}
-
-	t := time.Now()
-
-	var g errgroup.Group
-	results := make(chan []*models.GithubPullRequest)
-
-	// We want at most 5 concurrent requests, but no less than 10 branches per request
-	concurrency := 5
-	minBranchesPerRequest := 10
-	branchesPerRequest := max(len(branches)/concurrency, minBranchesPerRequest)
-	for i := 0; i < len(branches); i += branchesPerRequest {
-		end := i + branchesPerRequest
-		if end > len(branches) {
-			end = len(branches)
-		}
-		branchChunk := branches[i:end]
-
-		// Launch a goroutine for each chunk of branches
-		g.Go(func() error {
-			prs, err := self.FetchRecentPRsAux(repoOwner, repoName, branchChunk)
-			if err != nil {
-				return err
-			}
-			results <- prs
-			return nil
-		})
-	}
-
-	// Close the results channel when all goroutines are done
-	go func() {
-		g.Wait()
-		close(results)
-	}()
-
-	// Collect results from all goroutines
-	var allPRs []*models.GithubPullRequest
-	for prs := range results {
-		allPRs = append(allPRs, prs...)
-	}
-
-	if err := g.Wait(); err != nil {
-		return nil, err
-	}
-
-	self.Log.Warnf("Fetched PRs in %s", time.Since(t))
-
-	return allPRs, nil
-}
-
-func (self *GitHubCommands) FetchRecentPRsAux(repoOwner string, repoName string, branches []string) ([]*models.GithubPullRequest, error) {
-	queryString := fetchPullRequestsQuery(branches, repoOwner, repoName)
-	escapedQueryString := strconv.Quote(queryString)
-
-	body := fmt.Sprintf(`{"query": %s}`, escapedQueryString)
-	req, err := http.NewRequest("POST", "https://api.github.com/graphql", bytes.NewBuffer([]byte(body)))
-	if err != nil {
-		return nil, err
-	}
-
-	defaultHost, _ := auth.DefaultHost()
-	token, _ := auth.TokenForHost(defaultHost)
-	if token == "" {
-		return nil, fmt.Errorf("No token found for GitHub")
-	}
-	req.Header.Set("Authorization", "token "+token)
-	req.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		bodyStr := new(bytes.Buffer)
-		bodyStr.ReadFrom(resp.Body)
-		return nil, fmt.Errorf("GraphQL query failed with status: %s. Body: %s", resp.Status, bodyStr.String())
-	}
-
-	bodyBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var result Response
-	err = json.Unmarshal(bodyBytes, &result)
-	if err != nil {
-		return nil, err
-	}
-
-	prs := []*models.GithubPullRequest{}
-	for _, repoQuery := range result.Data.Repository {
-		for _, edge := range repoQuery.Edges {
-			node := edge.Node
-			pr := &models.GithubPullRequest{
-				HeadRefName: node.HeadRefName,
-				Number:      node.Number,
-				State:       node.State,
-				Url:         node.Url,
-				HeadRepositoryOwner: models.GithubRepositoryOwner{
-					Login: node.HeadRepositoryOwner.Login,
-				},
-			}
-			prs = append(prs, pr)
-		}
-	}
-
-	return prs, nil
-}
-
-// returns a map from branch name to pull request
-func GenerateGithubPullRequestMap(
-	prs []*models.GithubPullRequest,
-	branches []*models.Branch,
-	remotes []*models.Remote,
-) map[string]*models.GithubPullRequest {
-	res := map[string]*models.GithubPullRequest{}
-
-	if len(prs) == 0 {
-		return res
-	}
-
-	remotesToOwnersMap := getRemotesToOwnersMap(remotes)
-
-	if len(remotesToOwnersMap) == 0 {
-		return res
-	}
-
-	// A PR can be identified by two things: the owner e.g. 'jesseduffield' and the
-	// branch name e.g. 'feature/my-feature'. The owner might be different
-	// to the owner of the repo if the PR is from a fork of that repo.
-	type prKey struct {
-		owner      string
-		branchName string
-	}
-
-	prByKey := map[prKey]models.GithubPullRequest{}
-
-	for _, pr := range prs {
-		prByKey[prKey{owner: pr.UserName(), branchName: pr.BranchName()}] = *pr
-	}
-
-	for _, branch := range branches {
-		if !branch.IsTrackingRemote() {
-			continue
-		}
-
-		// TODO: support branches whose UpstreamRemote contains a full git
-		// URL rather than just a remote name.
-		owner, foundRemoteOwner := remotesToOwnersMap[branch.UpstreamRemote]
-		if !foundRemoteOwner {
-			continue
-		}
-
-		pr, hasPr := prByKey[prKey{owner: owner, branchName: branch.UpstreamBranch}]
-
-		if !hasPr {
-			continue
-		}
-
-		res[branch.Name] = &pr
-	}
-
-	return res
-}
-
-func getRemotesToOwnersMap(remotes []*models.Remote) map[string]string {
-	res := map[string]string{}
-	for _, remote := range remotes {
-		if len(remote.Urls) == 0 {
-			continue
-		}
-
-		if !strings.Contains(remote.Urls[0], ":") {
-			continue
-		}
-
-		res[remote.Name] = getRepoInfoFromURL(remote.Urls[0]).Owner
-	}
-	return res
-}
-
-type RepoInformation struct {
-	Owner      string
-	Repository string
-}
-
-// TODO: move this into hosting_service.go
-func getRepoInfoFromURL(url string) RepoInformation {
-	isHTTP := strings.HasPrefix(url, "http")
-
-	if isHTTP {
-		splits := strings.Split(url, "/")
-		owner := strings.Join(splits[3:len(splits)-1], "/")
-		repo := strings.TrimSuffix(splits[len(splits)-1], ".git")
-
-		return RepoInformation{
-			Owner:      owner,
-			Repository: repo,
-		}
-	}
-
-	tmpSplit := strings.Split(url, ":")
-	splits := strings.Split(tmpSplit[1], "/")
-	owner := strings.Join(splits[0:len(splits)-1], "/")
-	repo := strings.TrimSuffix(splits[len(splits)-1], ".git")
-
-	return RepoInformation{
-		Owner:      owner,
-		Repository: repo,
-	}
-}
-
-// return <installed>, <valid version>
-func (self *GitHubCommands) DetermineGitHubCliState() (bool, bool) {
-	output, err := self.cmd.New([]string{"gh", "--version"}).DontLog().RunWithOutput()
-	if err != nil {
-		// assuming a failure here means that it's not installed
-		return false, false
-	}
-
-	if !isGhVersionValid(output) {
-		return true, false
-	}
-
-	return true, true
-}
-
-func isGhVersionValid(versionStr string) bool {
-	// output should be something like:
-	// gh version 2.0.0 (2021-08-23)
-	// https://github.com/cli/cli/releases/tag/v2.0.0
-	re := regexp.MustCompile(`[^\d]+([\d\.]+)`)
-	matches := re.FindStringSubmatch(versionStr)
-
-	if len(matches) == 0 {
-		return false
-	}
-
-	ghVersion := matches[1]
-	majorVersion, err := strconv.Atoi(ghVersion[0:1])
-	if err != nil {
-		return false
-	}
-	if majorVersion < 2 {
-		return false
-	}
-
-	return true
-}
-
-func (self *GitHubCommands) InGithubRepo() bool {
-	remotes, err := self.repo.Remotes()
-	if err != nil {
-		self.Log.Error(err)
-		return false
-	}
-
-	if len(remotes) == 0 {
-		return false
-	}
-
-	remote := GetMainRemote(remotes)
-
-	if len(remote.Config().URLs) == 0 {
-		return false
-	}
-
-	url := remote.Config().URLs[0]
-	return strings.Contains(url, "github.com")
-}
-
-func GetMainRemote(remotes []*gogit.Remote) *gogit.Remote {
-	for _, remote := range remotes {
-		if remote.Config().Name == "origin" {
-			return remote
-		}
-	}
-
-	// need to sort remotes by name so that this is deterministic
-	return lo.MinBy(remotes, func(a, b *gogit.Remote) bool {
-		return a.Config().Name < b.Config().Name
-	})
-}
-
-func GetSuggestedRemoteName(remotes []*models.Remote) string {
-	if len(remotes) == 0 {
-		return "origin"
-	}
-
-	for _, remote := range remotes {
-		if remote.Name == "origin" {
-			return remote.Name
-		}
-	}
-
-	return remotes[0].Name
-}
-
-func (self *GitHubCommands) GetBaseRepoOwnerAndName() (string, string, error) {
-	remotes, err := self.repo.Remotes()
-	if err != nil {
-		return "", "", err
-	}
-
-	if len(remotes) == 0 {
-		return "", "", fmt.Errorf("No remotes found")
-	}
-
-	firstRemote := remotes[0]
-	if len(firstRemote.Config().URLs) == 0 {
-		return "", "", fmt.Errorf("No URLs found for remote")
-	}
-
-	url := firstRemote.Config().URLs[0]
-
-	repoInfo := getRepoInfoFromURL(url)
-
-	return repoInfo.Owner, repoInfo.Repository, nil
-}
--- a/pkg/commands/git_commands/hosting_service.go
+++ b/pkg/commands/git_commands/hosting_service.go
@@ -1,34 +0,0 @@
-package git_commands
-
-import "github.com/jesseduffield/lazygit/pkg/commands/hosting_service"
-
-// a hosting service is something like github, gitlab, bitbucket etc
-type HostingService struct {
-	*GitCommon
-}
-
-func NewHostingServiceCommand(gitCommon *GitCommon) *HostingService {
-	return &HostingService{
-		GitCommon: gitCommon,
-	}
-}
-
-func (self *HostingService) GetPullRequestURL(from string, to string) (string, error) {
-	return self.getHostingServiceMgr(self.config.GetRemoteURL()).GetPullRequestURL(from, to)
-}
-
-func (self *HostingService) GetCommitURL(commitSha string) (string, error) {
-	return self.getHostingServiceMgr(self.config.GetRemoteURL()).GetCommitURL(commitSha)
-}
-
-func (self *HostingService) GetRepoNameFromRemoteURL(remoteURL string) (string, error) {
-	return self.getHostingServiceMgr(remoteURL).GetRepoName()
-}
-
-// getting this on every request rather than storing it in state in case our remoteURL changes
-// from one invocation to the next. Note however that we're currently caching config
-// results so we might want to invalidate the cache here if it becomes a problem.
-func (self *HostingService) getHostingServiceMgr(remoteURL string) *hosting_service.HostingServiceMgr {
-	configServices := self.UserConfig.Services
-	return hosting_service.NewHostingServiceMgr(self.Log, self.Tr, remoteURL, configServices)
-}
--- a/pkg/commands/git_commands/main_branches.go
+++ b/pkg/commands/git_commands/main_branches.go
@@ -1,122 +0,0 @@
-package git_commands
-
-import (
-	"strings"
-	"sync"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"github.com/sasha-s/go-deadlock"
-)
-
-type MainBranches struct {
-	// List of main branches configured by the user. Just the bare names.
-	configuredMainBranches []string
-	// Which of these actually exist in the repository. Full ref names, and it
-	// could be either "refs/heads/..." or "refs/remotes/origin/..." depending
-	// on which one exists for a given bare name.
-	existingMainBranches []string
-
-	cmd   oscommands.ICmdObjBuilder
-	mutex *deadlock.Mutex
-}
-
-func NewMainBranches(
-	configuredMainBranches []string,
-	cmd oscommands.ICmdObjBuilder,
-) *MainBranches {
-	return &MainBranches{
-		configuredMainBranches: configuredMainBranches,
-		existingMainBranches:   nil,
-		cmd:                    cmd,
-		mutex:                  &deadlock.Mutex{},
-	}
-}
-
-// Get the list of main branches that exist in the repository. This is a list of
-// full ref names.
-func (self *MainBranches) Get() []string {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-
-	if self.existingMainBranches == nil {
-		self.existingMainBranches = self.determineMainBranches()
-	}
-
-	return self.existingMainBranches
-}
-
-// Return the merge base of the given refName with the closest main branch.
-func (self *MainBranches) GetMergeBase(refName string) string {
-	mainBranches := self.Get()
-	if len(mainBranches) == 0 {
-		return ""
-	}
-
-	// We pass all existing main branches to the merge-base call; git will
-	// return the base commit for the closest one.
-
-	// We ignore errors from this call, since we can't distinguish whether the
-	// error is because one of the main branches has been deleted since the last
-	// call to determineMainBranches, or because the refName has no common
-	// history with any of the main branches. Since the former should happen
-	// very rarely, users must quit and restart lazygit to fix it; the latter is
-	// also not very common, but can totally happen and is not an error.
-
-	output, _ := self.cmd.New(
-		NewGitCmd("merge-base").Arg(refName).Arg(mainBranches...).
-			ToArgv(),
-	).DontLog().RunWithOutput()
-	return ignoringWarnings(output)
-}
-
-func (self *MainBranches) determineMainBranches() []string {
-	var existingBranches []string
-	var wg sync.WaitGroup
-
-	existingBranches = make([]string, len(self.configuredMainBranches))
-
-	for i, branchName := range self.configuredMainBranches {
-		wg.Add(1)
-		go utils.Safe(func() {
-			defer wg.Done()
-
-			// Try to determine upstream of local main branch
-			if ref, err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--symbolic-full-name", branchName+"@{u}").ToArgv(),
-			).DontLog().RunWithOutput(); err == nil {
-				existingBranches[i] = strings.TrimSpace(ref)
-				return
-			}
-
-			// If this failed, a local branch for this main branch doesn't exist or it
-			// has no upstream configured. Try looking for one in the "origin" remote.
-			ref := "refs/remotes/origin/" + branchName
-			if err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
-			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-				return
-			}
-
-			// If this failed as well, try if we have the main branch as a local
-			// branch. This covers the case where somebody is using git locally
-			// for something, but never pushing anywhere.
-			ref = "refs/heads/" + branchName
-			if err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
-			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-			}
-		})
-	}
-
-	wg.Wait()
-
-	existingBranches = lo.Filter(existingBranches, func(branch string, _ int) bool {
-		return branch != ""
-	})
-
-	return existingBranches
-}
--- a/pkg/commands/git_commands/patch.go
+++ b/pkg/commands/git_commands/patch.go
@@ -47,8 +47,8 @@ type ApplyPatchOpts struct {
 	Reverse  bool
 }

-func (self *PatchCommands) ApplyCustomPatch(reverse bool, turnAddedFilesIntoDiffAgainstEmptyFile bool) error {
-	patch := self.PatchBuilder.PatchToApply(reverse, turnAddedFilesIntoDiffAgainstEmptyFile)
+func (self *PatchCommands) ApplyCustomPatch(reverse bool) error {
+	patch := self.PatchBuilder.PatchToApply(reverse)

 	return self.ApplyPatch(patch, ApplyPatchOpts{
 		Index:    true,
@@ -94,7 +94,7 @@ func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, com
 	}

 	// apply each patch in reverse
-	if err := self.ApplyCustomPatch(true, true); err != nil {
+	if err := self.ApplyCustomPatch(true); err != nil {
 		_ = self.rebase.AbortRebase()
 		return err
 	}
@@ -123,7 +123,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 		}

 		// apply each patch forward
-		if err := self.ApplyCustomPatch(false, false); err != nil {
+		if err := self.ApplyCustomPatch(false); err != nil {
 			// Don't abort the rebase here; this might cause conflicts, so give
 			// the user a chance to resolve them
 			return err
@@ -172,7 +172,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 	}

 	// apply each patch in reverse
-	if err := self.ApplyCustomPatch(true, true); err != nil {
+	if err := self.ApplyCustomPatch(true); err != nil {
 		_ = self.rebase.AbortRebase()
 		return err
 	}
@@ -228,7 +228,7 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 		return err
 	}

-	if err := self.ApplyCustomPatch(true, true); err != nil {
+	if err := self.ApplyCustomPatch(true); err != nil {
 		if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
 			_ = self.rebase.AbortRebase()
 		}
@@ -282,7 +282,7 @@ func (self *PatchCommands) PullPatchIntoNewCommit(
 		return err
 	}

-	if err := self.ApplyCustomPatch(true, true); err != nil {
+	if err := self.ApplyCustomPatch(true); err != nil {
 		_ = self.rebase.AbortRebase()
 		return err
 	}
--- a/pkg/commands/git_commands/rebase.go
+++ b/pkg/commands/git_commands/rebase.go
@@ -67,47 +67,42 @@ func (self *RebaseCommands) RewordCommitInEditor(commits []*models.Commit, index
 	}), nil
 }

-func (self *RebaseCommands) ResetCommitAuthor(commits []*models.Commit, start, end int) error {
-	return self.GenericAmend(commits, start, end, func(_ *models.Commit) error {
+func (self *RebaseCommands) ResetCommitAuthor(commits []*models.Commit, index int) error {
+	return self.GenericAmend(commits, index, func() error {
 		return self.commit.ResetAuthor()
 	})
 }

-func (self *RebaseCommands) SetCommitAuthor(commits []*models.Commit, start, end int, value string) error {
-	return self.GenericAmend(commits, start, end, func(_ *models.Commit) error {
+func (self *RebaseCommands) SetCommitAuthor(commits []*models.Commit, index int, value string) error {
+	return self.GenericAmend(commits, index, func() error {
 		return self.commit.SetAuthor(value)
 	})
 }

-func (self *RebaseCommands) AddCommitCoAuthor(commits []*models.Commit, start, end int, value string) error {
-	return self.GenericAmend(commits, start, end, func(commit *models.Commit) error {
-		return self.commit.AddCoAuthor(commit.Hash, value)
+func (self *RebaseCommands) AddCommitCoAuthor(commits []*models.Commit, index int, value string) error {
+	return self.GenericAmend(commits, index, func() error {
+		return self.commit.AddCoAuthor(commits[index].Hash, value)
 	})
 }

-func (self *RebaseCommands) GenericAmend(commits []*models.Commit, start, end int, f func(commit *models.Commit) error) error {
-	if start == end && models.IsHeadCommit(commits, start) {
+func (self *RebaseCommands) GenericAmend(commits []*models.Commit, index int, f func() error) error {
+	if models.IsHeadCommit(commits, index) {
 		// we've selected the top commit so no rebase is required
-		return f(commits[start])
+		return f()
 	}

-	err := self.BeginInteractiveRebaseForCommitRange(commits, start, end, false)
+	err := self.BeginInteractiveRebaseForCommit(commits, index, false)
 	if err != nil {
 		return err
 	}

-	for commitIndex := end; commitIndex >= start; commitIndex-- {
-		err = f(commits[commitIndex])
-		if err != nil {
-			return err
-		}
-
-		if err := self.ContinueRebase(); err != nil {
-			return err
-		}
+	// now the selected commit should be our head so we'll amend it
+	err = f()
+	if err != nil {
+		return err
 	}

-	return nil
+	return self.ContinueRebase()
 }

 func (self *RebaseCommands) MoveCommitsDown(commits []*models.Commit, startIdx int, endIdx int) error {
@@ -386,13 +381,7 @@ func (self *RebaseCommands) SquashAllAboveFixupCommits(commit *models.Commit) er
 func (self *RebaseCommands) BeginInteractiveRebaseForCommit(
 	commits []*models.Commit, commitIndex int, keepCommitsThatBecomeEmpty bool,
 ) error {
-	return self.BeginInteractiveRebaseForCommitRange(commits, commitIndex, commitIndex, keepCommitsThatBecomeEmpty)
-}
-
-func (self *RebaseCommands) BeginInteractiveRebaseForCommitRange(
-	commits []*models.Commit, start, end int, keepCommitsThatBecomeEmpty bool,
-) error {
-	if len(commits)-1 < end {
+	if len(commits)-1 < commitIndex {
 		return errors.New("index outside of range of commits")
 	}

@@ -403,17 +392,14 @@ func (self *RebaseCommands) BeginInteractiveRebaseForCommitRange(
 		return errors.New(self.Tr.DisabledForGPG)
 	}

-	changes := make([]daemon.ChangeTodoAction, 0, end-start)
-	for commitIndex := end; commitIndex >= start; commitIndex-- {
-		changes = append(changes, daemon.ChangeTodoAction{
-			Hash:      commits[commitIndex].Hash,
-			NewAction: todo.Edit,
-		})
-	}
+	changes := []daemon.ChangeTodoAction{{
+		Hash:      commits[commitIndex].Hash,
+		NewAction: todo.Edit,
+	}}
 	self.os.LogCommand(logTodoChanges(changes), false)

 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
-		baseHashOrRoot:             getBaseHashOrRoot(commits, end+1),
+		baseHashOrRoot:             getBaseHashOrRoot(commits, commitIndex+1),
 		overrideEditor:             true,
 		keepCommitsThatBecomeEmpty: keepCommitsThatBecomeEmpty,
 		instruction:                daemon.NewChangeTodoActionsInstruction(changes),
--- a/pkg/commands/git_commands/rebase_test.go
+++ b/pkg/commands/git_commands/rebase_test.go
@@ -67,6 +67,7 @@ func TestRebaseRebaseBranch(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildRebaseCommands(commonDeps{runner: s.runner, gitVersion: s.gitVersion})
 			s.test(instance.RebaseBranch(s.arg))
@@ -88,6 +89,7 @@ func TestRebaseSkipEditorCommand(t *testing.T) {
 			`^GIT_SEQUENCE_EDITOR=.*$`,
 			"^" + daemon.DaemonKindEnvKey + "=" + strconv.Itoa(int(daemon.DaemonKindExitImmediately)) + "$",
 		} {
+			regexStr := regexStr
 			foundMatch := lo.ContainsBy(envVars, func(envVar string) bool {
 				return regexp.MustCompile(regexStr).MatchString(envVar)
 			})
@@ -161,6 +163,7 @@ func TestRebaseDiscardOldFileChanges(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildRebaseCommands(commonDeps{
 				runner:     s.runner,
--- a/pkg/commands/git_commands/reflog_commit_loader_test.go
+++ b/pkg/commands/git_commands/reflog_commit_loader_test.go
@@ -176,6 +176,7 @@ func TestGetReflogCommits(t *testing.T) {
 	}

 	for _, scenario := range scenarios {
+		scenario := scenario
 		t.Run(scenario.testName, func(t *testing.T) {
 			builder := &ReflogCommitLoader{
 				Common: utils.NewDummyCommon(),
--- a/pkg/commands/git_commands/repo_paths_test.go
+++ b/pkg/commands/git_commands/repo_paths_test.go
@@ -101,6 +101,7 @@ func TestGetRepoPaths(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.Name, func(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t)
 			cmd := oscommands.NewDummyCmdObjBuilder(runner)
--- a/pkg/commands/git_commands/stash.go
+++ b/pkg/commands/git_commands/stash.go
@@ -121,22 +121,9 @@ func (self *StashCommands) StashUnstagedChanges(message string) error {
 	return nil
 }

-// SaveStagedChanges stashes only the currently staged changes.
+// SaveStagedChanges stashes only the currently staged changes. This takes a few steps
+// shoutouts to Joe on https://stackoverflow.com/questions/14759748/stashing-only-staged-changes-in-git-is-it-possible
 func (self *StashCommands) SaveStagedChanges(message string) error {
-	if self.version.IsAtLeast(2, 35, 0) {
-		return self.cmd.New(NewGitCmd("stash").Arg("push").Arg("--staged").Arg("-m", message).ToArgv()).Run()
-	}
-
-	// Git versions older than 2.35.0 don't support the --staged flag, so we
-	// need to fall back to a more complex solution.
-	// Shoutouts to Joe on https://stackoverflow.com/questions/14759748/stashing-only-staged-changes-in-git-is-it-possible
-	//
-	// Note that this method has a few bugs:
-	// - it fails when there are *only* staged changes
-	// - it fails when staged and unstaged changes within a single file are too close together
-	// We don't bother fixing these, because users can simply update git when
-	// they are affected by these issues.
-
 	// wrap in 'writing', which uses a mutex
 	if err := self.cmd.New(
 		NewGitCmd("stash").Arg("--keep-index").ToArgv(),
--- a/pkg/commands/git_commands/stash_loader_test.go
+++ b/pkg/commands/git_commands/stash_loader_test.go
@@ -47,6 +47,7 @@ func TestGetStashEntries(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)

--- a/pkg/commands/git_commands/stash_test.go
+++ b/pkg/commands/git_commands/stash_test.go
@@ -74,6 +74,7 @@ func TestStashStore(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t).
 				ExpectGitArgs(s.expected, "", nil)
@@ -130,6 +131,7 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			appState := &config.AppState{}
@@ -179,6 +181,7 @@ func TestStashRename(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t).
 				ExpectGitArgs(s.expectedHashCmd, s.hashResult, nil).
--- a/pkg/commands/git_commands/sync.go
+++ b/pkg/commands/git_commands/sync.go
@@ -19,7 +19,6 @@ func NewSyncCommands(gitCommon *GitCommon) *SyncCommands {
 // Push pushes to a branch
 type PushOpts struct {
 	Force          bool
-	ForceWithLease bool
 	UpstreamRemote string
 	UpstreamBranch string
 	SetUpstream    bool
@@ -31,11 +30,10 @@ func (self *SyncCommands) PushCmdObj(task gocui.Task, opts PushOpts) (oscommands
 	}

 	cmdArgs := NewGitCmd("push").
-		ArgIf(opts.Force, "--force").
-		ArgIf(opts.ForceWithLease, "--force-with-lease").
+		ArgIf(opts.Force, "--force-with-lease").
 		ArgIf(opts.SetUpstream, "--set-upstream").
 		ArgIf(opts.UpstreamRemote != "", opts.UpstreamRemote).
-		ArgIf(opts.UpstreamBranch != "", "HEAD:"+opts.UpstreamBranch).
+		ArgIf(opts.UpstreamBranch != "", opts.UpstreamBranch).
 		ToArgv()

 	cmdObj := self.cmd.New(cmdArgs).PromptOnCredentialRequest(task)
--- a/pkg/commands/git_commands/sync_test.go
+++ b/pkg/commands/git_commands/sync_test.go
@@ -18,70 +18,62 @@ func TestSyncPush(t *testing.T) {
 	scenarios := []scenario{
 		{
 			testName: "Push with force disabled",
-			opts:     PushOpts{ForceWithLease: false},
+			opts:     PushOpts{Force: false},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
 				assert.Equal(t, cmdObj.Args(), []string{"git", "push"})
 				assert.NoError(t, err)
 			},
 		},
-		{
-			testName: "Push with force-with-lease enabled",
-			opts:     PushOpts{ForceWithLease: true},
-			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease"})
-				assert.NoError(t, err)
-			},
-		},
 		{
 			testName: "Push with force enabled",
 			opts:     PushOpts{Force: true},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force"})
+				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease"})
 				assert.NoError(t, err)
 			},
 		},
 		{
 			testName: "Push with force disabled, upstream supplied",
 			opts: PushOpts{
-				ForceWithLease: false,
+				Force:          false,
 				UpstreamRemote: "origin",
 				UpstreamBranch: "master",
 			},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "origin", "HEAD:master"})
+				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "origin", "master"})
 				assert.NoError(t, err)
 			},
 		},
 		{
 			testName: "Push with force disabled, setting upstream",
 			opts: PushOpts{
-				ForceWithLease: false,
+				Force:          false,
 				UpstreamRemote: "origin",
 				UpstreamBranch: "master",
 				SetUpstream:    true,
 			},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--set-upstream", "origin", "HEAD:master"})
+				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--set-upstream", "origin", "master"})
 				assert.NoError(t, err)
 			},
 		},
 		{
-			testName: "Push with force-with-lease enabled, setting upstream",
+			testName: "Push with force enabled, setting upstream",
 			opts: PushOpts{
-				ForceWithLease: true,
+				Force:          true,
 				UpstreamRemote: "origin",
 				UpstreamBranch: "master",
 				SetUpstream:    true,
 			},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "HEAD:master"})
+				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "master"})
 				assert.NoError(t, err)
 			},
 		},
 		{
 			testName: "Push with remote branch but no origin",
 			opts: PushOpts{
-				ForceWithLease: true,
+				Force:          true,
 				UpstreamRemote: "",
 				UpstreamBranch: "master",
 				SetUpstream:    true,
@@ -94,6 +86,7 @@ func TestSyncPush(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildSyncCommands(commonDeps{})
 			task := gocui.NewFakeTask()
@@ -131,6 +124,7 @@ func TestSyncFetch(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildSyncCommands(commonDeps{})
 			instance.UserConfig.Git.FetchAll = s.fetchAllConfig
@@ -169,6 +163,7 @@ func TestSyncFetchBackground(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildSyncCommands(commonDeps{})
 			instance.UserConfig.Git.FetchAll = s.fetchAllConfig
--- a/pkg/commands/git_commands/tag_loader_test.go
+++ b/pkg/commands/git_commands/tag_loader_test.go
@@ -44,6 +44,7 @@ func TestGetTags(t *testing.T) {
 	}

 	for _, scenario := range scenarios {
+		scenario := scenario
 		t.Run(scenario.testName, func(t *testing.T) {
 			loader := &TagLoader{
 				Common: utils.NewDummyCommon(),
--- a/pkg/commands/git_commands/working_tree.go
+++ b/pkg/commands/git_commands/working_tree.go
@@ -363,7 +363,7 @@ func (self *WorkingTreeCommands) ResetAndClean() error {
 	return self.RemoveUntrackedFiles()
 }

-// ResetHard runs `git reset --hard`
+// ResetHardHead runs `git reset --hard`
 func (self *WorkingTreeCommands) ResetHard(ref string) error {
 	cmdArgs := NewGitCmd("reset").Arg("--hard", ref).
 		ToArgv()
--- a/pkg/commands/git_commands/working_tree_test.go
+++ b/pkg/commands/git_commands/working_tree_test.go
@@ -61,6 +61,7 @@ func TestWorkingTreeUnstageFile(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
 			s.test(instance.UnStageFile([]string{"test.txt"}, s.reset))
@@ -189,6 +190,7 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, removeFile: s.removeFile})
 			err := instance.DiscardAllFileChanges(s.file)
@@ -304,6 +306,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			appState := &config.AppState{}
@@ -372,6 +375,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			appState := &config.AppState{}
@@ -424,6 +428,7 @@ func TestWorkingTreeCheckoutFile(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})

@@ -454,6 +459,7 @@ func TestWorkingTreeDiscardUnstagedFileChanges(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
 			s.test(instance.DiscardUnstagedFileChanges(s.file))
@@ -481,6 +487,7 @@ func TestWorkingTreeDiscardAnyUnstagedFileChanges(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
 			s.test(instance.DiscardAnyUnstagedFileChanges())
@@ -508,6 +515,7 @@ func TestWorkingTreeRemoveUntrackedFiles(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
 			s.test(instance.RemoveUntrackedFiles())
@@ -537,6 +545,7 @@ func TestWorkingTreeResetHard(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner})
 			s.test(instance.ResetHard(s.ref))
--- a/pkg/commands/git_commands/worktree_loader.go
+++ b/pkg/commands/git_commands/worktree_loader.go
@@ -76,6 +76,8 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 	wg := sync.WaitGroup{}
 	wg.Add(len(worktrees))
 	for _, worktree := range worktrees {
+		worktree := worktree
+
 		go utils.Safe(func() {
 			defer wg.Done()

--- a/pkg/commands/git_commands/worktree_loader_test.go
+++ b/pkg/commands/git_commands/worktree_loader_test.go
@@ -181,6 +181,7 @@ branch refs/heads/mybranch-worktree
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t)
 			fs := afero.NewMemMapFs()
--- a/pkg/commands/git_config/cached_git_config_test.go
+++ b/pkg/commands/git_config/cached_git_config_test.go
@@ -50,6 +50,7 @@ func TestGetBool(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			fake := NewFakeGitConfig(s.mockResponses)
 			real := NewCachedGitConfig(
@@ -86,6 +87,7 @@ func TestGet(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			fake := NewFakeGitConfig(s.mockResponses)
 			real := NewCachedGitConfig(
--- a/pkg/commands/hosting_service/definitions.go
+++ b/pkg/commands/hosting_service/definitions.go
@@ -6,11 +6,7 @@ var defaultUrlRegexStrings = []string{
 	`^(?:https?|ssh)://[^/]+/(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`,
 	`^.*?@.*:(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`,
 }
-
-var (
-	defaultRepoURLTemplate  = "https://{{.webDomain}}/{{.owner}}/{{.repo}}"
-	defaultRepoNameTemplate = "{{.owner}}/{{.repo}}"
-)
+var defaultRepoURLTemplate = "https://{{.webDomain}}/{{.owner}}/{{.repo}}"

 // we've got less type safety using go templates but this lends itself better to
 // users adding custom service definitions in their config
@@ -21,7 +17,6 @@ var githubServiceDef = ServiceDefinition{
 	commitURL:                       "/commit/{{.CommitHash}}",
 	regexStrings:                    defaultUrlRegexStrings,
 	repoURLTemplate:                 defaultRepoURLTemplate,
-	repoNameTemplate:                defaultRepoNameTemplate,
 }

 var bitbucketServiceDef = ServiceDefinition{
@@ -34,7 +29,6 @@ var bitbucketServiceDef = ServiceDefinition{
 		`^.*@.*:(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`,
 	},
 	repoURLTemplate: defaultRepoURLTemplate,
-	repoNameTemplate: defaultRepoNameTemplate,
 }

 var gitLabServiceDef = ServiceDefinition{
@@ -44,7 +38,6 @@ var gitLabServiceDef = ServiceDefinition{
 	commitURL:                       "/-/commit/{{.CommitHash}}",
 	regexStrings:                    defaultUrlRegexStrings,
 	repoURLTemplate:                 defaultRepoURLTemplate,
-	repoNameTemplate:                defaultRepoNameTemplate,
 }

 var azdoServiceDef = ServiceDefinition{
@@ -57,8 +50,6 @@ var azdoServiceDef = ServiceDefinition{
 		`^https://.*@dev.azure.com/(?P<org>.*?)/(?P<project>.*?)/_git/(?P<repo>.*?)(?:\.git)?$`,
 	},
 	repoURLTemplate: "https://{{.webDomain}}/{{.org}}/{{.project}}/_git/{{.repo}}",
-	// TODO: verify this is actually correct
-	repoNameTemplate: "{{.org}}/{{.project}}/{{.repo}}",
 }

 var bitbucketServerServiceDef = ServiceDefinition{
@@ -71,8 +62,6 @@ var bitbucketServerServiceDef = ServiceDefinition{
 		`^https://.*/scm/(?P<project>.*)/(?P<repo>.*?)(?:\.git)?$`,
 	},
 	repoURLTemplate: "https://{{.webDomain}}/projects/{{.project}}/repos/{{.repo}}",
-	// TODO: verify this is actually correct
-	repoNameTemplate: "{{.project}}/{{.repo}}",
 }

 var giteaServiceDef = ServiceDefinition{
--- a/pkg/commands/hosting_service/hosting_service.go
+++ b/pkg/commands/hosting_service/hosting_service.go
@@ -62,18 +62,6 @@ func (self *HostingServiceMgr) GetCommitURL(commitHash string) (string, error) {
 	return pullRequestURL, nil
 }

-// e.g. 'jesseduffield/lazygit'
-func (self *HostingServiceMgr) GetRepoName() (string, error) {
-	gitService, err := self.getService()
-	if err != nil {
-		return "", err
-	}
-
-	repoName := gitService.repoName
-
-	return repoName, nil
-}
-
 func (self *HostingServiceMgr) getService() (*Service, error) {
 	serviceDomain, err := self.getServiceDomain(self.remoteURL)
 	if err != nil {
@@ -85,14 +73,8 @@ func (self *HostingServiceMgr) getService() (*Service, error) {
 		return nil, err
 	}

-	repoName, err := serviceDomain.serviceDefinition.getRepoNameFromRemoteURL(self.remoteURL)
-	if err != nil {
-		return nil, err
-	}
-
 	return &Service{
 		repoURL:           repoURL,
-		repoName:          repoName,
 		ServiceDefinition: serviceDomain.serviceDefinition,
 	}, nil
 }
@@ -164,44 +146,23 @@ type ServiceDefinition struct {

 	// can expect 'webdomain' to be passed in. Otherwise, you get to pick what we match in the regex
 	repoURLTemplate string
-	repoNameTemplate string
 }

 func (self ServiceDefinition) getRepoURLFromRemoteURL(url string, webDomain string) (string, error) {
-	matches, err := self.parseRemoteUrl(url)
-	if err != nil {
-		return "", err
-	}
-
-	matches["webDomain"] = webDomain
-	return utils.ResolvePlaceholderString(self.repoURLTemplate, matches), nil
-}
-
-func (self ServiceDefinition) getRepoNameFromRemoteURL(url string) (string, error) {
-	matches, err := self.parseRemoteUrl(url)
-	if err != nil {
-		return "", err
-	}
-
-	return utils.ResolvePlaceholderString(self.repoNameTemplate, matches), nil
-}
-
-func (self ServiceDefinition) parseRemoteUrl(url string) (map[string]string, error) {
 	for _, regexStr := range self.regexStrings {
 		re := regexp.MustCompile(regexStr)
-		matches := utils.FindNamedMatches(re, url)
-		if matches != nil {
-			return matches, nil
+		input := utils.FindNamedMatches(re, url)
+		if input != nil {
+			input["webDomain"] = webDomain
+			return utils.ResolvePlaceholderString(self.repoURLTemplate, input), nil
 		}
 	}

-	return nil, errors.New("Failed to parse repo information from url")
+	return "", errors.New("Failed to parse repo information from url")
 }

 type Service struct {
 	repoURL string
-	// e.g. 'jesseduffield/lazygit'
-	repoName string
 	ServiceDefinition
 }

--- a/pkg/commands/hosting_service/hosting_service_test.go
+++ b/pkg/commands/hosting_service/hosting_service_test.go
@@ -413,10 +413,11 @@ func TestGetPullRequestURL(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			tr := i18n.EnglishTranslationSet()
 			log := &fakes.FakeFieldLogger{}
-			hostingServiceMgr := NewHostingServiceMgr(log, tr, s.remoteUrl, s.configServiceDomains)
+			hostingServiceMgr := NewHostingServiceMgr(log, &tr, s.remoteUrl, s.configServiceDomains)
 			s.test(hostingServiceMgr.GetPullRequestURL(s.from, s.to))
 			log.AssertErrors(t, s.expectedLoggedErrors)
 		})
--- a/pkg/commands/models/branch.go
+++ b/pkg/commands/models/branch.go
@@ -1,9 +1,6 @@
 package models

-import (
-	"fmt"
-	"sync/atomic"
-)
+import "fmt"

 // Branch : A git branch
 // duplicating this for now
@@ -13,14 +10,10 @@ type Branch struct {
 	DisplayName string
 	// indicator of when the branch was last checked out e.g. '2d', '3m'
 	Recency string
-	// how many commits ahead we are from the remote branch (how many commits we can push, assuming we push to our tracked remote branch)
-	AheadForPull string
+	// how many commits ahead we are from the remote branch (how many commits we can push)
+	Pushables string
 	// how many commits behind we are from the remote branch (how many commits we can pull)
-	BehindForPull string
-	// how many commits ahead we are from the branch we're pushing to (which might not be the same as our upstream branch in a triangular workflow)
-	AheadForPush string
-	// how many commits behind we are from the branch we're pushing to (which might not be the same as our upstream branch in a triangular workflow)
-	BehindForPush string
+	Pullables string
 	// whether the remote branch is 'gone' i.e. we're tracking a remote branch that has been deleted
 	UpstreamGone bool
 	// whether this is the current branch. Exactly one branch should have this be true
@@ -35,11 +28,6 @@ type Branch struct {
 	Subject string
 	// commit hash
 	CommitHash string
-
-	// How far we have fallen behind our base branch. 0 means either not
-	// determined yet, or up to date with base branch. (We don't need to
-	// distinguish the two, as we don't draw anything in both cases.)
-	BehindBaseBranch atomic.Int32
 }

 func (b *Branch) FullRefName() string {
@@ -92,30 +80,26 @@ func (b *Branch) IsTrackingRemote() bool {
 // we know that the remote branch is not stored locally based on our pushable/pullable
 // count being question marks.
 func (b *Branch) RemoteBranchStoredLocally() bool {
-	return b.IsTrackingRemote() && b.AheadForPull != "?" && b.BehindForPull != "?"
+	return b.IsTrackingRemote() && b.Pushables != "?" && b.Pullables != "?"
 }

 func (b *Branch) RemoteBranchNotStoredLocally() bool {
-	return b.IsTrackingRemote() && b.AheadForPull == "?" && b.BehindForPull == "?"
+	return b.IsTrackingRemote() && b.Pushables == "?" && b.Pullables == "?"
 }

 func (b *Branch) MatchesUpstream() bool {
-	return b.RemoteBranchStoredLocally() && b.AheadForPull == "0" && b.BehindForPull == "0"
+	return b.RemoteBranchStoredLocally() && b.Pushables == "0" && b.Pullables == "0"
 }

-func (b *Branch) IsAheadForPull() bool {
-	return b.RemoteBranchStoredLocally() && b.AheadForPull != "0"
+func (b *Branch) HasCommitsToPush() bool {
+	return b.RemoteBranchStoredLocally() && b.Pushables != "0"
 }

-func (b *Branch) IsBehindForPull() bool {
-	return b.RemoteBranchStoredLocally() && b.BehindForPull != "0"
-}
-
-func (b *Branch) IsBehindForPush() bool {
-	return b.RemoteBranchStoredLocally() && b.BehindForPush != "0"
+func (b *Branch) HasCommitsToPull() bool {
+	return b.RemoteBranchStoredLocally() && b.Pullables != "0"
 }

 // for when we're in a detached head state
 func (b *Branch) IsRealBranch() bool {
-	return b.AheadForPull != "" && b.BehindForPull != ""
+	return b.Pushables != "" && b.Pullables != ""
 }
--- a/pkg/commands/models/github.go
+++ b/pkg/commands/models/github.go
@@ -1,24 +0,0 @@
-package models
-
-// TODO: see if I need to store the head repo name in case it differs from the base repo
-type GithubPullRequest struct {
-	HeadRefName         string                `json:"headRefName"`
-	Number              int                   `json:"number"`
-	State               string                `json:"state"` // "MERGED", "OPEN", "CLOSED"
-	Url                 string                `json:"url"`
-	HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"`
-}
-
-func (pr *GithubPullRequest) UserName() string {
-	// e.g. 'jesseduffield'
-	return pr.HeadRepositoryOwner.Login
-}
-
-func (pr *GithubPullRequest) BranchName() string {
-	// e.g. 'feature/my-feature'
-	return pr.HeadRefName
-}
-
-type GithubRepositoryOwner struct {
-	Login string `json:"login"`
-}
--- a/pkg/commands/oscommands/cmd_obj_runner.go
+++ b/pkg/commands/oscommands/cmd_obj_runner.go
@@ -161,7 +161,7 @@ func (self *cmdObjRunner) RunAndProcessLines(cmdObj ICmdObj, onLine func(line st
 	}

 	scanner := bufio.NewScanner(stdoutPipe)
-	scanner.Split(utils.ScanLinesAndTruncateWhenLongerThanBuffer(bufio.MaxScanTokenSize))
+	scanner.Split(bufio.ScanLines)
 	if err := cmd.Start(); err != nil {
 		return err
 	}
@@ -178,11 +178,6 @@ func (self *cmdObjRunner) RunAndProcessLines(cmdObj ICmdObj, onLine func(line st
 		}
 	}

-	if scanner.Err() != nil {
-		_ = Kill(cmd)
-		return scanner.Err()
-	}
-
 	_ = cmd.Wait()

 	self.log.Infof("%s (%s)", cmdObj.ToString(), time.Since(t))
--- a/pkg/commands/oscommands/os.go
+++ b/pkg/commands/oscommands/os.go
@@ -239,13 +239,14 @@ func (c *OSCommand) PipeCommands(cmdObjs ...ICmdObj) error {
 	wg.Add(len(cmds))

 	for _, cmd := range cmds {
+		currentCmd := cmd
 		go utils.Safe(func() {
-			stderr, err := cmd.StderrPipe()
+			stderr, err := currentCmd.StderrPipe()
 			if err != nil {
 				c.Log.Error(err)
 			}

-			if err := cmd.Start(); err != nil {
+			if err := currentCmd.Start(); err != nil {
 				c.Log.Error(err)
 			}

@@ -255,7 +256,7 @@ func (c *OSCommand) PipeCommands(cmdObjs ...ICmdObj) error {
 				}
 			}

-			if err := cmd.Wait(); err != nil {
+			if err := currentCmd.Wait(); err != nil {
 				c.Log.Error(err)
 			}

@@ -302,23 +303,6 @@ func (c *OSCommand) CopyToClipboard(str string) error {
 	return clipboard.WriteAll(str)
 }

-func (c *OSCommand) PasteFromClipboard() (string, error) {
-	var s string
-	var err error
-	if c.UserConfig.OS.CopyToClipboardCmd != "" {
-		cmdStr := c.UserConfig.OS.ReadFromClipboardCmd
-		s, err = c.Cmd.NewShell(cmdStr).RunWithOutput()
-	} else {
-		s, err = clipboard.ReadAll()
-	}
-
-	if err != nil {
-		return "", err
-	}
-
-	return strings.ReplaceAll(s, "\r\n", "\n"), nil
-}
-
 func (c *OSCommand) RemoveFile(path string) error {
 	msg := utils.ResolvePlaceholderString(
 		c.Tr.Log.RemoveFile,
--- a/pkg/commands/patch/patch_builder.go
+++ b/pkg/commands/patch/patch_builder.go
@@ -65,7 +65,7 @@ func (p *PatchBuilder) Start(from, to string, reverse bool, canRebase bool) {
 	p.fileInfoMap = map[string]*fileInfo{}
 }

-func (p *PatchBuilder) PatchToApply(reverse bool, turnAddedFilesIntoDiffAgainstEmptyFile bool) string {
+func (p *PatchBuilder) PatchToApply(reverse bool) string {
 	patch := ""

 	for filename, info := range p.fileInfoMap {
@@ -73,12 +73,7 @@ func (p *PatchBuilder) PatchToApply(reverse bool, turnAddedFilesIntoDiffAgainstE
 			continue
 		}

-		patch += p.RenderPatchForFile(RenderPatchForFileOpts{
-			Filename:                               filename,
-			Plain:                                  true,
-			Reverse:                                reverse,
-			TurnAddedFilesIntoDiffAgainstEmptyFile: turnAddedFilesIntoDiffAgainstEmptyFile,
-		})
+		patch += p.RenderPatchForFile(filename, true, reverse)
 	}

 	return patch
@@ -177,15 +172,8 @@ func (p *PatchBuilder) RemoveFileLineRange(filename string, firstLineIdx, lastLi
 	return nil
 }

-type RenderPatchForFileOpts struct {
-	Filename                               string
-	Plain                                  bool
-	Reverse                                bool
-	TurnAddedFilesIntoDiffAgainstEmptyFile bool
-}
-
-func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {
-	info, err := p.getFileInfo(opts.Filename)
+func (p *PatchBuilder) RenderPatchForFile(filename string, plain bool, reverse bool) string {
+	info, err := p.getFileInfo(filename)
 	if err != nil {
 		p.Log.Error(err)
 		return ""
@@ -195,7 +183,7 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {
 		return ""
 	}

-	if info.mode == WHOLE && opts.Plain {
+	if info.mode == WHOLE && plain {
 		// Use the whole diff (spares us parsing it and then formatting it).
 		// TODO: see if this is actually noticeably faster.
 		// The reverse flag is only for part patches so we're ignoring it here.
@@ -204,12 +192,11 @@ func (p *PatchBuilder) RenderPatchForFile(opts RenderPatchForFileOpts) string {

 	patch := Parse(info.diff).
 		Transform(TransformOpts{
-			Reverse:                                opts.Reverse,
-			TurnAddedFilesIntoDiffAgainstEmptyFile: opts.TurnAddedFilesIntoDiffAgainstEmptyFile,
-			IncludedLineIndices:                    info.includedLineIndices,
+			Reverse:             reverse,
+			IncludedLineIndices: info.includedLineIndices,
 		})

-	if opts.Plain {
+	if plain {
 		return patch.FormatPlain()
 	} else {
 		return patch.FormatView(FormatViewOpts{})
@@ -222,12 +209,7 @@ func (p *PatchBuilder) renderEachFilePatch(plain bool) []string {

 	sort.Strings(filenames)
 	patches := lo.Map(filenames, func(filename string, _ int) string {
-		return p.RenderPatchForFile(RenderPatchForFileOpts{
-			Filename:                               filename,
-			Plain:                                  plain,
-			Reverse:                                false,
-			TurnAddedFilesIntoDiffAgainstEmptyFile: true,
-		})
+		return p.RenderPatchForFile(filename, plain, false)
 	})
 	output := lo.Filter(patches, func(patch string, _ int) bool {
 		return patch != ""
--- a/pkg/commands/patch/patch_test.go
+++ b/pkg/commands/patch/patch_test.go
@@ -509,6 +509,7 @@ func TestTransform(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			lineIndices := ExpandRange(s.firstLineIndex, s.lastLineIndex)

@@ -565,6 +566,7 @@ func TestParseAndFormatPlain(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			// here we parse the patch, then format it, and ensure the result
 			// matches the original patch. Note that unified diffs allow omitting
@@ -602,6 +604,7 @@ func TestLineNumberOfLine(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			for i, idx := range s.indexes {
 				patch := Parse(s.patchStr)
@@ -630,6 +633,7 @@ func TestGetNextStageableLineIndex(t *testing.T) {
 	}

 	for _, s := range scenarios {
+		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			for i, idx := range s.indexes {
 				patch := Parse(s.patchStr)
--- a/pkg/commands/patch/transform.go
+++ b/pkg/commands/patch/transform.go
@@ -1,10 +1,6 @@
 package patch

-import (
-	"strings"
-
-	"github.com/samber/lo"
-)
+import "github.com/samber/lo"

 type patchTransformer struct {
 	patch *Patch
@@ -26,13 +22,6 @@ type TransformOpts struct {
 	// information it needs to cleanly apply patches
 	FileNameOverride string

-	// Custom patches tend to work better when treating new files as diffs
-	// against an empty file. The only case where we need this to be false is
-	// when moving a custom patch to an earlier commit; in that case the patch
-	// command would fail with the error "file does not exist in index" if we
-	// treat it as a diff against an empty file.
-	TurnAddedFilesIntoDiffAgainstEmptyFile bool
-
 	// The indices of lines that should be included in the patch.
 	IncludedLineIndices []int
 }
@@ -72,18 +61,6 @@ func (self *patchTransformer) transformHeader() []string {
 			"--- a/" + self.opts.FileNameOverride,
 			"+++ b/" + self.opts.FileNameOverride,
 		}
-	} else if self.opts.TurnAddedFilesIntoDiffAgainstEmptyFile {
-		result := make([]string, 0, len(self.patch.header))
-		for idx, line := range self.patch.header {
-			if strings.HasPrefix(line, "new file mode") {
-				continue
-			}
-			if line == "--- /dev/null" && strings.HasPrefix(self.patch.header[idx+1], "+++ b/") {
-				line = "--- a/" + self.patch.header[idx+1][6:]
-			}
-			result = append(result, line)
-		}
-		return result
 	} else {
 		return self.patch.header
 	}
--- a/pkg/config/editor_presets.go
+++ b/pkg/config/editor_presets.go
@@ -1,7 +1,5 @@
 package config

-import "os"
-
 func GetEditTemplate(osConfig *OSConfig, guessDefaultEditor func() string) (string, bool) {
 	preset := getPreset(osConfig, guessDefaultEditor)
 	template := osConfig.Edit
@@ -44,11 +42,9 @@ type editPreset struct {
 	editAtLineTemplate        string
 	editAtLineAndWaitTemplate string
 	openDirInEditorTemplate   string
-	suspend                   func() bool
+	suspend                   bool
 }

-func returnBool(a bool) func() bool { return (func() bool { return a }) }
-
 // IF YOU ADD A PRESET TO THIS FUNCTION YOU MUST UPDATE THE `Supported presets` SECTION OF docs/Config.md
 func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset {
 	presets := map[string]*editPreset{
@@ -56,15 +52,12 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 		"vim":  standardTerminalEditorPreset("vim"),
 		"nvim": standardTerminalEditorPreset("nvim"),
 		"nvim-remote": {
-			editTemplate:       `[ -z "$NVIM" ] && (nvim -- {{filename}}) || (nvim --server "$NVIM" --remote-send "q" && nvim --server "$NVIM" --remote-tab {{filename}})`,
-			editAtLineTemplate: `[ -z "$NVIM" ] && (nvim +{{line}} -- {{filename}}) || (nvim --server "$NVIM" --remote-send "q" &&  nvim --server "$NVIM" --remote-tab {{filename}} && nvim --server "$NVIM" --remote-send ":{{line}}<CR>")`,
+			editTemplate:       `nvim --server "$NVIM" --remote-tab {{filename}}`,
+			editAtLineTemplate: `nvim --server "$NVIM" --remote-tab {{filename}}; [ -z "$NVIM" ] || nvim --server "$NVIM" --remote-send ":{{line}}<CR>"`,
 			// No remote-wait support yet. See https://github.com/neovim/neovim/pull/17856
 			editAtLineAndWaitTemplate: `nvim +{{line}} {{filename}}`,
-			openDirInEditorTemplate:   `[ -z "$NVIM" ] && (nvim -- {{dir}}) || (nvim --server "$NVIM" --remote-send "q" && nvim --server "$NVIM" --remote-tab {{dir}})`,
-			suspend: func() bool {
-				_, ok := os.LookupEnv("NVIM")
-				return !ok
-			},
+			openDirInEditorTemplate:   `nvim --server "$NVIM" --remote-tab {{dir}}`,
+			suspend:                   false,
 		},
 		"lvim":    standardTerminalEditorPreset("lvim"),
 		"emacs":   standardTerminalEditorPreset("emacs"),
@@ -76,42 +69,42 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 			editAtLineTemplate:        "helix -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "helix -- {{filename}}:{{line}}",
 			openDirInEditorTemplate:   "helix -- {{dir}}",
-			suspend:                   returnBool(true),
+			suspend:                   true,
 		},
 		"helix (hx)": {
 			editTemplate:              "hx -- {{filename}}",
 			editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
 			openDirInEditorTemplate:   "hx -- {{dir}}",
-			suspend:                   returnBool(true),
+			suspend:                   true,
 		},
 		"vscode": {
 			editTemplate:              "code --reuse-window -- {{filename}}",
 			editAtLineTemplate:        "code --reuse-window --goto -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "code --reuse-window --goto --wait -- {{filename}}:{{line}}",
 			openDirInEditorTemplate:   "code -- {{dir}}",
-			suspend:                   returnBool(false),
+			suspend:                   false,
 		},
 		"sublime": {
 			editTemplate:              "subl -- {{filename}}",
 			editAtLineTemplate:        "subl -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "subl --wait -- {{filename}}:{{line}}",
 			openDirInEditorTemplate:   "subl -- {{dir}}",
-			suspend:                   returnBool(false),
+			suspend:                   false,
 		},
 		"bbedit": {
 			editTemplate:              "bbedit -- {{filename}}",
 			editAtLineTemplate:        "bbedit +{{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "bbedit +{{line}} --wait -- {{filename}}",
 			openDirInEditorTemplate:   "bbedit -- {{dir}}",
-			suspend:                   returnBool(false),
+			suspend:                   false,
 		},
 		"xcode": {
 			editTemplate:              "xed -- {{filename}}",
 			editAtLineTemplate:        "xed --line {{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "xed --line {{line}} --wait -- {{filename}}",
 			openDirInEditorTemplate:   "xed -- {{dir}}",
-			suspend:                   returnBool(false),
+			suspend:                   false,
 		},
 	}

@@ -148,7 +141,7 @@ func standardTerminalEditorPreset(editor string) *editPreset {
 		editAtLineTemplate:        editor + " +{{line}} -- {{filename}}",
 		editAtLineAndWaitTemplate: editor + " +{{line}} -- {{filename}}",
 		openDirInEditorTemplate:   editor + " -- {{dir}}",
-		suspend:                   returnBool(true),
+		suspend:                   true,
 	}
 }

@@ -156,5 +149,5 @@ func getEditInTerminal(osConfig *OSConfig, preset *editPreset) bool {
 	if osConfig.SuspendOnEdit != nil {
 		return *osConfig.SuspendOnEdit
 	}
-	return preset.suspend()
+	return preset.suspend
 }
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -19,9 +19,12 @@ type UserConfig struct {
 	ConfirmOnQuit bool `yaml:"confirmOnQuit"`
 	// If true, exit Lazygit when the user presses escape in a context where there is nothing to cancel/close
 	QuitOnTopLevelReturn bool `yaml:"quitOnTopLevelReturn"`
+	// Keybindings
+	Keybinding KeybindingConfig `yaml:"keybinding"`
 	// Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc
 	OS OSConfig `yaml:"os,omitempty"`
 	// If true, don't display introductory popups upon opening Lazygit.
+	// Lazygit sets this to true upon first runninng the program so that you don't see introductory popups every time you open the program.
 	DisableStartupPopups bool `yaml:"disableStartupPopups"`
 	// User-configured commands that can be invoked from within Lazygit
 	CustomCommands []CustomCommand `yaml:"customCommands" jsonschema:"uniqueItems=true"`
@@ -35,8 +38,6 @@ type UserConfig struct {
 	NotARepository string `yaml:"notARepository" jsonschema:"enum=prompt,enum=create,enum=skip,enum=quit"`
 	// If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit.
 	PromptToReturnFromSubprocess bool `yaml:"promptToReturnFromSubprocess"`
-	// Keybindings
-	Keybinding KeybindingConfig `yaml:"keybinding"`
 }

 type RefresherConfig struct {
@@ -77,9 +78,6 @@ type GuiConfig struct {
 	SidePanelWidth float64 `yaml:"sidePanelWidth" jsonschema:"maximum=1,minimum=0"`
 	// If true, increase the height of the focused side window; creating an accordion effect.
 	ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"`
-	// The weight of the expanded side panel, relative to the other panels. 2 means
-	// twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.
-	ExpandedSidePanelWeight int `yaml:"expandedSidePanelWeight"`
 	// Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split.
 	// Options are:
 	// - 'horizontal': split the window horizontally
@@ -125,17 +123,8 @@ type GuiConfig struct {
 	NerdFontsVersion string `yaml:"nerdFontsVersion" jsonschema:"enum=2,enum=3,enum="`
 	// If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
 	ShowFileIcons bool `yaml:"showFileIcons"`
-	// Whether to show full author names or their shortened form in the commit graph.
-	// One of 'auto' (default) | 'full' | 'short'
-	// If 'auto', initials will be shown in small windows, and full names - in larger ones.
-	CommitAuthorFormat string `yaml:"commitAuthorFormat" jsonschema:"enum=auto,enum=short,enum=full"`
-	// Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
-	CommitHashLength int `yaml:"commitHashLength" jsonschema:"minimum=0"`
 	// If true, show commit hashes alongside branch names in the branches view.
 	ShowBranchCommitHash bool `yaml:"showBranchCommitHash"`
-	// Whether to show the divergence from the base branch in the branches view.
-	// One of: 'none' | 'onlyArrow'  | 'arrowAndNumber'
-	ShowDivergenceFromBaseBranch string `yaml:"showDivergenceFromBaseBranch" jsonschema:"enum=none,enum=onlyArrow,enum=arrowAndNumber"`
 	// Height of the command log view
 	CommandLogSize int `yaml:"commandLogSize" jsonschema:"minimum=0"`
 	// Whether to split the main window when viewing file changes.
@@ -179,8 +168,6 @@ type ThemeConfig struct {
 	// Background color of selected line.
 	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
 	SelectedLineBgColor []string `yaml:"selectedLineBgColor" jsonschema:"minItems=1,uniqueItems=true"`
-	// Background color of selected line when view doesn't have focus.
-	InactiveViewSelectedLineBgColor []string `yaml:"inactiveViewSelectedLineBgColor" jsonschema:"minItems=1,uniqueItems=true"`
 	// Foreground color of copied commit
 	CherryPickedCommitFgColor []string `yaml:"cherryPickedCommitFgColor" jsonschema:"minItems=1,uniqueItems=true"`
 	// Background color of copied commit
@@ -233,8 +220,6 @@ type GitConfig struct {
 	// If true, do not allow force pushes
 	DisableForcePushing bool `yaml:"disableForcePushing"`
 	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
-	CommitPrefix *CommitPrefixConfig `yaml:"commitPrefix"`
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
 	CommitPrefixes map[string]CommitPrefixConfig `yaml:"commitPrefixes"`
 	// If true, parse emoji strings in commit messages e.g. render :rocket: as 🚀
 	// (This should really be under 'gui', not 'git')
@@ -244,8 +229,6 @@ type GitConfig struct {
 	// When copying commit hashes to the clipboard, truncate them to this
 	// length. Set to 40 to disable truncation.
 	TruncateCopiedCommitHashesTo int `yaml:"truncateCopiedCommitHashesTo"`
-	// If true and if if `gh` is installed and on version >=2, we will use `gh` to display pull requests against branches.
-	EnableGithubCli bool `yaml:"enableGithubCli"`
 }

 type PagerType string
@@ -265,7 +248,7 @@ type PagingConfig struct {
 	// diff-so-fancy
 	// delta --dark --paging=never
 	// ydiff -p cat -s --wrap --width={{columnWidth}}
-	Pager PagerType `yaml:"pager"`
+	Pager PagerType `yaml:"pager" jsonschema:"minLength=1"`
 	// If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
 	UseConfig bool `yaml:"useConfig"`
 	// e.g. 'difft --color=always'
@@ -307,9 +290,9 @@ type LogConfig struct {

 type CommitPrefixConfig struct {
 	// pattern to match on. E.g. for 'feature/AB-123' to match on the AB-123 use "^\\w+\\/(\\w+-\\w+).*"
-	Pattern string `yaml:"pattern" jsonschema:"example=^\\w+\\/(\\w+-\\w+).*"`
+	Pattern string `yaml:"pattern" jsonschema:"example=^\\w+\\/(\\w+-\\w+).*,minLength=1"`
 	// Replace directive. E.g. for 'feature/AB-123' to start the commit message with 'AB-123 ' use "[$1] "
-	Replace string `yaml:"replace" jsonschema:"example=[$1]"`
+	Replace string `yaml:"replace" jsonschema:"example=[$1] ,minLength=1"`
 }

 type UpdateConfig struct {
@@ -567,12 +550,8 @@ type OSConfig struct {
 	OpenLinkCommand string `yaml:"openLinkCommand,omitempty"`

 	// CopyToClipboardCmd is the command for copying to clipboard.
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
+	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-clipboard
 	CopyToClipboardCmd string `yaml:"copyToClipboardCmd,omitempty"`
-
-	// ReadFromClipboardCmd is the command for reading the clipboard.
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
-	ReadFromClipboardCmd string `yaml:"readFromClipboardCmd,omitempty"`
 }

 type CustomCommandAfterHook struct {
@@ -598,8 +577,6 @@ type CustomCommand struct {
 	Stream bool `yaml:"stream"`
 	// If true, show the command's output in a popup within Lazygit
 	ShowOutput bool `yaml:"showOutput"`
-	// The title to display in the popup panel if showOutput is true. If left unset, the command will be used as the title.
-	OutputTitle string `yaml:"outputTitle"`
 	// Actions to take after the command has completed
 	After CustomCommandAfterHook `yaml:"after"`
 }
@@ -669,49 +646,43 @@ func GetDefaultConfig() *UserConfig {
 			SkipStashWarning:         false,
 			SidePanelWidth:           0.3333,
 			ExpandFocusedSidePanel:   false,
-			ExpandedSidePanelWeight:  2,
 			MainPanelSplitMode:       "flexible",
 			EnlargedSideViewLocation: "left",
 			Language:                 "auto",
 			TimeFormat:               "02 Jan 06",
 			ShortTimeFormat:          time.Kitchen,
 			Theme: ThemeConfig{
-				ActiveBorderColor:               []string{"green", "bold"},
-				SearchingActiveBorderColor:      []string{"cyan", "bold"},
-				InactiveBorderColor:             []string{"default"},
-				OptionsTextColor:                []string{"blue"},
-				SelectedLineBgColor:             []string{"blue"},
-				InactiveViewSelectedLineBgColor: []string{"bold"},
-				CherryPickedCommitBgColor:       []string{"cyan"},
-				CherryPickedCommitFgColor:       []string{"blue"},
-				MarkedBaseCommitBgColor:         []string{"yellow"},
-				MarkedBaseCommitFgColor:         []string{"blue"},
-				UnstagedChangesColor:            []string{"red"},
-				DefaultFgColor:                  []string{"default"},
+				ActiveBorderColor:          []string{"green", "bold"},
+				SearchingActiveBorderColor: []string{"cyan", "bold"},
+				InactiveBorderColor:        []string{"default"},
+				OptionsTextColor:           []string{"blue"},
+				SelectedLineBgColor:        []string{"blue"},
+				CherryPickedCommitBgColor:  []string{"cyan"},
+				CherryPickedCommitFgColor:  []string{"blue"},
+				MarkedBaseCommitBgColor:    []string{"yellow"},
+				MarkedBaseCommitFgColor:    []string{"blue"},
+				UnstagedChangesColor:       []string{"red"},
+				DefaultFgColor:             []string{"default"},
 			},
-			CommitAuthorFormat:           "auto",
-			CommitLength:                 CommitLengthConfig{Show: true},
-			SkipNoStagedFilesWarning:     false,
-			ShowListFooter:               true,
-			ShowCommandLog:               true,
-			ShowBottomLine:               true,
-			ShowPanelJumps:               true,
-			ShowFileTree:                 true,
-			ShowRandomTip:                true,
-			ShowIcons:                    false,
-			NerdFontsVersion:             "",
-			ShowFileIcons:                true,
-			CommitHashLength:             8,
-			ShowBranchCommitHash:         false,
-			ShowDivergenceFromBaseBranch: "none",
-			CommandLogSize:               8,
-			SplitDiff:                    "auto",
-			SkipRewordInEditorWarning:    false,
-			WindowSize:                   "normal",
-			Border:                       "rounded",
-			AnimateExplosion:             true,
-			PortraitMode:                 "auto",
-			FilterMode:                   "substring",
+			CommitLength:              CommitLengthConfig{Show: true},
+			SkipNoStagedFilesWarning:  false,
+			ShowListFooter:            true,
+			ShowCommandLog:            true,
+			ShowBottomLine:            true,
+			ShowPanelJumps:            true,
+			ShowFileTree:              true,
+			ShowRandomTip:             true,
+			ShowIcons:                 false,
+			NerdFontsVersion:          "",
+			ShowFileIcons:             true,
+			ShowBranchCommitHash:      false,
+			CommandLogSize:            8,
+			SplitDiff:                 "auto",
+			SkipRewordInEditorWarning: false,
+			Border:                    "rounded",
+			AnimateExplosion:          true,
+			PortraitMode:              "auto",
+			FilterMode:                "substring",
 			Spinner: SpinnerConfig{
 				Frames: []string{"|", "/", "-", "\\"},
 				Rate:   50,
@@ -750,7 +721,6 @@ func GetDefaultConfig() *UserConfig {
 			CommitPrefixes:               map[string]CommitPrefixConfig(nil),
 			ParseEmoji:                   false,
 			TruncateCopiedCommitHashesTo: 12,
-			EnableGithubCli:              true,
 		},
 		Refresher: RefresherConfig{
 			RefreshInterval: 10,
@@ -760,14 +730,8 @@ func GetDefaultConfig() *UserConfig {
 			Method: "prompt",
 			Days:   14,
 		},
-		ConfirmOnQuit:                false,
-		QuitOnTopLevelReturn:         false,
-		OS:                           OSConfig{},
-		DisableStartupPopups:         false,
-		CustomCommands:               []CustomCommand(nil),
-		Services:                     map[string]string(nil),
-		NotARepository:               "prompt",
-		PromptToReturnFromSubprocess: true,
+		ConfirmOnQuit:        false,
+		QuitOnTopLevelReturn: false,
 		Keybinding: KeybindingConfig{
 			Universal: KeybindingUniversalConfig{
 				Quit:                         "q",
@@ -934,5 +898,11 @@ func GetDefaultConfig() *UserConfig {
 				CommitMenu: "<c-o>",
 			},
 		},
+		OS:                           OSConfig{},
+		DisableStartupPopups:         false,
+		CustomCommands:               []CustomCommand(nil),
+		Services:                     map[string]string(nil),
+		NotARepository:               "prompt",
+		PromptToReturnFromSubprocess: true,
 	}
 }
--- a/pkg/config/user_config_validation.go
+++ b/pkg/config/user_config_validation.go
@@ -7,17 +7,7 @@ import (
 )

 func (config *UserConfig) Validate() error {
-	if err := validateEnum("gui.commitAuthorFormat", config.Gui.CommitAuthorFormat,
-		[]string{"auto", "short", "full"}); err != nil {
-		return err
-	}
-
-	if err := validateEnum("gui.statusPanelView", config.Gui.StatusPanelView,
-		[]string{"dashboard", "allBranchesLog"}); err != nil {
-		return err
-	}
-	if err := validateEnum("gui.showDivergenceFromBaseBranch", config.Gui.ShowDivergenceFromBaseBranch,
-		[]string{"none", "onlyArrow", "arrowAndNumber"}); err != nil {
+	if err := validateEnum("gui.statusPanelView", config.Gui.StatusPanelView, []string{"dashboard", "allBranchesLog"}); err != nil {
 		return err
 	}
 	return nil
--- a/pkg/gui/background.go
+++ b/pkg/gui/background.go
@@ -1,8 +1,6 @@
 package gui

 import (
-	"fmt"
-	"runtime"
 	"strings"
 	"time"

@@ -30,8 +28,7 @@ func (self *BackgroundRoutineMgr) startBackgroundRoutines() {
 	if userConfig.Git.AutoFetch {
 		fetchInterval := userConfig.Refresher.FetchInterval
 		if fetchInterval > 0 {
-			refreshInterval := self.gui.UserConfig.Refresher.FetchInterval
-			go utils.Safe(func() { self.startBackgroundFetch(refreshInterval) })
+			go utils.Safe(self.startBackgroundFetch)
 		} else {
 			self.gui.c.Log.Errorf(
 				"Value of config option 'refresher.fetchInterval' (%d) is invalid, disabling auto-fetch",
@@ -49,40 +46,21 @@ func (self *BackgroundRoutineMgr) startBackgroundRoutines() {
 				refreshInterval)
 		}
 	}
-
-	if self.gui.Config.GetDebug() {
-		self.goEvery(time.Second*time.Duration(10), self.gui.stopChan, func() error {
-			formatBytes := func(b uint64) string {
-				const unit = 1000
-				if b < unit {
-					return fmt.Sprintf("%d B", b)
-				}
-				div, exp := uint64(unit), 0
-				for n := b / unit; n >= unit; n /= unit {
-					div *= unit
-					exp++
-				}
-				return fmt.Sprintf("%.1f %cB",
-					float64(b)/float64(div), "kMGTPE"[exp])
-			}
-
-			m := runtime.MemStats{}
-			runtime.ReadMemStats(&m)
-			self.gui.c.Log.Infof("Heap memory in use: %s", formatBytes(m.HeapAlloc))
-			return nil
-		})
-	}
 }

-func (self *BackgroundRoutineMgr) startBackgroundFetch(refreshInterval int) {
+func (self *BackgroundRoutineMgr) startBackgroundFetch() {
 	self.gui.waitForIntro.Wait()

 	isNew := self.gui.IsNewRepo
+	userConfig := self.gui.UserConfig
+	if !isNew {
+		time.After(time.Duration(userConfig.Refresher.FetchInterval) * time.Second)
+	}
 	err := self.backgroundFetch()
 	if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
 		_ = self.gui.c.Alert(self.gui.c.Tr.NoAutomaticGitFetchTitle, self.gui.c.Tr.NoAutomaticGitFetchBody)
 	} else {
-		self.goEvery(time.Second*time.Duration(refreshInterval), self.gui.stopChan, func() error {
+		self.goEvery(time.Second*time.Duration(userConfig.Refresher.FetchInterval), self.gui.stopChan, func() error {
 			err := self.backgroundFetch()
 			self.gui.c.Render()
 			return err
@@ -126,7 +104,7 @@ func (self *BackgroundRoutineMgr) goEvery(interval time.Duration, stop chan stru
 func (self *BackgroundRoutineMgr) backgroundFetch() (err error) {
 	err = self.gui.git.Sync.FetchBackground()

-	_ = self.gui.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS, types.PULL_REQUESTS}, Mode: types.ASYNC})
+	_ = self.gui.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS}, Mode: types.ASYNC})

 	return err
 }
--- a/pkg/gui/context.go
+++ b/pkg/gui/context.go
@@ -230,10 +230,6 @@ func (self *ContextMgr) ActivateContext(c types.Context, opts types.OnFocusOpts)
 	self.gui.helpers.Window.SetWindowContext(c)

 	self.gui.helpers.Window.MoveToTopOfWindow(c)
-	oldView := self.gui.c.GocuiGui().CurrentView()
-	if oldView != nil && oldView.Name() != viewName {
-		oldView.HighlightInactive = true
-	}
 	if _, err := self.gui.c.GocuiGui().SetCurrentView(viewName); err != nil {
 		return err
 	}
@@ -391,12 +387,3 @@ func (self *ContextMgr) ContextForKey(key types.ContextKey) types.Context {

 	return nil
 }
-
-func (self *ContextMgr) PopupContexts() []types.Context {
-	self.RLock()
-	defer self.RUnlock()
-
-	return lo.Filter(self.ContextStack, func(context types.Context, _ int) bool {
-		return context.GetKind() == types.TEMPORARY_POPUP || context.GetKind() == types.PERSISTENT_POPUP
-	})
-}
--- a/pkg/gui/context/base_context.go
+++ b/pkg/gui/context/base_context.go
@@ -20,12 +20,11 @@ type BaseContext struct {
 	onFocusFn           onFocusFn
 	onFocusLostFn       onFocusLostFn

-	focusable                   bool
-	transient                   bool
-	hasControlledBounds         bool
-	needsRerenderOnWidthChange  types.NeedsRerenderOnWidthChangeLevel
-	needsRerenderOnHeightChange bool
-	highlightOnFocus            bool
+	focusable                  bool
+	transient                  bool
+	hasControlledBounds        bool
+	needsRerenderOnWidthChange bool
+	highlightOnFocus           bool

 	*ParentContextMgr
 }
@@ -38,16 +37,15 @@ type (
 var _ types.IBaseContext = &BaseContext{}

 type NewBaseContextOpts struct {
-	Kind                        types.ContextKind
-	Key                         types.ContextKey
-	View                        *gocui.View
-	WindowName                  string
-	Focusable                   bool
-	Transient                   bool
-	HasUncontrolledBounds       bool // negating for the sake of making false the default
-	HighlightOnFocus            bool
-	NeedsRerenderOnWidthChange  types.NeedsRerenderOnWidthChangeLevel
-	NeedsRerenderOnHeightChange bool
+	Kind                       types.ContextKind
+	Key                        types.ContextKey
+	View                       *gocui.View
+	WindowName                 string
+	Focusable                  bool
+	Transient                  bool
+	HasUncontrolledBounds      bool // negating for the sake of making false the default
+	HighlightOnFocus           bool
+	NeedsRerenderOnWidthChange bool

 	OnGetOptionsMap func() map[string]string
 }
@@ -58,19 +56,18 @@ func NewBaseContext(opts NewBaseContextOpts) *BaseContext {
 	hasControlledBounds := !opts.HasUncontrolledBounds

 	return &BaseContext{
-		kind:                        opts.Kind,
-		key:                         opts.Key,
-		view:                        opts.View,
-		windowName:                  opts.WindowName,
-		onGetOptionsMap:             opts.OnGetOptionsMap,
-		focusable:                   opts.Focusable,
-		transient:                   opts.Transient,
-		hasControlledBounds:         hasControlledBounds,
-		highlightOnFocus:            opts.HighlightOnFocus,
-		needsRerenderOnWidthChange:  opts.NeedsRerenderOnWidthChange,
-		needsRerenderOnHeightChange: opts.NeedsRerenderOnHeightChange,
-		ParentContextMgr:            &ParentContextMgr{},
-		viewTrait:                   viewTrait,
+		kind:                       opts.Kind,
+		key:                        opts.Key,
+		view:                       opts.View,
+		windowName:                 opts.WindowName,
+		onGetOptionsMap:            opts.OnGetOptionsMap,
+		focusable:                  opts.Focusable,
+		transient:                  opts.Transient,
+		hasControlledBounds:        hasControlledBounds,
+		highlightOnFocus:           opts.HighlightOnFocus,
+		needsRerenderOnWidthChange: opts.NeedsRerenderOnWidthChange,
+		ParentContextMgr:           &ParentContextMgr{},
+		viewTrait:                  viewTrait,
 	}
 }

@@ -133,11 +130,6 @@ func (self *BaseContext) AddMouseKeybindingsFn(fn types.MouseKeybindingsFn) {
 	self.mouseKeybindingsFns = append(self.mouseKeybindingsFns, fn)
 }

-func (self *BaseContext) ClearAllBindingsFn() {
-	self.keybindingsFns = []types.KeybindingsFn{}
-	self.mouseKeybindingsFns = []types.MouseKeybindingsFn{}
-}
-
 func (self *BaseContext) AddOnClickFn(fn func() error) {
 	if fn != nil {
 		self.onClickFn = fn
@@ -201,14 +193,10 @@ func (self *BaseContext) HasControlledBounds() bool {
 	return self.hasControlledBounds
 }

-func (self *BaseContext) NeedsRerenderOnWidthChange() types.NeedsRerenderOnWidthChangeLevel {
+func (self *BaseContext) NeedsRerenderOnWidthChange() bool {
 	return self.needsRerenderOnWidthChange
 }

-func (self *BaseContext) NeedsRerenderOnHeightChange() bool {
-	return self.needsRerenderOnHeightChange
-}
-
 func (self *BaseContext) Title() string {
 	return ""
 }
--- a/pkg/gui/context/branches_context.go
+++ b/pkg/gui/context/branches_context.go
@@ -28,8 +28,6 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext {
 		return presentation.GetBranchListDisplayStrings(
 			viewModel.GetItems(),
 			c.State().GetItemOperation,
-			c.Model().PullRequests,
-			c.Model().Remotes,
 			c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
 			c.Modes().Diffing.Ref,
 			c.Views().Branches.Width(),
@@ -48,7 +46,7 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext {
 				Key:                        LOCAL_BRANCHES_CONTEXT_KEY,
 				Kind:                       types.SIDE_CONTEXT,
 				Focusable:                  true,
-				NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_WIDTH_CHANGES,
+				NeedsRerenderOnWidthChange: true,
 			})),
 			ListRenderer: ListRenderer{
 				list:              viewModel,
--- a/pkg/gui/context/commit_files_context.go
+++ b/pkg/gui/context/commit_files_context.go
@@ -1,7 +1,6 @@
 package context

 import (
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
@@ -19,9 +18,8 @@ type CommitFilesContext struct {
 }

 var (
-	_ types.IListContext       = (*CommitFilesContext)(nil)
-	_ types.DiffableContext    = (*CommitFilesContext)(nil)
-	_ types.ISearchableContext = (*CommitFilesContext)(nil)
+	_ types.IListContext    = (*CommitFilesContext)(nil)
+	_ types.DiffableContext = (*CommitFilesContext)(nil)
 )

 func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
@@ -66,7 +64,10 @@ func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(func(selectedLineIdx int) error {
+		ctx.GetList().SetSelection(selectedLineIdx)
+		return ctx.HandleFocus(types.OnFocusOpts{})
+	}))

 	return ctx
 }
@@ -74,7 +75,3 @@ func NewCommitFilesContext(c *ContextCommon) *CommitFilesContext {
 func (self *CommitFilesContext) GetDiffTerminals() []string {
 	return []string{self.GetRef().RefName()}
 }
-
-func (self *CommitFilesContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
-	return nil
-}
--- a/pkg/gui/context/commit_message_context.go
+++ b/pkg/gui/context/commit_message_context.go
@@ -116,8 +116,6 @@ func (self *CommitMessageContext) SetPanelState(
 			"togglePanelKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.Universal.TogglePanel),
 			"commitMenuKeybinding":  keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.CommitMenu),
 		})
-
-	self.c.Views().CommitDescription.Visible = true
 }

 func (self *CommitMessageContext) RenderCommitLength() {
--- a/pkg/gui/context/list_context_trait.go
+++ b/pkg/gui/context/list_context_trait.go
@@ -18,9 +18,6 @@ type ListContextTrait struct {
 	// we should find out exactly which lines are now part of the path and refresh those.
 	// We should also keep track of the previous path and refresh those lines too.
 	refreshViewportOnChange bool
-	// If this is true, we only render the visible lines of the list. Useful for lists that can
-	// get very long, because it can save a lot of memory
-	renderOnlyVisibleLines bool
 }

 func (self *ListContextTrait) IsListContext() {}
@@ -28,8 +25,7 @@ func (self *ListContextTrait) IsListContext() {}
 func (self *ListContextTrait) FocusLine() {
 	// Doing this at the end of the layout function because we need the view to be
 	// resized before we focus the line, otherwise if we're in accordion mode
-	// the view could be squashed and won't how to adjust the cursor/origin.
-	// Also, refreshing the viewport needs to happen after the view has been resized.
+	// the view could be squashed and won't how to adjust the cursor/origin
 	self.c.AfterLayout(func() error {
 		oldOrigin, _ := self.GetViewTrait().ViewPortYBounds()

@@ -44,18 +40,22 @@ func (self *ListContextTrait) FocusLine() {
 			self.GetViewTrait().CancelRangeSelect()
 		}

-		if self.refreshViewportOnChange {
+		// If FocusPoint() caused the view to scroll (because the selected line
+		// was out of view before), we need to rerender the view port again.
+		// This can happen when pressing , or . to scroll by pages, or < or > to
+		// jump to the top or bottom.
+		newOrigin, _ := self.GetViewTrait().ViewPortYBounds()
+		if self.refreshViewportOnChange && oldOrigin != newOrigin {
 			self.refreshViewport()
-		} else if self.renderOnlyVisibleLines {
-			newOrigin, _ := self.GetViewTrait().ViewPortYBounds()
-			if oldOrigin != newOrigin {
-				return self.HandleRender()
-			}
 		}
 		return nil
 	})

 	self.setFooter()
+
+	if self.refreshViewportOnChange {
+		self.refreshViewport()
+	}
 }

 func (self *ListContextTrait) refreshViewport() {
@@ -93,21 +93,8 @@ func (self *ListContextTrait) HandleFocusLost(opts types.OnFocusLostOpts) error
 // OnFocus assumes that the content of the context has already been rendered to the view. OnRender is the function which actually renders the content to the view
 func (self *ListContextTrait) HandleRender() error {
 	self.list.ClampSelection()
-	if self.renderOnlyVisibleLines {
-		// Rendering only the visible area can save a lot of cell memory for
-		// those views that support it.
-		totalLength := self.list.Len()
-		if self.getNonModelItems != nil {
-			totalLength += len(self.getNonModelItems())
-		}
-		self.GetViewTrait().SetContentLineCount(totalLength)
-		startIdx, length := self.GetViewTrait().ViewPortYBounds()
-		content := self.renderLines(startIdx, startIdx+length)
-		self.GetViewTrait().SetViewPortContentAndClearEverythingElse(content)
-	} else {
-		content := self.renderLines(-1, -1)
-		self.GetViewTrait().SetContent(content)
-	}
+	content := self.renderLines(-1, -1)
+	self.GetViewTrait().SetContent(content)
 	self.c.Render()
 	self.setFooter()

@@ -115,7 +102,7 @@ func (self *ListContextTrait) HandleRender() error {
 }

 func (self *ListContextTrait) OnSearchSelect(selectedLineIdx int) error {
-	self.GetList().SetSelection(self.ViewIndexToModelIndex(selectedLineIdx))
+	self.GetList().SetSelection(selectedLineIdx)
 	return self.HandleFocus(types.OnFocusOpts{})
 }

@@ -136,7 +123,3 @@ func (self *ListContextTrait) IsItemVisible(item types.HasUrn) bool {
 func (self *ListContextTrait) RangeSelectEnabled() bool {
 	return true
 }
-
-func (self *ListContextTrait) RenderOnlyVisibleLines() bool {
-	return self.renderOnlyVisibleLines
-}
--- a/pkg/gui/context/list_renderer.go
+++ b/pkg/gui/context/list_renderer.go
@@ -35,7 +35,6 @@ type ListRenderer struct {
 	numNonModelItems        int
 	viewIndicesByModelIndex []int
 	modelIndicesByViewIndex []int
-	columnPositions         []int
 }

 func (self *ListRenderer) GetList() types.IList {
@@ -60,10 +59,6 @@ func (self *ListRenderer) ViewIndexToModelIndex(viewIndex int) int {
 	return viewIndex
 }

-func (self *ListRenderer) ColumnPositions() []int {
-	return self.columnPositions
-}
-
 // startIdx and endIdx are view indices, not model indices. If you want to
 // render the whole list, pass -1 for both.
 func (self *ListRenderer) renderLines(startIdx int, endIdx int) string {
@@ -92,7 +87,6 @@ func (self *ListRenderer) renderLines(startIdx int, endIdx int) string {
 	lines, columnPositions := utils.RenderDisplayStrings(
 		self.getDisplayStrings(startModelIdx, endModelIdx),
 		columnAlignments)
-	self.columnPositions = columnPositions
 	lines = self.insertNonModelItems(nonModelItems, endIdx, startIdx, lines, columnPositions)
 	return strings.Join(lines, "\n")
 }
--- a/pkg/gui/context/local_commits_context.go
+++ b/pkg/gui/context/local_commits_context.go
@@ -2,10 +2,8 @@ package context

 import (
 	"log"
-	"strings"
 	"time"

-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
@@ -20,9 +18,8 @@ type LocalCommitsContext struct {
 }

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

 func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
@@ -72,13 +69,12 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 		SearchTrait:           NewSearchTrait(c),
 		ListContextTrait: &ListContextTrait{
 			Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-				View:                        c.Views().Commits,
-				WindowName:                  "commits",
-				Key:                         LOCAL_COMMITS_CONTEXT_KEY,
-				Kind:                        types.SIDE_CONTEXT,
-				Focusable:                   true,
-				NeedsRerenderOnWidthChange:  types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES,
-				NeedsRerenderOnHeightChange: true,
+				View:                       c.Views().Commits,
+				WindowName:                 "commits",
+				Key:                        LOCAL_COMMITS_CONTEXT_KEY,
+				Kind:                       types.SIDE_CONTEXT,
+				Focusable:                  true,
+				NeedsRerenderOnWidthChange: true,
 			})),
 			ListRenderer: ListRenderer{
 				list:              viewModel,
@@ -86,11 +82,13 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 			},
 			c:                       c,
 			refreshViewportOnChange: true,
-			renderOnlyVisibleLines:  true,
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(func(selectedLineIdx int) error {
+		ctx.GetList().SetSelection(selectedLineIdx)
+		return ctx.HandleFocus(types.OnFocusOpts{})
+	}))

 	return ctx
 }
@@ -157,10 +155,6 @@ func (self *LocalCommitsContext) GetDiffTerminals() []string {
 	return []string{itemId}
 }

-func (self *LocalCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
-	return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), searchStr)
-}
-
 func (self *LocalCommitsViewModel) SetLimitCommits(value bool) {
 	self.limitCommits = value
 }
@@ -200,18 +194,3 @@ func shouldShowGraph(c *ContextCommon) bool {
 	log.Fatalf("Unknown value for git.log.showGraph: %s. Expected one of: 'always', 'never', 'when-maximised'", value)
 	return false
 }
-
-func searchModelCommits(caseSensitive bool, commits []*models.Commit, columnPositions []int, searchStr string) []gocui.SearchPosition {
-	normalize := lo.Ternary(caseSensitive, func(s string) string { return s }, strings.ToLower)
-	return lo.FilterMap(commits, func(commit *models.Commit, idx int) (gocui.SearchPosition, bool) {
-		// The XStart and XEnd values are only used if the search string can't
-		// be found in the view. This can really only happen if the user is
-		// searching for a commit hash that is longer than the truncated hash
-		// that we render. So we just set the XStart and XEnd values to the
-		// start and end of the commit hash column, which is the second one.
-		result := gocui.SearchPosition{XStart: columnPositions[1], XEnd: columnPositions[2] - 1, Y: idx}
-		return result, strings.Contains(normalize(commit.Hash), searchStr) ||
-			strings.Contains(normalize(commit.Name), searchStr) ||
-			strings.Contains(normalize(commit.ExtraInfo), searchStr) // allow searching for tags
-	})
-}
--- a/pkg/gui/context/menu_context.go
+++ b/pkg/gui/context/menu_context.go
@@ -50,8 +50,6 @@ func NewMenuContext(
 type MenuViewModel struct {
 	c               *ContextCommon
 	menuItems       []*types.MenuItem
-	prompt          string
-	promptLines     []string
 	columnAlignment []utils.Alignment
 	*FilteredListViewModel[*types.MenuItem]
 }
@@ -75,23 +73,6 @@ func (self *MenuViewModel) SetMenuItems(items []*types.MenuItem, columnAlignment
 	self.columnAlignment = columnAlignment
 }

-func (self *MenuViewModel) GetPrompt() string {
-	return self.prompt
-}
-
-func (self *MenuViewModel) SetPrompt(prompt string) {
-	self.prompt = prompt
-	self.promptLines = nil
-}
-
-func (self *MenuViewModel) GetPromptLines() []string {
-	return self.promptLines
-}
-
-func (self *MenuViewModel) SetPromptLines(promptLines []string) {
-	self.promptLines = promptLines
-}
-
 // TODO: move into presentation package
 func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string {
 	menuItems := self.FilteredListViewModel.GetItems()
@@ -107,45 +88,24 @@ func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string {
 			keyLabel = style.FgCyan.Sprint(keybindings.LabelFromKey(item.Key))
 		}

-		checkMark := ""
-		switch item.Widget {
-		case types.MenuWidgetNone:
-			// do nothing
-		case types.MenuWidgetRadioButtonSelected:
-			checkMark = "(•)"
-		case types.MenuWidgetRadioButtonUnselected:
-			checkMark = "( )"
-		case types.MenuWidgetCheckboxSelected:
-			checkMark = "[✓]"
-		case types.MenuWidgetCheckboxUnselected:
-			checkMark = "[ ]"
-		}
-
-		displayStrings = utils.Prepend(displayStrings, keyLabel, checkMark)
+		displayStrings = utils.Prepend(displayStrings, keyLabel)
 		return displayStrings
 	})
 }

 func (self *MenuViewModel) GetNonModelItems() []*NonModelItem {
-	result := []*NonModelItem{}
-	result = append(result, lo.Map(self.promptLines, func(line string, _ int) *NonModelItem {
-		return &NonModelItem{
-			Index:   0,
-			Column:  0,
-			Content: line,
-		}
-	})...)
-
 	// Don't display section headers when we are filtering, and the filter mode
 	// is fuzzy. The reason is that filtering changes the order of the items
 	// (they are sorted by best match), so all the sections would be messed up.
 	if self.FilteredListViewModel.IsFiltering() && self.c.UserConfig.Gui.UseFuzzySearch() {
-		return result
+		return []*NonModelItem{}
 	}

+	result := []*NonModelItem{}
 	menuItems := self.FilteredListViewModel.GetItems()
 	var prevSection *types.MenuSection = nil
 	for i, menuItem := range menuItems {
+		menuItem := menuItem
 		if menuItem.Section != nil && menuItem.Section != prevSection {
 			if prevSection != nil {
 				result = append(result, &NonModelItem{
--- a/pkg/gui/context/patch_explorer_context.go
+++ b/pkg/gui/context/patch_explorer_context.go
@@ -18,10 +18,7 @@ type PatchExplorerContext struct {
 	mutex                  *deadlock.Mutex
 }

-var (
-	_ types.IPatchExplorerContext = (*PatchExplorerContext)(nil)
-	_ types.ISearchableContext    = (*PatchExplorerContext)(nil)
-)
+var _ types.IPatchExplorerContext = (*PatchExplorerContext)(nil)

 func NewPatchExplorerContext(
 	view *gocui.View,
@@ -142,7 +139,3 @@ func (self *PatchExplorerContext) NavigateTo(isFocused bool, selectedLineIdx int
 func (self *PatchExplorerContext) GetMutex() *deadlock.Mutex {
 	return self.mutex
 }
-
-func (self *PatchExplorerContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
-	return nil
-}
--- a/pkg/gui/context/reflog_commits_context.go
+++ b/pkg/gui/context/reflog_commits_context.go
@@ -48,7 +48,7 @@ func NewReflogCommitsContext(c *ContextCommon) *ReflogCommitsContext {
 				Key:                        REFLOG_COMMITS_CONTEXT_KEY,
 				Kind:                       types.SIDE_CONTEXT,
 				Focusable:                  true,
-				NeedsRerenderOnWidthChange: types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES,
+				NeedsRerenderOnWidthChange: true,
 			})),
 			ListRenderer: ListRenderer{
 				list:              viewModel,
--- a/pkg/gui/context/remote_branches_context.go
+++ b/pkg/gui/context/remote_branches_context.go
@@ -37,13 +37,13 @@ func NewRemoteBranchesContext(
 		DynamicTitleBuilder:   NewDynamicTitleBuilder(c.Tr.RemoteBranchesDynamicTitle),
 		ListContextTrait: &ListContextTrait{
 			Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-				View:                        c.Views().RemoteBranches,
-				WindowName:                  "branches",
-				Key:                         REMOTE_BRANCHES_CONTEXT_KEY,
-				Kind:                        types.SIDE_CONTEXT,
-				Focusable:                   true,
-				Transient:                   true,
-				NeedsRerenderOnHeightChange: true,
+				View:                       c.Views().RemoteBranches,
+				WindowName:                 "branches",
+				Key:                        REMOTE_BRANCHES_CONTEXT_KEY,
+				Kind:                       types.SIDE_CONTEXT,
+				Focusable:                  true,
+				Transient:                  true,
+				NeedsRerenderOnWidthChange: true,
 			})),
 			ListRenderer: ListRenderer{
 				list:              viewModel,
--- a/pkg/gui/context/simple_context.go
+++ b/pkg/gui/context/simple_context.go
@@ -52,8 +52,6 @@ func (self *SimpleContext) HandleFocus(opts types.OnFocusOpts) error {
 }

 func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) error {
-	self.GetViewTrait().SetHighlight(false)
-	_ = self.view.SetOriginX(0)
 	if self.onFocusLostFn != nil {
 		return self.onFocusLostFn(opts)
 	}
--- a/pkg/gui/context/sub_commits_context.go
+++ b/pkg/gui/context/sub_commits_context.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"time"

-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
@@ -22,9 +21,8 @@ type SubCommitsContext struct {
 }

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

 func NewSubCommitsContext(
@@ -75,7 +73,9 @@ func NewSubCommitsContext(
 			selectedCommitHash,
 			startIdx,
 			endIdx,
-			shouldShowGraph(c),
+			// Don't show the graph in the left/right view; we'd like to, but
+			// it's too complicated:
+			shouldShowGraph(c) && viewModel.GetRefToShowDivergenceFrom() == "",
 			git_commands.NewNullBisectInfo(),
 			false,
 		)
@@ -115,14 +115,13 @@ func NewSubCommitsContext(
 		DynamicTitleBuilder: NewDynamicTitleBuilder(c.Tr.SubCommitsDynamicTitle),
 		ListContextTrait: &ListContextTrait{
 			Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-				View:                        c.Views().SubCommits,
-				WindowName:                  "branches",
-				Key:                         SUB_COMMITS_CONTEXT_KEY,
-				Kind:                        types.SIDE_CONTEXT,
-				Focusable:                   true,
-				Transient:                   true,
-				NeedsRerenderOnWidthChange:  types.NEEDS_RERENDER_ON_WIDTH_CHANGE_WHEN_SCREEN_MODE_CHANGES,
-				NeedsRerenderOnHeightChange: true,
+				View:                       c.Views().SubCommits,
+				WindowName:                 "branches",
+				Key:                        SUB_COMMITS_CONTEXT_KEY,
+				Kind:                       types.SIDE_CONTEXT,
+				Focusable:                  true,
+				Transient:                  true,
+				NeedsRerenderOnWidthChange: true,
 			})),
 			ListRenderer: ListRenderer{
 				list:              viewModel,
@@ -131,11 +130,13 @@ func NewSubCommitsContext(
 			},
 			c:                       c,
 			refreshViewportOnChange: true,
-			renderOnlyVisibleLines:  true,
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(func(selectedLineIdx int) error {
+		ctx.GetList().SetSelection(selectedLineIdx)
+		return ctx.HandleFocus(types.OnFocusOpts{})
+	}))

 	return ctx
 }
@@ -203,7 +204,3 @@ func (self *SubCommitsContext) GetDiffTerminals() []string {

 	return []string{itemId}
 }
-
-func (self *SubCommitsContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
-	return searchModelCommits(caseSensitive, self.GetCommits(), self.ColumnPositions(), searchStr)
-}
--- a/pkg/gui/context/suggestions_context.go
+++ b/pkg/gui/context/suggestions_context.go
@@ -14,13 +14,10 @@ type SuggestionsContext struct {
 }

 type SuggestionsContextState struct {
-	Suggestions        []*types.Suggestion
-	OnConfirm          func() error
-	OnClose            func() error
-	OnDeleteSuggestion func() error
-	AsyncHandler       *tasks.AsyncHandler
-
-	AllowEditSuggestion bool
+	Suggestions  []*types.Suggestion
+	OnConfirm    func() error
+	OnClose      func() error
+	AsyncHandler *tasks.AsyncHandler

 	// FindSuggestions will take a string that the user has typed into a prompt
 	// and return a slice of suggestions which match that string.
--- a/pkg/gui/context/view_trait.go
+++ b/pkg/gui/context/view_trait.go
@@ -34,22 +34,12 @@ func (self *ViewTrait) SetViewPortContent(content string) {
 	self.view.OverwriteLines(y, content)
 }

-func (self *ViewTrait) SetViewPortContentAndClearEverythingElse(content string) {
-	_, y := self.view.Origin()
-	self.view.OverwriteLinesAndClearEverythingElse(y, content)
-}
-
-func (self *ViewTrait) SetContentLineCount(lineCount int) {
-	self.view.SetContentLineCount(lineCount)
-}
-
 func (self *ViewTrait) SetContent(content string) {
 	self.view.SetContent(content)
 }

 func (self *ViewTrait) SetHighlight(highlight bool) {
 	self.view.Highlight = highlight
-	self.view.HighlightInactive = false
 }

 func (self *ViewTrait) SetFooter(value string) {
--- a/pkg/gui/context/working_tree_context.go
+++ b/pkg/gui/context/working_tree_context.go
@@ -1,7 +1,6 @@
 package context

 import (
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
@@ -16,10 +15,7 @@ type WorkingTreeContext struct {
 	*SearchTrait
 }

-var (
-	_ types.IListContext       = (*WorkingTreeContext)(nil)
-	_ types.ISearchableContext = (*WorkingTreeContext)(nil)
-)
+var _ types.IListContext = (*WorkingTreeContext)(nil)

 func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
 	viewModel := filetree.NewFileTreeViewModel(
@@ -55,11 +51,10 @@ func NewWorkingTreeContext(c *ContextCommon) *WorkingTreeContext {
 		},
 	}

-	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(ctx.OnSearchSelect))
+	ctx.GetView().SetOnSelectItem(ctx.SearchTrait.onSelectItemWrapper(func(selectedLineIdx int) error {
+		ctx.GetList().SetSelection(selectedLineIdx)
+		return ctx.HandleFocus(types.OnFocusOpts{})
+	}))

 	return ctx
 }
-
-func (self *WorkingTreeContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
-	return nil
-}
--- a/pkg/gui/controllers.go
+++ b/pkg/gui/controllers.go
@@ -20,10 +20,6 @@ func (gui *Gui) Helpers() *helpers.Helpers {
 // in the keybinding menu: the earlier that the controller is attached to a context,
 // the lower in the list the keybindings will appear.
 func (gui *Gui) resetHelpersAndControllers() {
-	for _, context := range gui.Contexts().Flatten() {
-		context.ClearAllBindingsFn()
-	}
-
 	helperCommon := gui.c
 	recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon)
 	reposHelper := helpers.NewRecentReposHelper(helperCommon, recordDirectoryHelper, gui.onNewRepo)
@@ -69,7 +65,6 @@ func (gui *Gui) resetHelpersAndControllers() {
 		mergeConflictsHelper,
 		worktreeHelper,
 		searchHelper,
-		suggestionsHelper,
 	)
 	diffHelper := helpers.NewDiffHelper(helperCommon)
 	cherryPickHelper := helpers.NewCherryPickHelper(
@@ -405,6 +400,7 @@ func (gui *Gui) getCommitMessageSetTextareaTextFn(getView func() *gocui.View) fu
 		view := getView()
 		view.ClearTextArea()
 		view.TextArea.TypeString(text)
+		gui.helpers.Confirmation.ResizeCommitMessagePanels()
 		view.RenderTextArea()
 	}
 }
--- a/pkg/gui/controllers/branches_controller.go
+++ b/pkg/gui/controllers/branches_controller.go
@@ -100,13 +100,14 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			DisplayOnScreen:   true,
 		},
 		{
-			Key:               opts.GetKey(opts.Config.Branches.RebaseBranch),
-			Handler:           opts.Guards.OutsideFilterMode(self.withItem(self.rebase)),
-			GetDisabledReason: self.require(self.singleItemSelected()),
-			Description:       self.c.Tr.RebaseBranch,
-			Tooltip:           self.c.Tr.RebaseBranchTooltip,
-			OpensMenu:         true,
-			DisplayOnScreen:   true,
+			Key:     opts.GetKey(opts.Config.Branches.RebaseBranch),
+			Handler: opts.Guards.OutsideFilterMode(self.rebase),
+			GetDisabledReason: self.require(
+				self.singleItemSelected(self.notRebasingOntoSelf),
+			),
+			Description:     self.c.Tr.RebaseBranch,
+			Tooltip:         self.c.Tr.RebaseBranchTooltip,
+			DisplayOnScreen: true,
 		},
 		{
 			Key:               opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
@@ -204,40 +205,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc
 		},
 	}

-	var disabledReason *types.DisabledReason
-	baseBranch, err := self.c.Git().Loaders.BranchLoader.GetBaseBranch(selectedBranch, self.c.Model().MainBranches)
-	if err != nil {
-		return err
-	}
-	if baseBranch == "" {
-		baseBranch = self.c.Tr.CouldNotDetermineBaseBranch
-		disabledReason = &types.DisabledReason{Text: self.c.Tr.CouldNotDetermineBaseBranch}
-	}
-	shortBaseBranchName := helpers.ShortBranchName(baseBranch)
-	label := utils.ResolvePlaceholderString(
-		self.c.Tr.ViewDivergenceFromBaseBranch,
-		map[string]string{"baseBranch": shortBaseBranchName},
-	)
-	viewDivergenceFromBaseBranchItem := &types.MenuItem{
-		LabelColumns: []string{label},
-		Key:          'b',
-		OnPress: func() error {
-			branch := self.context().GetSelected()
-			if branch == nil {
-				return nil
-			}
-
-			return self.c.Helpers().SubCommits.ViewSubCommits(helpers.ViewSubCommitsOpts{
-				Ref:                     branch,
-				TitleRef:                fmt.Sprintf("%s <-> %s", branch.RefName(), shortBaseBranchName),
-				RefToShowDivergenceFrom: baseBranch,
-				Context:                 self.context(),
-				ShowBranchHeads:         false,
-			})
-		},
-		DisabledReason: disabledReason,
-	}
-
 	unsetUpstreamItem := &types.MenuItem{
 		LabelColumns: []string{self.c.Tr.UnsetUpstream},
 		OnPress: func() error {
@@ -345,7 +312,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc

 	options := []*types.MenuItem{
 		viewDivergenceItem,
-		viewDivergenceFromBaseBranchItem,
 		unsetUpstreamItem,
 		setUpstreamItem,
 		upstreamResetItem,
@@ -632,8 +598,19 @@ func (self *BranchesController) merge() error {
 	return self.c.Helpers().MergeAndRebase.MergeRefIntoCheckedOutBranch(selectedBranchName)
 }

-func (self *BranchesController) rebase(branch *models.Branch) error {
-	return self.c.Helpers().MergeAndRebase.RebaseOntoRef(branch.Name)
+func (self *BranchesController) rebase() error {
+	selectedBranchName := self.context().GetSelected().Name
+	return self.c.Helpers().MergeAndRebase.RebaseOntoRef(selectedBranchName)
+}
+
+func (self *BranchesController) notRebasingOntoSelf(branch *models.Branch) *types.DisabledReason {
+	selectedBranchName := branch.Name
+	checkedOutBranch := self.c.Helpers().Refs.GetCheckedOutRef().Name
+	if selectedBranchName == checkedOutBranch {
+		return &types.DisabledReason{Text: self.c.Tr.CantRebaseOntoSelf}
+	}
+
+	return nil
 }

 func (self *BranchesController) fastForward(branch *models.Branch) error {
@@ -643,7 +620,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 	if !branch.RemoteBranchStoredLocally() {
 		return errors.New(self.c.Tr.FwdNoLocalUpstream)
 	}
-	if branch.IsAheadForPull() {
+	if branch.HasCommitsToPush() {
 		return errors.New(self.c.Tr.FwdCommitsToPush)
 	}

@@ -696,8 +673,7 @@ func (self *BranchesController) createSortMenu() error {
 			return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
 		}
 		return nil
-	},
-		self.c.GetAppState().LocalBranchSortOrder)
+	})
 }

 func (self *BranchesController) createResetMenu(selectedBranch *models.Branch) error {
--- a/pkg/gui/controllers/commit_description_controller.go
+++ b/pkg/gui/controllers/commit_description_controller.go
@@ -53,7 +53,7 @@ func (self *CommitDescriptionController) context() *context.CommitMessageContext
 }

 func (self *CommitDescriptionController) switchToCommitMessage() error {
-	return self.c.ReplaceContext(self.c.Contexts().CommitMessage)
+	return self.c.PushContext(self.c.Contexts().CommitMessage)
 }

 func (self *CommitDescriptionController) close() error {
--- a/pkg/gui/controllers/commit_message_controller.go
+++ b/pkg/gui/controllers/commit_message_controller.go
@@ -85,7 +85,7 @@ func (self *CommitMessageController) handleNextCommit() error {
 }

 func (self *CommitMessageController) switchToCommitDescription() error {
-	if err := self.c.ReplaceContext(self.c.Contexts().CommitDescription); err != nil {
+	if err := self.c.PushContext(self.c.Contexts().CommitDescription); err != nil {
 		return err
 	}
 	return nil
--- a/pkg/gui/controllers/confirmation_controller.go
+++ b/pkg/gui/controllers/confirmation_controller.go
@@ -1,8 +1,6 @@
 package controllers

 import (
-	"fmt"
-
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
@@ -41,14 +39,6 @@ func (self *ConfirmationController) GetKeybindings(opts types.KeybindingsOpts) [
 			Key: opts.GetKey(opts.Config.Universal.TogglePanel),
 			Handler: func() error {
 				if len(self.c.Contexts().Suggestions.State.Suggestions) > 0 {
-					subtitle := ""
-					if self.c.State().GetRepoState().GetCurrentPopupOpts().HandleDeleteSuggestion != nil {
-						// We assume that whenever things are deletable, they
-						// are also editable, so we show both keybindings
-						subtitle = fmt.Sprintf(self.c.Tr.SuggestionsSubtitle,
-							self.c.UserConfig.Keybinding.Universal.Remove, self.c.UserConfig.Keybinding.Universal.Edit)
-					}
-					self.c.Views().Suggestions.Subtitle = subtitle
 					return self.c.ReplaceContext(self.c.Contexts().Suggestions)
 				}
 				return nil
--- a/pkg/gui/controllers/custom_command_action.go
+++ b/pkg/gui/controllers/custom_command_action.go
@@ -1,7 +1,6 @@
 package controllers

 import (
-	"slices"
 	"strings"

 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
@@ -18,7 +17,6 @@ func (self *CustomCommandAction) Call() error {
 	return self.c.Prompt(types.PromptOpts{
 		Title:               self.c.Tr.CustomCommand,
 		FindSuggestionsFunc: self.GetCustomCommandsHistorySuggestionsFunc(),
-		AllowEditSuggestion: true,
 		HandleConfirm: func(command string) error {
 			if self.shouldSaveCommand(command) {
 				self.c.GetAppState().CustomCommandsHistory = utils.Limit(
@@ -34,34 +32,13 @@ func (self *CustomCommandAction) Call() error {
 				self.c.OS().Cmd.NewShell(command),
 			)
 		},
-		HandleDeleteSuggestion: func(index int) error {
-			// index is the index in the _filtered_ list of suggestions, so we
-			// need to map it back to the full list. There's no really good way
-			// to do this, but fortunately we keep the items in the
-			// CustomCommandsHistory unique, which allows us to simply search
-			// for it by string.
-			item := self.c.Contexts().Suggestions.GetItems()[index].Value
-			fullIndex := lo.IndexOf(self.c.GetAppState().CustomCommandsHistory, item)
-			if fullIndex == -1 {
-				// Should never happen, but better be safe
-				return nil
-			}
-
-			self.c.GetAppState().CustomCommandsHistory = slices.Delete(
-				self.c.GetAppState().CustomCommandsHistory, fullIndex, fullIndex+1)
-			self.c.SaveAppStateAndLogError()
-			self.c.Contexts().Suggestions.RefreshSuggestions()
-			return nil
-		},
 	})
 }

 func (self *CustomCommandAction) GetCustomCommandsHistorySuggestionsFunc() func(string) []*types.Suggestion {
-	return func(input string) []*types.Suggestion {
-		history := self.c.GetAppState().CustomCommandsHistory
+	history := self.c.GetAppState().CustomCommandsHistory

-		return helpers.FilterFunc(history, self.c.UserConfig.Gui.UseFuzzySearch())(input)
-	}
+	return helpers.FilterFunc(history, self.c.UserConfig.Gui.UseFuzzySearch())
 }

 // this mimics the shell functionality `ignorespace`
--- a/pkg/gui/controllers/custom_patch_options_menu_action.go
+++ b/pkg/gui/controllers/custom_patch_options_menu_action.go
@@ -214,13 +214,10 @@ func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
 			PreserveMessage:  false,
 			OnConfirm: func(summary string, description string) error {
 				return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
-					_ = self.c.Helpers().Commits.CloseCommitMessagePanel()
+					_ = self.c.Helpers().Commits.PopCommitMessageContexts()
 					self.c.LogAction(self.c.Tr.Actions.MovePatchIntoNewCommit)
 					err := self.c.Git().Patch.PullPatchIntoNewCommit(self.c.Model().Commits, commitIndex, summary, description)
-					if err := self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err); err != nil {
-						return err
-					}
-					return self.c.PushContext(self.c.Contexts().LocalCommits)
+					return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
 				})
 			},
 		},
@@ -237,7 +234,7 @@ func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error {
 		action = "Apply patch in reverse"
 	}
 	self.c.LogAction(action)
-	if err := self.c.Git().Patch.ApplyCustomPatch(reverse, true); err != nil {
+	if err := self.c.Git().Patch.ApplyCustomPatch(reverse); err != nil {
 		return err
 	}
 	return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
--- a/pkg/gui/controllers/diffing_menu_action.go
+++ b/pkg/gui/controllers/diffing_menu_action.go
@@ -17,6 +17,7 @@ func (self *DiffingMenuAction) Call() error {

 	menuItems := []*types.MenuItem{}
 	for _, name := range names {
+		name := name
 		menuItems = append(menuItems, []*types.MenuItem{
 			{
 				Label: fmt.Sprintf("%s %s", self.c.Tr.Diff, name),
--- a/pkg/gui/controllers/files_controller.go
+++ b/pkg/gui/controllers/files_controller.go
@@ -1062,65 +1062,60 @@ func (self *FilesController) remove(selectedNodes []*filetree.FileNode) error {

 	selectedNodes = normalisedSelectedNodes(selectedNodes)

-	discardAllChangesItem := types.MenuItem{
-		Label: self.c.Tr.DiscardAllChanges,
-		OnPress: func() error {
-			self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInFile)
-
-			if self.context().IsSelectingRange() {
-				defer self.context().CancelRangeSelect()
-			}
-
-			for _, node := range selectedNodes {
-				if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil {
-					return err
-				}
-			}
-
-			return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
-		},
-		Key: self.c.KeybindingsOpts().GetKey(self.c.UserConfig.Keybinding.Files.ConfirmDiscard),
-		Tooltip: utils.ResolvePlaceholderString(
-			self.c.Tr.DiscardAllTooltip,
-			map[string]string{
-				"path": self.formattedPaths(selectedNodes),
-			},
-		),
-	}
-
-	discardUnstagedChangesItem := types.MenuItem{
-		Label: self.c.Tr.DiscardUnstagedChanges,
-		OnPress: func() error {
-			self.c.LogAction(self.c.Tr.Actions.DiscardAllUnstagedChangesInFile)
-
-			if self.context().IsSelectingRange() {
-				defer self.context().CancelRangeSelect()
-			}
-
-			for _, node := range selectedNodes {
-				if err := self.c.Git().WorkingTree.DiscardUnstagedDirChanges(node); err != nil {
-					return err
-				}
-			}
-
-			return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
-		},
-		Key: 'u',
-		Tooltip: utils.ResolvePlaceholderString(
-			self.c.Tr.DiscardUnstagedTooltip,
-			map[string]string{
-				"path": self.formattedPaths(selectedNodes),
-			},
-		),
-	}
-
-	if !someNodesHaveStagedChanges(selectedNodes) || !someNodesHaveUnstagedChanges(selectedNodes) {
-		discardUnstagedChangesItem.DisabledReason = &types.DisabledReason{Text: self.c.Tr.DiscardUnstagedDisabled}
-	}
-
 	menuItems := []*types.MenuItem{
-		&discardAllChangesItem,
-		&discardUnstagedChangesItem,
+		{
+			Label: self.c.Tr.DiscardAllChanges,
+			OnPress: func() error {
+				self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInFile)
+
+				if self.context().IsSelectingRange() {
+					defer self.context().CancelRangeSelect()
+				}
+
+				for _, node := range selectedNodes {
+					if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil {
+						return err
+					}
+				}
+
+				return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
+			},
+			Key: self.c.KeybindingsOpts().GetKey(self.c.UserConfig.Keybinding.Files.ConfirmDiscard),
+			Tooltip: utils.ResolvePlaceholderString(
+				self.c.Tr.DiscardAllTooltip,
+				map[string]string{
+					"path": self.formattedPaths(selectedNodes),
+				},
+			),
+		},
+	}
+
+	if someNodesHaveStagedChanges(selectedNodes) && someNodesHaveUnstagedChanges(selectedNodes) {
+		menuItems = append(menuItems, &types.MenuItem{
+			Label: self.c.Tr.DiscardUnstagedChanges,
+			OnPress: func() error {
+				self.c.LogAction(self.c.Tr.Actions.DiscardAllUnstagedChangesInFile)
+
+				if self.context().IsSelectingRange() {
+					defer self.context().CancelRangeSelect()
+				}
+
+				for _, node := range selectedNodes {
+					if err := self.c.Git().WorkingTree.DiscardUnstagedDirChanges(node); err != nil {
+						return err
+					}
+				}
+
+				return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
+			},
+			Key: 'u',
+			Tooltip: utils.ResolvePlaceholderString(
+				self.c.Tr.DiscardUnstagedTooltip,
+				map[string]string{
+					"path": self.formattedPaths(selectedNodes),
+				},
+			),
+		})
 	}

 	return self.c.Menu(types.CreateMenuOptions{Title: self.c.Tr.DiscardChangesTitle, Items: menuItems})
--- a/pkg/gui/controllers/helpers/branches_helper.go
+++ b/pkg/gui/controllers/helpers/branches_helper.go
@@ -1,8 +1,6 @@
 package helpers

 import (
-	"strings"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -46,7 +44,3 @@ func (self *BranchesHelper) ConfirmDeleteRemote(remoteName string, branchName st
 		},
 	})
 }
-
-func ShortBranchName(fullBranchName string) string {
-	return strings.TrimPrefix(strings.TrimPrefix(fullBranchName, "refs/heads/"), "refs/remotes/")
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Luka Markušić	d8cffa314e	Check for skipping pre-commit hooks in more situations	2024-04-27 08:48:21 +02:00
Luka Markušić	4ec41c4414	Add integration tests for skipping pre-commit hooks	2024-04-27 08:47:54 +02:00