Use double dash for disambuating path in editor templates

Fix flakey worktree tests
In the presentation layer, when showing branches, we'll show worktrees against branches if they're associated. But there was a race condition: if the worktree model was refreshed after the branches model, it wouldn't be used in the presentation layer when it came time to render the branches. A better solution would be to have some way of signalling that a particular context needs to be refreshed and after all the models are done being refreshed, we then refresh the contexts. This will prevent double-renders
2026-09-29 18:46:55 -04:00 · 2023-07-29 18:34:43 +10:00 · 2023-07-29 17:36:18 +10:00 · 2023-07-29 17:36:18 +10:00 · 2023-07-29 17:36:18 +10:00 · 2023-07-29 17:36:18 +10:00
516 changed files with 6369 additions and 12290 deletions
@@ -2,14 +2,9 @@

 - **Please check if the PR fulfills these requirements**

-* [ ] Cheatsheets are up-to-date (run `go generate ./...`)
+* [ ] Cheatsheets are up-to-date (run `go run scripts/cheatsheet/main.go generate`)
 * [ ] 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 (specifically `docs/Config.md`) have been updated if necessary
 * [ ] You've read through your own file changes for silly mistakes etc
-
-<!--
-Be sure to name your PR with an imperative e.g. 'Add worktrees view'
-see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples
-->
@@ -14,11 +14,11 @@ jobs:
      - name: Unshallow repo
        run: git fetch --prune --unshallow
      - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.x
+          go-version: 1.18.x
      - name: Run goreleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v1
        with:
          distribution: goreleaser
          version: v1.17.2
@@ -1,7 +1,7 @@
 name: Continuous Integration

 env:
-  GO_VERSION: 1.20
+  GO_VERSION: 1.18

 on:
  push:
@@ -30,9 +30,18 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v3
      - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.x
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{matrix.cache_path}}
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-test
+          restore-keys: |
+            ${{runner.os}}-go-
      - name: Test code
        # we're passing -short so that we skip the integration tests, which will be run in parallel below
        run: |
@@ -80,9 +89,18 @@ jobs:
          path: ~/git-${{matrix.git-version}}
          key: ${{runner.os}}-git-${{matrix.git-version}}
      - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.x
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-test
+          restore-keys: |
+            ${{runner.os}}-go-
      - name: Print git version
        run: git --version
      - name: Test code
@@ -97,9 +115,18 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v3
      - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.x
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
+          restore-keys: |
+            ${{runner.os}}-go-
      - name: Build linux binary
        run: |
          GOOS=linux go build
@@ -124,17 +151,29 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v3
      - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.x
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
+          restore-keys: |
+            ${{runner.os}}-go-
+      - name: Check Cheatsheet
+        run: |
+          go run scripts/cheatsheet/main.go check
      - name: Check Vendor Directory
        # ensure our vendor directory matches up with our go modules
        run: |
          go mod vendor && git diff --exit-code || (echo "Unexpected change to vendor directory. Run 'go mod vendor' locally and commit the changes" && exit 1)
-      - name: Check All Auto-Generated Files
-        # ensure all our auto-generated files are up to date
+      - name: Check Integration Test List
+        # ensure our integration test list is up to date
        run: |
-          go generate ./... && git diff --quiet || (git status -s; echo "Auto-generated files not up to date. Run 'go generate ./...' locally and commit the changes" && exit 1)
+          go generate pkg/integration/tests/tests.go && git diff --exit-code || (echo "Integration test list not up to date. Run 'go generate pkg/integration/tests/tests.go' locally and commit the changes" && exit 1)
        shell: bash # needed so that we get "-o pipefail"
      - name: Check Filenames
        run: scripts/check_filenames.sh
@@ -146,11 +185,20 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v3
      - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
        with:
-          go-version: 1.20.x
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-test
+          restore-keys: |
+            ${{runner.os}}-go-
      - name: Lint
-        uses: golangci/golangci-lint-action@v3.7.0
+        uses: golangci/golangci-lint-action@v3.1.0
        with:
          version: latest
      - name: errors
@@ -158,7 +206,6 @@ jobs:
        if: ${{ failure() }}
  check-required-label:
    runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/master'
    steps:
      - uses: mheap/github-action-required-labels@v5
        with:
@@ -12,7 +12,7 @@ jobs:
        uses: actions/checkout@v3

      - name: Generate Sponsors 💖
-        uses: JamesIves/github-sponsors-readme-action@v1.2.2
+        uses: JamesIves/github-sponsors-readme-action@v1.0.8
        with:
          token: ${{ secrets.SPONSORS_TOKEN }}
          file: 'README.md'
@@ -35,10 +35,9 @@ lazygit.exe

 test/git_server/data

-test/_results/**
+test/results/**

 oryxBuildBinary
 __debug_bin

-.worktrees
-demo/output/*
+.worktrees
@@ -20,15 +20,10 @@ linters:
 linters-settings:
  exhaustive:
    default-signifies-exhaustive: true
-  staticcheck:
-    # SA1019 is for checking that we're not using fields marked as deprecated
-    # in a comment. It decides this in a loose way so I'm silencing it. Also because
-    # it's tripping on our own structs.
-    checks: ["all", "-SA1019"]
+
  nakedret:
    # the gods will judge me but I just don't like naked returns at all
    max-func-lines: 0

 run:
-  go: '1.20'
-  timeout: 10m
+  go: 1.18
@@ -7,11 +7,7 @@
      "request": "launch",
      "mode": "auto",
      "program": "main.go",
-      "args": [
-        "--debug",
-        "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"
-      ],
-      "hideSystemGoroutines": true,
+      "args": ["--debug", "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"],
      "console": "integratedTerminal",
      "presentation": {
        "hidden": true
@@ -23,44 +19,17 @@
      "request": "launch",
      "mode": "auto",
      "program": "main.go",
-      "args": [
-        "--logs",
-        "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"
-      ],
+      "args": ["--logs", "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"],
      "console": "integratedTerminal",
      "presentation": {
        "hidden": true
      }
-    },
-    {
-      "name": "Attach to a running Lazygit",
-      "type": "go",
-      "request": "attach",
-      "mode": "local",
-      "processId": "lazygit",
-      "hideSystemGoroutines": true,
-      "console": "integratedTerminal",
-    },
-    {
-      // To use this, first start an integration test with the "cli" runner and
-      // use the -debug option; e.g.
-      // $ make integration-test-cli -- -debug tag/reset.go
-      "name": "Attach to integration test runner",
-      "type": "go",
-      "request": "attach",
-      "mode": "local",
-      "processId": "test_lazygit",
-      "hideSystemGoroutines": true,
-      "console": "integratedTerminal",
-    },
+    }
  ],
  "compounds": [
    {
      "name": "Run with logs",
-      "configurations": [
-        "Tail Lazygit logs",
-        "Debug Lazygit"
-      ],
+      "configurations": ["Tail Lazygit logs", "Debug Lazygit"],
      "stopAll": true
    }
  ]
@@ -1,5 +0,0 @@
-{
-  "gopls": {
-    "formatting.gofumpt": true,
-  },
-}
@@ -21,8 +21,6 @@ welcome your pull requests:
 4. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 5. Issue that pull request!

-Please do not raise pull request from your fork's master branch: make a feature branch instead. Lazygit maintainers will sometimes push changes to your branch when reviewing a PR and we often can't do this if you use your master branch.
-
 If you've never written Go in your life, then join the club! Lazygit was the maintainer's first Go program, and most contributors have never used Go before. Go is widely considered an easy-to-learn language, so if you're looking for an open source project to gain dev experience, you've come to the right place.

 ## Running in a VSCode dev container
@@ -99,10 +97,6 @@ To run gofumpt from your terminal go:
 go install mvdan.cc/gofumpt@latest && gofumpt -l -w .
 ```

-## Programming Font
-
-Lazygit supports [Nerd Fonts](https://www.nerdfonts.com) to render certain icons. Sometimes we use some of these icons verbatim in string literals in the code (mainly in tests), so you need to set your development environment to use a nerd font to see these.
-
 ## Internationalisation

 Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package. If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `self.c.Tr.YourNewText`, etc). Although it is appreciated if you translate the text into other languages, it's not expected of you (google translate will likely do a bad job anyway!).
@@ -2,7 +2,7 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh

-FROM golang:1.20 as build
+FROM golang:1.18 as build 
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY go.mod go.sum ./
 RUN go mod download
@@ -1,68 +0,0 @@
-.PHONY: all
-all: build
-
-.PHONY: build
-build:
-	go build -gcflags='all=-N -l'
-
-.PHONY: install
-install:
-	go install
-
-.PHONY: run
-run: build
-	./lazygit
-
-# Run `make run-debug` in one terminal tab and `make print-log` in another to view the program and its log output side by side
-.PHONY: run-debug
-run-debug:
-	go run main.go -debug
-
-.PHONY: print-log
-print-log:
-	go run main.go --logs
-
-.PHONY: unit-test
-unit-test:
-	go test ./... -short
-
-.PHONY: test
-test: unit-test integration-test-all
-
-# Generate all our auto-generated files (test list, cheatsheets, maybe other things in the future)
-.PHONY: generate
-generate:
-	go generate ./...
-
-.PHONY: format
-format:
-	gofumpt -l -w .
-
-# 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:
-	go run cmd/integration_test/main.go tui $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: integration-test-cli
-integration-test-cli:
-	go run cmd/integration_test/main.go cli $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: integration-test-all
-integration-test-all:
-	go test pkg/integration/clients/*.go
-
-.PHONY: bump-gocui
-bump-gocui:
-	scripts/bump_gocui.sh
-
-.PHONY: bump-lazycore
-bump-lazycore:
-	scripts/bump_lazycore.sh
-
-.PHONY: record-demo
-record-demo:
-	demo/record_demo.sh $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: vendor
-vendor:
-	go mod vendor && go mod tidy
@@ -16,7 +16,7 @@ Usage:
 		> go run cmd/integration_test/main.go cli [--slow] [--sandbox] <test1> <test2> ...
 	If you pass no test names, it runs all tests
 	Accepted environment variables:
-	INPUT_DELAY (e.g. 200): the number of milliseconds to wait between keypresses or mouse clicks
+	KEY_PRESS_DELAY (e.g. 200): the number of milliseconds to wait between keypresses

 	TUI mode:
 		> go run cmd/integration_test/main.go tui
@@ -26,29 +26,6 @@ Usage:
 		> go run cmd/integration_test/main.go help
 `

-type flagInfo struct {
-	name string // name of the flag; can be used with "-" or "--"
-	flag *bool  // a pointer to the variable that should be set to true when this flag is passed
-}
-
-// Takes the args that you want to parse (excluding the program name and any
-// subcommands), and returns the remaining args with the flags removed
-func parseFlags(args []string, flags []flagInfo) []string {
-outer:
-	for len(args) > 0 {
-		for _, f := range flags {
-			if args[0] == "-"+f.name || args[0] == "--"+f.name {
-				*f.flag = true
-				args = args[1:]
-				continue outer
-			}
-		}
-		break
-	}
-
-	return args
-}
-
 func main() {
 	if len(os.Args) < 2 {
 		log.Fatal(usage)
@@ -58,26 +35,23 @@ func main() {
 	case "help":
 		fmt.Println(usage)
 	case "cli":
+		testNames := os.Args[2:]
 		slow := false
 		sandbox := false
-		waitForDebugger := false
-		raceDetector := false
-		testNames := parseFlags(os.Args[2:], []flagInfo{
-			{"slow", &slow},
-			{"sandbox", &sandbox},
-			{"debug", &waitForDebugger},
-			{"race", &raceDetector},
-		})
-		clients.RunCLI(testNames, slow, sandbox, waitForDebugger, raceDetector)
-	case "tui":
-		raceDetector := false
-		remainingArgs := parseFlags(os.Args[2:], []flagInfo{
-			{"race", &raceDetector},
-		})
-		if len(remainingArgs) > 0 {
-			log.Fatal("tui only supports the -race argument.")
+		// get the next arg if it's --slow
+		if len(os.Args) > 2 {
+			if os.Args[2] == "--slow" || os.Args[2] == "-slow" {
+				testNames = os.Args[3:]
+				slow = true
+			} else if os.Args[2] == "--sandbox" || os.Args[2] == "-sandbox" {
+				testNames = os.Args[3:]
+				sandbox = true
+			}
 		}
-		clients.RunTUI(raceDetector)
+
+		clients.RunCLI(testNames, slow, sandbox)
+	case "tui":
+		clients.RunTUI()
 	default:
 		log.Fatal(usage)
 	}
@@ -1,2 +0,0 @@
-This directory contains stuff for recording lazygit demos.
-
@@ -1,112 +0,0 @@
-# Specify a command to be executed
-# like `/bin/bash -l`, `ls`, or any other commands
-# the default is bash for Linux
-# or powershell.exe for Windows
-command: echo "YOU NEED TO SPECIFY YOUR OWN COMMAND WITH THE -d ARG"
-
-# Specify the current working directory path
-# the default is the current working directory path
-cwd: null
-
-# Export additional ENV variables
-env:
-  recording: true
-
-# Explicitly set the number of columns
-# or use `auto` to take the current
-# number of columns of your shell
-cols: 120 # 100
-
-# Explicitly set the number of rows
-# or use `auto` to take the current
-# number of rows of your shell
-rows: 35 # 30
-
-# Amount of times to repeat GIF
-# If value is -1, play once
-# If value is 0, loop indefinitely
-# If value is a positive number, loop n times
-repeat: 0
-
-# Quality
-# 1 - 100
-# Higher quality seems to make no difference, but running it through
-# gifsicle ends up with a much better compressed version.
-quality: 100
-
-# Delay between frames in ms
-# If the value is `auto` use the actual recording delays
-frameDelay: auto
-
-# Maximum delay between frames in ms
-# Ignored if the `frameDelay` isn't set to `auto`
-# Set to `auto` to prevent limiting the max idle time
-maxIdleTime: 2000
-
-# The surrounding frame box
-# The `type` can be null, window, floating, or solid`
-# To hide the title use the value null
-# Don't forget to add a backgroundColor style with a null as type
-frameBox:
-  type: floating
-  title: Lazygit
-  style:
-    border: 0px black solid
-    backgroundColor: "#1d1d1d"
-    margin: -5px
-
-# Add a watermark image to the rendered gif
-# You need to specify an absolute path for
-# the image on your machine or a URL, and you can also
-# add your own CSS styles
-watermark:
-  imagePath: null
-  style:
-    position: absolute
-    right: 15px
-    bottom: 15px
-    width: 100px
-    opacity: 0.9
-
-# Cursor style can be one of
-# `block`, `underline`, or `bar`
-cursorStyle: block
-
-# Font family
-# You can use any font that is installed on your machine
-# in CSS-like syntax
-# Download from:
-# https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/DejaVuSansMono.zip
-# Not using the mono font because it makes icons too small.
-fontFamily: "DejaVuSansM Nerd Font"
-
-# The size of the font
-fontSize: 8
-
-# The height of lines
-lineHeight: 1
-
-# The spacing between letters
-letterSpacing: 0
-
-# Theme
-theme:
-  background: "transparent"
-  foreground: "#dddad6"
-  cursor: "#c7c7c7"
-  black: "#7a7a7a"
-  red: "#fc4384"
-  green: "#b3e33b"
-  yellow: "#ffa727"
-  blue: "#102895"
-  magenta: "#c930c7"
-  cyan: "#00c5c7"
-  white: "#c7c7c7"
-  brightBlack: "#676767"
-  brightRed: "#ff7fac"
-  brightGreen: "#c8ed71"
-  brightYellow: "#ebdf86"
-  brightBlue: "#6871ff"
-  brightMagenta: "#ff76ff"
-  brightCyan: "#5ffdff"
-  brightWhite: "#fffefe"
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-set -e
-
-TYPE=$1
-TEST=$2
-
-usage() {
-    echo "Usage: $0 [gif|mp4] <test path>"
-    echo "e.g. using full path: $0 gif pkg/integration/tests/demo/nuke_working_tree.go"
-    exit 1
-}
-
-if [ "$#" -ne 2 ]
-then
-    usage
-fi
-
-if [ "$TYPE" != "gif" ] && [ "$TYPE" != "mp4" ]
-then
-    usage
-    exit 1
-fi
-
-if [ -z "$TEST" ]
-then
-    usage
-fi
-
-WORKTREE_PATH=$(git worktree list | grep assets | awk '{print $1}')
-
-if [ -z "$WORKTREE_PATH" ]
-then
-    echo "Could not find assets worktree. You'll need to create a worktree for the assets branch using the following command:"
-    echo "git worktree add .worktrees/assets assets"
-    echo "The assets branch has no shared history with the main branch: it exists to store assets which are too large to store in the main branch."
-    exit 1
-fi
-
-OUTPUT_DIR="$WORKTREE_PATH/demo"
-
-if ! command -v terminalizer &> /dev/null
-then
-    echo "terminalizer could not be found"
-    echo "Install it with: npm install -g terminalizer"
-    exit 1
-fi
-
-if ! command -v "gifsicle" &> /dev/null
-then
-    echo "gifsicle could not be found"
-    echo "Install it with: npm install -g gifsicle"
-    exit 1
-fi
-
-# Get last part of the test path and set that as the output name
-# example test path: pkg/integration/tests/01_basic_test.go
-# For that we want: NAME=01_basic_test
-NAME=$(echo "$TEST" | sed -e 's/.*\///' | sed -e 's/\..*//')
-
-# Add the demo to the tests list (if missing) so that it can be run
-go generate pkg/integration/tests/tests.go
-
-mkdir -p "$OUTPUT_DIR"
-
-# First we record the demo into a yaml representation
-terminalizer -c demo/config.yml record --skip-sharing -d "go run cmd/integration_test/main.go cli --slow $TEST" "$OUTPUT_DIR/$NAME"
-# Then we render it into a gif
-terminalizer render "$OUTPUT_DIR/$NAME" -o "$OUTPUT_DIR/$NAME.gif"
-
-# Then we convert it to either an mp4 or gif based on the command line argument
-if [ "$TYPE" = "mp4" ]
-then
-    COMPRESSED_PATH="$OUTPUT_DIR/$NAME.mp4"
-    ffmpeg -y -i "$OUTPUT_DIR/$NAME.gif" -movflags faststart -pix_fmt yuv420p -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" "$COMPRESSED_PATH"
-else
-    COMPRESSED_PATH="$OUTPUT_DIR/$NAME-compressed.gif"
-    gifsicle --colors 256 --use-col=web -O3 < "$OUTPUT_DIR/$NAME.gif" > "$COMPRESSED_PATH"
-fi
-
-echo "Demo recorded to $COMPRESSED_PATH"
@@ -16,17 +16,6 @@ If you want to change the config directory:

 - MacOS: `export XDG_CONFIG_HOME="$HOME/.config"`

-JSON schema is available for `config.yml` so that IntelliSense in Visual Studio Code (completion and error checking) is automatically enabled when the [YAML Red Hat][yaml] extension is installed. However, note that automatic schema detection only works if your config file is in one of the standard paths mentioned above. If you override the path to the file, you can still make IntelliSense work by adding
-
-```yaml
-# yaml-language-server: $schema=https://json.schemastore.org/lazygit.json
-```
-
-to the top of your config file or via [Visual Studio Code settings.json config][settings].
-
-[yaml]: https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml
-[settings]: https://github.com/redhat-developer/vscode-yaml#associating-a-schema-to-a-glob-pattern-via-yamlschemas
-
 ## Default

 ```yaml
@@ -35,12 +24,10 @@ gui:
  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
  mainPanelSplitMode: 'flexible' # one of 'horizontal' | 'flexible' | 'vertical'
-  language: 'auto' # one of 'auto' | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
+  language: 'auto' # one of 'auto' | 'en' | 'zh' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
  timeFormat: '02 Jan 06' # https://pkg.go.dev/time#Time.Format
  shortTimeFormat: '3:04PM'
  theme:
@@ -75,17 +62,15 @@ gui:
  showListFooter: true # for seeing the '5 of 20' message in list panels
  showRandomTip: true
  showBranchCommitHash: false # show commit hashes alongside branch names
+  experimentalShowBranchHeads: false # visualize branch heads with (*) in commits list
  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
  showIcons: false # deprecated: use nerdFontsVersion instead
  nerdFontsVersion: "" # nerd fonts version to use ("2" or "3"); empty means don't show nerd font icons
  commandLogSize: 8
  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'
+  border: 'single' # one of 'single' | 'double' | 'rounded' | 'hidden'
 git:
  paging:
    colorArg: always
@@ -119,8 +104,8 @@ git:
  overrideGpg: false # prevents lazygit from spawning a separate process when using GPG
  disableForcePushing: false
  parseEmoji: false
+  diffContextSize: 3 # how many lines of context are shown around a change in diffs
 os:
-  copyToClipboardCmd: '' # See 'Custom Command for Copying to Clipboard' section
  editPreset: '' # see 'Configuring File Editing' section
  edit: ''
  editAtLine: ''
@@ -163,7 +148,7 @@ keybinding:
    jumpToBlock: ['1', '2', '3', '4', '5'] # goto the Nth block / panel
    nextMatch: 'n'
    prevMatch: 'N'
-    optionMenu: <disabled> # show help menu
+    optionMenu: null # show help menu
    optionMenu-alt1: '?' # show help menu
    select: '<space>'
    goInto: '<enter>'
@@ -208,7 +193,6 @@ keybinding:
    commitChangesWithoutHook: 'w' # commit changes without pre-commit hook
    amendLastCommit: 'A'
    commitChangesWithEditor: 'C'
-    confirmDiscard: 'x'
    ignoreFile: 'i'
    refreshFiles: 'r'
    stashAllChanges: 's'
@@ -294,36 +278,29 @@ os:
  open: 'open {{filename}}'
 ```

-## Custom Command for Copying to Clipboard
-```yaml
-os:
-  copyToClipboardCmd: ''
-```
-Specify an external command to invoke when copying to clipboard is requested. `{{text}` will be replaced by text to be copied. Default is to copy to system clipboard.
+### Configuring File Editing

-If you are working on a terminal that supports OSC52, the following command will let you take advantage of it:
-```
-os:
-  copyToClipboardCmd: printf "\033]52;c;$(printf {{text}} | base64)\a" > /dev/tty
-```
+There are two commands for opening files, `o` for "open" and `e` for "edit". `o`
+acts as if the file was double-clicked in the Finder/Explorer, so it also works
+for non-text files, whereas `e` opens the file in an editor. `e` can also jump
+to the right line in the file if you invoke it from the staging panel, for
+example.

-
-## Configuring File Editing
-
-There are two commands for opening files, `o` for "open" and `e` for "edit". `o` acts as if the file was double-clicked in the Finder/Explorer, so it also works for non-text files, whereas `e` opens the file in an editor. `e` can also jump to the right line in the file if you invoke it from the staging panel, for example.
-
-To tell lazygit which editor to use for the `e` command, the easiest way to do that is to provide an editPreset config, e.g.
+To tell lazygit which editor to use for the `e` command, the easiest way to do
+that is to provide an editPreset config, e.g.

 ```yaml
 os:
  editPreset: 'vscode'
 ```

-Supported presets are `vim`, `nvim`, `nvim-remote`, `lvim`, `emacs`, `nano`, `micro`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR.
+Supported presets are `vim`, `nvim`, `emacs`, `nano`, `vscode`, `sublime`, `bbedit`,
+`kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset
+from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR.

-`nvim-remote` is an experimental preset for when you have invoked lazygit from within a neovim process, allowing lazygit to open the file from within the parent process rather than spawning a new one.
-
-If for some reason you are not happy with the default commands from a preset, or there simply is no preset for your editor, you can customize the commands by setting the `edit`, `editAtLine`, and `editAtLineAndWait` options, e.g.:
+If for some reason you are not happy with the default commands from a preset, or
+there simply is no preset for your editor, you can customize the commands by
+setting the `edit`, `editAtLine`, and `editAtLineAndWait` options, e.g.:

 ```yaml
 os:
@@ -334,11 +311,13 @@ os:
  openDirInEditor: 'myeditor {{dir}}'
 ```

-The `editInTerminal` option is used to decide whether lazygit needs to suspend itself to the background before calling the editor. It should really be named `suspend` because for some cases like when lazygit is opened from within a neovim session and you're using the `nvim-remote` preset, you're technically still in a terminal. Nonetheless we're sticking with the name `editInTerminal` for backwards compatibility.
+The `editInTerminal` option is used to decide whether lazygit needs to suspend
+itself to the background before calling the editor.

-Contributions of new editor presets are welcome; see the `getPreset` function in [`editor_presets.go`](https://github.com/jesseduffield/lazygit/blob/master/pkg/config/editor_presets.go).
+Contributions of new editor presets are welcome; see the `getPreset` function in
+[`editor_presets.go`](https://github.com/jesseduffield/lazygit/blob/master/pkg/config/editor_presets.go).

-## Overriding default config file location
+### Overriding default config file location

 To override the default config directory, use `CONFIG_DIR="$HOME/.config/lazygit"`. This directory contains the config file in addition to some other files lazygit uses to keep track of state across sessions.

@@ -352,14 +331,6 @@ or
 LG_CONFIG_FILE="$HOME/.base_lg_conf,$HOME/.light_theme_lg_conf" lazygit
 ```

-## Scroll-off Margin
-
-When the selected line gets close to the bottom of the window and you hit down-arrow, there's a feature called "scroll-off margin" that lets the view scroll a little earlier so that you can see a bit of what's coming in the direction that you are moving. This is controlled by the `gui.scrollOffMargin` setting (default: 2), so it keeps 2 lines below the selection visible as you scroll down. It can be set to 0 to scroll only when the selection reaches the bottom of the window.
-
-That's the behavior when `gui.scrollOffBehavior` is set to "margin" (the default). If you set `gui.scrollOffBehavior` to "jump", then upon reaching the last line of a view and hitting down-arrow the view will scroll by half a page so that the selection ends up in the middle of the view. This may feel a little jarring because the cursor jumps around when continuously moving down, but it has the advantage that the view doesn't scroll as often.
-
-This setting applies both to all list views (e.g. commits and branches etc), and to the staging view.
-
 ## Color Attributes

 For color attributes you can choose an array of attributes (with max one color attribute)
@@ -456,18 +427,19 @@ gui:
  nerdFontsVersion: "3"
 ```

-Supported versions are "2" and "3". The deprecated config `showIcons` sets the version to "2" for backwards compatibility.
+Supported versions are "2" and "3". The deprecated config `showIcons` sets the
+version to "2" for backwards compatibility.

 ## Keybindings

 For all possible keybinding options, check [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md)

-You can disable certain key bindings by specifying `<disabled>`.
+You can disable certain key bindings by specifying `null`.

 ```yaml
 keybinding:
  universal:
-    edit: <disabled> # disable 'edit file'
+    edit: null # disable 'edit file'
 ```

 ### Example Keybindings For Colemak Users
@@ -504,7 +476,9 @@ keybinding:

 ## Custom pull request URLs

-Some git provider setups (e.g. on-premises GitLab) can have distinct URLs for git-related calls and the web interface/API itself. To work with those, Lazygit needs to know where it needs to create the pull request. You can do so on your `config.yml` file using the following syntax:
+Some git provider setups (e.g. on-premises GitLab) can have distinct URLs for git-related calls and
+the web interface/API itself. To work with those, Lazygit needs to know where it needs to create
+the pull request. You can do so on your `config.yml` file using the following syntax:

 ```yaml
 services:
@@ -519,7 +493,8 @@ Where:

 ## Predefined commit message prefix

-In situations where certain naming pattern is used for branches and commits, pattern can be used to populate commit message with prefix that is parsed from the branch name.
+In situations where certain naming pattern is used for branches and commits, pattern can be used to populate
+commit message with prefix that is parsed from the branch name.

 Example:

@@ -549,7 +524,9 @@ Result:

 ## Launching not in a repository behaviour

-By default, when launching lazygit from a directory that is not a repository, you will be prompted to choose if you would like to initialize a repo. You can override this behaviour in the config with one of the following:
+By default, when launching lazygit from a directory that is not a repository,
+you will be prompted to choose if you would like to initialize a repo. You can
+override this behaviour in the config with one of the following:

 ```yaml
 # for default prompting behaviour
@@ -1,6 +1,6 @@
 # Custom Pagers

-Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `e` in the Status panel).
+Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `o` in the Status panel).

 Support does not extend to Windows users, because we're making use of a package which doesn't have Windows support.

@@ -62,25 +62,3 @@ git:
 ```

 If you set `useConfig: 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).
-
-## Using external diff commands
-
-Some diff tools can't work as a simple pager like the ones above do, because they need access to the entire diff, so just post-processing git's diff is not enough for them. The most notable example is probably [difftastic](https://difftastic.wilfred.me.uk).
-
-These can be used in lazygit by using the `externalDiffCommand` config; in the case of difftastic, that could be
-
-```yaml
-git:
-  paging:
-    externalDiffCommand: difft --color=always
-```
-
-The `colorArg`, `pager`, and `useConfig` options are not used in this case.
-
-You can add whatever extra arguments you prefer for your difftool; for instance
-
-```yaml
-git:
-  paging:
-    externalDiffCommand: difft --color=always --display=inline --syntax-highlight=off
-```
@@ -6,5 +6,4 @@
 * [Keybindings](./keybindings)
 * [Undo/Redo](./Undoing.md)
 * [Searching/Filtering](./Searching.md)
-* [Stacked Branches](./Stacked_Branches.md)
 * [Dev docs](./dev)
@@ -1,18 +0,0 @@
-# Working with stacked branches
-
-When working on a large branch it can often be useful to break it down into
-smaller pieces, and it can help to create separate branches for each independent
-chunk of changes. For example, you could have one branch for preparatory
-refactorings, one for backend changes, and one for frontend changes. Those
-branches would then all be stacked onto each other.
-
-Git has support for rebasing such a stack as a whole; you can enable it by
-setting the git config `rebase.updateRfs` to true. If you then rebase the
-topmost branch of the stack, the other ones in the stack will follow. This
-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 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)).
@@ -1,9 +1,9 @@
 # Undo/Redo in lazygit

-You can undo the last action by pressing 'z' and redo with `ctrl+z`. Here we drop a couple of commits and then undo the actions.
-Undo uses the reflog which is specific to commits and branches so we can't undo changes to the working tree or stash.
+![Gif](../../assets/undo2.gif)

-![undo](../../assets/demo/undo-compressed.gif)
+## Keybindings:
+'z' to undo, 'ctrl+z' to redo

 ## How it works

@@ -1,82 +0,0 @@
-# Demo Recordings
-
-We want our demo recordings to be consistent and easy to update if we make changes to Lazygit's UI. Luckily for us, we have an existing recording system for the sake of our integration tests, so we can piggyback on that.
-
-You'll want to familiarise yourself with how integration tests are written: see [here](../../pkg/integration/README.md).
-
-## Prerequisites
-
-Ideally we'd run this whole thing through docker but we haven't got that working. So you will need:
-```
-# for recording
-npm i -g terminalizer
-# for gif compression
-npm i -g gifsicle
-# for mp4 conversion
-brew install ffmpeg
-
-# font with icons
-wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.2/DejaVuSansMono.tar.xz && \
-  tar -xf DejaVuSansMono.tar.xz -C /usr/local/share/fonts && \
-  rm DejaVuSansMono.tar.xz
-```
-
-## Creating a demo
-
-Demos are found in `pkg/integration/tests/demo/`. They are like regular integration tests but have `IsDemo: true` which has a few effects:
-* The bottom row of the UI is quieter so that we can render captions
-* Fetch/Push/Pull have artificial latency to mimic a network request
-* The loader at the bottom-right does not appear
-
-In demos, we don't need to be as strict in our assertions as we are in tests. But it's still good to have some basic assertions so that if we automate the process of updating demos we'll know if one of them has broken.
-
-You can use the same flow as we use with integration tests when you're writing a demo:
-* Setup the repo
-* Run the demo in sandbox mode to get a feel of what needs to happen
-* Come back and write the code to make it happen
-
-### Adding captions
-
-It's good to add captions explaining what task if being performed. Use the existing demos as a guide.
-
-### Setting up the assets worktree
-
-We store assets (which includes demo recordings) in the `assets` branch, which is a branch that shares no history with the main branch and exists purely for storing assets. Storing them separately means we don't clog up the code branches with large binaries.
-
-The scripts and demo definitions live in the code branches but the output lives in the assets branch so to be able to create a video from a demo you'll need to create a linked worktree for the assets branch which you can do with:
-
-```sh
-git worktree add .worktrees/assets assets
-```
-
-Outputs will be stored in `.worktrees/assets/demos/`. We'll store three separate things:
-* the yaml of the recording
-* the original gif
-* either the compressed gif or the mp4 depending on the output you chose (see below)
-
-### Recording the demo
-
-Once you're happy with your demo you can record it using:
-```sh
-scripts/record_demo.sh [gif|mp4] <path>
-# e.g.
-scripts/record_demo.sh gif pkg/integration/tests/demo/interactive_rebase.go
-```
-
-~~The gif format is for use in the first video of the readme (it has a larger size but has auto-play and looping)~~
-~~The mp4 format is for everything else (no looping, requires clicking, but smaller size).~~
-
-Turns out that you can't store mp4s in a repo and link them from a README so we're gonna just use gifs across the board for now.
-
-### Including demos in README/docs
-
-If you've followed the above steps you'll end up with your output in your assets worktree.
-
-Within that worktree, stage all three output files and raise a PR against the assets branch.
-
-Then back in the code branch, in the doc, you can embed the recording like so:
-```md
-![Nuke working tree](../assets/demo/interactive_rebase-compressed.gif)
-```
-
-This means we can update assets without needing to update the docs that embed them.
@@ -2,4 +2,3 @@

 * [Busy/Idle tracking](./Busy.md).
 * [Integration Tests](../../pkg/integration/README.md)
-* [Demo Recordings](./Demo_Recordings.md)
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit Keybindings

@@ -84,7 +84,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-j&gt;</kbd>: Move commit down one
  <kbd>&lt;c-k&gt;</kbd>: Move commit up one
  <kbd>v</kbd>: Paste commits (cherry-pick)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: Amend commit with staged changes
  <kbd>a</kbd>: Set/Reset commit author
  <kbd>t</kbd>: Revert commit
@@ -148,14 +147,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-y&gt;</kbd>: Copy pull request URL to clipboard
  <kbd>c</kbd>: Checkout by name
  <kbd>F</kbd>: Force checkout
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Delete branch
  <kbd>r</kbd>: Rebase checked-out branch onto this branch
  <kbd>M</kbd>: Merge into currently checked out branch
  <kbd>f</kbd>: Fast-forward this branch from its upstream
  <kbd>T</kbd>: Create tag
  <kbd>g</kbd>: View reset options
  <kbd>R</kbd>: Rename branch
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Set/Unset upstream
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
@@ -255,7 +254,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>n</kbd>: New branch
  <kbd>M</kbd>: Merge into currently checked out branch
  <kbd>r</kbd>: Rebase checked-out branch onto this branch
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: Delete branch
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: View reset options
  <kbd>w</kbd>: View worktree options
@@ -332,7 +331,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;space&gt;</kbd>: Checkout
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Delete tag
  <kbd>P</kbd>: Push tag
  <kbd>n</kbd>: Create tag
  <kbd>g</kbd>: View reset options
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit キーバインド

@@ -103,7 +103,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-j&gt;</kbd>: コミットを1つ下に移動
  <kbd>&lt;c-k&gt;</kbd>: コミットを1つ上に移動
  <kbd>v</kbd>: コミットを貼り付け (cherry-pick)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: ステージされた変更でamendコミット
  <kbd>a</kbd>: Set/Reset commit author
  <kbd>t</kbd>: コミットをrevert
@@ -172,7 +171,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;space&gt;</kbd>: チェックアウト
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: タグを削除
  <kbd>P</kbd>: タグをpush
  <kbd>n</kbd>: タグを作成
  <kbd>g</kbd>: View reset options
@@ -220,14 +219,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-y&gt;</kbd>: Pull RequestのURLをクリップボードにコピー
  <kbd>c</kbd>: Checkout by name
  <kbd>F</kbd>: Force checkout
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: ブランチを削除
  <kbd>r</kbd>: Rebase checked-out branch onto this branch
  <kbd>M</kbd>: 現在のブランチにマージ
  <kbd>f</kbd>: Fast-forward this branch from its upstream
  <kbd>T</kbd>: タグを作成
  <kbd>g</kbd>: View reset options
  <kbd>R</kbd>: ブランチ名を変更
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Set/Unset upstream
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
  <kbd>/</kbd>: Filter the current view by text
@@ -320,7 +319,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>n</kbd>: 新しいブランチを作成
  <kbd>M</kbd>: 現在のブランチにマージ
  <kbd>r</kbd>: Rebase checked-out branch onto this branch
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: ブランチを削除
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: View reset options
  <kbd>w</kbd>: View worktree options
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit 키 바인딩

@@ -183,14 +183,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-y&gt;</kbd>: 풀 리퀘스트 URL을 클립보드에 복사
  <kbd>c</kbd>: 이름으로 체크아웃
  <kbd>F</kbd>: 강제 체크아웃
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 브랜치 삭제
  <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
  <kbd>M</kbd>: 현재 브랜치에 병합
  <kbd>f</kbd>: Fast-forward this branch from its upstream
  <kbd>T</kbd>: 태그를 생성
  <kbd>g</kbd>: View reset options
  <kbd>R</kbd>: 브랜치 이름 변경
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Set/Unset upstream
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 커밋 보기
  <kbd>/</kbd>: Filter the current view by text
@@ -239,7 +239,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>n</kbd>: 새 브랜치 생성
  <kbd>M</kbd>: 현재 브랜치에 병합
  <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: 브랜치 삭제
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: View reset options
  <kbd>w</kbd>: View worktree options
@@ -265,7 +265,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-j&gt;</kbd>: 커밋을 1개 아래로 이동
  <kbd>&lt;c-k&gt;</kbd>: 커밋을 1개 위로 이동
  <kbd>v</kbd>: 커밋을 붙여넣기 (cherry-pick)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: Amend commit with staged changes
  <kbd>a</kbd>: Set/Reset commit author
  <kbd>t</kbd>: 커밋 되돌리기
@@ -309,7 +308,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;space&gt;</kbd>: 체크아웃
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 태그 삭제
  <kbd>P</kbd>: 태그를 push
  <kbd>n</kbd>: 태그를 생성
  <kbd>g</kbd>: View reset options
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit Sneltoetsen

@@ -90,14 +90,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-y&gt;</kbd>: Kopieer de URL van het pull-verzoek naar het klembord
  <kbd>c</kbd>: Uitchecken bij naam
  <kbd>F</kbd>: Forceer checkout
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Verwijder branch
  <kbd>r</kbd>: Rebase branch
  <kbd>M</kbd>: Merge in met huidige checked out branch
  <kbd>f</kbd>: Fast-forward deze branch vanaf zijn upstream
  <kbd>T</kbd>: Creëer tag
  <kbd>g</kbd>: Bekijk reset opties
  <kbd>R</kbd>: Hernoem branch
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Set/Unset upstream
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
  <kbd>/</kbd>: Filter the current view by text
@@ -143,7 +143,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-j&gt;</kbd>: Verplaats commit 1 naar beneden
  <kbd>&lt;c-k&gt;</kbd>: Verplaats commit 1 naar boven
  <kbd>v</kbd>: Plak commits (cherry-pick)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: Wijzig commit met staged veranderingen
  <kbd>a</kbd>: Set/Reset commit author
  <kbd>t</kbd>: Commit ongedaan maken
@@ -233,7 +232,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>n</kbd>: Nieuwe branch
  <kbd>M</kbd>: Merge in met huidige checked out branch
  <kbd>r</kbd>: Rebase branch
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: Verwijder branch
  <kbd>u</kbd>: Stel in als upstream van uitgecheckte branch
  <kbd>g</kbd>: Bekijk reset opties
  <kbd>w</kbd>: View worktree options
@@ -332,7 +331,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;space&gt;</kbd>: Uitchecken
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Verwijder tag
  <kbd>P</kbd>: Push tag
  <kbd>n</kbd>: Creëer tag
  <kbd>g</kbd>: Bekijk reset opties
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit Keybindings

@@ -69,7 +69,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-j&gt;</kbd>: Przenieś commit 1 w dół
  <kbd>&lt;c-k&gt;</kbd>: Przenieś commit 1 w górę
  <kbd>v</kbd>: Wklej commity (przebieranie)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: Popraw commit zmianami z poczekalni
  <kbd>a</kbd>: Set/Reset commit author
  <kbd>t</kbd>: Odwróć commit
@@ -106,14 +105,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-y&gt;</kbd>: Skopiuj adres URL żądania pobrania do schowka
  <kbd>c</kbd>: Przełącz używając nazwy
  <kbd>F</kbd>: Wymuś przełączenie
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Usuń gałąź
  <kbd>r</kbd>: Zmiana bazy gałęzi
  <kbd>M</kbd>: Scal do obecnej gałęzi
  <kbd>f</kbd>: Fast-forward this branch from its upstream
  <kbd>T</kbd>: Create tag
  <kbd>g</kbd>: Wyświetl opcje resetu
  <kbd>R</kbd>: Rename branch
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Set/Unset upstream
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: View commits
  <kbd>/</kbd>: Filter the current view by text
@@ -232,7 +231,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>n</kbd>: Nowa gałąź
  <kbd>M</kbd>: Scal do obecnej gałęzi
  <kbd>r</kbd>: Zmiana bazy gałęzi
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: Usuń gałąź
  <kbd>u</kbd>: Set as upstream of checked-out branch
  <kbd>g</kbd>: Wyświetl opcje resetu
  <kbd>w</kbd>: View worktree options
@@ -325,7 +324,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;space&gt;</kbd>: Przełącz
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Delete tag
  <kbd>P</kbd>: Push tag
  <kbd>n</kbd>: Create tag
  <kbd>g</kbd>: Wyświetl opcje resetu
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit Связки клавиш

@@ -151,7 +151,6 @@ _Связки клавиш_
  <kbd>&lt;c-j&gt;</kbd>: Переместить коммит вниз на один
  <kbd>&lt;c-k&gt;</kbd>: Переместить коммит вверх на один
  <kbd>v</kbd>: Вставить отобранные коммиты (cherry-pick)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: Править последний коммит с проиндексированными изменениями
  <kbd>a</kbd>: Установить/убрать автора коммита
  <kbd>t</kbd>: Отменить коммит
@@ -181,14 +180,14 @@ _Связки клавиш_
  <kbd>&lt;c-y&gt;</kbd>: Скопировать URL запроса на принятие изменений в буфер обмена
  <kbd>c</kbd>: Переключить по названию
  <kbd>F</kbd>: Принудительное переключение
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Удалить ветку
  <kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку
  <kbd>M</kbd>: Слияние с текущей переключённой веткой
  <kbd>f</kbd>: Перемотать эту ветку вперёд из её upstream-ветки
  <kbd>T</kbd>: Создать тег
  <kbd>g</kbd>: Просмотреть параметры сброса
  <kbd>R</kbd>: Переименовать ветку
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Установить/убрать upstream-ветку
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
  <kbd>/</kbd>: Filter the current view by text
@@ -277,7 +276,7 @@ _Связки клавиш_

 <pre>
  <kbd>&lt;space&gt;</kbd>: Переключить
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: Удалить тег
  <kbd>P</kbd>: Отправить тег
  <kbd>n</kbd>: Создать тег
  <kbd>g</kbd>: Просмотреть параметры сброса
@@ -294,7 +293,7 @@ _Связки клавиш_
  <kbd>n</kbd>: Новая ветка
  <kbd>M</kbd>: Слияние с текущей переключённой веткой
  <kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: Удалить ветку
  <kbd>u</kbd>: Установить как upstream-ветку переключённую ветку
  <kbd>g</kbd>: Просмотреть параметры сброса
  <kbd>w</kbd>: View worktree options
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit 按键绑定

@@ -84,14 +84,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-y&gt;</kbd>: 将抓取请求 URL 复制到剪贴板
  <kbd>c</kbd>: 按名称检出
  <kbd>F</kbd>: 强制检出
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 删除分支
  <kbd>r</kbd>: 将已检出的分支变基到该分支
  <kbd>M</kbd>: 合并到当前检出的分支
  <kbd>f</kbd>: 从上游快进此分支
  <kbd>T</kbd>: 创建标签
  <kbd>g</kbd>: 查看重置选项
  <kbd>R</kbd>: 重命名分支
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: Set/Unset upstream
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 查看提交
  <kbd>/</kbd>: Filter the current view by text
@@ -147,7 +147,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>&lt;c-j&gt;</kbd>: 下移提交
  <kbd>&lt;c-k&gt;</kbd>: 上移提交
  <kbd>v</kbd>: 粘贴提交（拣选）
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: 用已暂存的更改来修补提交
  <kbd>a</kbd>: Set/Reset commit author
  <kbd>t</kbd>: 还原提交
@@ -234,7 +233,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_

 <pre>
  <kbd>&lt;space&gt;</kbd>: 检出
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 删除标签
  <kbd>P</kbd>: 推送标签
  <kbd>n</kbd>: 创建标签
  <kbd>g</kbd>: 查看重置选项
@@ -334,7 +333,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
  <kbd>n</kbd>: 新分支
  <kbd>M</kbd>: 合并到当前检出的分支
  <kbd>r</kbd>: 将已检出的分支变基到该分支
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: 删除分支
  <kbd>u</kbd>: 设置为检出分支的上游
  <kbd>g</kbd>: 查看重置选项
  <kbd>w</kbd>: View worktree options
@@ -1,4 +1,4 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go generate ./...` from the project root._
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._

 # Lazygit 鍵盤快捷鍵

@@ -191,7 +191,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>&lt;c-j&gt;</kbd>: 向下移動提交
  <kbd>&lt;c-k&gt;</kbd>: 向上移動提交
  <kbd>v</kbd>: 貼上提交 (揀選)
-  <kbd>B</kbd>: Mark commit as base commit for rebase
  <kbd>A</kbd>: 使用已預存的更改修正提交
  <kbd>a</kbd>: 設置/重設提交作者
  <kbd>t</kbd>: 還原提交
@@ -256,14 +255,14 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>&lt;c-y&gt;</kbd>: 複製拉取請求的 URL 到剪貼板
  <kbd>c</kbd>: 根據名稱檢出
  <kbd>F</kbd>: 強制檢出
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 刪除分支
  <kbd>r</kbd>: 將已檢出的分支變基至此分支
  <kbd>M</kbd>: 合併到當前檢出的分支
  <kbd>f</kbd>: 從上游快進此分支
  <kbd>T</kbd>: 建立標籤
  <kbd>g</kbd>: 檢視重設選項
  <kbd>R</kbd>: 重新命名分支
-  <kbd>u</kbd>: View upstream options
+  <kbd>u</kbd>: 設定/取消設定上游
  <kbd>w</kbd>: View worktree options
  <kbd>&lt;enter&gt;</kbd>: 檢視提交
  <kbd>/</kbd>: Filter the current view by text
@@ -273,7 +272,7 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_

 <pre>
  <kbd>&lt;space&gt;</kbd>: 檢出
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 刪除標籤
  <kbd>P</kbd>: 推送標籤
  <kbd>n</kbd>: 建立標籤
  <kbd>g</kbd>: 檢視重設選項
@@ -344,7 +343,7 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
  <kbd>n</kbd>: 新分支
  <kbd>M</kbd>: 合併到當前檢出的分支
  <kbd>r</kbd>: 將已檢出的分支變基至此分支
-  <kbd>d</kbd>: Delete remote tag
+  <kbd>d</kbd>: 刪除分支
  <kbd>u</kbd>: 將此分支設為當前分支之上游
  <kbd>g</kbd>: 檢視重設選項
  <kbd>w</kbd>: View worktree options
@@ -1,21 +1,24 @@
 module github.com/jesseduffield/lazygit

-go 1.20
+go 1.18

 require (
 	github.com/OpenPeeDeeP/xdg v1.0.0
 	github.com/atotto/clipboard v0.1.4
 	github.com/aybabtme/humanlog v0.4.1
+	github.com/cli/safeexec v1.0.0
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 	github.com/creack/pty v1.1.11
 	github.com/fsmiamoto/git-todo-parser v0.0.5
-	github.com/go-errors/errors v1.5.1
+	github.com/fsnotify/fsnotify v1.4.7
+	github.com/gdamore/tcell/v2 v2.6.0
+	github.com/go-errors/errors v1.4.2
 	github.com/gookit/color v1.4.2
 	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.20230925062444-7cd0d7e2a70a
+	github.com/jesseduffield/gocui v0.3.1-0.20230723014157-03e858e46144
 	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
@@ -23,21 +26,17 @@ require (
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/mattn/go-runewidth v0.0.15
+	github.com/mattn/go-runewidth v0.0.14
 	github.com/mgutz/str v1.2.0
-	github.com/mitchellh/go-ps v1.0.0
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/sahilm/fuzzy v0.1.0
 	github.com/samber/lo v1.31.0
 	github.com/sanity-io/litter v1.5.2
 	github.com/sasha-s/go-deadlock v0.3.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.9.5
 	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
-	github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68
 	github.com/stretchr/testify v1.8.0
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
-	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8
 	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -65,11 +64,13 @@ require (
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 // indirect
 	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
@@ -55,6 +55,8 @@ 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/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=
@@ -82,14 +84,18 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fsmiamoto/git-todo-parser v0.0.5 h1:Bhzd/vz/6Qm3udfkd6NO9fWfD3TpwR9ucp3N75/J5I8=
 github.com/fsmiamoto/git-todo-parser v0.0.5/go.mod h1:B+AgTbNE2BARvJqzXygThzqxLIaEWvwr2sxKYYb0Fas=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
+github.com/gdamore/tcell/v2 v2.4.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
+github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
+github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
-github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
-github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
 github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM=
@@ -179,8 +185,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.20230925062444-7cd0d7e2a70a h1:/Ifbvq4BWY5VKoyPnHIW5oRLiy00S3ebFtVIY2MlJm0=
-github.com/jesseduffield/gocui v0.3.1-0.20230925062444-7cd0d7e2a70a/go.mod h1:trXE7RRGL2hTsv+Ntk+SHLtRobg9JE138n3Ug/X2Cf4=
+github.com/jesseduffield/gocui v0.3.1-0.20230723014157-03e858e46144 h1:gwy5JzP6+PhcPFG1obkUSLGcTkUY88sLKlCPOFjwtak=
+github.com/jesseduffield/gocui v0.3.1-0.20230723014157-03e858e46144/go.mod h1:dJ/BEUt3OWtaRg/PmuJWendRqREhre9JQ1SLvqrVJ8s=
 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=
@@ -212,6 +218,7 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/kyokomi/emoji/v2 v2.2.8 h1:jcofPxjHWEkJtkIbcLHvZhxKgCPl6C7MyjTrD4KDqUE=
 github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
+github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -223,15 +230,13 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 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.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-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=
 github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
-github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -241,14 +246,15 @@ github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
@@ -270,8 +276,6 @@ github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
 github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
-github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68 h1:NSTj9xAKUu85d6pAdNFyblL84BfiOB1rVnzxQO/cYUk=
-github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68/go.mod h1:PuJ7T6QKbsU7iVOHlhRoV3D/ipIAJsyiV4dbwcVaYj8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
@@ -310,6 +314,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 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 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
 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=
@@ -453,13 +458,14 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/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.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 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=
@@ -469,8 +475,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.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=
@@ -13,6 +13,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"

+	"github.com/jesseduffield/generics/slices"
 	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
@@ -62,7 +63,6 @@ func Run(

 func NewCommon(config config.AppConfigurer) (*common.Common, error) {
 	userConfig := config.GetUserConfig()
-	appState := config.GetAppState()

 	var err error
 	log := newLogger(config)
@@ -75,7 +75,6 @@ func NewCommon(config config.AppConfigurer) (*common.Common, error) {
 		Log:        log,
 		Tr:         tr,
 		UserConfig: userConfig,
-		AppState:   appState,
 		Debug:      config.GetDebug(),
 		Fs:         afero.NewOsFs(),
 	}, nil
@@ -268,11 +267,7 @@ func (app *App) Run(startArgs appTypes.StartArgs) error {

 // Close closes any resources
 func (app *App) Close() error {
-	for _, closer := range app.closers {
-		if err := closer.Close(); err != nil {
-			return err
-		}
-	}
-
-	return nil
+	return slices.TryForEach(app.closers, func(closer io.Closer) error {
+		return closer.Close()
+	})
 }
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"strconv"

 	"github.com/fsmiamoto/git-todo-parser/todo"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/secureexec"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )
@@ -92,7 +92,7 @@ func getDaemonKind() DaemonKind {
 }

 func getCommentChar() byte {
-	cmd := exec.Command("git", "config", "--get", "--null", "core.commentChar")
+	cmd := secureexec.Command("git", "config", "--get", "--null", "core.commentChar")
 	if output, err := cmd.Output(); err == nil && len(output) == 2 {
 		return output[0]
 	}
@@ -6,10 +6,10 @@ import (
 	"strings"

 	"github.com/fsmiamoto/git-todo-parser/todo"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/samber/lo"
 )

 type TodoLine struct {
@@ -26,11 +26,11 @@ func (self *TodoLine) ToString() string {
 }

 func TodoLinesToString(todoLines []TodoLine) string {
-	lines := lo.Map(todoLines, func(todoLine TodoLine, _ int) string {
+	lines := slices.Map(todoLines, func(todoLine TodoLine) string {
 		return todoLine.ToString()
 	})

-	return strings.Join(lo.Reverse(lines), "")
+	return strings.Join(slices.Reverse(lines), "")
 }

 type ChangeTodoAction struct {
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
@@ -18,6 +17,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/env"
 	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
 	"github.com/jesseduffield/lazygit/pkg/logs/tail"
+	"github.com/jesseduffield/lazygit/pkg/secureexec"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 	"gopkg.in/yaml.v3"
@@ -63,17 +63,8 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 			log.Fatal(absRepoPath + " is not a valid git repository.")
 		}

+		cliArgs.WorkTree = absRepoPath
 		cliArgs.GitDir = filepath.Join(absRepoPath, ".git")
-		err = os.Chdir(absRepoPath)
-		if err != nil {
-			log.Fatalf("Failed to change directory to %s: %v", absRepoPath, err)
-		}
-	} else if cliArgs.WorkTree != "" {
-		env.SetWorkTreeEnv(cliArgs.WorkTree)
-
-		if err := os.Chdir(cliArgs.WorkTree); err != nil {
-			log.Fatalf("Failed to change directory to %s: %v", cliArgs.WorkTree, err)
-		}
 	}

 	if cliArgs.CustomConfigFile != "" {
@@ -84,6 +75,13 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		os.Setenv("CONFIG_DIR", cliArgs.UseConfigDir)
 	}

+	if cliArgs.WorkTree != "" {
+		err := os.Chdir(cliArgs.WorkTree)
+		if err != nil {
+			log.Fatalf("Failed to change directory to %s: %v", cliArgs.WorkTree, err)
+		}
+	}
+
 	if cliArgs.GitDir != "" {
 		env.SetGitDirEnv(cliArgs.GitDir)
 	}
@@ -120,6 +118,12 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		os.Exit(0)
 	}

+	if cliArgs.WorkTree != "" {
+		if err := os.Chdir(cliArgs.WorkTree); err != nil {
+			log.Fatal(err.Error())
+		}
+	}
+
 	tempDir, err := os.MkdirTemp("", "lazygit-*")
 	if err != nil {
 		log.Fatal(err.Error())
@@ -180,10 +184,10 @@ func parseCliArgsAndEnvVars() *cliArgs {
 	useConfigDir := ""
 	flaggy.String(&useConfigDir, "ucd", "use-config-dir", "override default config directory with provided directory")

-	workTree := os.Getenv("GIT_WORK_TREE")
+	workTree := ""
 	flaggy.String(&workTree, "w", "work-tree", "equivalent of the --work-tree git argument")

-	gitDir := os.Getenv("GIT_DIR")
+	gitDir := ""
 	flaggy.String(&gitDir, "g", "git-dir", "equivalent of the --git-dir git argument")

 	customConfigFile := ""
@@ -276,7 +280,7 @@ func mergeBuildInfo(buildInfo *BuildInfo) {
 }

 func getGitVersionInfo() string {
-	cmd := exec.Command("git", "--version")
+	cmd := secureexec.Command("git", "--version")
 	stdout, _ := cmd.Output()
 	gitVersion := strings.Trim(strings.TrimPrefix(string(stdout), "git version "), " \r\n")
 	return gitVersion
@@ -3,8 +3,8 @@ package app
 import (
 	"strings"

+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/samber/lo"
 )

 type errorMapping struct {
@@ -18,7 +18,7 @@ func knownError(tr *i18n.TranslationSet, err error) (string, bool) {

 	knownErrorMessages := []string{tr.MinGitVersionError}

-	if lo.Contains(knownErrorMessages, errorMessage) {
+	if slices.Contains(knownErrorMessages, errorMessage) {
 		return errorMessage, true
 	}

@@ -29,7 +29,7 @@ func knownError(tr *i18n.TranslationSet, err error) (string, bool) {
 		},
 	}

-	if mapping, ok := lo.Find(mappings, func(mapping errorMapping) bool {
+	if mapping, ok := slices.Find(mappings, func(mapping errorMapping) bool {
 		return strings.Contains(errorMessage, mapping.originalError)
 	}); ok {
 		return mapping.newError, true
@@ -0,0 +1,77 @@
+package cheatsheet
+
+import (
+	"fmt"
+	"io/fs"
+	"log"
+	"os"
+	"path/filepath"
+	"regexp"
+
+	"github.com/pmezard/go-difflib/difflib"
+)
+
+func Check() {
+	dir := GetKeybindingsDir()
+	tmpDir := filepath.Join(os.TempDir(), "lazygit_cheatsheet")
+	err := os.RemoveAll(tmpDir)
+	if err != nil {
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+	}
+	err = os.Mkdir(tmpDir, 0o700)
+	if err != nil {
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+	}
+
+	generateAtDir(tmpDir)
+	defer os.RemoveAll(tmpDir)
+
+	actualContent := obtainContent(dir)
+	expectedContent := obtainContent(tmpDir)
+
+	if expectedContent == "" {
+		log.Fatal("empty expected content")
+	}
+
+	if actualContent != expectedContent {
+		err := difflib.WriteUnifiedDiff(os.Stdout, difflib.UnifiedDiff{
+			A:        difflib.SplitLines(expectedContent),
+			B:        difflib.SplitLines(actualContent),
+			FromFile: "Expected",
+			FromDate: "",
+			ToFile:   "Actual",
+			ToDate:   "",
+			Context:  1,
+		})
+		if err != nil {
+			log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+		}
+		fmt.Printf("\nCheatsheets are out of date. Please run `%s` at the project root and commit the changes. If you run the script and no keybindings files are updated as a result, try rebasing onto master and trying again.\n", CommandToRun())
+		os.Exit(1)
+	}
+
+	fmt.Println("\nCheatsheets are up to date")
+}
+
+func obtainContent(dir string) string {
+	re := regexp.MustCompile(`Keybindings_\w+\.md$`)
+
+	content := ""
+	err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
+		if re.MatchString(path) {
+			bytes, err := os.ReadFile(path)
+			if err != nil {
+				log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+			}
+			content += fmt.Sprintf("\n%s\n\n", filepath.Base(path))
+			content += string(bytes)
+		}
+
+		return nil
+	})
+	if err != nil {
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+	}
+
+	return content
+}
@@ -1,12 +1,10 @@
-//go:generate go run generator.go
-
-// This "script" generates files called Keybindings_{{.LANG}}.md
-// in the docs/keybindings directory.
+// This "script" generates a file called Keybindings_{{.LANG}}.md
+// in current working directory.
 //
-// The content of these generated files is a keybindings cheatsheet.
+// The content of this generated file is a keybindings cheatsheet.
 //
-// To generate the cheatsheets, run:
-//   go generate pkg/cheatsheet/generate.go
+// To generate cheatsheet in english run:
+//   go run scripts/generate_cheatsheet.go

 package cheatsheet

@@ -17,6 +15,7 @@ import (
 	"strings"

 	"github.com/jesseduffield/generics/maps"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazycore/pkg/utils"
 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
@@ -24,7 +23,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
 )

 type bindingSection struct {
@@ -44,7 +42,7 @@ type headerWithBindings struct {
 }

 func CommandToRun() string {
-	return "go generate ./..."
+	return "go run scripts/cheatsheet/main.go generate"
 }

 func GetKeybindingsDir() string {
@@ -131,7 +129,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {

 func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*bindingSection {
 	excludedViews := []string{"stagingSecondary", "patchBuildingSecondary"}
-	bindingsToDisplay := lo.Filter(bindings, func(binding *types.Binding, _ int) bool {
+	bindingsToDisplay := slices.Filter(bindings, func(binding *types.Binding) bool {
 		if lo.Contains(excludedViews, binding.ViewName) {
 			return false
 		}
@@ -164,7 +162,7 @@ func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*b
 		return a.header.title < b.header.title
 	})

-	return lo.Map(bindingGroups, func(hb headerWithBindings, _ int) *bindingSection {
+	return slices.Map(bindingGroups, func(hb headerWithBindings) *bindingSection {
 		return &bindingSection{
 			title:    hb.header.title,
 			bindings: hb.bindings,
@@ -1,14 +0,0 @@
-//go:build ignore
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/lazygit/pkg/cheatsheet"
-)
-
-func main() {
-	fmt.Printf("Generating cheatsheets in %s...\n", cheatsheet.GetKeybindingsDir())
-	cheatsheet.Generate()
-}
@@ -7,6 +7,7 @@ import (
 	"strings"

 	"github.com/go-errors/errors"
+	"github.com/sasha-s/go-deadlock"
 	"github.com/spf13/afero"

 	gogit "github.com/jesseduffield/go-git/v5"
@@ -62,6 +63,7 @@ func NewGitCommand(
 	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
+	syncMutex *deadlock.Mutex,
 ) (*GitCommand, error) {
 	currentPath, err := os.Getwd()
 	if err != nil {
@@ -116,6 +118,7 @@ func NewGitCommand(
 		gitConfig,
 		repoPaths,
 		repository,
+		syncMutex,
 	), nil
 }

@@ -126,6 +129,7 @@ func NewGitCommandAux(
 	gitConfig git_config.IGitConfig,
 	repoPaths *git_commands.RepoPaths,
 	repo *gogit.Repository,
+	syncMutex *deadlock.Mutex,
 ) *GitCommand {
 	cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd)

@@ -136,7 +140,7 @@ func NewGitCommandAux(
 	// common ones are: cmn, osCommand, dotGitDir, configCommands
 	configCommands := git_commands.NewConfigCommands(cmn, gitConfig, repo)

-	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, repo, configCommands)
+	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, repoPaths, repo, configCommands, syncMutex)

 	fileLoader := git_commands.NewFileLoader(gitCommon, cmd, configCommands)
 	statusCommands := git_commands.NewStatusCommands(gitCommon)
@@ -155,7 +159,9 @@ func NewGitCommandAux(
 	stashCommands := git_commands.NewStashCommands(gitCommon, fileLoader, workingTreeCommands)
 	patchBuilder := patch.NewPatchBuilder(cmn.Log,
 		func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
-			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, plain)
+			// TODO: make patch builder take Gui.IgnoreWhitespaceInDiffView into
+			// account. For now we just pass false.
+			return workingTreeCommands.ShowFileDiff(from, to, reverse, filename, plain, false)
 		})
 	patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
 	bisectCommands := git_commands.NewBisectCommands(gitCommon)
@@ -125,15 +125,6 @@ func (self *BisectCommands) Start() error {
 	return self.cmd.New(cmdArgs).StreamOutput().Run()
 }

-func (self *BisectCommands) StartWithTerms(oldTerm string, newTerm string) error {
-	cmdArgs := NewGitCmd("bisect").Arg("start").
-		Arg("--term-old=" + oldTerm).
-		Arg("--term-new=" + newTerm).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).StreamOutput().Run()
-}
-
 // tells us whether we've found our problem commit(s). We return a string slice of
 // commit sha's if we're done, and that slice may have more that one item if
 // skipped commits are involved.
@@ -2,7 +2,7 @@ package git_commands

 import (
 	"github.com/jesseduffield/generics/maps"
-	"github.com/samber/lo"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/sirupsen/logrus"
 )

@@ -97,5 +97,5 @@ func (self *BisectInfo) Bisecting() bool {
 		return false
 	}

-	return lo.Contains(maps.Values(self.statusMap), BisectStatusOld)
+	return slices.Contains(maps.Values(self.statusMap), BisectStatusOld)
 }
@@ -70,23 +70,8 @@ func (self *BranchCommands) CurrentBranchInfo() (BranchInfo, error) {
 	}, nil
 }

-// CurrentBranchName get name of current branch
-func (self *BranchCommands) CurrentBranchName() (string, error) {
-	cmdArgs := NewGitCmd("rev-parse").
-		Arg("--abbrev-ref").
-		Arg("--verify").
-		Arg("HEAD").
-		ToArgv()
-
-	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	if err == nil {
-		return strings.TrimSpace(output), nil
-	}
-	return "", err
-}
-
-// LocalDelete delete branch locally
-func (self *BranchCommands) LocalDelete(branch string, force bool) error {
+// Delete delete branch
+func (self *BranchCommands) Delete(branch string, force bool) error {
 	cmdArgs := NewGitCmd("branch").
 		ArgIfElse(force, "-D", "-d").
 		Arg(branch).
@@ -6,13 +6,13 @@ import (
 	"strings"

 	"github.com/jesseduffield/generics/set"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/go-git/v5/config"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
 )

 // context:
@@ -75,7 +75,7 @@ outer:
 			if strings.EqualFold(reflogBranch.Name, branch.Name) {
 				branch.Recency = reflogBranch.Recency
 				branchesWithRecency = append(branchesWithRecency, branch)
-				branches = utils.Remove(branches, j)
+				branches = slices.Remove(branches, j)
 				continue outer
 			}
 		}
@@ -87,14 +87,14 @@ outer:
 		return a.Name < b.Name
 	})

-	branches = utils.Prepend(branches, branchesWithRecency...)
+	branches = slices.Prepend(branches, branchesWithRecency...)

 	foundHead := false
 	for i, branch := range branches {
 		if branch.Head {
 			foundHead = true
 			branch.Recency = "  *"
-			branches = utils.Move(branches, i, 0)
+			branches = slices.Move(branches, i, 0)
 			break
 		}
 	}
@@ -103,7 +103,7 @@ outer:
 		if err != nil {
 			return nil, err
 		}
-		branches = utils.Prepend(branches, &models.Branch{Name: info.RefName, DisplayName: info.DisplayName, Head: true, DetachedHead: info.DetachedHead, Recency: "  *"})
+		branches = slices.Prepend(branches, &models.Branch{Name: info.RefName, DisplayName: info.DisplayName, Head: true, DetachedHead: info.DetachedHead, Recency: "  *"})
 	}

 	configBranches, err := self.config.Branches()
@@ -131,7 +131,7 @@ func (self *BranchLoader) obtainBranches() []*models.Branch {
 	trimmedOutput := strings.TrimSpace(output)
 	outputLines := strings.Split(trimmedOutput, "\n")

-	return lo.FilterMap(outputLines, func(line string, _ int) (*models.Branch, bool) {
+	return slices.FilterMap(outputLines, func(line string) (*models.Branch, bool) {
 		if line == "" {
 			return nil, false
 		}
@@ -171,7 +171,7 @@ var branchFields = []string{
 	"upstream:short",
 	"upstream:track",
 	"subject",
-	"objectname",
+	fmt.Sprintf("objectname:short=%d", utils.COMMIT_HASH_SHORT_SIZE),
 }

 // Obtain branch information from parsed line output of getRawBranches()
@@ -93,7 +93,7 @@ func TestBranchDeleteBranch(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildBranchCommands(commonDeps{runner: s.runner})

-			s.test(instance.LocalDelete("test", s.force))
+			s.test(instance.Delete("test", s.force))
 			s.runner.CheckForMissingCalls()
 		})
 	}
@@ -38,22 +38,6 @@ func (self *CommitCommands) SetAuthor(value string) error {
 	return self.cmd.New(cmdArgs).Run()
 }

-// Add a commit's coauthor using Github/Gitlab Co-authored-by metadata. Value is expected to be of the form 'Name <Email>'
-func (self *CommitCommands) AddCoAuthor(sha string, value string) error {
-	message, err := self.GetCommitMessage(sha)
-	if err != nil {
-		return err
-	}
-
-	message = message + fmt.Sprintf("\nCo-authored-by: %s", value)
-
-	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--amend", "--only", "-m", message).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
 // ResetToCommit reset to commit
 func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars []string) error {
 	cmdArgs := NewGitCmd("reset").Arg("--"+strength, sha).ToArgv()
@@ -84,19 +68,6 @@ func (self *CommitCommands) RewordLastCommitInEditorCmdObj() oscommands.ICmdObj
 	return self.cmd.New(NewGitCmd("commit").Arg("--allow-empty", "--amend", "--only").ToArgv())
 }

-func (self *CommitCommands) RewordLastCommitInEditorWithMessageFileCmdObj(tmpMessageFile string) oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("commit").
-		Arg("--allow-empty", "--amend", "--only", "--edit", "--file="+tmpMessageFile).ToArgv())
-}
-
-func (self *CommitCommands) CommitInEditorWithMessageFileCmdObj(tmpMessageFile string) oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("commit").
-		Arg("--edit").
-		Arg("--file="+tmpMessageFile).
-		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
-		ToArgv())
-}
-
 // RewordLastCommit rewords the topmost commit with the given message
 func (self *CommitCommands) RewordLastCommit(summary string, description string) error {
 	messageArgs := self.commitMessageArgs(summary, description)
@@ -212,13 +183,10 @@ func (self *CommitCommands) AmendHeadCmdObj() oscommands.ICmdObj {
 	return self.cmd.New(cmdArgs)
 }

-func (self *CommitCommands) ShowCmdObj(sha string, filterPath string) oscommands.ICmdObj {
-	contextSize := self.AppState.DiffContextSize
+func (self *CommitCommands) ShowCmdObj(sha string, filterPath string, ignoreWhitespace bool) oscommands.ICmdObj {
+	contextSize := self.UserConfig.Git.DiffContextSize

-	extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
 	cmdArgs := NewGitCmd("show").
-		ConfigIf(extDiffCmd != "", "diff.external="+extDiffCmd).
-		ArgIfElse(extDiffCmd != "", "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
 		Arg("--color="+self.UserConfig.Git.Paging.ColorArg).
 		Arg(fmt.Sprintf("--unified=%d", contextSize)).
@@ -226,7 +194,7 @@ func (self *CommitCommands) ShowCmdObj(sha string, filterPath string) oscommands
 		Arg("--decorate").
 		Arg("-p").
 		Arg(sha).
-		ArgIf(self.AppState.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		ArgIf(ignoreWhitespace, "--ignore-all-space").
 		ArgIf(filterPath != "", "--", filterPath).
 		ToArgv()

@@ -3,6 +3,7 @@ package git_commands
 import (
 	"strings"

+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
@@ -51,7 +52,7 @@ func getCommitFilesFromFilenames(filenames string) []*models.CommitFile {
 	}

 	// typical result looks like 'A my_file' meaning my_file was added
-	return lo.Map(lo.Chunk(lines, 2), func(chunk []string, _ int) *models.CommitFile {
+	return slices.Map(lo.Chunk(lines, 2), func(chunk []string) *models.CommitFile {
 		return &models.CommitFile{
 			ChangeStatus: chunk[0],
 			Name:         chunk[1],
@@ -6,12 +6,12 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"

 	"github.com/fsmiamoto/git-todo-parser/todo"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
@@ -66,11 +66,8 @@ type GetCommitsOptions struct {
 	FilterPath           string
 	IncludeRebaseCommits bool
 	RefName              string // e.g. "HEAD" or "my_branch"
-	RefForPushedStatus   string // the ref to use for determining pushed/unpushed status
 	// determines if we show the whole git graph i.e. pass the '--all' flag
 	All bool
-	// If non-empty, show divergence from this ref (left-right log)
-	RefToShowDivergenceFrom string
 }

 // GetCommits obtains the commits of the current branch
@@ -96,26 +93,22 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
 		defer wg.Done()

 		logErr = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
-			commit := self.extractCommitFromLine(line, opts.RefToShowDivergenceFrom != "")
+			commit := self.extractCommitFromLine(line)
 			commits = append(commits, commit)
 			return false, nil
 		})
 	})

 	var ancestor string
-	var remoteAncestor string
 	go utils.Safe(func() {
 		defer wg.Done()

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

 	passedFirstPushedCommit := false
 	// I can get this before
-	firstPushedCommit, err := self.getFirstPushedCommit(opts.RefForPushedStatus)
+	firstPushedCommit, err := self.getFirstPushedCommit(opts.RefName)
 	if err != nil {
 		// must have no upstream branch so we'll consider everything as pushed
 		passedFirstPushedCommit = true
@@ -131,12 +124,10 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
 		if commit.Sha == firstPushedCommit {
 			passedFirstPushedCommit = true
 		}
-		if commit.Status != models.StatusRebasing {
-			if passedFirstPushedCommit {
-				commit.Status = models.StatusPushed
-			} else {
-				commit.Status = models.StatusUnpushed
-			}
+		if passedFirstPushedCommit {
+			commit.Status = models.StatusPushed
+		} else {
+			commit.Status = models.StatusUnpushed
 		}
 	}

@@ -144,23 +135,8 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
 		return commits, nil
 	}

-	if opts.RefToShowDivergenceFrom != "" {
-		sort.SliceStable(commits, func(i, j int) bool {
-			// In the divergence view we want incoming commits to come first
-			return commits[i].Divergence > commits[j].Divergence
-		})
-
-		_, localSectionStart, found := lo.FindIndexOf(commits, func(commit *models.Commit) bool {
-			return commit.Divergence == models.DivergenceLeft
-		})
-		if !found {
-			localSectionStart = len(commits)
-		}
-
-		setCommitMergedStatuses(remoteAncestor, commits[:localSectionStart])
-		setCommitMergedStatuses(ancestor, commits[localSectionStart:])
-	} else {
-		setCommitMergedStatuses(ancestor, commits)
+	if ancestor != "" {
+		commits = self.setCommitMergedStatuses(ancestor, commits)
 	}

 	return commits, nil
@@ -201,8 +177,8 @@ func (self *CommitLoader) MergeRebasingCommits(commits []*models.Commit) ([]*mod
 // then puts them into a commit object
 // example input:
 // 8ad01fe32fcc20f07bc6693f87aa4977c327f1e1|10 hours ago|Jesse Duffield| (HEAD -> master, tag: v0.15.2)|refresh commits when adding a tag
-func (self *CommitLoader) extractCommitFromLine(line string, showDivergence bool) *models.Commit {
-	split := strings.SplitN(line, "\x00", 8)
+func (self *CommitLoader) extractCommitFromLine(line string) *models.Commit {
+	split := strings.SplitN(line, "\x00", 7)

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

 	tags := []string{}

@@ -248,7 +220,6 @@ func (self *CommitLoader) extractCommitFromLine(line string, showDivergence bool
 		AuthorName:    authorName,
 		AuthorEmail:   authorEmail,
 		Parents:       parents,
-		Divergence:    divergence,
 	}
 }

@@ -262,7 +233,7 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode
 		return nil, nil
 	}

-	commitShas := lo.FilterMap(commits, func(commit *models.Commit, _ int) (string, bool) {
+	commitShas := slices.FilterMap(commits, func(commit *models.Commit) (string, bool) {
 		return commit.Sha, commit.Sha != ""
 	})

@@ -278,7 +249,7 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode

 	fullCommits := map[string]*models.Commit{}
 	err = cmdObj.RunAndProcessLines(func(line string) (bool, error) {
-		commit := self.extractCommitFromLine(line, false)
+		commit := self.extractCommitFromLine(line)
 		fullCommits[commit.Sha] = commit
 		return false, nil
 	})
@@ -408,7 +379,7 @@ func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, err
 			// Command does not have a commit associated, skip
 			continue
 		}
-		commits = utils.Prepend(commits, &models.Commit{
+		commits = slices.Prepend(commits, &models.Commit{
 			Sha:    t.Commit,
 			Name:   t.Msg,
 			Status: models.StatusRebasing,
@@ -522,15 +493,10 @@ func (self *CommitLoader) commitFromPatch(content string) *models.Commit {
 	}
 }

-func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
-	if ancestor == "" {
-		return
-	}
-
+func (self *CommitLoader) setCommitMergedStatuses(ancestor string, commits []*models.Commit) []*models.Commit {
 	passedAncestor := false
 	for i, commit := range commits {
-		// some commits aren't really commits and don't have sha's, such as the update-ref todo
-		if commit.Sha != "" && strings.HasPrefix(ancestor, commit.Sha) {
+		if strings.HasPrefix(ancestor, commit.Sha) {
 			passedAncestor = true
 		}
 		if commit.Status != models.StatusPushed && commit.Status != models.StatusUnpushed {
@@ -540,6 +506,7 @@ func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
 			commits[i].Status = models.StatusMerged
 		}
 	}
+	return commits
 }

 func (self *CommitLoader) getMergeBase(refName string) string {
@@ -652,13 +619,8 @@ func (self *CommitLoader) getFirstPushedCommit(refName string) (string, error) {
 func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
 	config := self.UserConfig.Git.Log

-	refSpec := opts.RefName
-	if opts.RefToShowDivergenceFrom != "" {
-		refSpec += "..." + opts.RefToShowDivergenceFrom
-	}
-
 	cmdArgs := NewGitCmd("log").
-		Arg(refSpec).
+		Arg(opts.RefName).
 		ArgIf(config.Order != "default", "--"+config.Order).
 		ArgIf(opts.All, "--all").
 		Arg("--oneline").
@@ -667,7 +629,6 @@ func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
 		ArgIf(opts.Limit, "-300").
 		ArgIf(opts.FilterPath != "", "--follow").
 		Arg("--no-show-signature").
-		ArgIf(opts.RefToShowDivergenceFrom != "", "--left-right").
 		Arg("--").
 		ArgIf(opts.FilterPath != "", opts.FilterPath).
 		ToArgv()
@@ -675,4 +636,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%s%x00%m`
+const prettyFormat = `--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s`
@@ -42,10 +42,10 @@ func TestGetCommits(t *testing.T) {
 			testName:   "should return no commits if there are none",
 			logOrder:   "topo-order",
 			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
+			opts:       GetCommitsOptions{RefName: "HEAD", 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%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -54,10 +54,10 @@ func TestGetCommits(t *testing.T) {
 			testName:   "should use proper upstream name for branch",
 			logOrder:   "topo-order",
 			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "refs/heads/mybranch", RefForPushedStatus: "refs/heads/mybranch", IncludeRebaseCommits: false},
+			opts:       GetCommitsOptions{RefName: "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%s%x00%m", "--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", "--abbrev=40", "--no-show-signature", "--"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -66,13 +66,13 @@ func TestGetCommits(t *testing.T) {
 			testName:     "should return commits if they are present",
 			logOrder:     "topo-order",
 			rebaseMode:   enums.REBASE_MODE_NONE,
-			opts:         GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
+			opts:         GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
 			mainBranches: []string{"master", "main", "develop"},
 			runner: oscommands.NewFakeRunner(t).
 				// here it's seeing which commits are yet to be pushed
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{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%s%x00%m", "--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", "--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
@@ -203,13 +203,13 @@ func TestGetCommits(t *testing.T) {
 			testName:     "should not call merge-base for mainBranches if none exist",
 			logOrder:     "topo-order",
 			rebaseMode:   enums.REBASE_MODE_NONE,
-			opts:         GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
+			opts:         GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
 			mainBranches: []string{"master", "main"},
 			runner: oscommands.NewFakeRunner(t).
 				// here it's seeing which commits are yet to be pushed
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{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%s%x00%m", "--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", "--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")).
@@ -240,13 +240,13 @@ func TestGetCommits(t *testing.T) {
 			testName:     "should call merge-base for all main branches that exist",
 			logOrder:     "topo-order",
 			rebaseMode:   enums.REBASE_MODE_NONE,
-			opts:         GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
+			opts:         GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
 			mainBranches: []string{"master", "main", "develop", "1.0-hotfixes"},
 			runner: oscommands.NewFakeRunner(t).
 				// here it's seeing which commits are yet to be pushed
-				ExpectGitArgs([]string{"merge-base", "mybranch", "mybranch@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{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%s%x00%m", "--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", "--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")).
@@ -279,10 +279,10 @@ func TestGetCommits(t *testing.T) {
 			testName:   "should not specify order if `log.order` is `default`",
 			logOrder:   "default",
 			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", IncludeRebaseCommits: false},
+			opts:       GetCommitsOptions{RefName: "HEAD", 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%s%x00%m", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -291,10 +291,10 @@ func TestGetCommits(t *testing.T) {
 			testName:   "should set filter path",
 			logOrder:   "default",
 			rebaseMode: enums.REBASE_MODE_NONE,
-			opts:       GetCommitsOptions{RefName: "HEAD", RefForPushedStatus: "mybranch", FilterPath: "src"},
+			opts:       GetCommitsOptions{RefName: "HEAD", 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%s%x00%m", "--abbrev=40", "--follow", "--no-show-signature", "--", "src"}, "", nil),
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%D%x00%p%x00%s", "--abbrev=40", "--follow", "--no-show-signature", "--", "src"}, "", nil),

 			expectedCommits: []*models.Commit{},
 			expectedError:   nil,
@@ -506,51 +506,3 @@ func TestCommitLoader_getConflictedCommitImpl(t *testing.T) {
 		})
 	}
 }
-
-func TestCommitLoader_setCommitMergedStatuses(t *testing.T) {
-	type scenario struct {
-		testName        string
-		commits         []*models.Commit
-		ancestor        string
-		expectedCommits []*models.Commit
-	}
-
-	scenarios := []scenario{
-		{
-			testName: "basic",
-			commits: []*models.Commit{
-				{Sha: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Sha: "67890", Name: "2", Action: models.ActionNone, Status: models.StatusPushed},
-				{Sha: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusPushed},
-			},
-			ancestor: "67890",
-			expectedCommits: []*models.Commit{
-				{Sha: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Sha: "67890", Name: "2", Action: models.ActionNone, Status: models.StatusMerged},
-				{Sha: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusMerged},
-			},
-		},
-		{
-			testName: "with update-ref",
-			commits: []*models.Commit{
-				{Sha: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Sha: "", Name: "", Action: todo.UpdateRef, Status: models.StatusNone},
-				{Sha: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusPushed},
-			},
-			ancestor: "deadbeef",
-			expectedCommits: []*models.Commit{
-				{Sha: "12345", Name: "1", Action: models.ActionNone, Status: models.StatusUnpushed},
-				{Sha: "", Name: "", Action: todo.UpdateRef, Status: models.StatusNone},
-				{Sha: "abcde", Name: "3", Action: models.ActionNone, Status: models.StatusPushed},
-			},
-		},
-	}
-
-	for _, scenario := range scenarios {
-		t.Run(scenario.testName, func(t *testing.T) {
-			expectedCommits := scenario.commits
-			setCommitMergedStatuses(scenario.ancestor, expectedCommits)
-			assert.Equal(t, scenario.expectedCommits, expectedCommits)
-		})
-	}
-}
@@ -186,7 +186,6 @@ func TestCommitShowCmdObj(t *testing.T) {
 		filterPath       string
 		contextSize      int
 		ignoreWhitespace bool
-		extDiffCmd       string
 		expected         []string
 	}

@@ -196,40 +195,28 @@ func TestCommitShowCmdObj(t *testing.T) {
 			filterPath:       "",
 			contextSize:      3,
 			ignoreWhitespace: false,
-			extDiffCmd:       "",
-			expected:         []string{"show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890"},
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890"},
 		},
 		{
 			testName:         "Default case with filter path",
 			filterPath:       "file.txt",
 			contextSize:      3,
 			ignoreWhitespace: false,
-			extDiffCmd:       "",
-			expected:         []string{"show", "--no-ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--", "file.txt"},
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--", "file.txt"},
 		},
 		{
 			testName:         "Show diff with custom context size",
 			filterPath:       "",
 			contextSize:      77,
 			ignoreWhitespace: false,
-			extDiffCmd:       "",
-			expected:         []string{"show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890"},
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890"},
 		},
 		{
 			testName:         "Show diff, ignoring whitespace",
 			filterPath:       "",
 			contextSize:      77,
 			ignoreWhitespace: true,
-			extDiffCmd:       "",
-			expected:         []string{"show", "--no-ext-diff", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--ignore-all-space"},
-		},
-		{
-			testName:         "Show diff with external diff command",
-			filterPath:       "",
-			contextSize:      3,
-			ignoreWhitespace: false,
-			extDiffCmd:       "difft --color=always",
-			expected:         []string{"-c", "diff.external=difft --color=always", "show", "--ext-diff", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890"},
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--ignore-all-space"},
 		},
 	}

@@ -237,15 +224,12 @@ func TestCommitShowCmdObj(t *testing.T) {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
-			userConfig.Git.Paging.ExternalDiffCommand = s.extDiffCmd
-			appState := &config.AppState{}
-			appState.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
-			appState.DiffContextSize = s.contextSize
+			userConfig.Git.DiffContextSize = s.contextSize

 			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expected, "", nil)
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig, appState: appState, runner: runner})
+			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})

-			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPath).Run())
+			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPath, s.ignoreWhitespace).Run())
 			runner.CheckForMissingCalls()
 		})
 	}
@@ -4,6 +4,7 @@ import (
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/sasha-s/go-deadlock"
 )

 type GitCommon struct {
@@ -14,6 +15,8 @@ type GitCommon struct {
 	repoPaths *RepoPaths
 	repo      *gogit.Repository
 	config    *ConfigCommands
+	// mutex for doing things like push/pull/fetch
+	syncMutex *deadlock.Mutex
 }

 func NewGitCommon(
@@ -24,6 +27,7 @@ func NewGitCommon(
 	repoPaths *RepoPaths,
 	repo *gogit.Repository,
 	config *ConfigCommands,
+	syncMutex *deadlock.Mutex,
 ) *GitCommon {
 	return &GitCommon{
 		Common:    cmn,
@@ -33,5 +37,6 @@ func NewGitCommon(
 		repoPaths: repoPaths,
 		repo:      repo,
 		config:    config,
+		syncMutex: syncMutex,
 	}
 }
@@ -107,7 +107,3 @@ func (self *ConfigCommands) GetCoreCommentChar() byte {

 	return '#'
 }
-
-func (self *ConfigCommands) GetRebaseUpdateRefs() bool {
-	return self.gitConfig.GetBool("rebase.updateRefs")
-}
@@ -17,7 +17,6 @@ import (
 type commonDeps struct {
 	runner     *oscommands.FakeCmdObjRunner
 	userConfig *config.UserConfig
-	appState   *config.AppState
 	gitVersion *GitVersion
 	gitConfig  *git_config.FakeGitConfig
 	getenv     func(string) string
@@ -33,7 +32,7 @@ func buildGitCommon(deps commonDeps) *GitCommon {

 	gitCommon.Common = deps.common
 	if gitCommon.Common == nil {
-		gitCommon.Common = utils.NewDummyCommonWithUserConfigAndAppState(deps.userConfig, deps.appState)
+		gitCommon.Common = utils.NewDummyCommonWithUserConfig(deps.userConfig)
 	}

 	if deps.fs != nil {
@@ -83,14 +83,14 @@ func (self *FileCommands) GetEditCmdStr(filename string) (string, bool) {
 		}
 	}

-	template, suspend := config.GetEditTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
+	template, editInTerminal := config.GetEditTemplate(&self.UserConfig.OS, self.guessDefaultEditor)

 	templateValues := map[string]string{
 		"filename": self.cmd.Quote(filename),
 	}

 	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
+	return cmdStr, editInTerminal
 }

 func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (string, bool) {
@@ -101,7 +101,7 @@ func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (
 		}
 	}

-	template, suspend := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
+	template, editInTerminal := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor)

 	templateValues := map[string]string{
 		"filename": self.cmd.Quote(filename),
@@ -109,7 +109,7 @@ func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (
 	}

 	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
+	return cmdStr, editInTerminal
 }

 func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber int) string {
@@ -131,15 +131,15 @@ func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber
 	return cmdStr
 }

-func (self *FileCommands) GetOpenDirInEditorCmdStr(path string) (string, bool) {
-	template, suspend := config.GetOpenDirInEditorTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
+func (self *FileCommands) GetOpenDirInEditorCmdStr(path string) string {
+	template := config.GetOpenDirInEditorTemplate(&self.UserConfig.OS, self.guessDefaultEditor)

 	templateValues := map[string]string{
 		"dir": self.cmd.Quote(path),
 	}

 	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
+	return cmdStr
 }

 func (self *FileCommands) guessDefaultEditor() string {
@@ -179,34 +179,34 @@ func TestEditFileCmdStrLegacy(t *testing.T) {

 func TestEditFileCmd(t *testing.T) {
 	type scenario struct {
-		filename       string
-		osConfig       config.OSConfig
-		expectedCmdStr string
-		suspend        bool
+		filename               string
+		osConfig               config.OSConfig
+		expectedCmdStr         string
+		expectedEditInTerminal bool
 	}

 	scenarios := []scenario{
 		{
-			filename:       "test",
-			osConfig:       config.OSConfig{},
-			expectedCmdStr: `vim -- "test"`,
-			suspend:        true,
+			filename:               "test",
+			osConfig:               config.OSConfig{},
+			expectedCmdStr:         `vim -- "test"`,
+			expectedEditInTerminal: true,
 		},
 		{
 			filename: "test",
 			osConfig: config.OSConfig{
 				Edit: "nano {{filename}}",
 			},
-			expectedCmdStr: `nano "test"`,
-			suspend:        true,
+			expectedCmdStr:         `nano "test"`,
+			expectedEditInTerminal: true,
 		},
 		{
 			filename: "file/with space",
 			osConfig: config.OSConfig{
 				EditPreset: "sublime",
 			},
-			expectedCmdStr: `subl -- "file/with space"`,
-			suspend:        false,
+			expectedCmdStr:         `subl -- "file/with space"`,
+			expectedEditInTerminal: false,
 		},
 	}

@@ -218,28 +218,28 @@ func TestEditFileCmd(t *testing.T) {
 			userConfig: userConfig,
 		})

-		cmdStr, suspend := instance.GetEditCmdStr(s.filename)
+		cmdStr, editInTerminal := instance.GetEditCmdStr(s.filename)
 		assert.Equal(t, s.expectedCmdStr, cmdStr)
-		assert.Equal(t, s.suspend, suspend)
+		assert.Equal(t, s.expectedEditInTerminal, editInTerminal)
 	}
 }

 func TestEditFileAtLineCmd(t *testing.T) {
 	type scenario struct {
-		filename       string
-		lineNumber     int
-		osConfig       config.OSConfig
-		expectedCmdStr string
-		suspend        bool
+		filename               string
+		lineNumber             int
+		osConfig               config.OSConfig
+		expectedCmdStr         string
+		expectedEditInTerminal bool
 	}

 	scenarios := []scenario{
 		{
-			filename:       "test",
-			lineNumber:     42,
-			osConfig:       config.OSConfig{},
-			expectedCmdStr: `vim +42 -- "test"`,
-			suspend:        true,
+			filename:               "test",
+			lineNumber:             42,
+			osConfig:               config.OSConfig{},
+			expectedCmdStr:         `vim +42 -- "test"`,
+			expectedEditInTerminal: true,
 		},
 		{
 			filename:   "test",
@@ -247,8 +247,8 @@ func TestEditFileAtLineCmd(t *testing.T) {
 			osConfig: config.OSConfig{
 				EditAtLine: "nano +{{line}} {{filename}}",
 			},
-			expectedCmdStr: `nano +35 "test"`,
-			suspend:        true,
+			expectedCmdStr:         `nano +35 "test"`,
+			expectedEditInTerminal: true,
 		},
 		{
 			filename:   "file/with space",
@@ -256,8 +256,8 @@ func TestEditFileAtLineCmd(t *testing.T) {
 			osConfig: config.OSConfig{
 				EditPreset: "sublime",
 			},
-			expectedCmdStr: `subl -- "file/with space":12`,
-			suspend:        false,
+			expectedCmdStr:         `subl -- "file/with space":12`,
+			expectedEditInTerminal: false,
 		},
 	}

@@ -269,9 +269,9 @@ func TestEditFileAtLineCmd(t *testing.T) {
 			userConfig: userConfig,
 		})

-		cmdStr, suspend := instance.GetEditAtLineCmdStr(s.filename, s.lineNumber)
+		cmdStr, editInTerminal := instance.GetEditAtLineCmdStr(s.filename, s.lineNumber)
 		assert.Equal(t, s.expectedCmdStr, cmdStr)
-		assert.Equal(t, s.suspend, suspend)
+		assert.Equal(t, s.expectedEditInTerminal, editInTerminal)
 	}
 }

@@ -44,14 +44,6 @@ func (self *GitCommandBuilder) Config(value string) *GitCommandBuilder {
 	return self
 }

-func (self *GitCommandBuilder) ConfigIf(condition bool, ifTrue string) *GitCommandBuilder {
-	if condition {
-		self.Config(ifTrue)
-	}
-
-	return self
-}
-
 // the -C arg will make git do a `cd` to the directory before doing anything else
 func (self *GitCommandBuilder) Dir(path string) *GitCommandBuilder {
 	// repo path comes before the command
@@ -7,6 +7,7 @@ import (

 	"github.com/fsmiamoto/git-todo-parser/todo"
 	"github.com/go-errors/errors"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/app/daemon"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
@@ -79,12 +80,6 @@ func (self *RebaseCommands) SetCommitAuthor(commits []*models.Commit, index int,
 	})
 }

-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].Sha, value)
-	})
-}
-
 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
@@ -110,13 +105,7 @@ func (self *RebaseCommands) MoveCommitDown(commits []*models.Commit, index int)

 	sha := commits[index].Sha

-	msg := utils.ResolvePlaceholderString(
-		self.Tr.Log.MoveCommitDown,
-		map[string]string{
-			"shortSha": utils.ShortSha(sha),
-		},
-	)
-	self.os.LogCommand(msg, false)
+	self.os.LogCommand(fmt.Sprintf("Moving TODO down: %s", utils.ShortSha(sha)), false)

 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
 		baseShaOrRoot:  baseShaOrRoot,
@@ -130,13 +119,7 @@ func (self *RebaseCommands) MoveCommitUp(commits []*models.Commit, index int) er

 	sha := commits[index].Sha

-	msg := utils.ResolvePlaceholderString(
-		self.Tr.Log.MoveCommitUp,
-		map[string]string{
-			"shortSha": utils.ShortSha(sha),
-		},
-	)
-	self.os.LogCommand(msg, false)
+	self.os.LogCommand(fmt.Sprintf("Moving TODO up: %s", utils.ShortSha(sha)), false)

 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
 		baseShaOrRoot:  baseShaOrRoot,
@@ -167,37 +150,15 @@ func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, index in
 }

 func (self *RebaseCommands) EditRebase(branchRef string) error {
-	msg := utils.ResolvePlaceholderString(
-		self.Tr.Log.EditRebase,
-		map[string]string{
-			"ref": branchRef,
-		},
-	)
-	self.os.LogCommand(msg, false)
+	self.os.LogCommand(fmt.Sprintf("Beginning interactive rebase at '%s'", branchRef), false)
 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
 		baseShaOrRoot: branchRef,
 		instruction:   daemon.NewInsertBreakInstruction(),
 	}).Run()
 }

-func (self *RebaseCommands) EditRebaseFromBaseCommit(targetBranchName string, baseCommit string) error {
-	msg := utils.ResolvePlaceholderString(
-		self.Tr.Log.EditRebaseFromBaseCommit,
-		map[string]string{
-			"baseCommit":       baseCommit,
-			"targetBranchName": targetBranchName,
-		},
-	)
-	self.os.LogCommand(msg, false)
-	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
-		baseShaOrRoot: baseCommit,
-		onto:          targetBranchName,
-		instruction:   daemon.NewInsertBreakInstruction(),
-	}).Run()
-}
-
 func logTodoChanges(changes []daemon.ChangeTodoAction) string {
-	changeTodoStr := strings.Join(lo.Map(changes, func(c daemon.ChangeTodoAction, _ int) string {
+	changeTodoStr := strings.Join(slices.Map(changes, func(c daemon.ChangeTodoAction) string {
 		return fmt.Sprintf("%s:%s", c.Sha, c.NewAction)
 	}), "\n")
 	return fmt.Sprintf("Changing TODO actions: %s", changeTodoStr)
@@ -205,7 +166,6 @@ func logTodoChanges(changes []daemon.ChangeTodoAction) string {

 type PrepareInteractiveRebaseCommandOpts struct {
 	baseShaOrRoot              string
-	onto                       string
 	instruction                daemon.Instruction
 	overrideEditor             bool
 	keepCommitsThatBecomeEmpty bool
@@ -224,7 +184,6 @@ func (self *RebaseCommands) PrepareInteractiveRebaseCommand(opts PrepareInteract
 		ArgIf(opts.keepCommitsThatBecomeEmpty && !self.version.IsOlderThan(2, 26, 0), "--empty=keep").
 		Arg("--no-autosquash").
 		ArgIf(!self.version.IsOlderThan(2, 22, 0), "--rebase-merges").
-		ArgIf(opts.onto != "", "--onto", opts.onto).
 		Arg(opts.baseShaOrRoot).
 		ToArgv()

@@ -348,13 +307,6 @@ func (self *RebaseCommands) RebaseBranch(branchName string) error {
 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{baseShaOrRoot: branchName}).Run()
 }

-func (self *RebaseCommands) RebaseBranchFromBaseCommit(targetBranchName string, baseCommit string) error {
-	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
-		baseShaOrRoot: baseCommit,
-		onto:          targetBranchName,
-	}).Run()
-}
-
 func (self *RebaseCommands) GenericMergeOrRebaseActionCmdObj(commandType string, command string) oscommands.ICmdObj {
 	cmdArgs := NewGitCmd(commandType).Arg("--" + command).ToArgv()

@@ -443,13 +395,7 @@ func (self *RebaseCommands) CherryPickCommits(commits []*models.Commit) error {
 	commitLines := lo.Map(commits, func(commit *models.Commit, _ int) string {
 		return fmt.Sprintf("%s %s", utils.ShortSha(commit.Sha), commit.Name)
 	})
-	msg := utils.ResolvePlaceholderString(
-		self.Tr.Log.CherryPickCommits,
-		map[string]string{
-			"commitLines": strings.Join(commitLines, "\n"),
-		},
-	)
-	self.os.LogCommand(msg, false)
+	self.os.LogCommand(fmt.Sprintf("Cherry-picking commits:\n%s", strings.Join(commitLines, "\n")), false)

 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
 		baseShaOrRoot: "HEAD",
@@ -457,20 +403,6 @@ func (self *RebaseCommands) CherryPickCommits(commits []*models.Commit) error {
 	}).Run()
 }

-// CherryPickCommitsDuringRebase simply prepends the given commits to the existing git-rebase-todo file
-func (self *RebaseCommands) CherryPickCommitsDuringRebase(commits []*models.Commit) error {
-	todoLines := lo.Map(commits, func(commit *models.Commit, _ int) daemon.TodoLine {
-		return daemon.TodoLine{
-			Action: "pick",
-			Commit: commit,
-		}
-	})
-
-	todo := daemon.TodoLinesToString(todoLines)
-	filePath := filepath.Join(self.repoPaths.worktreeGitDirPath, "rebase-merge/git-rebase-todo")
-	return utils.PrependStrToTodoFile(filePath, []byte(todo))
-}
-
 // we can't start an interactive rebase from the first commit without passing the
 // '--root' arg
 func getBaseShaOrRoot(commits []*models.Commit, index int) string {
@@ -53,15 +53,7 @@ func (self *RemoteCommands) DeleteRemoteBranch(task gocui.Task, remoteName strin
 		Arg(remoteName, "--delete", branchName).
 		ToArgv()

-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
-}
-
-func (self *RemoteCommands) DeleteRemoteTag(task gocui.Task, remoteName string, tagName string) error {
-	cmdArgs := NewGitCmd("push").
-		Arg(remoteName, "--delete", tagName).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
+	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
 }

 // CheckRemoteBranchExists Returns remote branch
@@ -4,13 +4,12 @@ import (
 	"strings"
 	"sync"

+	"github.com/jesseduffield/generics/slices"
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
-	"golang.org/x/exp/slices"
 )

 type RemoteLoader struct {
@@ -54,7 +53,7 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
 		return nil, remoteBranchesErr
 	}

-	remotes := lo.Map(goGitRemotes, func(goGitRemote *gogit.Remote, _ int) *models.Remote {
+	remotes := slices.Map(goGitRemotes, func(goGitRemote *gogit.Remote) *models.Remote {
 		remoteName := goGitRemote.Config().Name
 		branches := remoteBranchesByRemoteName[remoteName]

@@ -91,24 +91,10 @@ func getRepoPathsAux(
 	if err != nil {
 		return nil, errors.Errorf("failed to get repo git dir path: %v", err)
 	}
-
-	var worktreeGitDirPath string
-	if env.GetWorkTreeEnv() != "" {
-		// This env is set when you pass --work-tree to lazygit. In that case,
-		// we're not dealing with a linked work-tree, we're dealing with a 'specified'
-		// worktree (for lack of a better term). In this case, the worktree has no
-		// .git file and it just contains a bunch of files: it has no idea it's
-		// pointed to by a bare repo. As such it does not have its own git dir within
-		// the bare repo's git dir. Instead, we just use the bare repo's git dir.
-		worktreeGitDirPath = repoGitDirPath
-	} else {
-		var err error
-		worktreeGitDirPath, err = getWorktreeGitDirPath(fs, currentPath)
-		if err != nil {
-			return nil, errors.Errorf("failed to get worktree git dir path: %v", err)
-		}
+	worktreeGitDirPath, err := worktreeGitDirPath(fs, currentPath)
+	if err != nil {
+		return nil, errors.Errorf("failed to get worktree git dir path: %v", err)
 	}
-
 	repoName := path.Base(repoPath)

 	return &RepoPaths{
@@ -124,7 +110,7 @@ func getRepoPathsAux(
 // Returns the path of the git-dir for the worktree. For linked worktrees, the worktree has
 // a .git file that points to the git-dir (which itself lives in the git-dir
 // of the repo)
-func getWorktreeGitDirPath(fs afero.Fs, worktreePath string) (string, error) {
+func worktreeGitDirPath(fs afero.Fs, worktreePath string) (string, error) {
 	// if .git is a file, we're in a linked worktree, otherwise we're in
 	// the main worktree
 	dotGitPath := path.Join(worktreePath, ".git")
@@ -157,11 +143,6 @@ func linkedWorktreeGitDirPath(fs afero.Fs, worktreePath string) (string, error)
 	}

 	gitDir := strings.TrimPrefix(gitDirLine[0], "gitdir: ")
-
-	gitDir = filepath.Clean(gitDir)
-	// For windows support
-	gitDir = filepath.ToSlash(gitDir)
-
 	return gitDir, nil
 }

@@ -199,32 +180,19 @@ func getCurrentRepoGitDirPath(
 		return "", "", errors.Errorf("could not find git dir for %s: %v", currentPath, err)
 	}

-	_, err = fs.Stat(worktreeGitPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			// hardcoding error to get around windows-specific error message
-			return "", "", errors.Errorf("could not find git dir for %s. %s does not exist", currentPath, worktreeGitPath)
-		}
-		return "", "", errors.Errorf("could not find git dir for %s: %v", currentPath, err)
-	}
-
-	// confirm whether the next directory up is the worktrees directory
+	// confirm whether the next directory up is the worktrees/submodules directory
 	parent := path.Dir(worktreeGitPath)
-	if path.Base(parent) == "worktrees" {
-		gitDirPath := path.Dir(parent)
-		return gitDirPath, path.Dir(gitDirPath), nil
+	if path.Base(parent) != "worktrees" && path.Base(parent) != "modules" {
+		return "", "", errors.Errorf("could not find git dir for %s", currentPath)
 	}

-	// Unlike worktrees, submodules can be nested arbitrarily deep, so we check
-	// if the `modules` directory is anywhere up the chain.
-	if strings.Contains(worktreeGitPath, "/modules/") {
-		// For submodules, we just return the path directly
+	// if it's a submodule, we treat it as its own repo
+	if path.Base(parent) == "modules" {
 		return worktreeGitPath, currentPath, nil
 	}

-	// If this error causes issues, we could relax the constraint and just always
-	// return the path
-	return "", "", errors.Errorf("could not find git dir for %s: the path '%s' is not under `worktrees` or `modules` directories", currentPath, worktreeGitPath)
+	gitDirPath := path.Dir(parent)
+	return gitDirPath, path.Dir(gitDirPath), nil
 }

 // takes a path containing a symlink and returns the true path
@@ -55,24 +55,6 @@ func TestGetRepoPathsAux(t *testing.T) {
 			},
 			Err: nil,
 		},
-		{
-			Name: "worktree with trailing separator in path",
-			BeforeFunc: func(fs afero.Fs) {
-				// setup for linked worktree
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/worktree1", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/worktree1/.git", []byte("gitdir: /path/to/repo/.git/worktrees/worktree1/"), 0o644)
-			},
-			Path: "/path/to/repo/worktree1",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo/worktree1",
-				worktreePath:       "/path/to/repo/worktree1",
-				worktreeGitDirPath: "/path/to/repo/.git/worktrees/worktree1",
-				repoPath:           "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				repoName:           "repo",
-			},
-			Err: nil,
-		},
 		{
 			Name: "worktree .git file missing gitdir directive",
 			BeforeFunc: func(fs afero.Fs) {
@@ -91,7 +73,7 @@ func TestGetRepoPathsAux(t *testing.T) {
 			},
 			Path:     "/path/to/repo/worktree2",
 			Expected: nil,
-			Err:      errors.New("failed to get repo git dir path: could not find git dir for /path/to/repo/worktree2. /nonexistant does not exist"),
+			Err:      errors.New("failed to get repo git dir path: could not find git dir for /path/to/repo/worktree2"),
 		},
 		{
 			Name: "submodule",
@@ -110,33 +92,6 @@ func TestGetRepoPathsAux(t *testing.T) {
 			},
 			Err: nil,
 		},
-		{
-			Name: "submodule in nested directory",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git/modules/my/submodule1", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/my/submodule1/.git", []byte("gitdir: /path/to/repo/.git/modules/my/submodule1"), 0o644)
-			},
-			Path: "/path/to/repo/my/submodule1",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo/my/submodule1",
-				worktreePath:       "/path/to/repo/my/submodule1",
-				worktreeGitDirPath: "/path/to/repo/.git/modules/my/submodule1",
-				repoPath:           "/path/to/repo/my/submodule1",
-				repoGitDirPath:     "/path/to/repo/.git/modules/my/submodule1",
-				repoName:           "submodule1",
-			},
-			Err: nil,
-		},
-		{
-			Name: "submodule git dir not under .git/modules",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/random/submodule1", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/my/submodule1/.git", []byte("gitdir: /random/submodule1"), 0o644)
-			},
-			Path:     "/path/to/repo/my/submodule1",
-			Expected: nil,
-			Err:      errors.New("failed to get repo git dir path: could not find git dir for /path/to/repo/my/submodule1: the path '/random/submodule1' is not under `worktrees` or `modules` directories"),
-		},
 	}

 	for _, s := range scenarios {
@@ -80,13 +80,13 @@ func (self *StashCommands) Sha(index int) (string, error) {
 	return strings.Trim(sha, "\r\n"), err
 }

-func (self *StashCommands) ShowStashEntryCmdObj(index int) oscommands.ICmdObj {
+func (self *StashCommands) ShowStashEntryCmdObj(index int, ignoreWhitespace bool) oscommands.ICmdObj {
 	cmdArgs := NewGitCmd("stash").Arg("show").
 		Arg("-p").
 		Arg("--stat").
 		Arg(fmt.Sprintf("--color=%s", self.UserConfig.Git.Paging.ColorArg)).
-		Arg(fmt.Sprintf("--unified=%d", self.AppState.DiffContextSize)).
-		ArgIf(self.AppState.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		Arg(fmt.Sprintf("--unified=%d", self.UserConfig.Git.DiffContextSize)).
+		ArgIf(ignoreWhitespace, "--ignore-all-space").
 		Arg(fmt.Sprintf("stash@{%d}", index)).
 		ToArgv()

@@ -5,11 +5,11 @@ import (
 	"strconv"
 	"strings"

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

 type StashLoader struct {
@@ -69,7 +69,7 @@ func (self *StashLoader) getUnfilteredStashEntries() []*models.StashEntry {
 	cmdArgs := NewGitCmd("stash").Arg("list", "-z", "--pretty=%gs").ToArgv()

 	rawString, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	return lo.Map(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
+	return slices.MapWithIndex(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
 		return self.stashEntryFromLine(line, index)
 	})
 }
@@ -134,12 +134,10 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
-			appState := &config.AppState{}
-			appState.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
-			appState.DiffContextSize = s.contextSize
-			instance := buildStashCommands(commonDeps{userConfig: userConfig, appState: appState})
+			userConfig.Git.DiffContextSize = s.contextSize
+			instance := buildStashCommands(commonDeps{userConfig: userConfig})

-			cmdStr := instance.ShowStashEntryCmdObj(s.index).Args()
+			cmdStr := instance.ShowStashEntryCmdObj(s.index, s.ignoreWhitespace).Args()
 			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
@@ -1,7 +1,6 @@
 package git_commands

 import (
-	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -25,16 +24,19 @@ func NewStatusCommands(
 // RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
 // and "interactive" for interactive rebase
 func (self *StatusCommands) RebaseMode() (enums.RebaseMode, error) {
-	ok, err := self.IsInNormalRebase()
-	if err == nil && ok {
+	exists, err := self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"))
+	if err != nil {
+		return enums.REBASE_MODE_NONE, err
+	}
+	if exists {
 		return enums.REBASE_MODE_NORMAL, nil
 	}
-	ok, err = self.IsInInteractiveRebase()
-	if err == nil && ok {
+	exists, err = self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge"))
+	if exists {
 		return enums.REBASE_MODE_INTERACTIVE, err
+	} else {
+		return enums.REBASE_MODE_NONE, err
 	}
-
-	return enums.REBASE_MODE_NONE, err
 }

 func (self *StatusCommands) WorkingTreeState() enums.RebaseMode {
@@ -65,26 +67,7 @@ func IsBareRepo(osCommand *oscommands.OSCommand) (bool, error) {
 	return strconv.ParseBool(strings.TrimSpace(res))
 }

-func (self *StatusCommands) IsInNormalRebase() (bool, error) {
-	return self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"))
-}
-
-func (self *StatusCommands) IsInInteractiveRebase() (bool, error) {
-	return self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge"))
-}
-
 // IsInMergeState states whether we are still mid-merge
 func (self *StatusCommands) IsInMergeState() (bool, error) {
 	return self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "MERGE_HEAD"))
 }
-
-// Full ref (e.g. "refs/heads/mybranch") of the branch that is currently
-// being rebased, or empty string when we're not in a rebase
-func (self *StatusCommands) BranchBeingRebased() string {
-	for _, dir := range []string{"rebase-merge", "rebase-apply"} {
-		if bytesContent, err := os.ReadFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), dir, "head-name")); err == nil {
-			return strings.TrimSpace(string(bytesContent))
-		}
-	}
-	return ""
-}
@@ -36,7 +36,7 @@ func (self *SyncCommands) PushCmdObj(task gocui.Task, opts PushOpts) (oscommands
 		ArgIf(opts.UpstreamBranch != "", opts.UpstreamBranch).
 		ToArgv()

-	cmdObj := self.cmd.New(cmdArgs).PromptOnCredentialRequest(task)
+	cmdObj := self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex)
 	return cmdObj, nil
 }

@@ -70,6 +70,7 @@ func (self *SyncCommands) FetchBackgroundCmdObj() oscommands.ICmdObj {

 	cmdObj := self.cmd.New(cmdArgs)
 	cmdObj.DontLog().FailOnCredentialRequest()
+	cmdObj.WithMutex(self.syncMutex)
 	return cmdObj
 }

@@ -95,7 +96,7 @@ func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {

 	// setting GIT_SEQUENCE_EDITOR to ':' as a way of skipping it, in case the user
 	// has 'pull.rebase = interactive' configured.
-	return self.cmd.New(cmdArgs).AddEnvVars("GIT_SEQUENCE_EDITOR=:").PromptOnCredentialRequest(task).Run()
+	return self.cmd.New(cmdArgs).AddEnvVars("GIT_SEQUENCE_EDITOR=:").PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
 }

 func (self *SyncCommands) FastForward(
@@ -109,7 +110,7 @@ func (self *SyncCommands) FastForward(
 		Arg(remoteBranchName + ":" + branchName).
 		ToArgv()

-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
+	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
 }

 func (self *SyncCommands) FetchRemote(task gocui.Task, remoteName string) error {
@@ -117,5 +118,5 @@ func (self *SyncCommands) FetchRemote(task gocui.Task, remoteName string) error
 		Arg(remoteName).
 		ToArgv()

-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
+	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
 }
@@ -12,19 +12,16 @@ func NewTagCommands(gitCommon *GitCommon) *TagCommands {
 	}
 }

-func (self *TagCommands) CreateLightweight(tagName string, ref string, force bool) error {
-	cmdArgs := NewGitCmd("tag").
-		ArgIf(force, "--force").
-		Arg("--", tagName).
+func (self *TagCommands) CreateLightweight(tagName string, ref string) error {
+	cmdArgs := NewGitCmd("tag").Arg("--", tagName).
 		ArgIf(len(ref) > 0, ref).
 		ToArgv()

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

-func (self *TagCommands) CreateAnnotated(tagName, ref, msg string, force bool) error {
+func (self *TagCommands) CreateAnnotated(tagName, ref, msg string) error {
 	cmdArgs := NewGitCmd("tag").Arg(tagName).
-		ArgIf(force, "--force").
 		ArgIf(len(ref) > 0, ref).
 		Arg("-m", msg).
 		ToArgv()
@@ -32,16 +29,7 @@ func (self *TagCommands) CreateAnnotated(tagName, ref, msg string, force bool) e
 	return self.cmd.New(cmdArgs).Run()
 }

-func (self *TagCommands) HasTag(tagName string) bool {
-	cmdArgs := NewGitCmd("show-ref").
-		Arg("--tags", "--quiet", "--verify", "--").
-		Arg("refs/tags/" + tagName).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).Run() == nil
-}
-
-func (self *TagCommands) LocalDelete(tagName string) error {
+func (self *TagCommands) Delete(tagName string) error {
 	cmdArgs := NewGitCmd("tag").Arg("-d", tagName).
 		ToArgv()

@@ -52,5 +40,5 @@ func (self *TagCommands) Push(task gocui.Task, remoteName string, tagName string
 	cmdArgs := NewGitCmd("push").Arg(remoteName, "tag", tagName).
 		ToArgv()

-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).Run()
+	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
 }
@@ -3,11 +3,11 @@ package git_commands
 import (
 	"regexp"

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

 type TagLoader struct {
@@ -38,7 +38,7 @@ func (self *TagLoader) GetTags() ([]*models.Tag, error) {

 	lineRegex := regexp.MustCompile(`^([^\s]+)(\s+)?(.*)$`)

-	tags := lo.Map(split, func(line string, _ int) *models.Tag {
+	tags := slices.Map(split, func(line string) *models.Tag {
 		matches := lineRegex.FindStringSubmatch(line)
 		tagName := matches[1]
 		message := ""
@@ -228,31 +228,28 @@ func (self *WorkingTreeCommands) Exclude(filename string) error {
 }

 // WorktreeFileDiff returns the diff of a file
-func (self *WorkingTreeCommands) WorktreeFileDiff(file *models.File, plain bool, cached bool) string {
+func (self *WorkingTreeCommands) WorktreeFileDiff(file *models.File, plain bool, cached bool, ignoreWhitespace bool) string {
 	// for now we assume an error means the file was deleted
-	s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached).RunWithOutput()
+	s, _ := self.WorktreeFileDiffCmdObj(file, plain, cached, ignoreWhitespace).RunWithOutput()
 	return s
 }

-func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool) oscommands.ICmdObj {
+func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain bool, cached bool, ignoreWhitespace bool) oscommands.ICmdObj {
 	colorArg := self.UserConfig.Git.Paging.ColorArg
 	if plain {
 		colorArg = "never"
 	}

-	contextSize := self.AppState.DiffContextSize
+	contextSize := self.UserConfig.Git.DiffContextSize
 	prevPath := node.GetPreviousPath()
 	noIndex := !node.GetIsTracked() && !node.GetHasStagedChanges() && !cached && node.GetIsFile()
-	extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
-	useExtDiff := extDiffCmd != "" && !plain

 	cmdArgs := NewGitCmd("diff").
-		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
-		ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
+		Arg("--no-ext-diff").
 		Arg(fmt.Sprintf("--unified=%d", contextSize)).
 		Arg(fmt.Sprintf("--color=%s", colorArg)).
-		ArgIf(!plain && self.AppState.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		ArgIf(ignoreWhitespace, "--ignore-all-space").
 		ArgIf(cached, "--cached").
 		ArgIf(noIndex, "--no-index").
 		Arg("--").
@@ -266,32 +263,32 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain

 // ShowFileDiff get the diff of specified from and to. Typically this will be used for a single commit so it'll be 123abc^..123abc
 // but when we're in diff mode it could be any 'from' to any 'to'. The reverse flag is also here thanks to diff mode.
-func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bool, fileName string, plain bool) (string, error) {
-	return self.ShowFileDiffCmdObj(from, to, reverse, fileName, plain).RunWithOutput()
+func (self *WorkingTreeCommands) ShowFileDiff(from string, to string, reverse bool, fileName string, plain bool,
+	ignoreWhitespace bool,
+) (string, error) {
+	return self.ShowFileDiffCmdObj(from, to, reverse, fileName, plain, ignoreWhitespace).RunWithOutput()
 }

-func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reverse bool, fileName string, plain bool) oscommands.ICmdObj {
-	contextSize := self.AppState.DiffContextSize
+func (self *WorkingTreeCommands) ShowFileDiffCmdObj(from string, to string, reverse bool, fileName string, plain bool,
+	ignoreWhitespace bool,
+) oscommands.ICmdObj {
+	contextSize := self.UserConfig.Git.DiffContextSize

 	colorArg := self.UserConfig.Git.Paging.ColorArg
 	if plain {
 		colorArg = "never"
 	}

-	extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
-	useExtDiff := extDiffCmd != "" && !plain
-
 	cmdArgs := NewGitCmd("diff").
-		ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
-		ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
 		Arg("--submodule").
+		Arg("--no-ext-diff").
 		Arg(fmt.Sprintf("--unified=%d", contextSize)).
 		Arg("--no-renames").
 		Arg(fmt.Sprintf("--color=%s", colorArg)).
 		Arg(from).
 		Arg(to).
 		ArgIf(reverse, "-R").
-		ArgIf(!plain && self.AppState.IgnoreWhitespaceInDiffView, "--ignore-all-space").
+		ArgIf(ignoreWhitespace, "--ignore-all-space").
 		Arg("--").
 		Arg(fileName).
 		ToArgv()
@@ -231,7 +231,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--color=always", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "cached",
@@ -245,7 +245,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--cached", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--color=always", "--cached", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "plain",
@@ -259,7 +259,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=never", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--color=never", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "File not tracked and file has no staged changes",
@@ -273,7 +273,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--no-index", "--", "/dev/null", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--color=always", "--no-index", "--", "/dev/null", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "Default case (ignore whitespace)",
@@ -287,7 +287,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			ignoreWhitespace: true,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--color=always", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--color=always", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName: "Show diff with custom context size",
@@ -301,7 +301,7 @@ func TestWorkingTreeDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      17,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=17", "--color=always", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=17", "--color=always", "--", "test.txt"}, expectedResult, nil),
 		},
 	}

@@ -309,12 +309,10 @@ func TestWorkingTreeDiff(t *testing.T) {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
-			appState := &config.AppState{}
-			appState.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
-			appState.DiffContextSize = s.contextSize
+			userConfig.Git.DiffContextSize = s.contextSize

-			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig, appState: appState})
-			result := instance.WorktreeFileDiff(s.file, s.plain, s.cached)
+			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig})
+			result := instance.WorktreeFileDiff(s.file, s.plain, s.cached, s.ignoreWhitespace)
 			assert.Equal(t, expectedResult, result)
 			s.runner.CheckForMissingCalls()
 		})
@@ -345,7 +343,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Show diff with custom context size",
@@ -356,7 +354,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: false,
 			contextSize:      123,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=123", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=123", "--no-renames", "--color=always", "1234567890", "0987654321", "--", "test.txt"}, expectedResult, nil),
 		},
 		{
 			testName:         "Default case (ignore whitespace)",
@@ -367,7 +365,7 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 			ignoreWhitespace: true,
 			contextSize:      3,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"diff", "--no-ext-diff", "--submodule", "--unified=3", "--no-renames", "--color=always", "1234567890", "0987654321", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
+				ExpectGitArgs([]string{"diff", "--submodule", "--no-ext-diff", "--unified=3", "--no-renames", "--color=always", "1234567890", "0987654321", "--ignore-all-space", "--", "test.txt"}, expectedResult, nil),
 		},
 	}

@@ -375,13 +373,11 @@ func TestWorkingTreeShowFileDiff(t *testing.T) {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
-			appState := &config.AppState{}
-			appState.IgnoreWhitespaceInDiffView = s.ignoreWhitespace
-			appState.DiffContextSize = s.contextSize
+			userConfig.Git.DiffContextSize = s.contextSize

-			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig, appState: appState})
+			instance := buildWorkingTreeCommands(commonDeps{runner: s.runner, userConfig: userConfig})

-			result, err := instance.ShowFileDiff(s.from, s.to, s.reverse, "test.txt", s.plain)
+			result, err := instance.ShowFileDiff(s.from, s.to, s.reverse, "test.txt", s.plain, s.ignoreWhitespace)
 			assert.NoError(t, err)
 			assert.Equal(t, expectedResult, result)
 			s.runner.CheckForMissingCalls()
@@ -58,7 +58,7 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 			isPathMissing := self.pathExists(path)

 			var gitDir string
-			gitDir, err := getWorktreeGitDirPath(self.Fs, path)
+			gitDir, err := worktreeGitDirPath(self.Fs, path)
 			if err != nil {
 				self.Log.Warnf("Could not find git dir for worktree %s: %v", path, err)
 			}
@@ -186,7 +186,7 @@ branch refs/heads/mybranch-worktree
 				assert.EqualError(t, errors.New(s.expectedErr), err.Error())
 			} else {
 				assert.NoError(t, err)
-				assert.EqualValues(t, s.expectedWorktrees, worktrees)
+				assert.EqualValues(t, worktrees, s.expectedWorktrees)
 			}
 		})
 	}
@@ -7,6 +7,8 @@ import (
 	"os/exec"
 	"strings"
 	"syscall"
+
+	"github.com/jesseduffield/lazygit/pkg/secureexec"
 )

 // including license from https://github.com/tcnksm/go-gitconfig because this file is an adaptation of that repo's code
@@ -53,10 +55,10 @@ func runGitConfigCmd(cmd *exec.Cmd) (string, error) {

 func getGitConfigCmd(key string) *exec.Cmd {
 	gitArgs := []string{"config", "--get", "--null", key}
-	return exec.Command("git", gitArgs...)
+	return secureexec.Command("git", gitArgs...)
 }

 func getGitConfigGeneralCmd(args string) *exec.Cmd {
 	gitArgs := append([]string{"config"}, strings.Split(args, " ")...)
-	return exec.Command("git", gitArgs...)
+	return secureexec.Command("git", gitArgs...)
 }
@@ -8,10 +8,9 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"

-	"golang.org/x/exp/slices"
+	"github.com/jesseduffield/generics/slices"
 )

 // This package is for handling logic specific to a git hosting service like github, gitlab, bitbucket, gitea, etc.
@@ -99,30 +98,33 @@ func (self *HostingServiceMgr) getCandidateServiceDomains() []ServiceDomain {

 	serviceDomains := slices.Clone(defaultServiceDomains)

-	for gitDomain, typeAndDomain := range self.configServiceDomains {
-		provider, webDomain, success := strings.Cut(typeAndDomain, ":")
+	if len(self.configServiceDomains) > 0 {
+		for gitDomain, typeAndDomain := range self.configServiceDomains {
+			splitData := strings.Split(typeAndDomain, ":")
+			if len(splitData) != 2 {
+				self.log.Errorf("Unexpected format for git service: '%s'. Expected something like 'github.com:github.com'", typeAndDomain)
+				continue
+			}

-		// we allow for one ':' for specifying the TCP port
-		if !success || strings.Count(webDomain, ":") > 1 {
-			self.log.Errorf("Unexpected format for git service: '%s'. Expected something like 'github.com:github.com'", typeAndDomain)
-			continue
-		}
+			provider := splitData[0]
+			webDomain := splitData[1]

-		serviceDefinition, ok := serviceDefinitionByProvider[provider]
-		if !ok {
-			providerNames := lo.Map(serviceDefinitions, func(serviceDefinition ServiceDefinition, _ int) string {
-				return serviceDefinition.provider
+			serviceDefinition, ok := serviceDefinitionByProvider[provider]
+			if !ok {
+				providerNames := slices.Map(serviceDefinitions, func(serviceDefinition ServiceDefinition) string {
+					return serviceDefinition.provider
+				})
+
+				self.log.Errorf("Unknown git service type: '%s'. Expected one of %s", provider, strings.Join(providerNames, ", "))
+				continue
+			}
+
+			serviceDomains = append(serviceDomains, ServiceDomain{
+				gitDomain:         gitDomain,
+				webDomain:         webDomain,
+				serviceDefinition: serviceDefinition,
 			})
-
-			self.log.Errorf("Unknown git service type: '%s'. Expected one of %s", provider, strings.Join(providerNames, ", "))
-			continue
 		}
-
-		serviceDomains = append(serviceDomains, ServiceDomain{
-			gitDomain:         gitDomain,
-			webDomain:         webDomain,
-			serviceDefinition: serviceDefinition,
-		})
 	}

 	return serviceDomains
@@ -340,30 +340,6 @@ func TestGetPullRequestURL(t *testing.T) {
 			},
 			expectedLoggedErrors: nil,
 		},
-		{
-			testName:  "Does not log error when config service webDomain contains a port",
-			from:      "feature/profile-page",
-			remoteUrl: "git@my.domain.test:johndoe/social_network.git",
-			configServiceDomains: map[string]string{
-				"my.domain.test": "gitlab:my.domain.test:1111",
-			},
-			test: func(url string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "https://my.domain.test:1111/johndoe/social_network/-/merge_requests/new?merge_request[source_branch]=feature%2Fprofile-page", url)
-			},
-		},
-		{
-			testName:  "Logs error when webDomain contains more than one colon",
-			from:      "feature/profile-page",
-			remoteUrl: "git@my.domain.test:johndoe/social_network.git",
-			configServiceDomains: map[string]string{
-				"my.domain.test": "gitlab:my.domain.test:1111:2222",
-			},
-			test: func(url string, err error) {
-				assert.Error(t, err)
-			},
-			expectedLoggedErrors: []string{"Unexpected format for git service: 'gitlab:my.domain.test:1111:2222'. Expected something like 'github.com:github.com'"},
-		},
 		{
 			testName:  "Logs error when config service domain is malformed",
 			from:      "feature/profile-page",
@@ -1,7 +1,5 @@
 package models

-import "fmt"
-
 // Branch : A git branch
 // duplicating this for now
 type Branch struct {
@@ -45,30 +43,10 @@ func (b *Branch) ParentRefName() string {
 	return b.RefName() + "^"
 }

-func (b *Branch) FullUpstreamRefName() string {
-	if b.UpstreamRemote == "" || b.UpstreamBranch == "" {
-		return ""
-	}
-
-	return fmt.Sprintf("refs/remotes/%s/%s", b.UpstreamRemote, b.UpstreamBranch)
-}
-
-func (b *Branch) ShortUpstreamRefName() string {
-	if b.UpstreamRemote == "" || b.UpstreamBranch == "" {
-		return ""
-	}
-
-	return fmt.Sprintf("%s/%s", b.UpstreamRemote, b.UpstreamBranch)
-}
-
 func (b *Branch) ID() string {
 	return b.RefName()
 }

-func (b *Branch) URN() string {
-	return "branch-" + b.ID()
-}
-
 func (b *Branch) Description() string {
 	return b.RefName()
 }
@@ -30,17 +30,6 @@ const (
 	ActionConflict = todo.Comment + 1
 )

-type Divergence int
-
-// For a divergence log (left/right comparison of two refs) this is set to
-// either DivergenceLeft or DivergenceRight for each commit; for normal
-// commit views it is always DivergenceNone.
-const (
-	DivergenceNone Divergence = iota
-	DivergenceLeft
-	DivergenceRight
-)
-
 // Commit : A git commit
 type Commit struct {
 	Sha           string
@@ -52,7 +41,6 @@ type Commit struct {
 	AuthorName    string // something like 'Jesse Duffield'
 	AuthorEmail   string // something like 'jessedduffield@gmail.com'
 	UnixTimestamp int64
-	Divergence    Divergence // set to DivergenceNone unless we are showing the divergence view

 	// SHAs of parent commits (will be multiple if it's a merge commit)
 	Parents []string
@@ -24,10 +24,6 @@ func (t *Tag) ID() string {
 	return t.RefName()
 }

-func (t *Tag) URN() string {
-	return "tag-" + t.ID()
-}
-
 func (t *Tag) Description() string {
 	return t.Message
 }
@@ -73,6 +73,10 @@ type ICmdObj interface {
 }

 type CmdObj struct {
+	// the secureexec package will swap out the first arg with the full path to the binary,
+	// so we store these args separately so that ToString() will output the original
+	args []string
+
 	cmd *exec.Cmd

 	runner ICmdObjRunner
@@ -117,7 +121,7 @@ func (self *CmdObj) GetCmd() *exec.Cmd {

 func (self *CmdObj) ToString() string {
 	// if a given arg contains a space, we need to wrap it in quotes
-	quotedArgs := lo.Map(self.cmd.Args, func(arg string, _ int) string {
+	quotedArgs := lo.Map(self.args, func(arg string, _ int) string {
 		if strings.Contains(arg, " ") {
 			return `"` + arg + `"`
 		}
@@ -128,7 +132,7 @@ func (self *CmdObj) ToString() string {
 }

 func (self *CmdObj) Args() []string {
-	return self.cmd.Args
+	return self.args
 }

 func (self *CmdObj) AddEnvVars(vars ...string) ICmdObj {
@@ -3,9 +3,9 @@ package oscommands
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"

+	"github.com/jesseduffield/lazygit/pkg/secureexec"
 	"github.com/mgutz/str"
 )

@@ -27,10 +27,11 @@ type CmdObjBuilder struct {
 var _ ICmdObjBuilder = &CmdObjBuilder{}

 func (self *CmdObjBuilder) New(args []string) ICmdObj {
-	cmd := exec.Command(args[0], args[1:]...)
+	cmd := secureexec.Command(args[0], args[1:]...)
 	cmd.Env = os.Environ()

 	return &CmdObj{
+		args:   args,
 		cmd:    cmd,
 		runner: self.runner,
 	}
@@ -27,8 +27,7 @@ func TestCmdObjToString(t *testing.T) {
 	}

 	for _, scenario := range scenarios {
-		cmd := exec.Command(scenario.cmdArgs[0], scenario.cmdArgs[1:]...)
-		cmdObj := &CmdObj{cmd: cmd}
+		cmdObj := &CmdObj{args: scenario.cmdArgs}
 		actual := cmdObj.ToString()
 		if actual != scenario.expected {
 			t.Errorf("Expected %s, got %s", quote(scenario.expected), quote(actual))
@@ -3,6 +3,7 @@ package oscommands
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -105,7 +106,7 @@ func CopyDir(src string, dst string) (err error) {
 		return //nolint: nakedret
 	}

-	entries, err := os.ReadDir(src)
+	entries, err := ioutil.ReadDir(src)
 	if err != nil {
 		return //nolint: nakedret
 	}
@@ -120,14 +121,8 @@ func CopyDir(src string, dst string) (err error) {
 				return //nolint: nakedret
 			}
 		} else {
-			var info os.FileInfo
-			info, err = entry.Info()
-			if err != nil {
-				return //nolint: nakedret
-			}
-
 			// Skip symlinks.
-			if info.Mode()&os.ModeSymlink != 0 {
+			if entry.Mode()&os.ModeSymlink != 0 {
 				continue
 			}

@@ -3,6 +3,8 @@ package oscommands
 import (
 	"bufio"
 	"fmt"
+	"regexp"
+	"runtime"
 	"strings"
 	"sync"
 	"testing"
@@ -122,7 +124,27 @@ func (self *FakeCmdObjRunner) ExpectFunc(description string, fn func(cmdObj ICmd
 func (self *FakeCmdObjRunner) ExpectArgs(expectedArgs []string, output string, err error) *FakeCmdObjRunner {
 	description := fmt.Sprintf("matches args %s", strings.Join(expectedArgs, " "))
 	self.ExpectFunc(description, func(cmdObj ICmdObj) bool {
-		return slices.Equal(expectedArgs, cmdObj.GetCmd().Args)
+		args := cmdObj.GetCmd().Args
+
+		if runtime.GOOS == "windows" {
+			// thanks to the secureexec package, the first arg is something like
+			// '"C:\\Program Files\\Git\\mingw64\\bin\\<command>.exe"
+			// on windows so we'll just ensure it contains our program
+			if !strings.Contains(args[0], expectedArgs[0]) {
+				return false
+			}
+		} else {
+			// first arg is the program name
+			if expectedArgs[0] != args[0] {
+				return false
+			}
+		}
+
+		if !slices.Equal(expectedArgs[1:], args[1:]) {
+			return false
+		}
+
+		return true
 	}, output, err)

 	return self
@@ -131,7 +153,18 @@ func (self *FakeCmdObjRunner) ExpectArgs(expectedArgs []string, output string, e
 func (self *FakeCmdObjRunner) ExpectGitArgs(expectedArgs []string, output string, err error) *FakeCmdObjRunner {
 	description := fmt.Sprintf("matches git args %s", strings.Join(expectedArgs, " "))
 	self.ExpectFunc(description, func(cmdObj ICmdObj) bool {
-		return slices.Equal(expectedArgs, cmdObj.GetCmd().Args[1:])
+		// first arg is 'git' on unix and something like '"C:\\Program Files\\Git\\mingw64\\bin\\git.exe" on windows so we'll just ensure it ends in either 'git' or 'git.exe'
+		re := regexp.MustCompile(`git(\.exe)?$`)
+		args := cmdObj.GetCmd().Args
+		if !re.MatchString(args[0]) {
+			return false
+		}
+
+		if !slices.Equal(expectedArgs, args[1:]) {
+			return false
+		}
+
+		return true
 	}, output, err)

 	return self
@@ -13,6 +13,7 @@ import (
 	"github.com/samber/lo"

 	"github.com/atotto/clipboard"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/kill"
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
@@ -117,15 +118,7 @@ func (c *OSCommand) Quote(message string) string {

 // AppendLineToFile adds a new line in file
 func (c *OSCommand) AppendLineToFile(filename, line string) error {
-	msg := utils.ResolvePlaceholderString(
-		c.Tr.Log.AppendingLineToFile,
-		map[string]string{
-			"line":     line,
-			"filename": filename,
-		},
-	)
-	c.LogCommand(msg, false)
-
+	c.LogCommand(fmt.Sprintf("Appending '%s' to file '%s'", line, filename), false)
 	f, err := os.OpenFile(filename, os.O_APPEND|os.O_RDWR|os.O_CREATE, 0o600)
 	if err != nil {
 		return utils.WrapError(err)
@@ -162,13 +155,7 @@ func (c *OSCommand) AppendLineToFile(filename, line string) error {

 // CreateFileWithContent creates a file with the given content
 func (c *OSCommand) CreateFileWithContent(path string, content string) error {
-	msg := utils.ResolvePlaceholderString(
-		c.Tr.Log.CreateFileWithContent,
-		map[string]string{
-			"path": path,
-		},
-	)
-	c.LogCommand(msg, false)
+	c.LogCommand(fmt.Sprintf("Creating file '%s'", path), false)
 	if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
 		c.Log.Error(err)
 		return err
@@ -184,13 +171,7 @@ func (c *OSCommand) CreateFileWithContent(path string, content string) error {

 // Remove removes a file or directory at the specified path
 func (c *OSCommand) Remove(filename string) error {
-	msg := utils.ResolvePlaceholderString(
-		c.Tr.Log.Remove,
-		map[string]string{
-			"filename": filename,
-		},
-	)
-	c.LogCommand(msg, false)
+	c.LogCommand(fmt.Sprintf("Removing '%s'", filename), false)
 	err := os.RemoveAll(filename)
 	return utils.WrapError(err)
 }
@@ -208,7 +189,7 @@ func (c *OSCommand) FileExists(path string) (bool, error) {

 // PipeCommands runs a heap of commands and pipes their inputs/outputs together like A | B | C
 func (c *OSCommand) PipeCommands(cmdObjs ...ICmdObj) error {
-	cmds := lo.Map(cmdObjs, func(cmdObj ICmdObj, _ int) *exec.Cmd {
+	cmds := slices.Map(cmdObjs, func(cmdObj ICmdObj) *exec.Cmd {
 		return cmdObj.GetCmd()
 	})

@@ -285,32 +266,12 @@ func PrepareForChildren(cmd *exec.Cmd) {
 func (c *OSCommand) CopyToClipboard(str string) error {
 	escaped := strings.Replace(str, "\n", "\\n", -1)
 	truncated := utils.TruncateWithEllipsis(escaped, 40)
-
-	msg := utils.ResolvePlaceholderString(
-		c.Tr.Log.CopyToClipboard,
-		map[string]string{
-			"str": truncated,
-		},
-	)
-	c.LogCommand(msg, false)
-	if c.UserConfig.OS.CopyToClipboardCmd != "" {
-		cmdStr := utils.ResolvePlaceholderString(c.UserConfig.OS.CopyToClipboardCmd, map[string]string{
-			"text": c.Cmd.Quote(str),
-		})
-		return c.Cmd.NewShell(cmdStr).Run()
-	}
-
+	c.LogCommand(fmt.Sprintf("Copying '%s' to clipboard", truncated), false)
 	return clipboard.WriteAll(str)
 }

 func (c *OSCommand) RemoveFile(path string) error {
-	msg := utils.ResolvePlaceholderString(
-		c.Tr.Log.RemoveFile,
-		map[string]string{
-			"path": path,
-		},
-	)
-	c.LogCommand(msg, false)
+	c.LogCommand(fmt.Sprintf("Deleting path '%s'", path), false)

 	return c.removeFileFn(path)
 }
@@ -6,6 +6,7 @@ package oscommands
 import (
 	"testing"

+	"github.com/cli/safeexec"
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
 )
@@ -19,11 +20,13 @@ func TestOSCommandOpenFileWindows(t *testing.T) {
 		test     func(error)
 	}

+	fullCmdPath, _ := safeexec.LookPath("cmd")
+
 	scenarios := []scenario{
 		{
 			filename: "test",
 			runner: NewFakeRunner(t).
-				ExpectArgs([]string{"cmd", "/c", "start", "", "test"}, "", errors.New("error")),
+				ExpectArgs([]string{fullCmdPath, "/c", "start", "", "test"}, "", errors.New("error")),
 			test: func(err error) {
 				assert.Error(t, err)
 			},
@@ -31,7 +34,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) {
 		{
 			filename: "test",
 			runner: NewFakeRunner(t).
-				ExpectArgs([]string{"cmd", "/c", "start", "", "test"}, "", nil),
+				ExpectArgs([]string{fullCmdPath, "/c", "start", "", "test"}, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -39,7 +42,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) {
 		{
 			filename: "filename with spaces",
 			runner: NewFakeRunner(t).
-				ExpectArgs([]string{"cmd", "/c", "start", "", "filename with spaces"}, "", nil),
+				ExpectArgs([]string{fullCmdPath, "/c", "start", "", "filename with spaces"}, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -47,7 +50,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) {
 		{
 			filename: "let's_test_with_single_quote",
 			runner: NewFakeRunner(t).
-				ExpectArgs([]string{"cmd", "/c", "start", "", "let's_test_with_single_quote"}, "", nil),
+				ExpectArgs([]string{fullCmdPath, "/c", "start", "", "let's_test_with_single_quote"}, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -55,7 +58,7 @@ func TestOSCommandOpenFileWindows(t *testing.T) {
 		{
 			filename: "$USER.txt",
 			runner: NewFakeRunner(t).
-				ExpectArgs([]string{"cmd", "/c", "start", "", "$USER.txt"}, "", nil),
+				ExpectArgs([]string{fullCmdPath, "/c", "start", "", "$USER.txt"}, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -97,12 +97,12 @@ func (self *Patch) LineNumberOfLine(idx int) int {
 	idxInHunk := idx - hunkStartIdx

 	if idxInHunk == 0 {
-		return hunk.newStart
+		return hunk.oldStart
 	}

 	lines := hunk.bodyLines[:idxInHunk-1]
 	offset := nLinesWithKind(lines, []PatchLineKind{ADDITION, CONTEXT})
-	return hunk.newStart + offset
+	return hunk.oldStart + offset
 }

 // Returns hunk index containing the line at the given patch line index
@@ -149,8 +149,3 @@ func (self *Patch) LineCount() int {
 	}
 	return count
 }
-
-// Returns the number of hunks of the patch
-func (self *Patch) HunkCount() int {
-	return len(self.hunks)
-}
@@ -5,6 +5,7 @@ import (
 	"strings"

 	"github.com/jesseduffield/generics/maps"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 )
@@ -208,10 +209,10 @@ func (p *PatchBuilder) renderEachFilePatch(plain bool) []string {
 	filenames := maps.Keys(p.fileInfoMap)

 	sort.Strings(filenames)
-	patches := lo.Map(filenames, func(filename string, _ int) string {
+	patches := slices.Map(filenames, func(filename string) string {
 		return p.RenderPatchForFile(filename, plain, false)
 	})
-	output := lo.Filter(patches, func(patch string, _ int) bool {
+	output := slices.Filter(patches, func(patch string) bool {
 		return patch != ""
 	})

@@ -67,29 +67,6 @@ index e48a11c..b2ab81b 100644
 ...
 `

-const twoHunksWithMoreAdditionsThanRemovals = `diff --git a/filename b/filename
-index bac359d75..6e5b89f36 100644
--- a/filename
-+++ b/filename
-@@ -1,5 +1,6 @@
- apple
-grape
-+orange
-+kiwi
- ...
- ...
- ...
-@@ -8,6 +9,8 @@ grape
- ...
- ...
- ...
-+pear
-+lemon
- ...
- ...
- ...
-`
-
 const twoChangesInOneHunk = `diff --git a/filename b/filename
 index 9320895..6d79956 100644
 --- a/filename
@@ -595,12 +572,6 @@ func TestLineNumberOfLine(t *testing.T) {
 			indexes:   []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 1000},
 			expecteds: []int{1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 8, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15},
 		},
-		{
-			testName:  "twoHunksWithMoreAdditionsThanRemovals",
-			patchStr:  twoHunksWithMoreAdditionsThanRemovals,
-			indexes:   []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 1000},
-			expecteds: []int{1, 1, 1, 1, 1, 1, 2, 2, 3, 4, 5, 6, 9, 9, 10, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16},
-		},
 	}

 	for _, s := range scenarios {
@@ -12,7 +12,6 @@ type Common struct {
 	Log        *logrus.Entry
 	Tr         *i18n.TranslationSet
 	UserConfig *config.UserConfig
-	AppState   *config.AppState
 	Debug      bool
 	// for interacting with the filesystem. We use afero rather than the default
 	// `os` package for the sake of mocking the filesystem in tests
@@ -283,13 +283,11 @@ func (c *AppConfig) SaveAppState() error {

 // loadAppState loads recorded AppState from file
 func loadAppState() (*AppState, error) {
-	appState := getDefaultAppState()
-
 	filepath, err := configFilePath("state.yml")
 	if err != nil {
 		if os.IsPermission(err) {
 			// apparently when people have read-only permissions they prefer us to fail silently
-			return appState, nil
+			return getDefaultAppState(), nil
 		}
 		return nil, err
 	}
@@ -300,9 +298,10 @@ func loadAppState() (*AppState, error) {
 	}

 	if len(appStateBytes) == 0 {
-		return appState, nil
+		return getDefaultAppState(), nil
 	}

+	appState := &AppState{}
 	err = yaml.Unmarshal(appStateBytes, appState)
 	if err != nil {
 		return nil, err
@@ -319,10 +318,8 @@ type AppState struct {
 	StartupPopupVersion int

 	// these are for custom commands typed in directly, not for custom commands in the lazygit config
-	CustomCommandsHistory      []string
-	HideCommandLog             bool
-	IgnoreWhitespaceInDiffView bool
-	DiffContextSize            int
+	CustomCommandsHistory []string
+	HideCommandLog        bool
 }

 func getDefaultAppState() *AppState {
@@ -330,7 +327,6 @@ func getDefaultAppState() *AppState {
 		LastUpdateCheck:     0,
 		RecentRepos:         []string{},
 		StartupPopupVersion: 0,
-		DiffContextSize:     3,
 	}
 }

@@ -1,17 +1,18 @@
 package config

 import (
+	"io/ioutil"
 	"os"
 	"strings"
 )

 func isWSL() bool {
-	data, err := os.ReadFile("/proc/sys/kernel/osrelease")
+	data, err := ioutil.ReadFile("/proc/sys/kernel/osrelease")
 	return err == nil && strings.Contains(string(data), "microsoft")
 }

 func isContainer() bool {
-	data, err := os.ReadFile("/proc/1/cgroup")
+	data, err := ioutil.ReadFile("/proc/1/cgroup")

 	if strings.Contains(string(data), "docker") ||
 		strings.Contains(string(data), "/lxc/") ||
@@ -28,13 +28,13 @@ func GetEditAtLineAndWaitTemplate(osConfig *OSConfig, guessDefaultEditor func()
 	return template
 }

-func GetOpenDirInEditorTemplate(osConfig *OSConfig, guessDefaultEditor func() string) (string, bool) {
+func GetOpenDirInEditorTemplate(osConfig *OSConfig, guessDefaultEditor func() string) string {
 	preset := getPreset(osConfig, guessDefaultEditor)
 	template := osConfig.OpenDirInEditor
 	if template == "" {
 		template = preset.openDirInEditorTemplate
 	}
-	return template, getEditInTerminal(osConfig, preset)
+	return template
 }

 type editPreset struct {
@@ -42,26 +42,16 @@ type editPreset struct {
 	editAtLineTemplate        string
 	editAtLineAndWaitTemplate string
 	openDirInEditorTemplate   string
-	suspend                   bool
+	editInTerminal            bool
 }

 // 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{
-		"vi":   standardTerminalEditorPreset("vi"),
-		"vim":  standardTerminalEditorPreset("vim"),
-		"nvim": standardTerminalEditorPreset("nvim"),
-		"nvim-remote": {
-			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:   `nvim --server "$NVIM" --remote-tab {{dir}}`,
-			suspend:                   false,
-		},
-		"lvim":    standardTerminalEditorPreset("lvim"),
+		"vi":      standardTerminalEditorPreset("vi"),
+		"vim":     standardTerminalEditorPreset("vim"),
+		"nvim":    standardTerminalEditorPreset("nvim"),
 		"emacs":   standardTerminalEditorPreset("emacs"),
-		"micro":   standardTerminalEditorPreset("micro"),
 		"nano":    standardTerminalEditorPreset("nano"),
 		"kakoune": standardTerminalEditorPreset("kak"),
 		"helix": {
@@ -69,35 +59,35 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 			editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
 			openDirInEditorTemplate:   "hx -- {{dir}}",
-			suspend:                   true,
+			editInTerminal:            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:                   false,
+			editInTerminal:            false,
 		},
 		"sublime": {
 			editTemplate:              "subl -- {{filename}}",
 			editAtLineTemplate:        "subl -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "subl --wait -- {{filename}}:{{line}}",
 			openDirInEditorTemplate:   "subl -- {{dir}}",
-			suspend:                   false,
+			editInTerminal:            false,
 		},
 		"bbedit": {
 			editTemplate:              "bbedit -- {{filename}}",
 			editAtLineTemplate:        "bbedit +{{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "bbedit +{{line}} --wait -- {{filename}}",
 			openDirInEditorTemplate:   "bbedit -- {{dir}}",
-			suspend:                   false,
+			editInTerminal:            false,
 		},
 		"xcode": {
 			editTemplate:              "xed -- {{filename}}",
 			editAtLineTemplate:        "xed --line {{line}} -- {{filename}}",
 			editAtLineAndWaitTemplate: "xed --line {{line}} --wait -- {{filename}}",
 			openDirInEditorTemplate:   "xed -- {{dir}}",
-			suspend:                   false,
+			editInTerminal:            false,
 		},
 	}

@@ -133,13 +123,13 @@ func standardTerminalEditorPreset(editor string) *editPreset {
 		editAtLineTemplate:        editor + " +{{line}} -- {{filename}}",
 		editAtLineAndWaitTemplate: editor + " +{{line}} -- {{filename}}",
 		openDirInEditorTemplate:   editor + " -- {{dir}}",
-		suspend:                   true,
+		editInTerminal:            true,
 	}
 }

 func getEditInTerminal(osConfig *OSConfig, preset *editPreset) bool {
-	if osConfig.SuspendOnEdit != nil {
-		return *osConfig.SuspendOnEdit
+	if osConfig.EditInTerminal != nil {
+		return *osConfig.EditInTerminal
 	}
-	return preset.suspend
+	return preset.editInTerminal
 }
@@ -16,7 +16,7 @@ func TestGetEditTemplate(t *testing.T) {
 		expectedEditTemplate              string
 		expectedEditAtLineTemplate        string
 		expectedEditAtLineAndWaitTemplate string
-		expectedSuspend                   bool
+		expectedEditInTerminal            bool
 	}{
 		{
 			"Default template is vim",
@@ -52,9 +52,9 @@ func TestGetEditTemplate(t *testing.T) {
 		{
 			"Overriding a preset with explicit config (edit)",
 			&OSConfig{
-				EditPreset:    "vscode",
-				Edit:          "myeditor {{filename}}",
-				SuspendOnEdit: &trueVal,
+				EditPreset:     "vscode",
+				Edit:           "myeditor {{filename}}",
+				EditInTerminal: &trueVal,
 			},
 			func() string { return "" },
 			"myeditor {{filename}}",
@@ -65,9 +65,9 @@ func TestGetEditTemplate(t *testing.T) {
 		{
 			"Overriding a preset with explicit config (edit at line)",
 			&OSConfig{
-				EditPreset:    "vscode",
-				EditAtLine:    "myeditor --line={{line}} {{filename}}",
-				SuspendOnEdit: &trueVal,
+				EditPreset:     "vscode",
+				EditAtLine:     "myeditor --line={{line}} {{filename}}",
+				EditInTerminal: &trueVal,
 			},
 			func() string { return "" },
 			"code --reuse-window -- {{filename}}",
@@ -80,7 +80,7 @@ func TestGetEditTemplate(t *testing.T) {
 			&OSConfig{
 				EditPreset:        "vscode",
 				EditAtLineAndWait: "myeditor --line={{line}} -w {{filename}}",
-				SuspendOnEdit:     &trueVal,
+				EditInTerminal:    &trueVal,
 			},
 			func() string { return "" },
 			"code --reuse-window -- {{filename}}",
@@ -111,13 +111,13 @@ func TestGetEditTemplate(t *testing.T) {
 	}
 	for _, s := range scenarios {
 		t.Run(s.name, func(t *testing.T) {
-			template, suspend := GetEditTemplate(s.osConfig, s.guessDefaultEditor)
+			template, editInTerminal := GetEditTemplate(s.osConfig, s.guessDefaultEditor)
 			assert.Equal(t, s.expectedEditTemplate, template)
-			assert.Equal(t, s.expectedSuspend, suspend)
+			assert.Equal(t, s.expectedEditInTerminal, editInTerminal)

-			template, suspend = GetEditAtLineTemplate(s.osConfig, s.guessDefaultEditor)
+			template, editInTerminal = GetEditAtLineTemplate(s.osConfig, s.guessDefaultEditor)
 			assert.Equal(t, s.expectedEditAtLineTemplate, template)
-			assert.Equal(t, s.expectedSuspend, suspend)
+			assert.Equal(t, s.expectedEditInTerminal, editInTerminal)

 			template = GetEditAtLineAndWaitTemplate(s.osConfig, s.guessDefaultEditor)
 			assert.Equal(t, s.expectedEditAtLineAndWaitTemplate, template)
@@ -5,269 +5,139 @@ import (
 )

 type UserConfig struct {
-	// Config relating to the Lazygit UI
-	Gui GuiConfig `yaml:"gui"`
-	// Config relating to git
-	Git GitConfig `yaml:"git"`
-	// Periodic update checks
-	Update UpdateConfig `yaml:"update"`
-	// Background refreshes
-	Refresher RefresherConfig `yaml:"refresher"`
-	// If true, show a confirmation popup before quitting Lazygit
-	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"`
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-pull-request-urls
-	Services map[string]string `yaml:"services"`
-	// 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 string `yaml:"notARepository"`
-	// 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"`
+	Gui                  GuiConfig        `yaml:"gui"`
+	Git                  GitConfig        `yaml:"git"`
+	Update               UpdateConfig     `yaml:"update"`
+	Refresher            RefresherConfig  `yaml:"refresher"`
+	ConfirmOnQuit        bool             `yaml:"confirmOnQuit"`
+	QuitOnTopLevelReturn bool             `yaml:"quitOnTopLevelReturn"`
+	Keybinding           KeybindingConfig `yaml:"keybinding"`
+	// OS determines what defaults are set for opening files and links
+	OS                           OSConfig          `yaml:"os,omitempty"`
+	DisableStartupPopups         bool              `yaml:"disableStartupPopups"`
+	CustomCommands               []CustomCommand   `yaml:"customCommands"`
+	Services                     map[string]string `yaml:"services"`
+	NotARepository               string            `yaml:"notARepository"`
+	PromptToReturnFromSubprocess bool              `yaml:"promptToReturnFromSubprocess"`
 }

 type RefresherConfig struct {
-	// File/submodule refresh interval in seconds.
-	// Auto-refresh can be disabled via option 'git.autoRefresh'.
 	RefreshInterval int `yaml:"refreshInterval"`
-	// Re-fetch interval in seconds.
-	// Auto-fetch can be disabled via option 'git.autoFetch'.
-	FetchInterval int `yaml:"fetchInterval"`
+	FetchInterval   int `yaml:"fetchInterval"`
 }

 type GuiConfig struct {
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color
-	AuthorColors map[string]string `yaml:"authorColors"`
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
-	BranchColors map[string]string `yaml:"branchColors"`
-	// The number of lines you scroll by when scrolling the main window
-	ScrollHeight int `yaml:"scrollHeight"`
-	// If true, allow scrolling past the bottom of the content in the main window
-	ScrollPastBottom bool `yaml:"scrollPastBottom"`
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#scroll-off-margin
-	ScrollOffMargin int `yaml:"scrollOffMargin"`
-	// One of: 'margin' (default) | 'jump'
-	ScrollOffBehavior string `yaml:"scrollOffBehavior"`
-	// 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 bool `yaml:"mouseEvents"`
-	// If true, do not show a warning when discarding changes in the staging view.
-	SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"`
-	// If true, do not show warning when applying/popping the stash
-	SkipStashWarning bool `yaml:"skipStashWarning"`
-	// If true, do not show a warning when attempting to commit without any staged files; instead stage all unstaged files.
-	SkipNoStagedFilesWarning bool `yaml:"skipNoStagedFilesWarning"`
-	// If true, do not show a warning when rewording a commit via an external editor
-	SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"`
-	// 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 float64 `yaml:"sidePanelWidth"`
-	// If true, increase the height of the focused side window; creating an accordion effect.
-	ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"`
-	// 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 string `yaml:"mainPanelSplitMode"`
-	// One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
-	Language string `yaml:"language"`
-	// Format used when displaying time e.g. commit time.
-	// Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
-	TimeFormat string `yaml:"timeFormat"`
-	// 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 string `yaml:"shortTimeFormat"`
-	// Config relating to colors and styles.
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes
-	Theme ThemeConfig `yaml:"theme"`
-	// Config relating to the commit length indicator
-	CommitLength CommitLengthConfig `yaml:"commitLength"`
-	// If true, show the '5 of 20' footer at the bottom of list views
-	ShowListFooter bool `yaml:"showListFooter"`
-	// 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 bool `yaml:"showFileTree"`
-	// If true, show a random tip in the command log when Lazygit starts
-	ShowRandomTip bool `yaml:"showRandomTip"`
-	// If true, show the command log
-	ShowCommandLog bool `yaml:"showCommandLog"`
-	// 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 bool `yaml:"showBottomLine"`
-	// If true, show jump-to-window keybindings in window titles.
-	ShowPanelJumps bool `yaml:"showPanelJumps"`
-	// Deprecated: use nerdFontsVersion instead
-	ShowIcons bool `yaml:"showIcons"`
-	// Nerd fonts version to use.
-	// One of: '2' | '3' | empty string (default)
-	// If empty, do not show icons.
-	NerdFontsVersion string `yaml:"nerdFontsVersion"`
-	// If true, show commit hashes alongside branch names in the branches view.
-	ShowBranchCommitHash bool `yaml:"showBranchCommitHash"`
-	// Height of the command log view
-	CommandLogSize int `yaml:"commandLogSize"`
-	// 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 string `yaml:"splitDiff"`
-	// 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 string `yaml:"windowSize"`
-	// Window border style.
-	// One of 'rounded' (default) | 'single' | 'double' | 'hidden'
-	Border string `yaml:"border"`
-	// If true, show a seriously epic explosion animation when nuking the working tree.
-	AnimateExplosion bool `yaml:"animateExplosion"`
-	// Whether to stack UI components on top of each other.
-	// One of 'auto' (default) | 'always' | 'never'
-	PortraitMode string `yaml:"portraitMode"`
+	AuthorColors                map[string]string  `yaml:"authorColors"`
+	BranchColors                map[string]string  `yaml:"branchColors"`
+	ScrollHeight                int                `yaml:"scrollHeight"`
+	ScrollPastBottom            bool               `yaml:"scrollPastBottom"`
+	MouseEvents                 bool               `yaml:"mouseEvents"`
+	SkipDiscardChangeWarning    bool               `yaml:"skipDiscardChangeWarning"`
+	SkipStashWarning            bool               `yaml:"skipStashWarning"`
+	SidePanelWidth              float64            `yaml:"sidePanelWidth"`
+	ExpandFocusedSidePanel      bool               `yaml:"expandFocusedSidePanel"`
+	MainPanelSplitMode          string             `yaml:"mainPanelSplitMode"`
+	Language                    string             `yaml:"language"`
+	TimeFormat                  string             `yaml:"timeFormat"`
+	ShortTimeFormat             string             `yaml:"shortTimeFormat"`
+	Theme                       ThemeConfig        `yaml:"theme"`
+	CommitLength                CommitLengthConfig `yaml:"commitLength"`
+	SkipNoStagedFilesWarning    bool               `yaml:"skipNoStagedFilesWarning"`
+	ShowListFooter              bool               `yaml:"showListFooter"`
+	ShowFileTree                bool               `yaml:"showFileTree"`
+	ShowRandomTip               bool               `yaml:"showRandomTip"`
+	ShowCommandLog              bool               `yaml:"showCommandLog"`
+	ShowBottomLine              bool               `yaml:"showBottomLine"`
+	ShowIcons                   bool               `yaml:"showIcons"`
+	NerdFontsVersion            string             `yaml:"nerdFontsVersion"`
+	ShowBranchCommitHash        bool               `yaml:"showBranchCommitHash"`
+	ExperimentalShowBranchHeads bool               `yaml:"experimentalShowBranchHeads"`
+	CommandLogSize              int                `yaml:"commandLogSize"`
+	SplitDiff                   string             `yaml:"splitDiff"`
+	SkipRewordInEditorWarning   bool               `yaml:"skipRewordInEditorWarning"`
+	WindowSize                  string             `yaml:"windowSize"`
+	Border                      string             `yaml:"border"`
 }

 type ThemeConfig struct {
-	// Border color of focused window
-	ActiveBorderColor []string `yaml:"activeBorderColor"`
-	// Border color of non-focused windows
-	InactiveBorderColor []string `yaml:"inactiveBorderColor"`
-	// Border color of focused window when searching in that window
+	ActiveBorderColor          []string `yaml:"activeBorderColor"`
+	InactiveBorderColor        []string `yaml:"inactiveBorderColor"`
 	SearchingActiveBorderColor []string `yaml:"searchingActiveBorderColor"`
-	// Color of keybindings help text in the bottom line
-	OptionsTextColor []string `yaml:"optionsTextColor"`
-	// Background color of selected line.
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
-	SelectedLineBgColor []string `yaml:"selectedLineBgColor"`
-	// Background color of selected range
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
-	SelectedRangeBgColor []string `yaml:"selectedRangeBgColor"`
-	// Foreground color of copied commit
-	CherryPickedCommitFgColor []string `yaml:"cherryPickedCommitFgColor"`
-	// Background color of copied commit
-	CherryPickedCommitBgColor []string `yaml:"cherryPickedCommitBgColor"`
-	// Foreground color of marked base commit (for rebase)
-	MarkedBaseCommitFgColor []string `yaml:"markedBaseCommitFgColor"`
-	// Background color of marked base commit (for rebase)
-	MarkedBaseCommitBgColor []string `yaml:"markedBaseCommitBgColor"`
-	// Color for file with unstaged changes
-	UnstagedChangesColor []string `yaml:"unstagedChangesColor"`
-	// Default text color
-	DefaultFgColor []string `yaml:"defaultFgColor"`
+	OptionsTextColor           []string `yaml:"optionsTextColor"`
+	SelectedLineBgColor        []string `yaml:"selectedLineBgColor"`
+	SelectedRangeBgColor       []string `yaml:"selectedRangeBgColor"`
+	CherryPickedCommitBgColor  []string `yaml:"cherryPickedCommitBgColor"`
+	CherryPickedCommitFgColor  []string `yaml:"cherryPickedCommitFgColor"`
+	UnstagedChangesColor       []string `yaml:"unstagedChangesColor"`
+	DefaultFgColor             []string `yaml:"defaultFgColor"`
 }

 type CommitLengthConfig struct {
-	// If true, show an indicator of commit message length
 	Show bool `yaml:"show"`
 }

 type GitConfig struct {
-	// See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
-	Paging PagingConfig `yaml:"paging"`
-	// Config relating to committing
-	Commit CommitConfig `yaml:"commit"`
-	// Config relating to merging
-	Merging MergingConfig `yaml:"merging"`
-	// list of branches that are considered 'main' branches, used when displaying commits
-	MainBranches []string `yaml:"mainBranches"`
-	// Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP'
-	SkipHookPrefix string `yaml:"skipHookPrefix"`
-	// If true, periodically fetch from remote
-	AutoFetch bool `yaml:"autoFetch"`
-	// If true, periodically refresh files and submodules
-	AutoRefresh bool `yaml:"autoRefresh"`
-	// If true, pass the --all arg to git fetch
-	FetchAll bool `yaml:"fetchAll"`
-	// Command used when displaying the current branch git log in the main window
-	BranchLogCmd string `yaml:"branchLogCmd"`
-	// Command used to display git log of all branches in the main window
-	AllBranchesLogCmd string `yaml:"allBranchesLogCmd"`
-	// If true, do not spawn a separate process when using GPG
-	OverrideGpg bool `yaml:"overrideGpg"`
-	// 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
-	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')
-	ParseEmoji bool `yaml:"parseEmoji"`
-	// Config for showing the log in the commits view
-	Log LogConfig `yaml:"log"`
+	Paging              PagingConfig                  `yaml:"paging"`
+	Commit              CommitConfig                  `yaml:"commit"`
+	Merging             MergingConfig                 `yaml:"merging"`
+	MainBranches        []string                      `yaml:"mainBranches"`
+	SkipHookPrefix      string                        `yaml:"skipHookPrefix"`
+	AutoFetch           bool                          `yaml:"autoFetch"`
+	AutoRefresh         bool                          `yaml:"autoRefresh"`
+	FetchAll            bool                          `yaml:"fetchAll"`
+	BranchLogCmd        string                        `yaml:"branchLogCmd"`
+	AllBranchesLogCmd   string                        `yaml:"allBranchesLogCmd"`
+	OverrideGpg         bool                          `yaml:"overrideGpg"`
+	DisableForcePushing bool                          `yaml:"disableForcePushing"`
+	CommitPrefixes      map[string]CommitPrefixConfig `yaml:"commitPrefixes"`
+	// this should really be under 'gui', not 'git'
+	ParseEmoji      bool      `yaml:"parseEmoji"`
+	Log             LogConfig `yaml:"log"`
+	DiffContextSize int       `yaml:"diffContextSize"`
 }

 type PagingConfig struct {
-	// 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 string `yaml:"colorArg"`
-	// e.g.
-	// diff-so-fancy
-	// delta --dark --paging=never
-	// ydiff -p cat -s --wrap --width={{columnWidth}}
-	Pager string `yaml:"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 bool `yaml:"useConfig"`
-	// e.g. 'difft --color=always'
-	ExternalDiffCommand string `yaml:"externalDiffCommand"`
+	ColorArg  string `yaml:"colorArg"`
+	Pager     string `yaml:"pager"`
+	UseConfig bool   `yaml:"useConfig"`
 }

 type CommitConfig struct {
-	// If true, pass '--signoff' flag when committing
 	SignOff bool `yaml:"signOff"`
 }

 type MergingConfig struct {
-	// If true, run merges in a subprocess so that if a commit message is required, Lazygit will not hang
-	// Only applicable to unix users.
-	ManualCommit bool `yaml:"manualCommit"`
-	// Extra args passed to `git merge`, e.g. --no-ff
-	Args string `yaml:"args"`
+	ManualCommit bool   `yaml:"manualCommit"`
+	Args         string `yaml:"args"`
 }

 type LogConfig struct {
-	// One of: 'date-order' | 'author-date-order' | 'topo-order'
-	// 'topo-order' makes it easier to read the git log graph, but commits may not
-	// appear chronologically. See https://git-scm.com/docs/
-	Order string `yaml:"order"`
-	// This determines whether the git graph is rendered in the commits panel
-	// One of 'always' | 'never' 'when-maximised'
-	ShowGraph string `yaml:"showGraph"`
-	// displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
-	ShowWholeGraph bool `yaml:"showWholeGraph"`
+	Order          string `yaml:"order"`     // one of date-order, author-date-order, topo-order
+	ShowGraph      string `yaml:"showGraph"` // one of always, never, when-maximised
+	ShowWholeGraph bool   `yaml:"showWholeGraph"`
 }

 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"`
-	// Replace directive. E.g. for 'feature/AB-123' to start the commit message with 'AB-123 ' use "[$1] "
 	Replace string `yaml:"replace"`
 }

 type UpdateConfig struct {
-	// One of: 'prompt' (default) | 'background' | 'never'
 	Method string `yaml:"method"`
-	// Period in days between update checks
-	Days int64 `yaml:"days"`
+	Days   int64  `yaml:"days"`
 }

 type KeybindingConfig struct {
-	Universal     KeybindingUniversalConfig     `yaml:"universal"`
-	Status        KeybindingStatusConfig        `yaml:"status"`
-	Files         KeybindingFilesConfig         `yaml:"files"`
-	Branches      KeybindingBranchesConfig      `yaml:"branches"`
-	Worktrees     KeybindingWorktreesConfig     `yaml:"worktrees"`
-	Commits       KeybindingCommitsConfig       `yaml:"commits"`
-	Stash         KeybindingStashConfig         `yaml:"stash"`
-	CommitFiles   KeybindingCommitFilesConfig   `yaml:"commitFiles"`
-	Main          KeybindingMainConfig          `yaml:"main"`
-	Submodules    KeybindingSubmodulesConfig    `yaml:"submodules"`
-	CommitMessage KeybindingCommitMessageConfig `yaml:"commitMessage"`
+	Universal   KeybindingUniversalConfig   `yaml:"universal"`
+	Status      KeybindingStatusConfig      `yaml:"status"`
+	Files       KeybindingFilesConfig       `yaml:"files"`
+	Branches    KeybindingBranchesConfig    `yaml:"branches"`
+	Worktrees   KeybindingWorktreesConfig   `yaml:"worktrees"`
+	Commits     KeybindingCommitsConfig     `yaml:"commits"`
+	Stash       KeybindingStashConfig       `yaml:"stash"`
+	CommitFiles KeybindingCommitFilesConfig `yaml:"commitFiles"`
+	Main        KeybindingMainConfig        `yaml:"main"`
+	Submodules  KeybindingSubmodulesConfig  `yaml:"submodules"`
 }

 // damn looks like we have some inconsistencies here with -alt and -alt1
@@ -348,7 +218,6 @@ type KeybindingFilesConfig struct {
 	CommitChangesWithoutHook string `yaml:"commitChangesWithoutHook"`
 	AmendLastCommit          string `yaml:"amendLastCommit"`
 	CommitChangesWithEditor  string `yaml:"commitChangesWithEditor"`
-	ConfirmDiscard           string `yaml:"confirmDiscard"`
 	IgnoreFile               string `yaml:"ignoreFile"`
 	RefreshFiles             string `yaml:"refreshFiles"`
 	StashAllChanges          string `yaml:"stashAllChanges"`
@@ -399,7 +268,6 @@ type KeybindingCommitsConfig struct {
 	CherryPickCopy                 string `yaml:"cherryPickCopy"`
 	CherryPickCopyRange            string `yaml:"cherryPickCopyRange"`
 	PasteCommits                   string `yaml:"pasteCommits"`
-	MarkCommitAsBaseForRebase      string `yaml:"markCommitAsBaseForRebase"`
 	CreateTag                      string `yaml:"tagCommit"`
 	CheckoutCommit                 string `yaml:"checkoutCommit"`
 	ResetCherryPick                string `yaml:"resetCherryPick"`
@@ -432,10 +300,6 @@ type KeybindingSubmodulesConfig struct {
 	BulkMenu string `yaml:"bulkMenu"`
 }

-type KeybindingCommitMessageConfig struct {
-	SwitchToEditor string `yaml:"switchToEditor"`
-}
-
 // OSConfig contains config on the level of the os
 type OSConfig struct {
 	// Command for editing a file. Should contain "{{filename}}".
@@ -449,10 +313,10 @@ type OSConfig struct {
 	// window is closed.
 	EditAtLineAndWait string `yaml:"editAtLineAndWait,omitempty"`

-	// Whether lazygit suspends until an edit process returns
+	// Whether the given edit commands use the terminal. Used to decide whether
+	// lazygit needs to suspend to the background before calling the editor.
 	// Pointer to bool so that we can distinguish unset (nil) from false.
-	// We're naming this `editInTerminal` for backwards compatibility
-	SuspendOnEdit *bool `yaml:"editInTerminal,omitempty"`
+	EditInTerminal *bool `yaml:"editInTerminal,omitempty"`

 	// For opening a directory in an editor
 	OpenDirInEditor string `yaml:"openDirInEditor,omitempty"`
@@ -490,10 +354,6 @@ type OSConfig struct {
 	// OpenLinkCommand is the command for opening a link
 	// Deprecated: use OpenLink instead.
 	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-clipboard
-	CopyToClipboardCmd string `yaml:"copyToClipboardCmd,omitempty"`
 }

 type CustomCommandAfterHook struct {
@@ -501,79 +361,50 @@ type CustomCommandAfterHook struct {
 }

 type CustomCommand struct {
-	// The key to trigger the command. Use a single letter or one of the values from https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md
-	Key string `yaml:"key"`
-	// The context in which to listen for the key
-	Context string `yaml:"context"`
-	// The command to run (using Go template syntax for placeholder values)
-	Command string `yaml:"command"`
-	// If true, run the command in a subprocess (e.g. if the command requires user input)
-	Subprocess bool `yaml:"subprocess"`
-	// A list of prompts that will request user input before running the final command
-	Prompts []CustomCommandPrompt `yaml:"prompts"`
-	// Text to display while waiting for command to finish
-	LoadingText string `yaml:"loadingText"`
-	// Label for the custom command when displayed in the keybindings menu
-	Description string `yaml:"description"`
-	// If true, stream the command's output to the Command Log panel
-	Stream bool `yaml:"stream"`
-	// If true, show the command's output in a popup within Lazygit
-	ShowOutput bool `yaml:"showOutput"`
-	// Actions to take after the command has completed
-	After CustomCommandAfterHook `yaml:"after"`
+	Key         string                 `yaml:"key"`
+	Context     string                 `yaml:"context"`
+	Command     string                 `yaml:"command"`
+	Subprocess  bool                   `yaml:"subprocess"`
+	Prompts     []CustomCommandPrompt  `yaml:"prompts"`
+	LoadingText string                 `yaml:"loadingText"`
+	Description string                 `yaml:"description"`
+	Stream      bool                   `yaml:"stream"`
+	ShowOutput  bool                   `yaml:"showOutput"`
+	After       CustomCommandAfterHook `yaml:"after"`
 }

 type CustomCommandPrompt struct {
-	// One of: 'input' | 'menu' | 'confirm' | 'menuFromCommand'
-	Type string `yaml:"type"`
-	// Used to reference the entered value from within the custom command. E.g. a prompt with `key: 'Branch'` can be referred to as `{{.Form.Branch}}` in the command
-	Key string `yaml:"key"`
-	// The title to display in the popup panel
+	// one of 'input', 'menu', 'confirm', or 'menuFromCommand'
+	Type  string `yaml:"type"`
+	Key   string `yaml:"key"`
 	Title string `yaml:"title"`

-	// The initial value to appear in the text box.
-	// Only for input prompts.
-	InitialValue string `yaml:"initialValue"`
-	// Shows suggestions as the input is entered
-	// Only for input prompts.
-	Suggestions CustomCommandSuggestions `yaml:"suggestions"`
+	// these only apply to input prompts
+	InitialValue string                   `yaml:"initialValue"`
+	Suggestions  CustomCommandSuggestions `yaml:"suggestions"`

-	// The message of the confirmation prompt.
-	// Only for confirm prompts.
+	// this only applies to confirm prompts
 	Body string `yaml:"body"`

-	// Menu options.
-	// Only for menu prompts.
+	// this only applies to menus
 	Options []CustomCommandMenuOption

-	// The command to run to generate menu options
-	// Only for menuFromCommand prompts.
-	Command string `yaml:"command"`
-	// The regexp to run specifying groups which are going to be kept from the command's output.
-	// Only for menuFromCommand prompts.
-	Filter string `yaml:"filter"`
-	// How to format matched groups from the filter to construct a menu item's value.
-	// Only for menuFromCommand prompts.
+	// this only applies to menuFromCommand
+	Command     string `yaml:"command"`
+	Filter      string `yaml:"filter"`
 	ValueFormat string `yaml:"valueFormat"`
-	// Like valueFormat but for the labels. If `labelFormat` is not specified, `valueFormat` is shown instead.
-	// Only for menuFromCommand prompts.
 	LabelFormat string `yaml:"labelFormat"`
 }

 type CustomCommandSuggestions struct {
-	// Uses built-in logic to obtain the suggestions. One of 'authors' | 'branches' | 'files' | 'refs' | 'remotes' | 'remoteBranches' | 'tags'
-	Preset string `yaml:"preset"`
-	// Command to run such that each line in the output becomes a suggestion. Mutually exclusive with 'preset' field.
+	Preset  string `yaml:"preset"`
 	Command string `yaml:"command"`
 }

 type CustomCommandMenuOption struct {
-	// The first part of the label
-	Name string `yaml:"name"`
-	// The second part of the label
+	Name        string `yaml:"name"`
 	Description string `yaml:"description"`
-	// The value that will be used in the command
-	Value string `yaml:"value"`
+	Value       string `yaml:"value"`
 }

 func GetDefaultConfig() *UserConfig {
@@ -581,8 +412,6 @@ func GetDefaultConfig() *UserConfig {
 		Gui: GuiConfig{
 			ScrollHeight:             2,
 			ScrollPastBottom:         true,
-			ScrollOffMargin:          2,
-			ScrollOffBehavior:        "margin",
 			MouseEvents:              true,
 			SkipDiscardChangeWarning: false,
 			SkipStashWarning:         false,
@@ -601,35 +430,30 @@ func GetDefaultConfig() *UserConfig {
 				SelectedRangeBgColor:       []string{"blue"},
 				CherryPickedCommitBgColor:  []string{"cyan"},
 				CherryPickedCommitFgColor:  []string{"blue"},
-				MarkedBaseCommitBgColor:    []string{"yellow"},
-				MarkedBaseCommitFgColor:    []string{"blue"},
 				UnstagedChangesColor:       []string{"red"},
 				DefaultFgColor:             []string{"default"},
 			},
-			CommitLength:              CommitLengthConfig{Show: true},
-			SkipNoStagedFilesWarning:  false,
-			ShowListFooter:            true,
-			ShowCommandLog:            true,
-			ShowBottomLine:            true,
-			ShowPanelJumps:            true,
-			ShowFileTree:              true,
-			ShowRandomTip:             true,
-			ShowIcons:                 false,
-			NerdFontsVersion:          "",
-			ShowBranchCommitHash:      false,
-			CommandLogSize:            8,
-			SplitDiff:                 "auto",
-			SkipRewordInEditorWarning: false,
-			Border:                    "rounded",
-			AnimateExplosion:          true,
-			PortraitMode:              "auto",
+			CommitLength:                CommitLengthConfig{Show: true},
+			SkipNoStagedFilesWarning:    false,
+			ShowListFooter:              true,
+			ShowCommandLog:              true,
+			ShowBottomLine:              true,
+			ShowFileTree:                true,
+			ShowRandomTip:               true,
+			ShowIcons:                   false,
+			NerdFontsVersion:            "",
+			ExperimentalShowBranchHeads: false,
+			ShowBranchCommitHash:        false,
+			CommandLogSize:              8,
+			SplitDiff:                   "auto",
+			SkipRewordInEditorWarning:   false,
+			Border:                      "single",
 		},
 		Git: GitConfig{
 			Paging: PagingConfig{
-				ColorArg:            "always",
-				Pager:               "",
-				UseConfig:           false,
-				ExternalDiffCommand: "",
+				ColorArg:  "always",
+				Pager:     "",
+				UseConfig: false,
 			},
 			Commit: CommitConfig{
 				SignOff: false,
@@ -653,6 +477,7 @@ func GetDefaultConfig() *UserConfig {
 			DisableForcePushing: false,
 			CommitPrefixes:      map[string]CommitPrefixConfig(nil),
 			ParseEmoji:          false,
+			DiffContextSize:     3,
 		},
 		Refresher: RefresherConfig{
 			RefreshInterval: 10,
@@ -691,7 +516,7 @@ func GetDefaultConfig() *UserConfig {
 				NextMatch:                    "n",
 				PrevMatch:                    "N",
 				StartSearch:                  "/",
-				OptionMenu:                   "<disabled>",
+				OptionMenu:                   "",
 				OptionMenuAlt1:               "?",
 				Select:                       "<space>",
 				GoInto:                       "<enter>",
@@ -750,7 +575,6 @@ func GetDefaultConfig() *UserConfig {
 				ToggleTreeView:           "`",
 				OpenMergeTool:            "M",
 				OpenStatusFilter:         "<c-b>",
-				ConfirmDiscard:           "x",
 			},
 			Branches: KeybindingBranchesConfig{
 				CopyPullRequestURL:     "<c-y>",
@@ -788,7 +612,6 @@ func GetDefaultConfig() *UserConfig {
 				CherryPickCopy:                 "c",
 				CherryPickCopyRange:            "C",
 				PasteCommits:                   "v",
-				MarkCommitAsBaseForRebase:      "B",
 				CreateTag:                      "T",
 				CheckoutCommit:                 "<space>",
 				ResetCherryPick:                "<c-R>",
@@ -816,9 +639,6 @@ func GetDefaultConfig() *UserConfig {
 				Update:   "u",
 				BulkMenu: "b",
 			},
-			CommitMessage: KeybindingCommitMessageConfig{
-				SwitchToEditor: "<c-o>",
-			},
 		},
 		OS:                           OSConfig{},
 		DisableStartupPopups:         false,
@@ -14,15 +14,6 @@ func SetGitDirEnv(value string) {
 	os.Setenv("GIT_DIR", value)
 }

-func GetWorkTreeEnv() string {
-	return os.Getenv("GIT_WORK_TREE")
-}
-
-func SetWorkTreeEnv(value string) {
-	os.Setenv("GIT_WORK_TREE", value)
-}
-
-func UnsetGitLocationEnvVars() {
+func UnsetGitDirEnv() {
 	_ = os.Unsetenv("GIT_DIR")
-	_ = os.Unsetenv("GIT_WORK_TREE")
 }
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"sync"

+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )

@@ -134,7 +134,7 @@ func (self *ContextMgr) pushToContextStack(c types.Context) ([]types.Context, ty
 				(topContext.GetKind() == types.MAIN_CONTEXT && c.GetKind() == types.MAIN_CONTEXT) {

 				contextsToDeactivate = append(contextsToDeactivate, topContext)
-				_, self.ContextStack = utils.Pop(self.ContextStack)
+				_, self.ContextStack = slices.Pop(self.ContextStack)
 			}

 			self.ContextStack = append(self.ContextStack, c)
@@ -154,7 +154,7 @@ func (self *ContextMgr) Pop() error {
 	}

 	var currentContext types.Context
-	currentContext, self.ContextStack = utils.Pop(self.ContextStack)
+	currentContext, self.ContextStack = slices.Pop(self.ContextStack)

 	newContext := self.ContextStack[len(self.ContextStack)-1]

@@ -20,11 +20,10 @@ type BaseContext struct {
 	onFocusFn           onFocusFn
 	onFocusLostFn       onFocusLostFn

-	focusable                  bool
-	transient                  bool
-	hasControlledBounds        bool
-	needsRerenderOnWidthChange bool
-	highlightOnFocus           bool
+	focusable           bool
+	transient           bool
+	hasControlledBounds bool
+	highlightOnFocus    bool

 	*ParentContextMgr
 }
@@ -37,15 +36,14 @@ 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 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

 	OnGetOptionsMap func() map[string]string
 }
@@ -56,18 +54,17 @@ 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,
-		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,
+		ParentContextMgr:    &ParentContextMgr{},
+		viewTrait:           viewTrait,
 	}
 }

@@ -193,10 +190,6 @@ func (self *BaseContext) HasControlledBounds() bool {
 	return self.hasControlledBounds
 }

-func (self *BaseContext) NeedsRerenderOnWidthChange() bool {
-	return self.needsRerenderOnWidthChange
-}
-
 func (self *BaseContext) Title() string {
 	return ""
 }
@@ -24,13 +24,11 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext {
 		},
 	)

-	getDisplayStrings := func(_ int, _ int) [][]string {
+	getDisplayStrings := func(startIdx int, length int) [][]string {
 		return presentation.GetBranchListDisplayStrings(
 			viewModel.GetItems(),
-			c.State().GetItemOperation,
 			c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
 			c.Modes().Diffing.Ref,
-			c.Views().Branches.Width(),
 			c.Tr,
 			c.UserConfig,
 			c.Model().Worktrees,
@@ -41,18 +39,15 @@ func NewBranchesContext(c *ContextCommon) *BranchesContext {
 		FilteredListViewModel: viewModel,
 		ListContextTrait: &ListContextTrait{
 			Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
-				View:                       c.Views().Branches,
-				WindowName:                 "branches",
-				Key:                        LOCAL_BRANCHES_CONTEXT_KEY,
-				Kind:                       types.SIDE_CONTEXT,
-				Focusable:                  true,
-				NeedsRerenderOnWidthChange: true,
+				View:       c.Views().Branches,
+				WindowName: "branches",
+				Key:        LOCAL_BRANCHES_CONTEXT_KEY,
+				Kind:       types.SIDE_CONTEXT,
+				Focusable:  true,
 			})),
-			ListRenderer: ListRenderer{
-				list:              viewModel,
-				getDisplayStrings: getDisplayStrings,
-			},
-			c: c,
+			list:              viewModel,
+			getDisplayStrings: getDisplayStrings,
+			c:                 c,
 		},
 	}

@@ -88,7 +83,3 @@ func (self *BranchesContext) GetDiffTerminals() []string {
 	}
 	return nil
 }
-
-func (self *BranchesContext) ShowBranchHeadsInSubCommits() bool {
-	return true
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Duffield	3557bc44ad	Use double dash for disambuating path in editor templates	2023-07-29 18:34:43 +10:00
Jesse Duffield	201ec5307f	Fix flakey worktree tests In the presentation layer, when showing branches, we'll show worktrees against branches if they're associated. But there was a race condition: if the worktree model was refreshed after the branches model, it wouldn't be used in the presentation layer when it came time to render the branches. A better solution would be to have some way of signalling that a particular context needs to be refreshed and after all the models are done being refreshed, we then refresh the contexts. This will prevent double-renders	2023-07-29 17:36:18 +10:00
Jesse Duffield	ab4f310ce9	rename files	2023-07-29 17:36:18 +10:00
Jesse Duffield	40753e916d	Write unit tests with the help of afero Afero is a package that lets you mock out a filesystem with an in-memory filesystem. It allows us to easily create the files required for a given test without worrying about a cleanup step or different tests tripping on eachother when run in parallel. Later on I'll standardise on using afero over the vanilla os package	2023-07-29 17:36:18 +10:00
Jesse Duffield	72ec7922ac	Fix bug where worktree view would take over window upon switching branches When switching worktrees (which we can now do via the branch view) we re-layout the windows and their views. We had the worktree view ahead of the file view based on the Flatten() method in context.go, because it used to be associated with the branches panel.	2023-07-29 17:36:18 +10:00
Jesse Duffield	c9a19f0fbc	Use forward-slashes on windows We want to be using forward slashes everywhere internally, so if we get a path from windows we should immediately convert it to use forward slashes. I'm leaving out the recent repos list because that would require a migration	2023-07-29 17:36:18 +10:00
Jesse Duffield	6d48c0ead3	Add section in integration readme about testing against old git versions	2023-07-29 17:36:18 +10:00
Jesse Duffield	0e91a2f16e	Add more i18n for worktrees	2023-07-29 17:36:18 +10:00
Jesse Duffield	693048eb29	Use fields rather than methods on worktrees I would prefer to use methods to keep things immutable but I'd rather be consistent with the other models and update them all at once	2023-07-29 17:36:18 +10:00
Jesse Duffield	873a68949e	Centralise logic for obtaining repo paths There are quite a few paths you might want to get e.g. the repo's path, the worktree's path, the repo's git dir path, the worktree's git dir path. I want these all obtained once and then used when needed rather than having to have IO whenever we need them. This is not so much about reducing time spent on IO as it is about not having to care about errors every time we want a path.	2023-07-29 17:36:18 +10:00
Jesse Duffield	f8c18d074a	Remove IO logic from presentation code for worktrees We're doing all the IO in our workers loader method so that we don't need to do any in our presentation code	2023-07-29 17:36:18 +10:00
Jesse Duffield	9fb0fe1e35	Add test for opening lazygit in the worktree of a bare repo	2023-07-29 17:36:18 +10:00
Jesse Duffield	d599511c14	Remove dead function	2023-07-29 17:36:18 +10:00
Jesse Duffield	180908d244	Fix test by making branches appear deterministically This fixes pkg/integration/tests/worktree/rebase.go which was failing on old git versions due to a difference in order of branches that don't have recency values	2023-07-29 17:36:18 +10:00
Jesse Duffield	30cf274874	Allow entering a submodule by pressing space	2023-07-29 17:36:18 +10:00
Jesse Duffield	10287c0dc3	Allow entering a worktree by pressing enter	2023-07-29 17:36:18 +10:00
Jesse Duffield	939c573907	Update repo switch logic We now always re-use the state of the repo if we're returning to it, and we always reset the windows to their default tabs. We reset to default tabs because it's easy to implement. If people want to: * have tab states be retained when switching * have tab states specific to the current repo retained when switching back Then we'll need to revisit this	2023-07-29 17:36:18 +10:00
Jesse Duffield	30d24d0954	Add test for retained context focus when switching worktrees	2023-07-29 17:36:18 +10:00
Jesse Duffield	4a2c21bc10	Support fastforwarding worktree	2023-07-29 17:36:18 +10:00
Jesse Duffield	df78ffd081	Add more worktree tests	2023-07-29 17:36:18 +10:00
Jesse Duffield	0eac6483ec	Add worktree tests for removing/detaching	2023-07-29 17:36:18 +10:00
Jesse Duffield	71070827f2	Add worktree integration tests	2023-07-29 17:36:18 +10:00
Jesse Duffield	fb73bb7e25	Update cheatsheets	2023-07-29 17:36:18 +10:00
Jesse Duffield	e782b77475	Remove worktree version guards Our min required git version is 2.20 so there's no need to add guards for worktrees because they were added in 2.5	2023-07-29 17:36:18 +10:00
Jesse Duffield	d764f35c5d	Fix unit tests	2023-07-29 17:36:18 +10:00
Jesse Duffield	b06f938e00	Show loader when switching worktrees	2023-07-29 17:36:18 +10:00
Jesse Duffield	ca0b966f44	Support older versions of git when fetching worktrees Older versions of git don't support the -z flag in `git worktree list`. So we're using newlines. Also, we're not raising an error upon error because that triggers another refresh, which gets us into an infinite loop	2023-07-29 17:36:18 +10:00
Jesse Duffield	514c2f0897	Fix tests Going and fixing up some submodule tests which were broken by bad assumptions with worktree code	2023-07-29 17:36:18 +10:00
Jesse Duffield	cef0186b7d	Fix tests We now change directories to the repo on startup so we don't need to determine the test path in some special way	2023-07-29 17:36:18 +10:00
Jesse Duffield	af5ec473f3	Safer fetching of linked worktree paths	2023-07-29 17:36:18 +10:00
Jesse Duffield	faa3a612eb	Move worktrees tab to files window	2023-07-29 17:36:18 +10:00
Jesse Duffield	47717802f8	Change directory to worktree if given as an argument Previously we used an env var for this and it's not clear to me how that worked but with this PR current directory = worktree directory	2023-07-29 17:36:18 +10:00
Jesse Duffield	b79d19e0a7	Support opening worktree in editor	2023-07-29 17:36:18 +10:00
Jesse Duffield	0cef35324f	Properly render worktrees in files panel	2023-07-29 17:36:18 +10:00
Jesse Duffield	1638354474	Better logic for knowing which repo we're in	2023-07-29 17:36:18 +10:00
Jesse Duffield	96e41fa985	Only show worktree in status panel if not the main worktree and worktrees are supported	2023-07-29 17:36:18 +10:00
Jesse Duffield	4c1d706a85	Hide worktree functionality on old git versions	2023-07-29 17:36:18 +10:00
Jesse Duffield	b6d5542b35	Associate branches with worktrees even when mid-rebase	2023-07-29 17:36:18 +10:00
Jesse Duffield	72d7b91640	Assume that the base of a worktree can be checked out	2023-07-29 17:36:18 +10:00
Jesse Duffield	32ceeaa43f	i18n for worktrees	2023-07-29 17:36:18 +10:00
Jesse Duffield	82da8d7586	Don't quit on error	2023-07-29 17:36:17 +10:00
Jesse Duffield	096b8a19c5	Allow opening worktree in editor This does the job but I think we need yet another editor command for opening a directory in a new window.	2023-07-29 17:36:17 +10:00
Jesse Duffield	8f51c80d76	Show base ref suggestions when creating worktree	2023-07-29 17:36:17 +10:00
Jesse Duffield	33fc54d6e2	Refresh work trees when discarding file changes We do this because we may be deleting a worktree folder so we'll need to show that in the worktrees view	2023-07-29 17:36:17 +10:00
Jesse Duffield	c8dcd002e2	Checkout worktree when creating from worktree view	2023-07-29 17:36:17 +10:00
Jesse Duffield	49b8806cc4	Use 'M' for months in branches panel	2023-07-29 17:36:17 +10:00
Jesse Duffield	e2cef55f94	Fix filtering logic in worktrees view	2023-07-29 17:36:17 +10:00
Jesse Duffield	500c0eafb9	Support creating worktrees from refs	2023-07-29 17:36:17 +10:00
Jesse Duffield	e0c8a56db5	Fix wording	2023-07-29 17:36:17 +10:00
Jesse Duffield	002e4eedf5	Log when directory is changed	2023-07-29 17:36:17 +10:00
Jesse Duffield	a991525391	Handle deleting branch attached to worktree	2023-07-29 17:36:17 +10:00
Jesse Duffield	7be3658533	Update wording	2023-07-29 17:36:17 +10:00
Jesse Duffield	fd854fb7f7	Don't touch repo stack when switching worktrees We shouldn't touch this cos we're doing a lateral move	2023-07-29 17:36:17 +10:00
Jesse Duffield	64711dfc2f	Move status panel presentation logic into presentation package	2023-07-29 17:36:17 +10:00
Jesse Duffield	0776ae41d3	Land in the same panel when switching to a worktree	2023-07-29 17:36:17 +10:00
Jesse Duffield	ad017f3bb8	Move current worktree to top of list	2023-07-29 17:36:17 +10:00
Jesse Duffield	9eb9ce88b3	Prompt to switch to worktree when branch is checked out by other worktree	2023-07-29 17:36:17 +10:00
Jesse Duffield	7af9715a1b	Use git lingo	2023-07-29 17:36:17 +10:00
Jesse Duffield	dbd32f63dd	Improve name handling	2023-07-29 17:36:17 +10:00
Jesse Duffield	d7aca1bcbd	Use sentence case	2023-07-29 17:36:17 +10:00
Jesse Duffield	72c856ac13	Refactor	2023-07-29 17:36:17 +10:00
Jesse Duffield	038de926b3	Update worktree model	2023-07-29 17:36:17 +10:00
Jesse Duffield	4c471dff83	Alert when attempting to enter the current worktree	2023-07-29 17:36:17 +10:00
Jesse Duffield	c1ea17b66f	Remove comment	2023-07-29 17:36:17 +10:00
Joel Baranick	b22f936522	Address PR comments	2023-07-29 17:36:17 +10:00
Joel Baranick	53e408f156	Basic support for adding a worktree	2023-07-29 17:36:17 +10:00
Joel Baranick	46bb9bb60b	Put all worktree i18n strings together Use tabwriter to align worktree panel contents	2023-07-29 17:36:17 +10:00
Joel Baranick	b10670ba44	Improve worktree panel	2023-07-29 17:36:17 +10:00
Joel Baranick	f13f85de8e	Style missing worktree as red and display better error when trying to switch to them Use a broken link icon for missing worktrees	2023-07-29 17:36:17 +10:00
Joel Baranick	141011aaae	Hide worktrees in the worktree panel if they point at a non-existing filesystem location. Remove unneeded check when filtering out branches from non-current worktrees from the branch panel. Add link icon for linked worktrees	2023-07-29 17:36:17 +10:00
Joel Baranick	4a2c54e5d8	Update status to differentiate the main vs linked worktrees	2023-07-29 17:36:17 +10:00
Joel Baranick	2f156b3438	Support for deleting a worktree	2023-07-29 17:36:17 +10:00
Joel Baranick	eded08bacf	Initial addition of support for worktrees	2023-07-29 17:36:17 +10:00
				`@@ -1,2 +0,0 @@`
				`This directory contains stuff for recording lazygit demos.`