Mark commits which changed a file among the last X commits

See https://github.com/jesseduffield/lazygit/issues/2653

.github/pull_request_template.md

@@ -8,8 +8,3 @@
 * [ ] 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
--->

.github/release.yml

@@ -1,26 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-  categories:
-    - title: Features ✨
-      labels:
-        - feature
-    - title: Enhancements 🔥
-      labels:
-        - enhancement
-    - title: Fixes 🔧
-      labels:
-        - bug
-    - title: Maintenance ⚙️
-      labels:
-        - maintenance
-    - title: Docs 📖
-      labels:
-        - docs
-    - title: I18n 🌎
-      labels:
-        - i18n
-    - title: Other Changes
-      labels:
-        - "*"

.github/workflows/cd.yml

@@ -10,19 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - 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
-        with:
-          distribution: goreleaser
-          version: v1.17.2
-          args: release --clean
+        uses: goreleaser/goreleaser-action@v1
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
   homebrew:

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: Continuous Integration
 
 env:
-  GO_VERSION: 1.20
+  GO_VERSION: 1.18
 
 on:
   push:
@@ -28,66 +28,49 @@ jobs:
       GOFLAGS: -mod=vendor
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - 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: |
           go test ./... -short
   integration-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        git-version:
-          - 2.20.0 # oldest supported version
-          - 2.22.5
-          - 2.23.0
-          - 2.25.1
-          - 2.30.8
-          - latest # We rely on github to have the latest version installed on their VMs
     runs-on: ubuntu-latest
-    name: "Integration Tests - git ${{matrix.git-version}}"
+    name: "Integration Tests"
     env:
       GOFLAGS: -mod=vendor
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Restore Git cache
-        if: matrix.git-version != 'latest'
-        id: cache-git-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: ~/git-${{matrix.git-version}}
-          key: ${{runner.os}}-git-${{matrix.git-version}}
-      - name: Build Git ${{matrix.git-version}}
-        if: steps.cache-git-restore.outputs.cache-hit != 'true' && matrix.git-version != 'latest'
-        run: >
-          sudo apt-get update && sudo apt-get install --no-install-recommends -y build-essential ca-certificates curl gettext libexpat1-dev libssl-dev libz-dev openssl
-          && curl -sL "https://mirrors.edge.kernel.org/pub/software/scm/git/git-${{matrix.git-version}}.tar.xz" -o - | tar xJ -C "$HOME"
-          && cd "$HOME/git-${{matrix.git-version}}"
-          && ./configure
-          && make -j
-      - name: Install Git ${{matrix.git-version}}
-        if: matrix.git-version != 'latest'
-        run: sudo make -C "$HOME/git-${{matrix.git-version}}" -j install
-      - name: Save Git cache
-        if: steps.cache-git-restore.outputs.cache-hit != 'true' && matrix.git-version != 'latest'
-        uses: actions/cache/save@v3
-        with:
-          path: ~/git-${{matrix.git-version}}
-          key: ${{runner.os}}-git-${{matrix.git-version}}
+        uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v1
         with:
-          go-version: 1.20.x
-      - name: Print git version
-        run: git --version
+          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: Test code
+        # LONG_WAIT_BEFORE_FAIL means that for a given test assertion, we'll wait longer before failing
         run: |
-          ./scripts/run_integration_tests.sh
+          LONG_WAIT_BEFORE_FAIL=true go test pkg/integration/clients/*.go
   build:
     runs-on: ubuntu-latest
     env:
@@ -95,11 +78,20 @@ jobs:
       GOARCH: amd64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - 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
@@ -122,11 +114,20 @@ jobs:
       GOARCH: amd64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - 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
@@ -147,24 +148,24 @@ jobs:
       GOFLAGS: -mod=vendor
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - 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
         run: golangci-lint run
         if: ${{ failure() }}
-  check-required-label:
-    runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/master'
-    steps:
-      - uses: mheap/github-action-required-labels@v5
-        with:
-          mode: exactly
-          count: 1
-          labels: "ignore-for-release, feature, enhancement, bug, maintenance, docs, i18n"

.github/workflows/sponsors.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - 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'

.github/workflows/uffizzi-build.yml

@@ -0,0 +1,81 @@
+name: Build PR Image
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+
+jobs:
+  build-application:
+    name: Build and Push `lazygit`
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
+    outputs:
+      tags: ${{ steps.meta.outputs.tags }}
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2        
+      - name: Generate UUID image name
+        id: uuid
+        run: echo "UUID_APP_TAG=$(uuidgen)" >> $GITHUB_ENV
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: registry.uffizzi.com/${{ env.UUID_APP_TAG }}
+          tags: type=raw,value=60d
+      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          context: ./
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          file: ./uffizzi/DockerfileTtyd
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+
+  render-compose-file:
+    name: Render Docker Compose File
+    # Pass output of this workflow to another triggered by `workflow_run` event.
+    runs-on: ubuntu-latest
+    needs:
+      - build-application
+    outputs:
+      compose-file-cache-key: ${{ steps.hash.outputs.hash }}
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v3
+      - name: Render Compose File
+        run: |
+          APP_IMAGE=$(echo ${{ needs.build-application.outputs.tags }})
+          export APP_IMAGE
+          # Render simple template from environment variables.
+          envsubst < ./uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
+          cat docker-compose.rendered.yml
+      - name: Upload Rendered Compose File as Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: preview-spec
+          path: docker-compose.rendered.yml
+          retention-days: 2
+      - name: Upload PR Event as Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: preview-spec
+          path: ${{ github.event_path }}
+          retention-days: 2
+
+  delete-preview:
+    name: Call for Preview Deletion
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'closed' }}
+    steps:
+      # If this PR is closing, we will not render a compose file nor pass it to the next workflow.
+      - name: Upload PR Event as Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: preview-spec
+          path: ${{ github.event_path }}
+          retention-days: 2

.github/workflows/uffizzi-preview.yml

@@ -0,0 +1,90 @@
+name: Deploy Uffizzi Preview
+
+on:
+  workflow_run:
+    workflows:
+      - "Build PR Image"
+    types:
+      - completed
+
+jobs:
+  cache-compose-file:
+    name: Cache Compose File
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    outputs:
+      compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }}
+      pr-number: ${{ env.PR_NUMBER }}
+    steps:
+      - name: 'Download artifacts'
+        # Fetch output (zip archive) from the workflow run that triggered this workflow.
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "preview-spec"
+            })[0];
+            if (matchArtifact === undefined) {
+              throw TypeError('Build Artifact not found!');
+            }
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data));
+      - name: 'Unzip artifact'
+        run: unzip preview-spec.zip
+
+      - name: Read Event into ENV
+        run: |
+          echo 'EVENT_JSON<<EOF' >> $GITHUB_ENV
+          cat event.json >> $GITHUB_ENV
+          echo -e '\nEOF' >> $GITHUB_ENV
+      - name: Hash Rendered Compose File
+        id: hash
+        # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact.
+        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
+        run: echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV
+
+      - name: Cache Rendered Compose File
+        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
+        uses: actions/cache@v3
+        with:
+          path: docker-compose.rendered.yml
+          key: ${{ env.COMPOSE_FILE_HASH }}
+
+      - name: Read PR Number From Event Object
+        id: pr
+        run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV
+
+      - name: DEBUG - Print Job Outputs
+        if: ${{ runner.debug }}
+        run: |
+          echo "PR number: ${{ env.PR_NUMBER }}"
+          echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}"
+          cat event.json
+  deploy-uffizzi-preview:
+    name: Use Remote Workflow to Preview on Uffizzi
+    needs:
+      - cache-compose-file
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2
+    with:
+      # If this workflow was triggered by a PR close event, cache-key will be an empty string
+      # and this reusable workflow will delete the preview deployment.
+      compose-file-cache-key: ${{ needs.cache-compose-file.outputs.compose-file-cache-key }}
+      compose-file-cache-path: docker-compose.rendered.yml
+      server: https://app.uffizzi.com
+      pr-number: ${{ needs.cache-compose-file.outputs.pr-number }}
+    permissions:
+      contents: read
+      pull-requests: write
+      id-token: write

.gitignore

@@ -39,6 +39,3 @@ test/results/**
 
 oryxBuildBinary
 __debug_bin
-
-.worktrees
-demo/output/*

.golangci.yml

@@ -26,5 +26,4 @@ linters-settings:
     max-func-lines: 0
 
 run:
-  go: '1.20'
-  timeout: 10m
+  go: 1.18

.goreleaser.yml

@@ -12,7 +12,7 @@ builds:
       - amd64
       - arm
       - arm64
-      - '386'
+      - 386
     # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease

CONTRIBUTING.md

@@ -99,19 +99,36 @@ go install mvdan.cc/gofumpt@latest && gofumpt -l -w .
 
 ## 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!).
-
-Note, we use 'Sentence case' for everything (so no 'Title Case' or 'whatever-it's-called-when-there's-no-capital-letters-case')
+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 `app.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!).
 
 ## Debugging
 
 The easiest way to debug lazygit is to have two terminal tabs open at once: one for running lazygit (via `go run main.go -debug` in the project root) and one for viewing lazygit's logs (which can be done via `go run main.go --logs` or just `lazygit --logs`).
 
-From most places in the codebase you have access to a logger e.g. `gui.Log.Warn("blah")` or `self.c.Log.Warn("blah")`.
+From most places in the codebase you have access to a logger e.g. `gui.Log.Warn("blah")`.
 
 If you find that the existing logs are too noisy, you can set the log level with e.g. `LOG_LEVEL=warn go run main.go -debug` and then only use `Warn` logs yourself.
 
-If you need to log from code in the vendor directory (e.g. the `gocui` package), you won't have access to the logger, but you can easily add logging support by setting the `LAZYGIT_LOG_PATH` environment variable and using `logs.Global.Warn("blah")`. This is a global logger that's only intended for development purposes.
+If you need to log from code in the vendor directory (e.g. the `gocui` package), you won't have access to the logger, but you can easily add logging support by adding the following:
+
+```go
+func newLogger() *logrus.Entry {
+	// REPLACE THE BELOW PATH WITH YOUR ACTUAL LOG PATH (YOU'LL SEE THIS PRINTED WHEN YOU RUN `lazygit --logs`
+	logPath := "/Users/jesseduffield/Library/Application Support/jesseduffield/lazygit/development.log"
+	file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+	if err != nil {
+		panic("unable to log to file")
+	}
+	logger := logrus.New()
+	logger.SetLevel(logrus.WarnLevel)
+	logger.SetOutput(file)
+	return logger.WithFields(logrus.Fields{})
+}
+
+var Log = newLogger()
+...
+Log.Warn("blah")
+```
 
 If you keep having to do some setup steps to reproduce an issue, read the Testing section below to see how to create an integration test by recording a lazygit session. It's pretty easy!
 

Dockerfile

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

Makefile

@@ -1,71 +0,0 @@
-.PHONY: all
-all: build
-
-.PHONY: build
-build:
-	go build
-
-.PHONY: install
-install:
-	go install
-
-.PHONY: run
-run:
-	go run main.go
-
-# 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
-
-.PHONY: generate
-generate:
-	go generate ./...
-
-.PHONY: format
-format:
-	gofumpt -l -w .
-
-.PHONY: update-cheatsheet
-update-cheatsheet:
-	go run scripts/cheatsheet/main.go generate
-
-# 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
-
-.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

cmd/integration_test/main.go

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

demo/README.md

@@ -1,2 +0,0 @@
-This directory contains stuff for recording lazygit demos.
-

demo/config.yml

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

demo/record_demo.sh

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

docs/Config.md

@@ -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,23 +24,17 @@ 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'
-  timeFormat: '02 Jan 06' # https://pkg.go.dev/time#Time.Format
-  shortTimeFormat: '3:04PM'
+  language: 'auto' # one of 'auto' | 'en' | 'zh' | 'pl' | 'nl' | 'ja' | 'ko'
+  timeFormat: '02 Jan 06 15:04 MST' # https://pkg.go.dev/time#Time.Format
   theme:
     activeBorderColor:
       - green
       - bold
     inactiveBorderColor:
       - white
-    searchingActiveBorderColor:
-      - cyan
-      - bold
     optionsTextColor:
       - blue
     selectedLineBgColor:
@@ -69,28 +52,28 @@ gui:
   commitLength:
     show: true
   mouseEvents: true
-  skipDiscardChangeWarning: false
+  skipUnstageLineWarning: false
   skipStashWarning: false
   showFileTree: true # for rendering changes files in a tree format
   showListFooter: true # for seeing the '5 of 20' message in list panels
   showRandomTip: true
-  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
+  showIcons: false
   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
+  border: 'single' # one of 'single' | 'double' | 'rounded' | 'hidden'
+  # For marking recent commits which changed the selected file
+  experimentalMarkCommitsWhichChangedFile: false
 git:
   paging:
     colorArg: always
     useConfig: false
   commit:
     signOff: false
+    verbose: default # one of 'default' | 'always' | 'never'
   merging:
     # only applicable to unix users
     manualCommit: false
@@ -112,14 +95,13 @@ git:
   mainBranches: [master, main]
   autoFetch: true
   autoRefresh: true
-  fetchAll: true # Pass --all flag when running git fetch. Set to false to fetch only origin (or the current branch's upstream remote if there is one)
   branchLogCmd: 'git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --'
   allBranchesLogCmd: 'git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium'
   overrideGpg: false # prevents lazygit from spawning a separate process when using GPG
   disableForcePushing: false
   parseEmoji: false
+  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: ''
@@ -207,7 +189,6 @@ keybinding:
     commitChangesWithoutHook: 'w' # commit changes without pre-commit hook
     amendLastCommit: 'A'
     commitChangesWithEditor: 'C'
-    confirmDiscard: 'x'
     ignoreFile: 'i'
     refreshFiles: 'r'
     stashAllChanges: 's'
@@ -293,36 +274,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`, `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.
+Supported presets are `vim`, `nvim`, `emacs`, `nano`, `vscode`, `sublime`, `bbedit`,
+`kakoune` 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:
@@ -330,14 +304,15 @@ os:
   editAtLine: 'myeditor --line={{line}} {{filename}}'
   editAtLineAndWait: 'myeditor --block --line={{line}} {{filename}}'
   editInTerminal: true
-  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.
 
@@ -351,14 +326,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)
@@ -452,11 +419,9 @@ If you are using [Nerd Fonts](https://www.nerdfonts.com), you can display icons.
 
 ```yaml
 gui:
-  nerdFontsVersion: "3"
+  showIcons: true
 ```
 
-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)
@@ -503,7 +468,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:
@@ -518,7 +485,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:
 
@@ -548,7 +516,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

docs/Custom_Command_Keybindings.md

@@ -5,22 +5,20 @@ You can add custom command keybindings in your config.yml (accessible by pressin
 ```yml
 customCommands:
   - key: '<c-r>'
-    context: 'commits'
     command: 'hub browse -- "commit/{{.SelectedLocalCommit.Sha}}"'
+    context: 'commits'
   - key: 'a'
-    context: 'files'
     command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name | quote}}"
-    description: 'Toggle file staged'
+    context: 'files'
+    description: 'toggle file staged'
   - key: 'C'
-    context: 'global'
     command: "git commit"
+    context: 'global'
     subprocess: true
   - key: 'n'
-    context: 'localBranches'
     prompts:
       - type: 'menu'
         title: 'What kind of branch is it?'
-        key: 'BranchType'
         options:
           - name: 'feature'
             description: 'a feature branch'
@@ -33,259 +31,110 @@ customCommands:
             value: 'release'
       - type: 'input'
         title: 'What is the new branch name?'
-        key: 'BranchName'
         initialValue: ''
-    command: "git flow {{.Form.BranchType}} start {{.Form.BranchName}}"
-    loadingText: 'Creating branch'
+    command: "git flow {{index .PromptResponses 0}} start {{index .PromptResponses 1}}"
+    context: 'localBranches'
+    loadingText: 'creating branch'
+  - key : 'r'
+    description: 'Checkout a remote branch as FETCH_HEAD'
+    command: "git fetch {{index .PromptResponses 0}} {{index .PromptResponses 1}} && git checkout FETCH_HEAD"
+    context: 'remotes'
+    prompts:
+      - type: 'input'
+        title: 'Remote:'
+        initialValue: "{{index .SelectedRemote.Name }}"
+      - type: 'menuFromCommand'
+        title: 'Remote branch:'
+        command: 'git branch  -r --list {{index .PromptResponses 0}}/*'
+        filter: '.*{{index .PromptResponses 0}}/(?P<branch>.*)'
+        valueFormat: '{{ .branch }}'
+        labelFormat: '{{ .branch | green }}'
+  - key: '<f1>'
+    command: 'git reset --soft {{.CheckedOutBranch.UpstreamRemote}}'
+    context: 'files'
+    prompts:
+      - type: 'confirm'
+        title: "Confirm:"
+        body: "Are you sure you want to reset HEAD to {{.CheckedOutBranch.UpstreamRemote}}?"
 ```
 
 Looking at the command assigned to the 'n' key, here's what the result looks like:
 
 ![](../../assets/custom-command-keybindings.gif)
 
-Custom command keybindings will appear alongside inbuilt keybindings when you view the keybindings menu by pressing '?':
+Custom command keybindings will appear alongside inbuilt keybindings when you view the options menu by pressing 'x':
 
 ![](https://i.imgur.com/QB21FPx.png)
 
 For a given custom command, here are the allowed fields:
 | _field_ | _description_ | required |
 |-----------------|----------------------|-|
-| key | The key to trigger the command. Use a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | yes |
-| command | The command to run (using Go template syntax for placeholder values) | yes |
-| context | The context in which to listen for the key (see [below](#contexts)) | yes |
-| subprocess | Whether you want the command to run in a subprocess (e.g. if the command requires user input) | no |
-| prompts | A list of prompts that will request user input before running the final command | no |
-| loadingText | Text to display while waiting for command to finish | no |
-| description | Label for the custom command when displayed in the keybindings menu | no |
-| stream | Whether you want to stream the command's output to the Command Log panel | no |
-| showOutput | Whether you want to show the command's output in a popup within Lazygit | no |
-| after | Actions to take after the command has completed | no |
+| key | the key to trigger the command. Use a single letter or one of the values from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md) | yes |
+| command | the command to run | yes |
+| context | the context in which to listen for the key (see below) | yes |
+| subprocess | whether you want the command to run in a subprocess (necessary if you want to view the output of the command or provide user input) | no |
+| prompts | a list of prompts that will request user input before running the final command | no |
+| loadingText | text to display while waiting for command to finish | no |
+| description | text to display in the keybindings menu that appears when you press 'x' | no |
+| stream | whether you want to stream the command's output to the Command Log panel | no |
+| showOutput | whether you want to show the command's output in a gui prompt | no |
 
-Here are the options for the `after` key:
-| _field_ | _description_ | required |
-|-----------------|----------------------|-|
-| checkForConflicts | true/false. If true, check for merge conflicts | no |
-
-## Contexts
+### Contexts
 
 The permitted contexts are:
 
 | _context_      | _description_                                                                                            |
 | -------------- | -------------------------------------------------------------------------------------------------------- |
-| status         | The 'Status' tab                                                                                         |
-| files          | The 'Files' tab                                                                                          |
-| worktrees      | The 'Worktrees' tab                                                                                      |
-| localBranches  | The 'Local Branches' tab                                                                                 |
-| remotes        | The 'Remotes' tab                                                                                        |
-| remoteBranches | The context you get when pressing enter on a remote in the remotes tab                                   |
-| tags           | The 'Tags' tab                                                                                           |
-| commits        | The 'Commits' tab                                                                                        |
-| reflogCommits  | The 'Reflog' tab                                                                                         |
-| subCommits     | The context you see when pressing enter on a branch                                                      |
-| commitFiles    | The context you see when pressing enter on a commit or stash entry (warning, might be renamed in future) |
-| stash          | The 'Stash' tab                                                                                          |
-| global         | This keybinding will take affect everywhere                                                              |
+| status         | the 'Status' tab                                                                                         |
+| files          | the 'Files' tab                                                                                          |
+| localBranches  | the 'Local Branches' tab                                                                                 |
+| remotes        | the 'Remotes' tab                                                                                        |
+| remoteBranches | the context you get when pressing enter on a remote in the remotes tab                                   |
+| tags           | the 'Tags' tab                                                                                           |
+| commits        | the 'Commits' tab                                                                                        |
+| reflogCommits  | the 'Reflog' tab                                                                                         |
+| subCommits     | the context you see when pressing enter on a branch                                                      |
+| commitFiles    | the context you see when pressing enter on a commit or stash entry (warning, might be renamed in future) |
+| stash          | the 'Stash' tab                                                                                          |
+| global         | this keybinding will take affect everywhere                                                              |
 
-## Prompts
+### Prompts
 
-### Common fields
-
-These fields are applicable to all prompts.
+The permitted prompt fields are:
 
 | _field_           | _description_                                                                                  | _required_ |
 | ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| type              | One of 'input', 'confirm', 'menu', 'menuFromCommand'                                                           | yes        |
-| title             | The title to display in the popup panel                                                        | no         |
-| key | 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 | yes |
-
-### Input
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| initialValue      | The initial value to appear in the text box               | no         |
-| suggestions       | Shows suggestions as the input is entered. See below for details                                                          | no         |
-
-The permitted suggestions fields are:
-| _field_ | _description_ | _required_ |
-|-----------------|----------------------|-|
-| preset | Uses built-in logic to obtain the suggestions. One of 'authors', 'branches', 'files', 'refs', 'remotes', 'remoteBranches', 'tags' | no |
-| command | Command to run such that each line in the output becomes a suggestion. Mutually exclusive with 'preset' field. | no |
-
-Here's an example of passing a preset:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.Branch | quote}}'
-    context: 'commits'
-    prompts:
-      - type: 'input'
-        title: 'Which branch?'
-        key: 'Branch'
-        suggestions:
-          preset: 'branches' # use built-in logic for obtaining branches
-```
-
-Here's an example of passing a command directly:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.Branch | quote}}'
-    context: 'commits'
-    prompts:
-      - type: 'input'
-        title: 'Which branch?'
-        key: 'Branch'
-        suggestions:
-          command: "git branch --format='%(refname:short)'"
-```
-
-
-Here's an example of passing an initial value for the input:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.Remote | quote}}'
-    context: 'commits'
-    prompts:
-    - type: 'input'
-      title: 'Remote:'
-      key: 'Remote'
-      initialValue: "{{.SelectedRemote.Name}}"
-```
-
-### Confirm
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| body              | The immutable body text to appear in the text box       | no         |
-
-Example:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo "pushing to remote"'
-    context: 'commits'
-    prompts:
-    - type: 'confirm'
-      title: 'Push to remote'
-      body: 'Are you sure you want to push to the remote?'
-```
-
-### Menu
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| options           | The options to display in the menu                         | yes         |
+| type              | one of 'input', 'menu', or 'confirm'                                                           | yes        |
+| title             | the title to display in the popup panel                                                        | no         |
+| initialValue      | (only applicable to 'input' prompts) the initial value to appear in the text box               | no         |
+| body              | (only applicable to 'confirm' prompts) the immutable body text to appear in the text box       | no         |
+| options           | (only applicable to 'menu' prompts) the options to display in the menu                         | no         |
+| command           | (only applicable to 'menuFromCommand' prompts) the command to run to generate                  | yes        |
+|                   | menu options                                                                                   |            |
+| filter            | (only applicable to 'menuFromCommand' prompts) the regexp to run specifying groups which are going to be kept from the command's output      | yes        |
+| valueFormat       | (only applicable to 'menuFromCommand' prompts) how to format matched groups from the filter to construct a menu item's value (What gets appended to prompt responses when the item is selected). You can use named groups, or `{{ .group_GROUPID }}`. PS: named groups keep first match only | yes        |
+| labelFormat       | (only applicable to 'menuFromCommand' prompts) how to format matched groups from the filter to construct the item's label (What's shown on screen). You can use named groups, or `{{ .group_GROUPID }}`. You can also color each match with `{{ .group_GROUPID \| colorname }}` (Color names from [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md)). If `labelFormat` is not specified, `valueFormat` is shown instead. PS: named groups keep first match only | no         |
 
 The permitted option fields are:
 | _field_ | _description_ | _required_ |
 |-----------------|----------------------|-|
-| name | The first part of the label | no |
-| description | The second part of the label | no |
-| value | the value that will be used in the command | yes |
+| name | the string which will appear first on the line | no |
+| description | the string which will appear second on the line | no |
+| value | the value that will be stored in `.PromptResponses` if the option is selected | yes |
 
 If an option has no name the value will be displayed to the user in place of the name, so you're allowed to only include the value like so:
 
 ```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.BranchType | quote}}'
-    context: 'commits'
     prompts:
       - type: 'menu'
         title: 'What kind of branch is it?'
-        key: 'BranchType'
         options:
           - value: 'feature'
           - value: 'hotfix'
           - value: 'release'
 ```
 
-Here's an example of supplying more detail for each option:
-
-```yml
-customCommands:
-  - key: 'a'
-    command: 'echo {{.Form.BranchType | quote}}'
-    context: 'commits'
-    prompts:
-      - type: 'menu'
-        title: 'What kind of branch is it?'
-        key: 'BranchType'
-        options:
-          - value: 'feature'
-            name: 'feature branch'
-            description: 'branch based off develop'
-          - value: 'hotfix'
-            name: 'hotfix branch'
-            description: 'branch based off main for fast bug fixes'
-          - value: 'release'
-            name: 'release branch'
-            description: 'branch for a release'
-```
-
-### Menu-from-command
-
-| _field_           | _description_                                                                                  | _required_ |
-| ------------      | -----------------------------------------------------------------------------------------------| ---------- |
-| command           | The command to run to generate menu options                  | yes        |
-| filter            | The regexp to run specifying groups which are going to be kept from the command's output      | no        |
-| valueFormat       | How to format matched groups from the filter to construct a menu item's value | no        |
-| labelFormat       | Like valueFormat but for the labels. If `labelFormat` is not specified, `valueFormat` is shown instead. | no         |
-
-Here's an example using named groups in the regex. Notice how we can pipe the label to a colour function for coloured output (available colours [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md))
-
-```yml
-  - key : 'a'
-    description: 'Checkout a remote branch as FETCH_HEAD'
-    command: "git fetch {{.Form.Remote}} {{.Form.Branch}} && git checkout FETCH_HEAD"
-    context: 'remotes'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'Remote branch:'
-        key: 'Branch'
-        command: 'git branch  -r --list {{.SelectedRemote.Name }}/*'
-        filter: '.*{{.SelectedRemote.Name }}/(?P<branch>.*)'
-        valueFormat: '{{ .branch }}'
-        labelFormat: '{{ .branch | green }}'
-```
-
-Here's an example using unnamed groups:
-
-```yml
-  - key : 'a'
-    description: 'Checkout a remote branch as FETCH_HEAD'
-    command: "git fetch {{.Form.Remote}} {{.Form.Branch}} && git checkout FETCH_HEAD"
-    context: 'remotes'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'Remote branch:'
-        key: 'Branch'
-        command: 'git branch  -r --list {{.SelectedRemote.Name }}/*'
-        filter: '.*{{.SelectedRemote.Name }}/(.*)'
-        valueFormat: '{{ .group_1 }}'
-        labelFormat: '{{ .group_1 | green }}'
-```
-
-Here's an example using a command but not specifying anything else: so each line from the command becomes the value and label of the menu items
-
-```yml
-  - key : 'a'
-    description: 'Checkout a remote branch as FETCH_HEAD'
-    command: "open {{.Form.File | quote}}"
-    context: 'global'
-    prompts:
-      - type: 'menuFromCommand'
-        title: 'File:'
-        key: 'File'
-        command: 'ls'
-```
-
-## Placeholder values
+### Placeholder values
 
 Your commands can contain placeholder strings using Go's [template syntax](https://jan.newmarch.name/golang/template/chapter-template.html). The template syntax is pretty powerful, letting you do things like conditionals if you want, but for the most part you'll simply want to be accessing the fields on the following objects:
 
@@ -301,20 +150,19 @@ SelectedRemote
 SelectedTag
 SelectedStashEntry
 SelectedCommitFile
-SelectedWorktree
 CheckedOutBranch
 ```
 
-To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/commands/models/file.go) (all the modelling lives in the same directory). Note that the custom commands feature does not guarantee backwards compatibility (until we hit Lazygit version 1.0 of course) which means a field you're accessing on an object may no longer be available from one release to the next. Typically however, all you'll need is `{{.SelectedFile.Name}}`, `{{.SelectedLocalCommit.Sha}}` and `{{.SelectedLocalBranch.Name}}`. In the future we will likely introduce a tighter interface that exposes a limited set of fields for each model.
+To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/commands/models/file.go) (all the modelling lives in the same directory). Note that the custom commands feature does not guarantee backwards compatibility (until we hit lazygit version 1.0 of course) which means a field you're accessing on an object may no longer be available from one release to the next. Typically however, all you'll need is `{{.SelectedFile.Name}}`, `{{.SelectedLocalCommit.Sha}}` and `{{.SelectedLocalBranch.Name}}`. In the future we will likely introduce a tighter interface that exposes a limited set of fields for each model.
 
-## Keybinding collisions
+### Keybinding collisions
 
 If your custom keybinding collides with an inbuilt keybinding that is defined for the same context, only the custom keybinding will be executed. This also applies to the global context. However, one caveat is that if you have a custom keybinding defined on the global context for some key, and there is an in-built keybinding defined for the same key and for a specific context (say the 'files' context), then the in-built keybinding will take precedence. See how to change in-built keybindings [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#keybindings)
 
-## Debugging
+### Debugging
 
-If you want to verify that your command actually does what you expect, you can wrap it in an 'echo' call and set `showOutput: true` so that it doesn't actually execute the command but you can see how the placeholders were resolved.
+If you want to verify that your command actually does what you expect, you can wrap it in an 'echo' call and set `showOutput: true` so that it doesn't actually execute the command but you can see how the placeholders were resolved. Alternatively you can run lazygit in debug mode with `lazygit --debug` and in another terminal window run `lazygit --logs` to see which commands are actually run
 
-## More Examples
+### More Examples
 
 See the [wiki](https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium) page for more examples, and feel free to add your own custom commands to this page so others can benefit!

docs/Custom_Pagers.md

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

docs/Integration_Tests.md

@@ -0,0 +1 @@
+see new docs [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)

docs/README.md

@@ -1,10 +1,7 @@
-# Documentation Overview
+# Documentation Overview 
 
 * [Configuration](./Config.md).
 * [Custom Commands](./Custom_Command_Keybindings.md)
 * [Custom Pagers](./Custom_Pagers.md)
 * [Keybindings](./keybindings)
 * [Undo/Redo](./Undoing.md)
-* [Searching/Filtering](./Searching.md)
-* [Stacked Branches](./Stacked_Branches.md)
-* [Dev docs](./dev)

docs/Searching.md

@@ -1,21 +0,0 @@
-# Searching/Filtering
-
-## View searching/filtering
-
-Depending on the currently focused view, hitting '/' will bring up a filter or search prompt. When filtering, the contents of the view will be filtered down to only those lines which match the query string. When searching, the contents of the view are not filtered, but matching lines are highlighted and you can iterate through matches with `n`/`N`.
-
-We intend to support filtering for the files view soon, but at the moment it uses searching. We intend to continue using search for the commits view because you typically care about the commits that come before/after a matching commit.
-
-If you would like both filtering and searching to be enabled on a given view, please raise an issue for this.
-
-## Filtering files by status
-
-You can filter the files view to only show staged/unstaged files by pressing `<c-b>` in the files view.
-
-## Filtering commits by file path
-
-You can filter the commits view to only show commits which contain changes to a given file path.
-
-You can do this in a couple of ways:
-1) Start lazygit with the -f flag e.g. `lazygit -f my/path`
-2) From within lazygit, press `<c-s>` and then enter the path of the file you want to filter by

docs/Stacked_Branches.md

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

docs/Undoing.md

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

docs/dev/Busy.md

@@ -1,78 +0,0 @@
-# Knowing when Lazygit is busy/idle
-
-## The use-case
-
-This topic deserves its own doc because there there are a few touch points for it. We have a use-case for knowing when Lazygit is idle or busy because integration tests follow the following process:
-1) press a key
-2) wait until Lazygit is idle
-3) run assertion / press another key
-4) repeat
-
-In the past the process was:
-1) press a key
-2) run assertion
-3) if assertion fails, wait a bit and retry
-4) repeat
-
-The old process was problematic because an assertion may give a false positive due to the contents of some view not yet having changed since the last key was pressed.
-
-## The solution
-
-First, it's important to distinguish three different types of goroutines:
-* The UI goroutine, of which there is only one, which infinitely processes a queue of events
-* Worker goroutines, which do some work and then typically enqueue an event in the UI goroutine to display the results
-* Background goroutines, which periodically spawn worker goroutines (e.g. doing a git fetch every minute)
-
-The point of distinguishing worker goroutines from background goroutines is that when any worker goroutine is running, we consider Lazygit to be 'busy', whereas this is not the case with background goroutines. It would be pointless to have background goroutines be considered 'busy' because then Lazygit would be considered busy for the entire duration of the program!
-
-In gocui, the underlying package we use for managing the UI and events, we keep track of how many busy goroutines there are using the `Task` type. A task represents some work being done by lazygit. The gocui Gui struct holds a map of tasks and allows creating a new task (which adds it to the map), pausing/continuing a task, and marking a task as done (which removes it from the map). Lazygit is considered to be busy so long as there is at least one busy task in the map; otherwise it's considered idle. When Lazygit goes from busy to idle, it notifies the integration test.
-
-It's important that we play by the rules below to ensure that after the user does anything, all the processing that follows happens in a contiguous block of busy-ness with no gaps.
-
-### Spawning a worker goroutine
-
-Here's the basic implementation of `OnWorker` (using the same flow as `WaitGroup`s):
-
-```go
-func (g *Gui) OnWorker(f func(*Task)) {
-	task := g.NewTask()
-	go func() {
-		f(task)
-		task.Done()
-	}()
-}
-```
-
-The crucial thing here is that we create the task _before_ spawning the goroutine, because it means that we'll have at least one busy task in the map until the completion of the goroutine. If we created the task within the goroutine, the current function could exit and Lazygit would be considered idle before the goroutine starts, leading to our integration test prematurely progressing.
-
-You typically invoke this with `self.c.OnWorker(f)`. Note that the callback function receives the task. This allows the callback to pause/continue the task (see below).
-
-### Spawning a background goroutine
-
-Spawning a background goroutine is as simple as:
-
-```go
-go utils.Safe(f)
-```
-
-Where `utils.Safe` is a helper function that ensures we clean up the gui if the goroutine panics.
-
-### Programmatically enqueing a UI event
-
-This is invoked with `self.c.OnUIThread(f)`. Internally, it creates a task before enqueuing the function as an event (including the task in the event struct) and once that event is processed by the event queue (and any other pending events are processed) the task is removed from the map by calling `task.Done()`.
-
-### Pressing a key
-
-If the user presses a key, an event will be enqueued automatically and a task will be created before (and `Done`'d after) the event is processed.
-
-## Special cases
-
-There are a couple of special cases where we manually pause/continue the task directly in the client code. These are subject to change but for the sake of completeness:
-
-### Writing to the main view(s)
-
-If the user focuses a file in the files panel, we run a `git diff` command for that file and write the output to the main view. But we only read enough of the command's output to fill the view's viewport: further loading only happens if the user scrolls. Given that we have a background goroutine for running the command and writing more output upon scrolling, we create our own task and call `Done` on it as soon as the viewport is filled.
-
-### Requesting credentials from a git command
-
-Some git commands (e.g. git push) may request credentials. This is the same deal as above; we use a worker goroutine and manually pause continue its task as we go from waiting on the git command to waiting on user input. This requires passing the task through to the `Push` method so that it can be paused/continued.

docs/dev/Demo_Recordings.md

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

docs/dev/Integration_Tests.md

@@ -1 +0,0 @@
-see new docs [here](../../pkg/integration/README.md)

docs/dev/README.md

@@ -1,5 +0,0 @@
-# Dev Documentation Overview
-
-* [Busy/Idle tracking](./Busy.md).
-* [Integration Tests](../../pkg/integration/README.md)
-* [Demo Recordings](./Demo_Recordings.md)

docs/keybindings/Keybindings_en.md

@@ -4,350 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
-## Global keybindings
+## Global Keybindings
 
 <pre>
-  <kbd>&lt;c-r&gt;</kbd>: Switch to a recent repo
-  <kbd>&lt;pgup&gt;</kbd>: Scroll up main panel (fn+up/shift+k)
-  <kbd>&lt;pgdown&gt;</kbd>: Scroll down main panel (fn+down/shift+j)
-  <kbd>@</kbd>: Open command log menu
+  <kbd>&lt;c-r&gt;</kbd>: switch to a recent repo
+  <kbd>&lt;pgup&gt;</kbd>: scroll up main panel (fn+up/shift+k)
+  <kbd>&lt;pgdown&gt;</kbd>: scroll down main panel (fn+down/shift+j)
+  <kbd>@</kbd>: open command log menu
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
-  <kbd>:</kbd>: Execute custom command
-  <kbd>&lt;c-p&gt;</kbd>: View custom patch options
-  <kbd>m</kbd>: View merge/rebase options
-  <kbd>R</kbd>: Refresh
-  <kbd>+</kbd>: Next screen mode (normal/half/fullscreen)
-  <kbd>_</kbd>: Prev screen mode
-  <kbd>?</kbd>: Open menu
-  <kbd>&lt;c-s&gt;</kbd>: View filter-by-path options
-  <kbd>W</kbd>: Open diff menu
-  <kbd>&lt;c-e&gt;</kbd>: Open diff menu
+  <kbd>:</kbd>: execute custom command
+  <kbd>&lt;c-p&gt;</kbd>: view custom patch options
+  <kbd>m</kbd>: view merge/rebase options
+  <kbd>R</kbd>: refresh
+  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
+  <kbd>_</kbd>: prev screen mode
+  <kbd>?</kbd>: open menu
+  <kbd>&lt;c-s&gt;</kbd>: view filter-by-path options
+  <kbd>W</kbd>: open diff menu
+  <kbd>&lt;c-e&gt;</kbd>: open diff menu
   <kbd>&lt;c-w&gt;</kbd>: Toggle whether or not whitespace changes are shown in the diff view
-  <kbd>z</kbd>: Undo
-  <kbd>&lt;c-z&gt;</kbd>: Redo
-  <kbd>P</kbd>: Push
-  <kbd>p</kbd>: Pull
+  <kbd>z</kbd>: undo (via reflog) (experimental)
+  <kbd>&lt;c-z&gt;</kbd>: redo (via reflog) (experimental)
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
 </pre>
 
-## List panel navigation
+## List Panel Navigation
 
 <pre>
-  <kbd>,</kbd>: Previous page
-  <kbd>.</kbd>: Next page
-  <kbd>&lt;</kbd>: Scroll to top
-  <kbd>&gt;</kbd>: Scroll to bottom
-  <kbd>/</kbd>: Search the current view by text
-  <kbd>H</kbd>: Scroll left
-  <kbd>L</kbd>: Scroll right
-  <kbd>]</kbd>: Next tab
-  <kbd>[</kbd>: Previous tab
+  <kbd>,</kbd>: previous page
+  <kbd>.</kbd>: next page
+  <kbd>&lt;</kbd>: scroll to top
+  <kbd>/</kbd>: start search
+  <kbd>&gt;</kbd>: scroll to bottom
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
 </pre>
 
-## Commit files
+## Commit Files
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy the committed file name to the clipboard
-  <kbd>c</kbd>: Checkout file
-  <kbd>d</kbd>: Discard this commit's changes to this file
-  <kbd>o</kbd>: Open file
-  <kbd>e</kbd>: Edit file
-  <kbd>&lt;space&gt;</kbd>: Toggle file included in patch
-  <kbd>a</kbd>: Toggle all files included in patch
-  <kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
-  <kbd>`</kbd>: Toggle file tree view
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy the committed file name to the clipboard
+  <kbd>c</kbd>: checkout file
+  <kbd>d</kbd>: discard this commit's changes to this file
+  <kbd>o</kbd>: open file
+  <kbd>e</kbd>: edit file
+  <kbd>&lt;space&gt;</kbd>: toggle file included in patch
+  <kbd>a</kbd>: toggle all files included in patch
+  <kbd>&lt;enter&gt;</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
+  <kbd>`</kbd>: toggle file tree view
 </pre>
 
-## Commit summary
+## Commit Summary
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Confirm
-  <kbd>&lt;esc&gt;</kbd>: Close
+  <kbd>&lt;enter&gt;</kbd>: confirm
+  <kbd>&lt;esc&gt;</kbd>: close
 </pre>
 
 ## Commits
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>b</kbd>: View bisect options
-  <kbd>s</kbd>: Squash down
-  <kbd>f</kbd>: Fixup commit
-  <kbd>r</kbd>: Reword commit
-  <kbd>R</kbd>: Reword commit with editor
-  <kbd>d</kbd>: Delete commit
-  <kbd>e</kbd>: Edit commit
-  <kbd>p</kbd>: Pick commit (when mid-rebase)
-  <kbd>F</kbd>: Create fixup commit for this commit
-  <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
-  <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
-  <kbd>T</kbd>: Tag commit
-  <kbd>&lt;c-l&gt;</kbd>: Open log menu
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Create new branch off of commit
-  <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: Copy commit (cherry-pick)
-  <kbd>C</kbd>: Copy commit range (cherry-pick)
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>b</kbd>: view bisect options
+  <kbd>s</kbd>: squash down
+  <kbd>f</kbd>: fixup commit
+  <kbd>r</kbd>: reword commit
+  <kbd>R</kbd>: reword commit with editor
+  <kbd>d</kbd>: delete commit
+  <kbd>e</kbd>: edit commit
+  <kbd>p</kbd>: pick commit (when mid-rebase)
+  <kbd>F</kbd>: create fixup commit for this commit
+  <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
+  <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>A</kbd>: amend commit with staged changes
+  <kbd>a</kbd>: reset commit author
+  <kbd>t</kbd>: revert commit
+  <kbd>T</kbd>: tag commit
+  <kbd>&lt;c-l&gt;</kbd>: open log menu
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>g</kbd>: view reset options
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
-## Confirmation panel
+## Confirmation Panel
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Confirm
-  <kbd>&lt;esc&gt;</kbd>: Close/Cancel
+  <kbd>&lt;enter&gt;</kbd>: confirm
+  <kbd>&lt;esc&gt;</kbd>: close/cancel
 </pre>
 
 ## Files
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy the file name to the clipboard
-  <kbd>d</kbd>: View 'discard changes' options
-  <kbd>&lt;space&gt;</kbd>: Toggle staged
-  <kbd>&lt;c-b&gt;</kbd>: Filter files by status
-  <kbd>c</kbd>: Commit changes
-  <kbd>w</kbd>: Commit changes without pre-commit hook
-  <kbd>A</kbd>: Amend last commit
-  <kbd>C</kbd>: Commit changes using git editor
-  <kbd>e</kbd>: Edit file
-  <kbd>o</kbd>: Open file
-  <kbd>i</kbd>: Ignore or exclude file
-  <kbd>r</kbd>: Refresh files
-  <kbd>s</kbd>: Stash all changes
-  <kbd>S</kbd>: View stash options
-  <kbd>a</kbd>: Stage/unstage all
-  <kbd>&lt;enter&gt;</kbd>: Stage individual hunks/lines for file, or collapse/expand for directory
-  <kbd>g</kbd>: View upstream reset options
-  <kbd>D</kbd>: View reset options
-  <kbd>`</kbd>: Toggle file tree view
-  <kbd>M</kbd>: Open external merge tool (git mergetool)
-  <kbd>f</kbd>: Fetch
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy the file name to the clipboard
+  <kbd>d</kbd>: view 'discard changes' options
+  <kbd>&lt;space&gt;</kbd>: toggle staged
+  <kbd>&lt;c-b&gt;</kbd>: Filter files (staged/unstaged)
+  <kbd>c</kbd>: commit changes
+  <kbd>w</kbd>: commit changes without pre-commit hook
+  <kbd>A</kbd>: amend last commit
+  <kbd>C</kbd>: commit changes using git editor
+  <kbd>e</kbd>: edit file
+  <kbd>o</kbd>: open file
+  <kbd>i</kbd>: ignore or exclude file
+  <kbd>r</kbd>: refresh files
+  <kbd>s</kbd>: stash all changes
+  <kbd>S</kbd>: view stash options
+  <kbd>a</kbd>: stage/unstage all
+  <kbd>&lt;enter&gt;</kbd>: stage individual hunks/lines for file, or collapse/expand for directory
+  <kbd>g</kbd>: view upstream reset options
+  <kbd>D</kbd>: view reset options
+  <kbd>`</kbd>: toggle file tree view
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>f</kbd>: fetch
 </pre>
 
-## Local branches
+## Local Branches
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard
-  <kbd>i</kbd>: Show git-flow options
-  <kbd>&lt;space&gt;</kbd>: Checkout
-  <kbd>n</kbd>: New branch
-  <kbd>o</kbd>: Create pull request
-  <kbd>O</kbd>: Create pull request options
-  <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>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>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy branch name to clipboard
+  <kbd>i</kbd>: show git-flow options
+  <kbd>&lt;space&gt;</kbd>: checkout
+  <kbd>n</kbd>: new branch
+  <kbd>o</kbd>: create pull request
+  <kbd>O</kbd>: create pull request options
+  <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>: 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>: set/unset upstream
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
-## Main panel (merging)
+## Main Panel (Merging)
 
 <pre>
-  <kbd>e</kbd>: Edit file
-  <kbd>o</kbd>: Open file
-  <kbd>&lt;left&gt;</kbd>: Select previous conflict
-  <kbd>&lt;right&gt;</kbd>: Select next conflict
-  <kbd>&lt;up&gt;</kbd>: Select previous hunk
-  <kbd>&lt;down&gt;</kbd>: Select next hunk
-  <kbd>z</kbd>: Undo
-  <kbd>M</kbd>: Open external merge tool (git mergetool)
-  <kbd>&lt;space&gt;</kbd>: Pick hunk
-  <kbd>b</kbd>: Pick all hunks
-  <kbd>&lt;esc&gt;</kbd>: Return to files panel
+  <kbd>e</kbd>: edit file
+  <kbd>o</kbd>: open file
+  <kbd>&lt;left&gt;</kbd>: select previous conflict
+  <kbd>&lt;right&gt;</kbd>: select next conflict
+  <kbd>&lt;up&gt;</kbd>: select previous hunk
+  <kbd>&lt;down&gt;</kbd>: select next hunk
+  <kbd>z</kbd>: undo
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>&lt;space&gt;</kbd>: pick hunk
+  <kbd>b</kbd>: pick all hunks
+  <kbd>&lt;esc&gt;</kbd>: return to files panel
 </pre>
 
-## Main panel (normal)
+## Main Panel (Normal)
 
 <pre>
-  <kbd>mouse wheel down</kbd>: Scroll down (fn+up)
-  <kbd>mouse wheel up</kbd>: Scroll up (fn+down)
+  <kbd>mouse wheel down</kbd>: scroll down (fn+up)
+  <kbd>mouse wheel up</kbd>: scroll up (fn+down)
 </pre>
 
-## Main panel (patch building)
+## Main Panel (Patch Building)
 
 <pre>
-  <kbd>&lt;left&gt;</kbd>: Select previous hunk
-  <kbd>&lt;right&gt;</kbd>: Select next hunk
-  <kbd>v</kbd>: Toggle drag select
-  <kbd>V</kbd>: Toggle drag select
-  <kbd>a</kbd>: Toggle select hunk
-  <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
-  <kbd>o</kbd>: Open file
-  <kbd>e</kbd>: Edit file
-  <kbd>&lt;space&gt;</kbd>: Add/Remove line(s) to patch
-  <kbd>&lt;esc&gt;</kbd>: Exit custom patch builder
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;left&gt;</kbd>: select previous hunk
+  <kbd>&lt;right&gt;</kbd>: select next hunk
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>&lt;c-o&gt;</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open file
+  <kbd>e</kbd>: edit file
+  <kbd>&lt;space&gt;</kbd>: add/remove line(s) to patch
+  <kbd>&lt;esc&gt;</kbd>: exit custom patch builder
 </pre>
 
-## Main panel (staging)
+## Main Panel (Staging)
 
 <pre>
-  <kbd>&lt;left&gt;</kbd>: Select previous hunk
-  <kbd>&lt;right&gt;</kbd>: Select next hunk
-  <kbd>v</kbd>: Toggle drag select
-  <kbd>V</kbd>: Toggle drag select
-  <kbd>a</kbd>: Toggle select hunk
-  <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
-  <kbd>o</kbd>: Open file
-  <kbd>e</kbd>: Edit file
-  <kbd>&lt;esc&gt;</kbd>: Return to files panel
-  <kbd>&lt;tab&gt;</kbd>: Switch to other panel (staged/unstaged changes)
-  <kbd>&lt;space&gt;</kbd>: Toggle line staged / unstaged
-  <kbd>d</kbd>: Discard change (git reset)
-  <kbd>E</kbd>: Edit hunk
-  <kbd>c</kbd>: Commit changes
-  <kbd>w</kbd>: Commit changes without pre-commit hook
-  <kbd>C</kbd>: Commit changes using git editor
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;left&gt;</kbd>: select previous hunk
+  <kbd>&lt;right&gt;</kbd>: select next hunk
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>&lt;c-o&gt;</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open file
+  <kbd>e</kbd>: edit file
+  <kbd>&lt;esc&gt;</kbd>: return to files panel
+  <kbd>&lt;tab&gt;</kbd>: switch to other panel (staged/unstaged changes)
+  <kbd>&lt;space&gt;</kbd>: toggle line staged / unstaged
+  <kbd>d</kbd>: delete change (git reset)
+  <kbd>E</kbd>: edit hunk
+  <kbd>c</kbd>: commit changes
+  <kbd>w</kbd>: commit changes without pre-commit hook
+  <kbd>C</kbd>: commit changes using git editor
 </pre>
 
 ## Menu
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Execute
-  <kbd>&lt;esc&gt;</kbd>: Close
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;enter&gt;</kbd>: execute
+  <kbd>&lt;esc&gt;</kbd>: close
 </pre>
 
 ## Reflog
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Create new branch off of commit
-  <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: Copy commit (cherry-pick)
-  <kbd>C</kbd>: Copy commit range (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>g</kbd>: view reset options
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
-## Remote branches
+## Remote Branches
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard
-  <kbd>&lt;space&gt;</kbd>: Checkout
-  <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>u</kbd>: Set as upstream of checked-out branch
-  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy branch name to clipboard
+  <kbd>&lt;space&gt;</kbd>: checkout
+  <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 branch
+  <kbd>u</kbd>: set as upstream of checked-out branch
+  <kbd>&lt;esc&gt;</kbd>: Return to remotes list
+  <kbd>g</kbd>: view reset options
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
 ## Remotes
 
 <pre>
-  <kbd>f</kbd>: Fetch remote
-  <kbd>n</kbd>: Add new remote
-  <kbd>d</kbd>: Remove remote
-  <kbd>e</kbd>: Edit remote
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>f</kbd>: fetch remote
+  <kbd>n</kbd>: add new remote
+  <kbd>d</kbd>: remove remote
+  <kbd>e</kbd>: edit remote
 </pre>
 
 ## Stash
 
 <pre>
-  <kbd>&lt;space&gt;</kbd>: Apply
-  <kbd>g</kbd>: Pop
-  <kbd>d</kbd>: Drop
-  <kbd>n</kbd>: New branch
-  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;space&gt;</kbd>: apply
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: drop
+  <kbd>n</kbd>: new branch
+  <kbd>r</kbd>: rename stash
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## Status
 
 <pre>
-  <kbd>o</kbd>: Open config file
-  <kbd>e</kbd>: Edit config file
-  <kbd>u</kbd>: Check for update
-  <kbd>&lt;enter&gt;</kbd>: Switch to a recent repo
-  <kbd>a</kbd>: Show all branch logs
+  <kbd>o</kbd>: open config file
+  <kbd>e</kbd>: edit config file
+  <kbd>u</kbd>: check for update
+  <kbd>&lt;enter&gt;</kbd>: switch to a recent repo
+  <kbd>a</kbd>: show all branch logs
 </pre>
 
 ## Sub-commits
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Create new branch off of commit
-  <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: Copy commit (cherry-pick)
-  <kbd>C</kbd>: Copy commit range (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>g</kbd>: view reset options
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## Submodules
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy submodule name to clipboard
-  <kbd>&lt;enter&gt;</kbd>: Enter submodule
-  <kbd>&lt;space&gt;</kbd>: Enter submodule
-  <kbd>d</kbd>: Remove submodule
-  <kbd>u</kbd>: Update submodule
-  <kbd>n</kbd>: Add new submodule
-  <kbd>e</kbd>: Update submodule URL
-  <kbd>i</kbd>: Initialize submodule
-  <kbd>b</kbd>: View bulk submodule options
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy submodule name to clipboard
+  <kbd>&lt;enter&gt;</kbd>: enter submodule
+  <kbd>d</kbd>: remove submodule
+  <kbd>u</kbd>: update submodule
+  <kbd>n</kbd>: add new submodule
+  <kbd>e</kbd>: update submodule URL
+  <kbd>i</kbd>: initialize submodule
+  <kbd>b</kbd>: view bulk submodule options
 </pre>
 
 ## Tags
 
 <pre>
-  <kbd>&lt;space&gt;</kbd>: Checkout
-  <kbd>d</kbd>: View delete options
-  <kbd>P</kbd>: Push tag
-  <kbd>n</kbd>: Create tag
-  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;space&gt;</kbd>: checkout
+  <kbd>d</kbd>: delete tag
+  <kbd>P</kbd>: push tag
+  <kbd>n</kbd>: create tag
+  <kbd>g</kbd>: view reset options
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>

docs/keybindings/Keybindings_ja.md

@@ -14,20 +14,20 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
   <kbd>:</kbd>: カスタムコマンドを実行
-  <kbd>&lt;c-p&gt;</kbd>: View custom patch options
-  <kbd>m</kbd>: View merge/rebase options
+  <kbd>&lt;c-p&gt;</kbd>: view custom patch options
+  <kbd>m</kbd>: view merge/rebase options
   <kbd>R</kbd>: リフレッシュ
   <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen)
   <kbd>_</kbd>: 前のスクリーンモード
   <kbd>?</kbd>: メニューを開く
-  <kbd>&lt;c-s&gt;</kbd>: View filter-by-path options
+  <kbd>&lt;c-s&gt;</kbd>: view filter-by-path options
   <kbd>W</kbd>: 差分メニューを開く
   <kbd>&lt;c-e&gt;</kbd>: 差分メニューを開く
   <kbd>&lt;c-w&gt;</kbd>: 空白文字の差分の表示有無を切り替え
   <kbd>z</kbd>: アンドゥ (via reflog) (experimental)
   <kbd>&lt;c-z&gt;</kbd>: リドゥ (via reflog) (experimental)
-  <kbd>P</kbd>: Push
-  <kbd>p</kbd>: Pull
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
 </pre>
 
 ## 一覧パネルの操作
@@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>,</kbd>: 前のページ
   <kbd>.</kbd>: 次のページ
   <kbd>&lt;</kbd>: 最上部までスクロール
-  <kbd>&gt;</kbd>: 最下部までスクロール
   <kbd>/</kbd>: 検索を開始
+  <kbd>&gt;</kbd>: 最下部までスクロール
   <kbd>H</kbd>: 左スクロール
   <kbd>L</kbd>: 右スクロール
   <kbd>]</kbd>: 次のタブ
@@ -48,92 +48,73 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 <pre>
   <kbd>&lt;space&gt;</kbd>: 適用
-  <kbd>g</kbd>: Pop
-  <kbd>d</kbd>: Drop
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: drop
   <kbd>n</kbd>: 新しいブランチを作成
   <kbd>r</kbd>: Stashを変更
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## Sub-commits
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
   <kbd>y</kbd>: コミットの情報をコピー
   <kbd>o</kbd>: ブラウザでコミットを開く
   <kbd>n</kbd>: コミットにブランチを作成
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>c</kbd>: コミットをコピー (cherry-pick)
   <kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: 検索を開始
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## コミット
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>b</kbd>: View bisect options
-  <kbd>s</kbd>: Squash down
-  <kbd>f</kbd>: Fixup commit
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>b</kbd>: view bisect options
+  <kbd>s</kbd>: squash down
+  <kbd>f</kbd>: fixup commit
   <kbd>r</kbd>: コミットメッセージを変更
   <kbd>R</kbd>: エディタでコミットメッセージを編集
   <kbd>d</kbd>: コミットを削除
   <kbd>e</kbd>: コミットを編集
-  <kbd>p</kbd>: Pick commit (when mid-rebase)
+  <kbd>p</kbd>: pick commit (when mid-rebase)
   <kbd>F</kbd>: このコミットに対するfixupコミットを作成
-  <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
+  <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
   <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>a</kbd>: reset commit author
   <kbd>t</kbd>: コミットをrevert
   <kbd>T</kbd>: タグを作成
   <kbd>&lt;c-l&gt;</kbd>: ログメニューを開く
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
   <kbd>y</kbd>: コミットの情報をコピー
   <kbd>o</kbd>: ブラウザでコミットを開く
   <kbd>n</kbd>: コミットにブランチを作成
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>c</kbd>: コミットをコピー (cherry-pick)
   <kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: 検索を開始
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## コミットファイル
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: コミットされたファイル名をクリップボードにコピー
-  <kbd>c</kbd>: Checkout file
-  <kbd>d</kbd>: Discard this commit's changes to this file
+  <kbd>c</kbd>: checkout file
+  <kbd>d</kbd>: discard this commit's changes to this file
   <kbd>o</kbd>: ファイルを開く
   <kbd>e</kbd>: ファイルを編集
-  <kbd>&lt;space&gt;</kbd>: Toggle file included in patch
-  <kbd>a</kbd>: Toggle all files included in patch
-  <kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
+  <kbd>&lt;space&gt;</kbd>: toggle file included in patch
+  <kbd>a</kbd>: toggle all files included in patch
+  <kbd>&lt;enter&gt;</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
   <kbd>`</kbd>: ファイルツリーの表示を切り替え
-  <kbd>/</kbd>: 検索を開始
 </pre>
 
 ## コミットメッセージ
@@ -148,14 +129,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: サブモジュール名をクリップボードにコピー
   <kbd>&lt;enter&gt;</kbd>: サブモジュールを開く
-  <kbd>&lt;space&gt;</kbd>: サブモジュールを開く
   <kbd>d</kbd>: サブモジュールを削除
   <kbd>u</kbd>: サブモジュールを更新
   <kbd>n</kbd>: サブモジュールを新規追加
   <kbd>e</kbd>: サブモジュールのURLを更新
   <kbd>i</kbd>: サブモジュールを初期化
-  <kbd>b</kbd>: View bulk submodule options
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>b</kbd>: view bulk submodule options
 </pre>
 
 ## ステータス
@@ -172,20 +151,18 @@ _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
-  <kbd>w</kbd>: View worktree options
+  <kbd>g</kbd>: view reset options
   <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## ファイル
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: ファイル名をクリップボードにコピー
-  <kbd>d</kbd>: View 'discard changes' options
+  <kbd>d</kbd>: view 'discard changes' options
   <kbd>&lt;space&gt;</kbd>: ステージ/アンステージ
   <kbd>&lt;c-b&gt;</kbd>: ファイルをフィルタ (ステージ/アンステージ)
   <kbd>c</kbd>: 変更をコミット
@@ -197,40 +174,37 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>i</kbd>: ファイルをignore
   <kbd>r</kbd>: ファイルをリフレッシュ
   <kbd>s</kbd>: 変更をstash
-  <kbd>S</kbd>: View stash options
+  <kbd>S</kbd>: view stash options
   <kbd>a</kbd>: すべての変更をステージ/アンステージ
-  <kbd>&lt;enter&gt;</kbd>: Stage individual hunks/lines for file, or collapse/expand for directory
-  <kbd>g</kbd>: View upstream reset options
-  <kbd>D</kbd>: View reset options
+  <kbd>&lt;enter&gt;</kbd>: stage individual hunks/lines for file, or collapse/expand for directory
+  <kbd>g</kbd>: view upstream reset options
+  <kbd>D</kbd>: view reset options
   <kbd>`</kbd>: ファイルツリーの表示を切り替え
-  <kbd>M</kbd>: Git mergetoolを開く
-  <kbd>f</kbd>: Fetch
-  <kbd>/</kbd>: 検索を開始
+  <kbd>M</kbd>: git mergetoolを開く
+  <kbd>f</kbd>: fetch
 </pre>
 
 ## ブランチ
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: ブランチ名をクリップボードにコピー
-  <kbd>i</kbd>: Show git-flow options
+  <kbd>i</kbd>: show git-flow options
   <kbd>&lt;space&gt;</kbd>: チェックアウト
   <kbd>n</kbd>: 新しいブランチを作成
   <kbd>o</kbd>: Pull Requestを作成
-  <kbd>O</kbd>: Create pull request options
+  <kbd>O</kbd>: create pull request options
   <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>r</kbd>: Rebase checked-out branch onto this branch
+  <kbd>c</kbd>: checkout by name
+  <kbd>F</kbd>: force checkout
+  <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>f</kbd>: fast-forward this branch from its upstream
   <kbd>T</kbd>: タグを作成
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>R</kbd>: ブランチ名を変更
-  <kbd>u</kbd>: View upstream options
-  <kbd>w</kbd>: View worktree options
+  <kbd>u</kbd>: set/unset upstream
   <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## メインパネル (Merging)
@@ -243,9 +217,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;up&gt;</kbd>: 前のhunkを選択
   <kbd>&lt;down&gt;</kbd>: 次のhunkを選択
   <kbd>z</kbd>: アンドゥ
-  <kbd>M</kbd>: Git mergetoolを開く
-  <kbd>&lt;space&gt;</kbd>: Pick hunk
-  <kbd>b</kbd>: Pick all hunks
+  <kbd>M</kbd>: git mergetoolを開く
+  <kbd>&lt;space&gt;</kbd>: pick hunk
+  <kbd>b</kbd>: pick all hunks
   <kbd>&lt;esc&gt;</kbd>: ファイル一覧に戻る
 </pre>
 
@@ -263,13 +237,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;right&gt;</kbd>: 次のhunkを選択
   <kbd>v</kbd>: 範囲選択を切り替え
   <kbd>V</kbd>: 範囲選択を切り替え
-  <kbd>a</kbd>: Hunk選択を切り替え
+  <kbd>a</kbd>: hunk選択を切り替え
   <kbd>&lt;c-o&gt;</kbd>: 選択されたテキストをクリップボードにコピー
   <kbd>o</kbd>: ファイルを開く
   <kbd>e</kbd>: ファイルを編集
   <kbd>&lt;space&gt;</kbd>: 行をパッチに追加/削除
-  <kbd>&lt;esc&gt;</kbd>: Exit custom patch builder
-  <kbd>/</kbd>: 検索を開始
+  <kbd>&lt;esc&gt;</kbd>: exit custom patch builder
 </pre>
 
 ## メインパネル (Staging)
@@ -279,7 +252,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;right&gt;</kbd>: 次のhunkを選択
   <kbd>v</kbd>: 範囲選択を切り替え
   <kbd>V</kbd>: 範囲選択を切り替え
-  <kbd>a</kbd>: Hunk選択を切り替え
+  <kbd>a</kbd>: hunk選択を切り替え
   <kbd>&lt;c-o&gt;</kbd>: 選択されたテキストをクリップボードにコピー
   <kbd>o</kbd>: ファイルを開く
   <kbd>e</kbd>: ファイルを編集
@@ -287,11 +260,10 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;tab&gt;</kbd>: パネルを切り替え
   <kbd>&lt;space&gt;</kbd>: 選択行をステージ/アンステージ
   <kbd>d</kbd>: 変更を削除 (git reset)
-  <kbd>E</kbd>: Edit hunk
+  <kbd>E</kbd>: edit hunk
   <kbd>c</kbd>: 変更をコミット
   <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット
   <kbd>C</kbd>: gitエディタを使用して変更をコミット
-  <kbd>/</kbd>: 検索を開始
 </pre>
 
 ## メニュー
@@ -299,7 +271,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;enter&gt;</kbd>: 実行
   <kbd>&lt;esc&gt;</kbd>: 閉じる
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## リモート
@@ -309,7 +280,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>n</kbd>: リモートを新規追加
   <kbd>d</kbd>: リモートを削除
   <kbd>e</kbd>: リモートを編集
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## リモートブランチ
@@ -319,30 +289,27 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;space&gt;</kbd>: チェックアウト
   <kbd>n</kbd>: 新しいブランチを作成
   <kbd>M</kbd>: 現在のブランチにマージ
-  <kbd>r</kbd>: Rebase checked-out branch onto this branch
-  <kbd>d</kbd>: Delete remote tag
-  <kbd>u</kbd>: Set as upstream of checked-out branch
-  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
+  <kbd>r</kbd>: rebase checked-out branch onto this branch
+  <kbd>d</kbd>: ブランチを削除
+  <kbd>u</kbd>: set as upstream of checked-out branch
+  <kbd>&lt;esc&gt;</kbd>: リモート一覧に戻る
+  <kbd>g</kbd>: view reset options
   <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 参照ログ
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
   <kbd>y</kbd>: コミットの情報をコピー
   <kbd>o</kbd>: ブラウザでコミットを開く
   <kbd>n</kbd>: コミットにブランチを作成
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>c</kbd>: コミットをコピー (cherry-pick)
   <kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
   <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 確認パネル

docs/keybindings/Keybindings_ko.md

@@ -11,16 +11,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;pgup&gt;</kbd>: 메인 패널을 위로 스크롤 (fn+up/shift+k)
   <kbd>&lt;pgdown&gt;</kbd>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j)
   <kbd>@</kbd>: 명령어 로그 메뉴 열기
-  <kbd>}</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기
-  <kbd>{</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기
-  <kbd>:</kbd>: Execute custom command
+  <kbd>}</kbd>: diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기
+  <kbd>{</kbd>: diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기
+  <kbd>:</kbd>: execute custom command
   <kbd>&lt;c-p&gt;</kbd>: 커스텀 Patch 옵션 보기
-  <kbd>m</kbd>: View merge/rebase options
+  <kbd>m</kbd>: view merge/rebase options
   <kbd>R</kbd>: 새로고침
   <kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen)
   <kbd>_</kbd>: 이전 스크린 모드
   <kbd>?</kbd>: 매뉴 열기
-  <kbd>&lt;c-s&gt;</kbd>: View filter-by-path options
+  <kbd>&lt;c-s&gt;</kbd>: view filter-by-path options
   <kbd>W</kbd>: Diff 메뉴 열기
   <kbd>&lt;c-e&gt;</kbd>: Diff 메뉴 열기
   <kbd>&lt;c-w&gt;</kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환
@@ -30,14 +30,14 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>p</kbd>: 업데이트
 </pre>
 
-## List panel navigation
+## List Panel Navigation
 
 <pre>
   <kbd>,</kbd>: 이전 페이지
   <kbd>.</kbd>: 다음 페이지
   <kbd>&lt;</kbd>: 맨 위로 스크롤 
-  <kbd>&gt;</kbd>: 맨 아래로 스크롤 
   <kbd>/</kbd>: 검색 시작
+  <kbd>&gt;</kbd>: 맨 아래로 스크롤 
   <kbd>H</kbd>: 우 스크롤
   <kbd>L</kbd>: 좌 스크롤
   <kbd>]</kbd>: 이전 탭
@@ -48,58 +48,41 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
   <kbd>y</kbd>: 커밋 attribute 복사
   <kbd>o</kbd>: 브라우저에서 커밋 열기
   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>c</kbd>: 커밋을 복사 (cherry-pick)
   <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
   <kbd>&lt;enter&gt;</kbd>: 커밋 보기
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## Stash
 
 <pre>
   <kbd>&lt;space&gt;</kbd>: 적용
-  <kbd>g</kbd>: Pop
-  <kbd>d</kbd>: Drop
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: drop
   <kbd>n</kbd>: 새 브랜치 생성
-  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>r</kbd>: rename stash
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## Sub-commits
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
   <kbd>y</kbd>: 커밋 attribute 복사
   <kbd>o</kbd>: 브라우저에서 커밋 열기
   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>c</kbd>: 커밋을 복사 (cherry-pick)
   <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: 검색 시작
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## 메뉴
@@ -107,7 +90,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;enter&gt;</kbd>: 실행
   <kbd>&lt;esc&gt;</kbd>: 닫기
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 메인 패널 (Merging)
@@ -120,9 +102,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;up&gt;</kbd>: 이전 hunk를 선택
   <kbd>&lt;down&gt;</kbd>: 다음 hunk를 선택
   <kbd>z</kbd>: 되돌리기
-  <kbd>M</kbd>: Git mergetool를 열기
-  <kbd>&lt;space&gt;</kbd>: Pick hunk
-  <kbd>b</kbd>: Pick all hunks
+  <kbd>M</kbd>: git mergetool를 열기
+  <kbd>&lt;space&gt;</kbd>: pick hunk
+  <kbd>b</kbd>: pick all hunks
   <kbd>&lt;esc&gt;</kbd>: 파일 목록으로 돌아가기
 </pre>
 
@@ -140,13 +122,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택
   <kbd>v</kbd>: 드래그 선택 전환
   <kbd>V</kbd>: 드래그 선택 전환
-  <kbd>a</kbd>: Toggle select hunk
+  <kbd>a</kbd>: toggle select hunk
   <kbd>&lt;c-o&gt;</kbd>: 선택한 텍스트를 클립보드에 복사
   <kbd>o</kbd>: 파일 닫기
   <kbd>e</kbd>: 파일 편집
-  <kbd>&lt;space&gt;</kbd>: Line(s)을 패치에 추가/삭제
-  <kbd>&lt;esc&gt;</kbd>: Exit custom patch builder
-  <kbd>/</kbd>: 검색 시작
+  <kbd>&lt;space&gt;</kbd>: line(s)을 패치에 추가/삭제
+  <kbd>&lt;esc&gt;</kbd>: exit custom patch builder
 </pre>
 
 ## 메인 패널 (Staging)
@@ -156,7 +137,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택
   <kbd>v</kbd>: 드래그 선택 전환
   <kbd>V</kbd>: 드래그 선택 전환
-  <kbd>a</kbd>: Toggle select hunk
+  <kbd>a</kbd>: toggle select hunk
   <kbd>&lt;c-o&gt;</kbd>: 선택한 텍스트를 클립보드에 복사
   <kbd>o</kbd>: 파일 닫기
   <kbd>e</kbd>: 파일 편집
@@ -164,18 +145,17 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;tab&gt;</kbd>: 패널 전환
   <kbd>&lt;space&gt;</kbd>: 선택한 행을 staged / unstaged
   <kbd>d</kbd>: 변경을 삭제 (git reset)
-  <kbd>E</kbd>: Edit hunk
+  <kbd>E</kbd>: edit hunk
   <kbd>c</kbd>: 커밋 변경내용
-  <kbd>w</kbd>: Commit changes without pre-commit hook
+  <kbd>w</kbd>: commit changes without pre-commit hook
   <kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
-  <kbd>/</kbd>: 검색 시작
 </pre>
 
 ## 브랜치
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 브랜치명을 클립보드에 복사
-  <kbd>i</kbd>: Git-flow 옵션 보기
+  <kbd>i</kbd>: git-flow 옵션 보기
   <kbd>&lt;space&gt;</kbd>: 체크아웃
   <kbd>n</kbd>: 새 브랜치 생성
   <kbd>o</kbd>: 풀 리퀘스트 생성
@@ -183,17 +163,15 @@ _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>f</kbd>: fast-forward this branch from its upstream
   <kbd>T</kbd>: 태그를 생성
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>R</kbd>: 브랜치 이름 변경
-  <kbd>u</kbd>: View upstream options
-  <kbd>w</kbd>: View worktree options
+  <kbd>u</kbd>: set/unset upstream
   <kbd>&lt;enter&gt;</kbd>: 커밋 보기
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 상태
@@ -211,14 +189,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 서브모듈 이름을 클립보드에 복사
   <kbd>&lt;enter&gt;</kbd>: 서브모듈 열기
-  <kbd>&lt;space&gt;</kbd>: 서브모듈 열기
   <kbd>d</kbd>: 서브모듈 삭제
   <kbd>u</kbd>: 서브모듈 업데이트
   <kbd>n</kbd>: 새로운 서브모듈 추가
   <kbd>e</kbd>: 서브모듈의 URL을 수정
   <kbd>i</kbd>: 서브모듈 초기화
-  <kbd>b</kbd>: View bulk submodule options
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>b</kbd>: view bulk submodule options
 </pre>
 
 ## 원격
@@ -228,7 +204,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>n</kbd>: 새로운 Remote 추가
   <kbd>d</kbd>: Remote를 삭제
   <kbd>e</kbd>: Remote를 수정
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 원격 브랜치
@@ -239,63 +214,58 @@ _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>u</kbd>: Set as upstream of checked-out branch
-  <kbd>g</kbd>: View reset options
-  <kbd>w</kbd>: View worktree options
+  <kbd>d</kbd>: 브랜치 삭제
+  <kbd>u</kbd>: set as upstream of checked-out branch
+  <kbd>&lt;esc&gt;</kbd>: 원격목록으로 돌아가기
+  <kbd>g</kbd>: view reset options
   <kbd>&lt;enter&gt;</kbd>: 커밋 보기
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 커밋
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>b</kbd>: Bisect 옵션 보기
-  <kbd>s</kbd>: Squash down
-  <kbd>f</kbd>: Fixup commit
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>b</kbd>: bisect 옵션 보기
+  <kbd>s</kbd>: squash down
+  <kbd>f</kbd>: fixup commit
   <kbd>r</kbd>: 커밋메시지 변경
   <kbd>R</kbd>: 에디터에서 커밋메시지 수정
   <kbd>d</kbd>: 커밋 삭제
   <kbd>e</kbd>: 커밋을 편집
-  <kbd>p</kbd>: Pick commit (when mid-rebase)
-  <kbd>F</kbd>: Create fixup commit for this commit
-  <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
+  <kbd>p</kbd>: pick commit (when mid-rebase)
+  <kbd>F</kbd>: create fixup commit for this commit
+  <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
   <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>A</kbd>: amend commit with staged changes
+  <kbd>a</kbd>: reset commit author
   <kbd>t</kbd>: 커밋 되돌리기
-  <kbd>T</kbd>: Tag commit
+  <kbd>T</kbd>: tag commit
   <kbd>&lt;c-l&gt;</kbd>: 로그 메뉴 열기
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
   <kbd>y</kbd>: 커밋 attribute 복사
   <kbd>o</kbd>: 브라우저에서 커밋 열기
   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
-  <kbd>g</kbd>: View reset options
+  <kbd>g</kbd>: view reset options
   <kbd>c</kbd>: 커밋을 복사 (cherry-pick)
   <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
-  <kbd>&lt;enter&gt;</kbd>: View selected item's files
-  <kbd>/</kbd>: 검색 시작
+  <kbd>&lt;enter&gt;</kbd>: view selected item's files
 </pre>
 
 ## 커밋 파일
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 커밋한 파일명을 클립보드에 복사
-  <kbd>c</kbd>: Checkout file
-  <kbd>d</kbd>: Discard this commit's changes to this file
+  <kbd>c</kbd>: checkout file
+  <kbd>d</kbd>: discard this commit's changes to this file
   <kbd>o</kbd>: 파일 닫기
   <kbd>e</kbd>: 파일 편집
-  <kbd>&lt;space&gt;</kbd>: Toggle file included in patch
-  <kbd>a</kbd>: Toggle all files included in patch
-  <kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
+  <kbd>&lt;space&gt;</kbd>: toggle file included in patch
+  <kbd>a</kbd>: toggle all files included in patch
+  <kbd>&lt;enter&gt;</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
   <kbd>`</kbd>: 파일 트리뷰로 전환
-  <kbd>/</kbd>: 검색 시작
 </pre>
 
 ## 커밋메시지
@@ -309,40 +279,37 @@ _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
-  <kbd>w</kbd>: View worktree options
+  <kbd>g</kbd>: view reset options
   <kbd>&lt;enter&gt;</kbd>: 커밋 보기
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 파일
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 파일명을 클립보드에 복사
-  <kbd>d</kbd>: View 'discard changes' options
+  <kbd>d</kbd>: view 'discard changes' options
   <kbd>&lt;space&gt;</kbd>: Staged 전환
   <kbd>&lt;c-b&gt;</kbd>: 파일을 필터하기 (Staged/unstaged)
   <kbd>c</kbd>: 커밋 변경내용
-  <kbd>w</kbd>: Commit changes without pre-commit hook
+  <kbd>w</kbd>: commit changes without pre-commit hook
   <kbd>A</kbd>: 마지맛 커밋 수정
   <kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
   <kbd>e</kbd>: 파일 편집
   <kbd>o</kbd>: 파일 닫기
-  <kbd>i</kbd>: Ignore file
+  <kbd>i</kbd>: ignore file
   <kbd>r</kbd>: 파일 새로고침
   <kbd>s</kbd>: 변경사항을 Stash
   <kbd>S</kbd>: Stash 옵션 보기
   <kbd>a</kbd>: 모든 변경을 Staged/unstaged으로 전환
-  <kbd>&lt;enter&gt;</kbd>: Stage individual hunks/lines for file, or collapse/expand for directory
-  <kbd>g</kbd>: View upstream reset options
-  <kbd>D</kbd>: View reset options
+  <kbd>&lt;enter&gt;</kbd>: stage individual hunks/lines for file, or collapse/expand for directory
+  <kbd>g</kbd>: view upstream reset options
+  <kbd>D</kbd>: view reset options
   <kbd>`</kbd>: 파일 트리뷰로 전환
-  <kbd>M</kbd>: Git mergetool를 열기
-  <kbd>f</kbd>: Fetch
-  <kbd>/</kbd>: 검색 시작
+  <kbd>M</kbd>: git mergetool를 열기
+  <kbd>f</kbd>: fetch
 </pre>
 
 ## 확인 패널

docs/keybindings/Keybindings_nl.md

@@ -4,350 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 
 _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
-## Globale sneltoetsen
+## Globale Sneltoetsen
 
 <pre>
-  <kbd>&lt;c-r&gt;</kbd>: Wissel naar een recente repo
-  <kbd>&lt;pgup&gt;</kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
-  <kbd>&lt;pgdown&gt;</kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
-  <kbd>@</kbd>: Open command log menu
+  <kbd>&lt;c-r&gt;</kbd>: wissel naar een recente repo
+  <kbd>&lt;pgup&gt;</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
+  <kbd>&lt;pgdown&gt;</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
+  <kbd>@</kbd>: open command log menu
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
-  <kbd>:</kbd>: Voer aangepaste commando uit
-  <kbd>&lt;c-p&gt;</kbd>: Bekijk aangepaste patch opties
-  <kbd>m</kbd>: Bekijk merge/rebase opties
-  <kbd>R</kbd>: Verversen
-  <kbd>+</kbd>: Volgende scherm modus (normaal/half/groot)
-  <kbd>_</kbd>: Vorige scherm modus
-  <kbd>?</kbd>: Open menu
-  <kbd>&lt;c-s&gt;</kbd>: Bekijk scoping opties
-  <kbd>W</kbd>: Open diff menu
-  <kbd>&lt;c-e&gt;</kbd>: Open diff menu
+  <kbd>:</kbd>: voer aangepaste commando uit
+  <kbd>&lt;c-p&gt;</kbd>: bekijk aangepaste patch opties
+  <kbd>m</kbd>: bekijk merge/rebase opties
+  <kbd>R</kbd>: verversen
+  <kbd>+</kbd>: volgende scherm modus (normaal/half/groot)
+  <kbd>_</kbd>: vorige scherm modus
+  <kbd>?</kbd>: open menu
+  <kbd>&lt;c-s&gt;</kbd>: bekijk scoping opties
+  <kbd>W</kbd>: open diff menu
+  <kbd>&lt;c-e&gt;</kbd>: open diff menu
   <kbd>&lt;c-w&gt;</kbd>: Toggle whether or not whitespace changes are shown in the diff view
-  <kbd>z</kbd>: Ongedaan maken (via reflog) (experimenteel)
-  <kbd>&lt;c-z&gt;</kbd>: Redo (via reflog) (experimenteel)
-  <kbd>P</kbd>: Push
-  <kbd>p</kbd>: Pull
+  <kbd>z</kbd>: ongedaan maken (via reflog) (experimenteel)
+  <kbd>&lt;c-z&gt;</kbd>: redo (via reflog) (experimenteel)
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
 </pre>
 
-## Lijstpaneel navigatie
+## Lijstpaneel Navigatie
 
 <pre>
-  <kbd>,</kbd>: Vorige pagina
-  <kbd>.</kbd>: Volgende pagina
-  <kbd>&lt;</kbd>: Scroll naar boven
-  <kbd>&gt;</kbd>: Scroll naar beneden
-  <kbd>/</kbd>: Start met zoeken
-  <kbd>H</kbd>: Scroll left
-  <kbd>L</kbd>: Scroll right
-  <kbd>]</kbd>: Volgende tabblad
-  <kbd>[</kbd>: Vorige tabblad
+  <kbd>,</kbd>: vorige pagina
+  <kbd>.</kbd>: volgende pagina
+  <kbd>&lt;</kbd>: scroll naar boven
+  <kbd>/</kbd>: start met zoeken
+  <kbd>&gt;</kbd>: scroll naar beneden
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>]</kbd>: volgende tabblad
+  <kbd>[</kbd>: vorige tabblad
 </pre>
 
 ## Bestanden
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer de bestandsnaam naar het klembord
-  <kbd>d</kbd>: Bekijk 'veranderingen ongedaan maken' opties
-  <kbd>&lt;space&gt;</kbd>: Toggle staged
-  <kbd>&lt;c-b&gt;</kbd>: Filter files by status
-  <kbd>c</kbd>: Commit veranderingen
-  <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook
-  <kbd>A</kbd>: Wijzig laatste commit
-  <kbd>C</kbd>: Commit veranderingen met de git editor
-  <kbd>e</kbd>: Verander bestand
-  <kbd>o</kbd>: Open bestand
-  <kbd>i</kbd>: Ignore or exclude file
-  <kbd>r</kbd>: Refresh bestanden
-  <kbd>s</kbd>: Stash-bestanden
-  <kbd>S</kbd>: Bekijk stash opties
-  <kbd>a</kbd>: Toggle staged alle
-  <kbd>&lt;enter&gt;</kbd>: Stage individuele hunks/lijnen
-  <kbd>g</kbd>: Bekijk upstream reset opties
-  <kbd>D</kbd>: Bekijk reset opties
-  <kbd>`</kbd>: Toggle bestandsboom weergave
-  <kbd>M</kbd>: Open external merge tool (git mergetool)
-  <kbd>f</kbd>: Fetch
-  <kbd>/</kbd>: Start met zoeken
+  <kbd>&lt;c-o&gt;</kbd>: kopieer de bestandsnaam naar het klembord
+  <kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties
+  <kbd>&lt;space&gt;</kbd>: toggle staged
+  <kbd>&lt;c-b&gt;</kbd>: Filter files (staged/unstaged)
+  <kbd>c</kbd>: commit veranderingen
+  <kbd>w</kbd>: commit veranderingen zonder pre-commit hook
+  <kbd>A</kbd>: wijzig laatste commit
+  <kbd>C</kbd>: commit veranderingen met de git editor
+  <kbd>e</kbd>: verander bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>i</kbd>: ignore or exclude file
+  <kbd>r</kbd>: refresh bestanden
+  <kbd>s</kbd>: stash-bestanden
+  <kbd>S</kbd>: bekijk stash opties
+  <kbd>a</kbd>: toggle staged alle
+  <kbd>&lt;enter&gt;</kbd>: stage individuele hunks/lijnen
+  <kbd>g</kbd>: bekijk upstream reset opties
+  <kbd>D</kbd>: bekijk reset opties
+  <kbd>`</kbd>: toggle bestandsboom weergave
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>f</kbd>: fetch
 </pre>
 
 ## Bevestigingspaneel
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Bevestig
-  <kbd>&lt;esc&gt;</kbd>: Sluiten
+  <kbd>&lt;enter&gt;</kbd>: bevestig
+  <kbd>&lt;esc&gt;</kbd>: sluiten
 </pre>
 
 ## Branches
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer branch name naar klembord
-  <kbd>i</kbd>: Laat git-flow opties zien
-  <kbd>&lt;space&gt;</kbd>: Uitchecken
-  <kbd>n</kbd>: Nieuwe branch
-  <kbd>o</kbd>: Maak een pull-request
-  <kbd>O</kbd>: Bekijk opties voor pull-aanvraag
-  <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>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>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: kopieer branch name naar klembord
+  <kbd>i</kbd>: laat git-flow opties zien
+  <kbd>&lt;space&gt;</kbd>: uitchecken
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>o</kbd>: maak een pull-request
+  <kbd>O</kbd>: bekijk opties voor pull-aanvraag
+  <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>: 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>: set/unset upstream
+  <kbd>&lt;enter&gt;</kbd>: bekijk commits
 </pre>
 
-## Commit bericht
+## Commit Bericht
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Bevestig
-  <kbd>&lt;esc&gt;</kbd>: Sluiten
+  <kbd>&lt;enter&gt;</kbd>: bevestig
+  <kbd>&lt;esc&gt;</kbd>: sluiten
 </pre>
 
 ## Commit bestanden
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer de vastgelegde bestandsnaam naar het klembord
-  <kbd>c</kbd>: Bestand uitchecken
-  <kbd>d</kbd>: Uitsluit deze commit zijn veranderingen aan dit bestand
-  <kbd>o</kbd>: Open bestand
-  <kbd>e</kbd>: Verander bestand
-  <kbd>&lt;space&gt;</kbd>: Toggle bestand inbegrepen in patch
-  <kbd>a</kbd>: Toggle all files included in patch
-  <kbd>&lt;enter&gt;</kbd>: Enter bestand om geselecteerde regels toe te voegen aan de patch
-  <kbd>`</kbd>: Toggle bestandsboom weergave
-  <kbd>/</kbd>: Start met zoeken
+  <kbd>&lt;c-o&gt;</kbd>: kopieer de vastgelegde bestandsnaam naar het klembord
+  <kbd>c</kbd>: bestand uitchecken
+  <kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>e</kbd>: verander bestand
+  <kbd>&lt;space&gt;</kbd>: toggle bestand inbegrepen in patch
+  <kbd>a</kbd>: toggle all files included in patch
+  <kbd>&lt;enter&gt;</kbd>: enter bestand om geselecteerde regels toe te voegen aan de patch
+  <kbd>`</kbd>: toggle bestandsboom weergave
 </pre>
 
 ## Commits
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie
-  <kbd>b</kbd>: View bisect options
-  <kbd>s</kbd>: Squash beneden
+  <kbd>&lt;c-o&gt;</kbd>: kopieer commit SHA naar klembord
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (gekopieerde) commits selectie
+  <kbd>b</kbd>: view bisect options
+  <kbd>s</kbd>: squash beneden
   <kbd>f</kbd>: Fixup commit
-  <kbd>r</kbd>: Hernoem commit
-  <kbd>R</kbd>: Hernoem commit met editor
-  <kbd>d</kbd>: Verwijder commit
-  <kbd>e</kbd>: Wijzig commit
-  <kbd>p</kbd>: Kies commit (wanneer midden in rebase)
-  <kbd>F</kbd>: Creëer fixup commit
-  <kbd>S</kbd>: Squash bovenstaande commits
-  <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
-  <kbd>T</kbd>: Tag commit
-  <kbd>&lt;c-l&gt;</kbd>: Open log menu
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Creëer nieuwe branch van commit
-  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>c</kbd>: Kopieer commit (cherry-pick)
-  <kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
-  <kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden
-  <kbd>/</kbd>: Start met zoeken
+  <kbd>r</kbd>: hernoem commit
+  <kbd>R</kbd>: hernoem commit met editor
+  <kbd>d</kbd>: verwijder commit
+  <kbd>e</kbd>: wijzig commit
+  <kbd>p</kbd>: kies commit (wanneer midden in rebase)
+  <kbd>F</kbd>: creëer fixup commit voor deze commit
+  <kbd>S</kbd>: squash bovenstaande commits
+  <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>A</kbd>: wijzig commit met staged veranderingen
+  <kbd>a</kbd>: reset commit author
+  <kbd>t</kbd>: commit ongedaan maken
+  <kbd>T</kbd>: tag commit
+  <kbd>&lt;c-l&gt;</kbd>: open log menu
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: creëer nieuwe branch van commit
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>c</kbd>: kopieer commit (cherry-pick)
+  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
+  <kbd>&lt;enter&gt;</kbd>: bekijk gecommite bestanden
 </pre>
 
 ## Menu
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Uitvoeren
-  <kbd>&lt;esc&gt;</kbd>: Sluiten
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;enter&gt;</kbd>: uitvoeren
+  <kbd>&lt;esc&gt;</kbd>: sluiten
 </pre>
 
 ## Mergen
 
 <pre>
-  <kbd>e</kbd>: Verander bestand
-  <kbd>o</kbd>: Open bestand
-  <kbd>&lt;left&gt;</kbd>: Selecteer voorgaand conflict
-  <kbd>&lt;right&gt;</kbd>: Selecteer volgende conflict
-  <kbd>&lt;up&gt;</kbd>: Selecteer bovenste hunk
-  <kbd>&lt;down&gt;</kbd>: Selecteer onderste hunk
-  <kbd>z</kbd>: Ongedaan maken
-  <kbd>M</kbd>: Open external merge tool (git mergetool)
-  <kbd>&lt;space&gt;</kbd>: Kies stuk
-  <kbd>b</kbd>: Kies beide stukken
-  <kbd>&lt;esc&gt;</kbd>: Ga terug naar het bestanden paneel
+  <kbd>e</kbd>: verander bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>&lt;left&gt;</kbd>: selecteer voorgaand conflict
+  <kbd>&lt;right&gt;</kbd>: selecteer volgende conflict
+  <kbd>&lt;up&gt;</kbd>: selecteer bovenste hunk
+  <kbd>&lt;down&gt;</kbd>: selecteer onderste hunk
+  <kbd>z</kbd>: ongedaan maken
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>&lt;space&gt;</kbd>: kies hunk
+  <kbd>b</kbd>: kies bijde hunks
+  <kbd>&lt;esc&gt;</kbd>: ga terug naar het bestanden paneel
 </pre>
 
 ## Normaal
 
 <pre>
-  <kbd>mouse wheel down</kbd>: Scroll omlaag (fn+up)
-  <kbd>mouse wheel up</kbd>: Scroll omhoog (fn+down)
+  <kbd>mouse wheel down</kbd>: scroll omlaag (fn+up)
+  <kbd>mouse wheel up</kbd>: scroll omhoog (fn+down)
 </pre>
 
-## Patch bouwen
+## Patch Bouwen
 
 <pre>
-  <kbd>&lt;left&gt;</kbd>: Selecteer de vorige hunk
-  <kbd>&lt;right&gt;</kbd>: Selecteer de volgende hunk
-  <kbd>v</kbd>: Toggle drag selecteer
-  <kbd>V</kbd>: Toggle drag selecteer
-  <kbd>a</kbd>: Toggle selecteer hunk
-  <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
-  <kbd>o</kbd>: Open bestand
-  <kbd>e</kbd>: Verander bestand
-  <kbd>&lt;space&gt;</kbd>: Voeg toe/verwijder lijn(en) in patch
-  <kbd>&lt;esc&gt;</kbd>: Sluit lijn-bij-lijn modus
-  <kbd>/</kbd>: Start met zoeken
+  <kbd>&lt;left&gt;</kbd>: selecteer de vorige hunk
+  <kbd>&lt;right&gt;</kbd>: selecteer de volgende hunk
+  <kbd>v</kbd>: toggle drag selecteer
+  <kbd>V</kbd>: toggle drag selecteer
+  <kbd>a</kbd>: toggle selecteer hunk
+  <kbd>&lt;c-o&gt;</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open bestand
+  <kbd>e</kbd>: verander bestand
+  <kbd>&lt;space&gt;</kbd>: voeg toe/verwijder lijn(en) in patch
+  <kbd>&lt;esc&gt;</kbd>: sluit lijn-bij-lijn modus
 </pre>
 
 ## Reflog
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Creëer nieuwe branch van commit
-  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>c</kbd>: Kopieer commit (cherry-pick)
-  <kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie
-  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: kopieer commit SHA naar klembord
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: creëer nieuwe branch van commit
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>c</kbd>: kopieer commit (cherry-pick)
+  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (gekopieerde) commits selectie
+  <kbd>&lt;enter&gt;</kbd>: bekijk commits
 </pre>
 
-## Remote branches
+## Remote Branches
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer branch name naar klembord
-  <kbd>&lt;space&gt;</kbd>: Uitchecken
-  <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>u</kbd>: Stel in als upstream van uitgecheckte branch
-  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: kopieer branch name naar klembord
+  <kbd>&lt;space&gt;</kbd>: uitchecken
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>M</kbd>: merge in met huidige checked out branch
+  <kbd>r</kbd>: rebase branch
+  <kbd>d</kbd>: verwijder branch
+  <kbd>u</kbd>: stel in als upstream van uitgecheckte branch
+  <kbd>&lt;esc&gt;</kbd>: ga terug naar remotes lijst
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>&lt;enter&gt;</kbd>: bekijk commits
 </pre>
 
 ## Remotes
 
 <pre>
-  <kbd>f</kbd>: Fetch remote
-  <kbd>n</kbd>: Voeg een nieuwe remote toe
-  <kbd>d</kbd>: Verwijder remote
-  <kbd>e</kbd>: Wijzig remote
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>f</kbd>: fetch remote
+  <kbd>n</kbd>: voeg een nieuwe remote toe
+  <kbd>d</kbd>: verwijder remote
+  <kbd>e</kbd>: wijzig remote
 </pre>
 
 ## Staging
 
 <pre>
-  <kbd>&lt;left&gt;</kbd>: Selecteer de vorige hunk
-  <kbd>&lt;right&gt;</kbd>: Selecteer de volgende hunk
-  <kbd>v</kbd>: Toggle drag selecteer
-  <kbd>V</kbd>: Toggle drag selecteer
-  <kbd>a</kbd>: Toggle selecteer hunk
-  <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
-  <kbd>o</kbd>: Open bestand
-  <kbd>e</kbd>: Verander bestand
-  <kbd>&lt;esc&gt;</kbd>: Ga terug naar het bestanden paneel
-  <kbd>&lt;tab&gt;</kbd>: Ga naar een ander paneel
-  <kbd>&lt;space&gt;</kbd>: Toggle lijnen staged / unstaged
-  <kbd>d</kbd>: Verwijdert change (git reset)
-  <kbd>E</kbd>: Edit hunk
-  <kbd>c</kbd>: Commit veranderingen
-  <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook
-  <kbd>C</kbd>: Commit veranderingen met de git editor
-  <kbd>/</kbd>: Start met zoeken
+  <kbd>&lt;left&gt;</kbd>: selecteer de vorige hunk
+  <kbd>&lt;right&gt;</kbd>: selecteer de volgende hunk
+  <kbd>v</kbd>: toggle drag selecteer
+  <kbd>V</kbd>: toggle drag selecteer
+  <kbd>a</kbd>: toggle selecteer hunk
+  <kbd>&lt;c-o&gt;</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open bestand
+  <kbd>e</kbd>: verander bestand
+  <kbd>&lt;esc&gt;</kbd>: ga terug naar het bestanden paneel
+  <kbd>&lt;tab&gt;</kbd>: ga naar een ander paneel
+  <kbd>&lt;space&gt;</kbd>: toggle lijnen staged / unstaged
+  <kbd>d</kbd>: verwijdert change (git reset)
+  <kbd>E</kbd>: edit hunk
+  <kbd>c</kbd>: commit veranderingen
+  <kbd>w</kbd>: commit veranderingen zonder pre-commit hook
+  <kbd>C</kbd>: commit veranderingen met de git editor
 </pre>
 
 ## Stash
 
 <pre>
-  <kbd>&lt;space&gt;</kbd>: Toepassen
-  <kbd>g</kbd>: Pop
-  <kbd>d</kbd>: Laten vallen
-  <kbd>n</kbd>: Nieuwe branch
-  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;space&gt;</kbd>: toepassen
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: laten vallen
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>r</kbd>: rename stash
+  <kbd>&lt;enter&gt;</kbd>: bekijk gecommite bestanden
 </pre>
 
 ## Status
 
 <pre>
-  <kbd>o</kbd>: Open config bestand
-  <kbd>e</kbd>: Verander config bestand
-  <kbd>u</kbd>: Check voor updates
-  <kbd>&lt;enter&gt;</kbd>: Wissel naar een recente repo
-  <kbd>a</kbd>: Alle logs van de branch laten zien
+  <kbd>o</kbd>: open config bestand
+  <kbd>e</kbd>: verander config bestand
+  <kbd>u</kbd>: check voor updates
+  <kbd>&lt;enter&gt;</kbd>: wissel naar een recente repo
+  <kbd>a</kbd>: alle logs van de branch laten zien
 </pre>
 
 ## Sub-commits
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Creëer nieuwe branch van commit
-  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>c</kbd>: Kopieer commit (cherry-pick)
-  <kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie
-  <kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden
-  <kbd>/</kbd>: Start met zoeken
+  <kbd>&lt;c-o&gt;</kbd>: kopieer commit SHA naar klembord
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: creëer nieuwe branch van commit
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>c</kbd>: kopieer commit (cherry-pick)
+  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (gekopieerde) commits selectie
+  <kbd>&lt;enter&gt;</kbd>: bekijk gecommite bestanden
 </pre>
 
 ## Submodules
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Kopieer submodule naam naar klembord
-  <kbd>&lt;enter&gt;</kbd>: Enter submodule
-  <kbd>&lt;space&gt;</kbd>: Enter submodule
-  <kbd>d</kbd>: Remove submodule
-  <kbd>u</kbd>: Update submodule
-  <kbd>n</kbd>: Voeg nieuwe submodule toe
-  <kbd>e</kbd>: Update submodule URL
-  <kbd>i</kbd>: Initialiseer submodule
-  <kbd>b</kbd>: Bekijk bulk submodule opties
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: kopieer submodule naam naar klembord
+  <kbd>&lt;enter&gt;</kbd>: enter submodule
+  <kbd>d</kbd>: remove submodule
+  <kbd>u</kbd>: update submodule
+  <kbd>n</kbd>: voeg nieuwe submodule toe
+  <kbd>e</kbd>: update submodule URL
+  <kbd>i</kbd>: initialiseer submodule
+  <kbd>b</kbd>: bekijk bulk submodule opties
 </pre>
 
 ## Tags
 
 <pre>
-  <kbd>&lt;space&gt;</kbd>: Uitchecken
-  <kbd>d</kbd>: View delete options
-  <kbd>P</kbd>: Push tag
-  <kbd>n</kbd>: Creëer tag
-  <kbd>g</kbd>: Bekijk reset opties
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;space&gt;</kbd>: uitchecken
+  <kbd>d</kbd>: verwijder tag
+  <kbd>P</kbd>: push tag
+  <kbd>n</kbd>: creëer tag
+  <kbd>g</kbd>: bekijk reset opties
+  <kbd>&lt;enter&gt;</kbd>: bekijk commits
 </pre>

docs/keybindings/Keybindings_pl.md

@@ -7,347 +7,314 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 ## Globalne
 
 <pre>
-  <kbd>&lt;c-r&gt;</kbd>: Switch to a recent repo
-  <kbd>&lt;pgup&gt;</kbd>: Scroll up main panel (fn+up/shift+k)
-  <kbd>&lt;pgdown&gt;</kbd>: Scroll down main panel (fn+down/shift+j)
-  <kbd>@</kbd>: Open command log menu
+  <kbd>&lt;c-r&gt;</kbd>: switch to a recent repo
+  <kbd>&lt;pgup&gt;</kbd>: scroll up main panel (fn+up/shift+k)
+  <kbd>&lt;pgdown&gt;</kbd>: scroll down main panel (fn+down/shift+j)
+  <kbd>@</kbd>: open command log menu
   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
-  <kbd>:</kbd>: Wykonaj własną komendę
-  <kbd>&lt;c-p&gt;</kbd>: View custom patch options
-  <kbd>m</kbd>: Widok scalenia/opcje zmiany bazy
-  <kbd>R</kbd>: Odśwież
-  <kbd>+</kbd>: Next screen mode (normal/half/fullscreen)
-  <kbd>_</kbd>: Prev screen mode
-  <kbd>?</kbd>: Open menu
-  <kbd>&lt;c-s&gt;</kbd>: View filter-by-path options
-  <kbd>W</kbd>: Open diff menu
-  <kbd>&lt;c-e&gt;</kbd>: Open diff menu
+  <kbd>:</kbd>: wykonaj własną komendę
+  <kbd>&lt;c-p&gt;</kbd>: view custom patch options
+  <kbd>m</kbd>: widok scalenia/opcje zmiany bazy
+  <kbd>R</kbd>: odśwież
+  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
+  <kbd>_</kbd>: prev screen mode
+  <kbd>?</kbd>: open menu
+  <kbd>&lt;c-s&gt;</kbd>: view filter-by-path options
+  <kbd>W</kbd>: open diff menu
+  <kbd>&lt;c-e&gt;</kbd>: open diff menu
   <kbd>&lt;c-w&gt;</kbd>: Toggle whether or not whitespace changes are shown in the diff view
-  <kbd>z</kbd>: Undo
-  <kbd>&lt;c-z&gt;</kbd>: Redo
-  <kbd>P</kbd>: Push
-  <kbd>p</kbd>: Pull
+  <kbd>z</kbd>: undo (via reflog) (experimental)
+  <kbd>&lt;c-z&gt;</kbd>: redo (via reflog) (experimental)
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
 </pre>
 
-## List panel navigation
+## List Panel Navigation
 
 <pre>
-  <kbd>,</kbd>: Previous page
-  <kbd>.</kbd>: Next page
-  <kbd>&lt;</kbd>: Scroll to top
-  <kbd>&gt;</kbd>: Scroll to bottom
-  <kbd>/</kbd>: Search the current view by text
-  <kbd>H</kbd>: Scroll left
-  <kbd>L</kbd>: Scroll right
-  <kbd>]</kbd>: Next tab
-  <kbd>[</kbd>: Previous tab
+  <kbd>,</kbd>: previous page
+  <kbd>.</kbd>: next page
+  <kbd>&lt;</kbd>: scroll to top
+  <kbd>/</kbd>: start search
+  <kbd>&gt;</kbd>: scroll to bottom
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
 </pre>
 
-## Commit summary
+## Commit Summary
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Potwierdź
-  <kbd>&lt;esc&gt;</kbd>: Zamknij
+  <kbd>&lt;enter&gt;</kbd>: potwierdź
+  <kbd>&lt;esc&gt;</kbd>: zamknij
 </pre>
 
 ## Commity
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>b</kbd>: View bisect options
-  <kbd>s</kbd>: Ściśnij
-  <kbd>f</kbd>: Napraw commit
-  <kbd>r</kbd>: Zmień nazwę commita
-  <kbd>R</kbd>: Zmień nazwę commita w edytorze
-  <kbd>d</kbd>: Usuń commit
-  <kbd>e</kbd>: Edytuj commit
-  <kbd>p</kbd>: Wybierz commit (podczas zmiany bazy)
-  <kbd>F</kbd>: Utwórz commit naprawczy dla tego commita
-  <kbd>S</kbd>: Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
-  <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
-  <kbd>T</kbd>: Tag commit
-  <kbd>&lt;c-l&gt;</kbd>: Open log menu
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Create new branch off of commit
-  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>c</kbd>: Kopiuj commit (przebieranie)
-  <kbd>C</kbd>: Kopiuj zakres commitów (przebieranie)
-  <kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>b</kbd>: view bisect options
+  <kbd>s</kbd>: ściśnij
+  <kbd>f</kbd>: napraw commit
+  <kbd>r</kbd>: zmień nazwę commita
+  <kbd>R</kbd>: zmień nazwę commita w edytorze
+  <kbd>d</kbd>: usuń commit
+  <kbd>e</kbd>: edytuj commit
+  <kbd>p</kbd>: wybierz commit (podczas zmiany bazy)
+  <kbd>F</kbd>: utwórz commit naprawczy dla tego commita
+  <kbd>S</kbd>: spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
+  <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>A</kbd>: popraw commit zmianami z poczekalni
+  <kbd>a</kbd>: reset commit author
+  <kbd>t</kbd>: odwróć commit
+  <kbd>T</kbd>: tag commit
+  <kbd>&lt;c-l&gt;</kbd>: open log menu
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>c</kbd>: kopiuj commit (przebieranie)
+  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
+  <kbd>&lt;enter&gt;</kbd>: przeglądaj pliki commita
 </pre>
 
-## Confirmation panel
+## Confirmation Panel
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Potwierdź
-  <kbd>&lt;esc&gt;</kbd>: Zamknij
+  <kbd>&lt;enter&gt;</kbd>: potwierdź
+  <kbd>&lt;esc&gt;</kbd>: zamknij
 </pre>
 
-## Local branches
+## Local Branches
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard
-  <kbd>i</kbd>: Show git-flow options
-  <kbd>&lt;space&gt;</kbd>: Przełącz
-  <kbd>n</kbd>: Nowa gałąź
-  <kbd>o</kbd>: Utwórz żądanie pobrania
-  <kbd>O</kbd>: Utwórz opcje żądania ściągnięcia
-  <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>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>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy branch name to clipboard
+  <kbd>i</kbd>: show git-flow options
+  <kbd>&lt;space&gt;</kbd>: przełącz
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>o</kbd>: utwórz żądanie pobrania
+  <kbd>O</kbd>: utwórz opcje żądania ściągnięcia
+  <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>: 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>: set/unset upstream
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
-## Main panel (patch building)
+## Main Panel (Patch Building)
 
 <pre>
-  <kbd>&lt;left&gt;</kbd>: Poprzedni kawałek
-  <kbd>&lt;right&gt;</kbd>: Następny kawałek
-  <kbd>v</kbd>: Toggle drag select
-  <kbd>V</kbd>: Toggle drag select
-  <kbd>a</kbd>: Toggle select hunk
-  <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
-  <kbd>o</kbd>: Otwórz plik
-  <kbd>e</kbd>: Edytuj plik
-  <kbd>&lt;space&gt;</kbd>: Add/Remove line(s) to patch
-  <kbd>&lt;esc&gt;</kbd>: Wyście z trybu "linia po linii"
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;left&gt;</kbd>: poprzedni kawałek
+  <kbd>&lt;right&gt;</kbd>: następny kawałek
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>&lt;c-o&gt;</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: otwórz plik
+  <kbd>e</kbd>: edytuj plik
+  <kbd>&lt;space&gt;</kbd>: add/remove line(s) to patch
+  <kbd>&lt;esc&gt;</kbd>: wyście z trybu "linia po linii"
 </pre>
 
 ## Menu
 
 <pre>
-  <kbd>&lt;enter&gt;</kbd>: Wykonaj
-  <kbd>&lt;esc&gt;</kbd>: Zamknij
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;enter&gt;</kbd>: wykonaj
+  <kbd>&lt;esc&gt;</kbd>: zamknij
 </pre>
 
 ## Pliki
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy the file name to the clipboard
-  <kbd>d</kbd>: Pokaż opcje porzucania zmian
-  <kbd>&lt;space&gt;</kbd>: Przełącz stan poczekalni
-  <kbd>&lt;c-b&gt;</kbd>: Filter files by status
+  <kbd>&lt;c-o&gt;</kbd>: copy the file name to the clipboard
+  <kbd>d</kbd>: pokaż opcje porzucania zmian
+  <kbd>&lt;space&gt;</kbd>: przełącz stan poczekalni
+  <kbd>&lt;c-b&gt;</kbd>: Filter files (staged/unstaged)
   <kbd>c</kbd>: Zatwierdź zmiany
-  <kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit
+  <kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
   <kbd>A</kbd>: Zmień ostatni commit
   <kbd>C</kbd>: Zatwierdź zmiany używając edytora
-  <kbd>e</kbd>: Edytuj plik
-  <kbd>o</kbd>: Otwórz plik
-  <kbd>i</kbd>: Ignore or exclude file
-  <kbd>r</kbd>: Odśwież pliki
-  <kbd>s</kbd>: Przechowaj zmiany
-  <kbd>S</kbd>: Wyświetl opcje schowka
-  <kbd>a</kbd>: Przełącz stan poczekalni wszystkich
-  <kbd>&lt;enter&gt;</kbd>: Zatwierdź pojedyncze linie
-  <kbd>g</kbd>: View upstream reset options
-  <kbd>D</kbd>: Wyświetl opcje resetu
-  <kbd>`</kbd>: Toggle file tree view
-  <kbd>M</kbd>: Open external merge tool (git mergetool)
-  <kbd>f</kbd>: Pobierz
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>e</kbd>: edytuj plik
+  <kbd>o</kbd>: otwórz plik
+  <kbd>i</kbd>: ignore or exclude file
+  <kbd>r</kbd>: odśwież pliki
+  <kbd>s</kbd>: przechowaj zmiany
+  <kbd>S</kbd>: wyświetl opcje schowka
+  <kbd>a</kbd>: przełącz stan poczekalni wszystkich
+  <kbd>&lt;enter&gt;</kbd>: zatwierdź pojedyncze linie
+  <kbd>g</kbd>: view upstream reset options
+  <kbd>D</kbd>: wyświetl opcje resetu
+  <kbd>`</kbd>: toggle file tree view
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>f</kbd>: pobierz
 </pre>
 
 ## Pliki commita
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy the committed file name to the clipboard
-  <kbd>c</kbd>: Plik wybierania
-  <kbd>d</kbd>: Porzuć zmiany commita dla tego pliku
-  <kbd>o</kbd>: Otwórz plik
-  <kbd>e</kbd>: Edytuj plik
-  <kbd>&lt;space&gt;</kbd>: Toggle file included in patch
-  <kbd>a</kbd>: Toggle all files included in patch
-  <kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
-  <kbd>`</kbd>: Toggle file tree view
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy the committed file name to the clipboard
+  <kbd>c</kbd>: plik wybierania
+  <kbd>d</kbd>: porzuć zmiany commita dla tego pliku
+  <kbd>o</kbd>: otwórz plik
+  <kbd>e</kbd>: edytuj plik
+  <kbd>&lt;space&gt;</kbd>: toggle file included in patch
+  <kbd>a</kbd>: toggle all files included in patch
+  <kbd>&lt;enter&gt;</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
+  <kbd>`</kbd>: toggle file tree view
 </pre>
 
 ## Poczekalnia
 
 <pre>
-  <kbd>&lt;left&gt;</kbd>: Poprzedni kawałek
-  <kbd>&lt;right&gt;</kbd>: Następny kawałek
-  <kbd>v</kbd>: Toggle drag select
-  <kbd>V</kbd>: Toggle drag select
-  <kbd>a</kbd>: Toggle select hunk
-  <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
-  <kbd>o</kbd>: Otwórz plik
-  <kbd>e</kbd>: Edytuj plik
-  <kbd>&lt;esc&gt;</kbd>: Wróć do panelu plików
-  <kbd>&lt;tab&gt;</kbd>: Switch to other panel (staged/unstaged changes)
-  <kbd>&lt;space&gt;</kbd>: Toggle line staged / unstaged
-  <kbd>d</kbd>: Discard change (git reset)
-  <kbd>E</kbd>: Edit hunk
+  <kbd>&lt;left&gt;</kbd>: poprzedni kawałek
+  <kbd>&lt;right&gt;</kbd>: następny kawałek
+  <kbd>v</kbd>: toggle drag select
+  <kbd>V</kbd>: toggle drag select
+  <kbd>a</kbd>: toggle select hunk
+  <kbd>&lt;c-o&gt;</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: otwórz plik
+  <kbd>e</kbd>: edytuj plik
+  <kbd>&lt;esc&gt;</kbd>: wróć do panelu plików
+  <kbd>&lt;tab&gt;</kbd>: switch to other panel (staged/unstaged changes)
+  <kbd>&lt;space&gt;</kbd>: toggle line staged / unstaged
+  <kbd>d</kbd>: delete change (git reset)
+  <kbd>E</kbd>: edit hunk
   <kbd>c</kbd>: Zatwierdź zmiany
-  <kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit
+  <kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
   <kbd>C</kbd>: Zatwierdź zmiany używając edytora
-  <kbd>/</kbd>: Search the current view by text
 </pre>
 
 ## Reflog
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Create new branch off of commit
-  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>c</kbd>: Kopiuj commit (przebieranie)
-  <kbd>C</kbd>: Kopiuj zakres commitów (przebieranie)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>c</kbd>: kopiuj commit (przebieranie)
+  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
-## Remote branches
+## Remote Branches
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard
-  <kbd>&lt;space&gt;</kbd>: Przełącz
-  <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>u</kbd>: Set as upstream of checked-out branch
-  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy branch name to clipboard
+  <kbd>&lt;space&gt;</kbd>: przełącz
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>M</kbd>: scal do obecnej gałęzi
+  <kbd>r</kbd>: zmiana bazy gałęzi
+  <kbd>d</kbd>: usuń gałąź
+  <kbd>u</kbd>: set as upstream of checked-out branch
+  <kbd>&lt;esc&gt;</kbd>: wróć do listy repozytoriów zdalnych
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
 ## Remotes
 
 <pre>
-  <kbd>f</kbd>: Fetch remote
-  <kbd>n</kbd>: Add new remote
-  <kbd>d</kbd>: Remove remote
-  <kbd>e</kbd>: Edit remote
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>f</kbd>: fetch remote
+  <kbd>n</kbd>: add new remote
+  <kbd>d</kbd>: remove remote
+  <kbd>e</kbd>: edit remote
 </pre>
 
 ## Scalanie
 
 <pre>
-  <kbd>e</kbd>: Edytuj plik
-  <kbd>o</kbd>: Otwórz plik
-  <kbd>&lt;left&gt;</kbd>: Poprzedni konflikt
-  <kbd>&lt;right&gt;</kbd>: Następny konflikt
-  <kbd>&lt;up&gt;</kbd>: Wybierz poprzedni kawałek
-  <kbd>&lt;down&gt;</kbd>: Wybierz następny kawałek
-  <kbd>z</kbd>: Cofnij
-  <kbd>M</kbd>: Open external merge tool (git mergetool)
-  <kbd>&lt;space&gt;</kbd>: Wybierz kawałek
-  <kbd>b</kbd>: Wybierz oba kawałki
-  <kbd>&lt;esc&gt;</kbd>: Wróć do panelu plików
+  <kbd>e</kbd>: edytuj plik
+  <kbd>o</kbd>: otwórz plik
+  <kbd>&lt;left&gt;</kbd>: poprzedni konflikt
+  <kbd>&lt;right&gt;</kbd>: następny konflikt
+  <kbd>&lt;up&gt;</kbd>: wybierz poprzedni kawałek
+  <kbd>&lt;down&gt;</kbd>: wybierz następny kawałek
+  <kbd>z</kbd>: cofnij
+  <kbd>M</kbd>: open external merge tool (git mergetool)
+  <kbd>&lt;space&gt;</kbd>: wybierz kawałek
+  <kbd>b</kbd>: wybierz wszystkie kawałki
+  <kbd>&lt;esc&gt;</kbd>: wróć do panelu plików
 </pre>
 
 ## Schowek
 
 <pre>
-  <kbd>&lt;space&gt;</kbd>: Zastosuj
-  <kbd>g</kbd>: Wyciągnij
-  <kbd>d</kbd>: Porzuć
-  <kbd>n</kbd>: Nowa gałąź
-  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;space&gt;</kbd>: zastosuj
+  <kbd>g</kbd>: wyciągnij
+  <kbd>d</kbd>: porzuć
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>r</kbd>: rename stash
+  <kbd>&lt;enter&gt;</kbd>: przeglądaj pliki commita
 </pre>
 
 ## Status
 
 <pre>
-  <kbd>o</kbd>: Otwórz konfigurację
-  <kbd>e</kbd>: Edytuj konfigurację
-  <kbd>u</kbd>: Sprawdź aktualizacje
-  <kbd>&lt;enter&gt;</kbd>: Switch to a recent repo
-  <kbd>a</kbd>: Pokaż wszystkie logi gałęzi
+  <kbd>o</kbd>: otwórz konfigurację
+  <kbd>e</kbd>: edytuj konfigurację
+  <kbd>u</kbd>: sprawdź aktualizacje
+  <kbd>&lt;enter&gt;</kbd>: switch to a recent repo
+  <kbd>a</kbd>: pokaż wszystkie logi gałęzi
 </pre>
 
 ## Sub-commits
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Checkout commit
-  <kbd>y</kbd>: Copy commit attribute
-  <kbd>o</kbd>: Open commit in browser
-  <kbd>n</kbd>: Create new branch off of commit
-  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>c</kbd>: Kopiuj commit (przebieranie)
-  <kbd>C</kbd>: Kopiuj zakres commitów (przebieranie)
-  <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
-  <kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita
-  <kbd>/</kbd>: Search the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;space&gt;</kbd>: checkout commit
+  <kbd>y</kbd>: copy commit attribute
+  <kbd>o</kbd>: open commit in browser
+  <kbd>n</kbd>: create new branch off of commit
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>c</kbd>: kopiuj commit (przebieranie)
+  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
+  <kbd>&lt;c-r&gt;</kbd>: reset cherry-picked (copied) commits selection
+  <kbd>&lt;enter&gt;</kbd>: przeglądaj pliki commita
 </pre>
 
 ## Submodules
 
 <pre>
-  <kbd>&lt;c-o&gt;</kbd>: Copy submodule name to clipboard
-  <kbd>&lt;enter&gt;</kbd>: Enter submodule
-  <kbd>&lt;space&gt;</kbd>: Enter submodule
-  <kbd>d</kbd>: Remove submodule
-  <kbd>u</kbd>: Update submodule
-  <kbd>n</kbd>: Add new submodule
-  <kbd>e</kbd>: Update submodule URL
-  <kbd>i</kbd>: Initialize submodule
-  <kbd>b</kbd>: View bulk submodule options
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;c-o&gt;</kbd>: copy submodule name to clipboard
+  <kbd>&lt;enter&gt;</kbd>: enter submodule
+  <kbd>d</kbd>: remove submodule
+  <kbd>u</kbd>: update submodule
+  <kbd>n</kbd>: add new submodule
+  <kbd>e</kbd>: update submodule URL
+  <kbd>i</kbd>: initialize submodule
+  <kbd>b</kbd>: view bulk submodule options
 </pre>
 
 ## Tags
 
 <pre>
-  <kbd>&lt;space&gt;</kbd>: Przełącz
-  <kbd>d</kbd>: View delete options
-  <kbd>P</kbd>: Push tag
-  <kbd>n</kbd>: Create tag
-  <kbd>g</kbd>: Wyświetl opcje resetu
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: View commits
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
+  <kbd>&lt;space&gt;</kbd>: przełącz
+  <kbd>d</kbd>: delete tag
+  <kbd>P</kbd>: push tag
+  <kbd>n</kbd>: create tag
+  <kbd>g</kbd>: wyświetl opcje resetu
+  <kbd>&lt;enter&gt;</kbd>: view commits
 </pre>
 
 ## Zwykłe
 
 <pre>
-  <kbd>mouse wheel down</kbd>: Przewiń w dół (fn+up)
-  <kbd>mouse wheel up</kbd>: Przewiń w górę (fn+down)
+  <kbd>mouse wheel down</kbd>: przewiń w dół (fn+up)
+  <kbd>mouse wheel up</kbd>: przewiń w górę (fn+down)
 </pre>

docs/keybindings/Keybindings_ru.md

@@ -1,353 +0,0 @@
-_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 Связки клавиш
-
-_Связки клавиш_
-
-## Глобальные сочетания клавиш
-
-<pre>
-  <kbd>&lt;c-r&gt;</kbd>: Переключиться на последний репозиторий
-  <kbd>&lt;pgup&gt;</kbd>: Прокрутить вверх главную панель (fn+up/shift+k)
-  <kbd>&lt;pgdown&gt;</kbd>: Прокрутить вниз главную панель (fn+down/shift+j)
-  <kbd>@</kbd>: Открыть меню журнала команд
-  <kbd>}</kbd>: Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении
-  <kbd>{</kbd>: Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении
-  <kbd>:</kbd>: Выполнить пользовательскую команду
-  <kbd>&lt;c-p&gt;</kbd>: Просмотреть пользовательские параметры патча
-  <kbd>m</kbd>: Просмотреть параметры слияния/перебазирования
-  <kbd>R</kbd>: Обновить
-  <kbd>+</kbd>: Следующий режим экрана (нормальный/полуэкранный/полноэкранный)
-  <kbd>_</kbd>: Предыдущий режим экрана
-  <kbd>?</kbd>: Открыть меню
-  <kbd>&lt;c-s&gt;</kbd>: Просмотреть параметры фильтрации по пути
-  <kbd>W</kbd>: Открыть меню сравнении
-  <kbd>&lt;c-e&gt;</kbd>: Открыть меню сравнении
-  <kbd>&lt;c-w&gt;</kbd>: Переключить отображение изменении пробелов в просмотрщике сравнении
-  <kbd>z</kbd>: Отменить (через reflog) (экспериментальный)
-  <kbd>&lt;c-z&gt;</kbd>: Повторить (через reflog) (экспериментальный)
-  <kbd>P</kbd>: Отправить изменения
-  <kbd>p</kbd>: Получить и слить изменения
-</pre>
-
-## Навигация по панели списка
-
-<pre>
-  <kbd>,</kbd>: Предыдущая страница
-  <kbd>.</kbd>: Следующая страница
-  <kbd>&lt;</kbd>: Пролистать наверх
-  <kbd>&gt;</kbd>: Прокрутить вниз
-  <kbd>/</kbd>: Найти
-  <kbd>H</kbd>: Прокрутить влево
-  <kbd>L</kbd>: Прокрутить вправо
-  <kbd>]</kbd>: Следующая вкладка
-  <kbd>[</kbd>: Предыдущая вкладка
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Главная панель (Индексирование)
-
-<pre>
-  <kbd>&lt;left&gt;</kbd>: Выбрать предыдущую часть
-  <kbd>&lt;right&gt;</kbd>: Выбрать следующую часть
-  <kbd>v</kbd>: Переключить выборку перетаскивания
-  <kbd>V</kbd>: Переключить выборку перетаскивания
-  <kbd>a</kbd>: Переключить выборку частей
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать выделенный текст в буфер обмена
-  <kbd>o</kbd>: Открыть файл
-  <kbd>e</kbd>: Редактировать файл
-  <kbd>&lt;esc&gt;</kbd>: Вернуться к панели файлов
-  <kbd>&lt;tab&gt;</kbd>: Переключиться на другую панель (проиндексированные/непроиндексированные изменения)
-  <kbd>&lt;space&gt;</kbd>: Переключить строку в проиндексированные / непроиндексированные
-  <kbd>d</kbd>: Отменить изменение (git reset)
-  <kbd>E</kbd>: Изменить эту часть
-  <kbd>c</kbd>: Сохранить изменения
-  <kbd>w</kbd>: Закоммитить изменения без предварительного хука коммита
-  <kbd>C</kbd>: Сохранить изменения с помощью редактора git
-  <kbd>/</kbd>: Найти
-</pre>
-
-## Главная панель (Обычный)
-
-<pre>
-  <kbd>mouse wheel down</kbd>: Прокрутить вниз (fn+up)
-  <kbd>mouse wheel up</kbd>: Прокрутить вверх (fn+down)
-</pre>
-
-## Главная панель (Слияние)
-
-<pre>
-  <kbd>e</kbd>: Редактировать файл
-  <kbd>o</kbd>: Открыть файл
-  <kbd>&lt;left&gt;</kbd>: Выбрать предыдущий конфликт
-  <kbd>&lt;right&gt;</kbd>: Выбрать следующий конфликт
-  <kbd>&lt;up&gt;</kbd>: Выбрать предыдущую часть
-  <kbd>&lt;down&gt;</kbd>: Выбрать следующую часть
-  <kbd>z</kbd>: Отменить
-  <kbd>M</kbd>: Открыть внешний инструмент слияния (git mergetool)
-  <kbd>&lt;space&gt;</kbd>: Выбрать эту часть
-  <kbd>b</kbd>: Выбрать все части
-  <kbd>&lt;esc&gt;</kbd>: Вернуться к панели файлов
-</pre>
-
-## Главная панель (сборка патчей)
-
-<pre>
-  <kbd>&lt;left&gt;</kbd>: Выбрать предыдущую часть
-  <kbd>&lt;right&gt;</kbd>: Выбрать следующую часть
-  <kbd>v</kbd>: Переключить выборку перетаскивания
-  <kbd>V</kbd>: Переключить выборку перетаскивания
-  <kbd>a</kbd>: Переключить выборку частей
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать выделенный текст в буфер обмена
-  <kbd>o</kbd>: Открыть файл
-  <kbd>e</kbd>: Редактировать файл
-  <kbd>&lt;space&gt;</kbd>: Добавить/удалить строку(и) для патча
-  <kbd>&lt;esc&gt;</kbd>: Выйти из сборщика пользовательских патчей
-  <kbd>/</kbd>: Найти
-</pre>
-
-## Журнал ссылок (Reflog)
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Переключить коммит
-  <kbd>y</kbd>: Скопировать атрибут коммита
-  <kbd>o</kbd>: Открыть коммит в браузере
-  <kbd>n</kbd>: Создать новую ветку с этого коммита
-  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>c</kbd>: Скопировать отобранные коммит (cherry-pick)
-  <kbd>C</kbd>: Скопировать несколько отобранных коммитов (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Коммиты
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена
-  <kbd>&lt;c-r&gt;</kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов
-  <kbd>b</kbd>: Просмотреть параметры бинарного поиска
-  <kbd>s</kbd>: Объединить несколько коммитов в один нижний
-  <kbd>f</kbd>: Объединить несколько коммитов в один отбросив сообщение коммита
-  <kbd>r</kbd>: Перефразировать коммит
-  <kbd>R</kbd>: Переписать коммит с помощью редактора
-  <kbd>d</kbd>: Удалить коммит
-  <kbd>e</kbd>: Изменить коммит
-  <kbd>p</kbd>: Выбрать коммит (в середине перебазирования)
-  <kbd>F</kbd>: Создать fixup коммит для этого коммита
-  <kbd>S</kbd>: Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение)
-  <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>: Отменить коммит
-  <kbd>T</kbd>: Пометить коммит тегом
-  <kbd>&lt;c-l&gt;</kbd>: Открыть меню журнала
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Переключить коммит
-  <kbd>y</kbd>: Скопировать атрибут коммита
-  <kbd>o</kbd>: Открыть коммит в браузере
-  <kbd>n</kbd>: Создать новую ветку с этого коммита
-  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>c</kbd>: Скопировать отобранные коммит (cherry-pick)
-  <kbd>C</kbd>: Скопировать несколько отобранных коммитов (cherry-pick)
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента
-  <kbd>/</kbd>: Найти
-</pre>
-
-## Локальные Ветки
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать название ветки в буфер обмена
-  <kbd>i</kbd>: Показать параметры git-flow
-  <kbd>&lt;space&gt;</kbd>: Переключить
-  <kbd>n</kbd>: Новая ветка
-  <kbd>o</kbd>: Создать запрос на принятие изменений
-  <kbd>O</kbd>: Создать параметры запроса принятие изменений
-  <kbd>&lt;c-y&gt;</kbd>: Скопировать URL запроса на принятие изменений в буфер обмена
-  <kbd>c</kbd>: Переключить по названию
-  <kbd>F</kbd>: Принудительное переключение
-  <kbd>d</kbd>: View delete options
-  <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>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Меню
-
-<pre>
-  <kbd>&lt;enter&gt;</kbd>: Выполнить
-  <kbd>&lt;esc&gt;</kbd>: Закрыть
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Панель Подтверждения
-
-<pre>
-  <kbd>&lt;enter&gt;</kbd>: Подтвердить
-  <kbd>&lt;esc&gt;</kbd>: Закрыть/отменить
-</pre>
-
-## Подкоммиты
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: Переключить коммит
-  <kbd>y</kbd>: Скопировать атрибут коммита
-  <kbd>o</kbd>: Открыть коммит в браузере
-  <kbd>n</kbd>: Создать новую ветку с этого коммита
-  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>c</kbd>: Скопировать отобранные коммит (cherry-pick)
-  <kbd>C</kbd>: Скопировать несколько отобранных коммитов (cherry-pick)
-  <kbd>&lt;c-r&gt;</kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента
-  <kbd>/</kbd>: Найти
-</pre>
-
-## Подмодули
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать название подмодуля в буфер обмена
-  <kbd>&lt;enter&gt;</kbd>: Ввести подмодуль
-  <kbd>&lt;space&gt;</kbd>: Ввести подмодуль
-  <kbd>d</kbd>: Удалить подмодуль
-  <kbd>u</kbd>: Обновить подмодуль
-  <kbd>n</kbd>: Добавить новый подмодуль
-  <kbd>e</kbd>: Обновить URL подмодуля
-  <kbd>i</kbd>: Инициализировать подмодуль
-  <kbd>b</kbd>: Просмотреть параметры массового подмодуля
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Сводка коммита
-
-<pre>
-  <kbd>&lt;enter&gt;</kbd>: Подтвердить
-  <kbd>&lt;esc&gt;</kbd>: Закрыть
-</pre>
-
-## Сохранить Изменения Файлов
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать закомиченное имя файла в буфер обмена
-  <kbd>c</kbd>: Переключить файл
-  <kbd>d</kbd>: Отменить изменения коммита в этом файле
-  <kbd>o</kbd>: Открыть файл
-  <kbd>e</kbd>: Редактировать файл
-  <kbd>&lt;space&gt;</kbd>: Переключить файлы включённые в патч
-  <kbd>a</kbd>: Переключить все файлы, включённые в патч
-  <kbd>&lt;enter&gt;</kbd>: Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения)
-  <kbd>`</kbd>: Переключить вид дерева файлов
-  <kbd>/</kbd>: Найти
-</pre>
-
-## Статус
-
-<pre>
-  <kbd>o</kbd>: Открыть файл конфигурации
-  <kbd>e</kbd>: Редактировать файл конфигурации
-  <kbd>u</kbd>: Проверить обновления
-  <kbd>&lt;enter&gt;</kbd>: Переключиться на последний репозиторий
-  <kbd>a</kbd>: Показать все логи ветки
-</pre>
-
-## Теги
-
-<pre>
-  <kbd>&lt;space&gt;</kbd>: Переключить
-  <kbd>d</kbd>: View delete options
-  <kbd>P</kbd>: Отправить тег
-  <kbd>n</kbd>: Создать тег
-  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Удалённые ветки
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать название ветки в буфер обмена
-  <kbd>&lt;space&gt;</kbd>: Переключить
-  <kbd>n</kbd>: Новая ветка
-  <kbd>M</kbd>: Слияние с текущей переключённой веткой
-  <kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку
-  <kbd>d</kbd>: Delete remote tag
-  <kbd>u</kbd>: Установить как upstream-ветку переключённую ветку
-  <kbd>g</kbd>: Просмотреть параметры сброса
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Удалённые репозитории
-
-<pre>
-  <kbd>f</kbd>: Получение изменения из удалённого репозитория
-  <kbd>n</kbd>: Добавить новую удалённую ветку
-  <kbd>d</kbd>: Удалить удалённую ветку
-  <kbd>e</kbd>: Редактировать удалённый репозитории
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Файлы
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: Скопировать название файла в буфер обмена
-  <kbd>d</kbd>: Просмотреть параметры «отмены изменении»
-  <kbd>&lt;space&gt;</kbd>: Переключить индекс
-  <kbd>&lt;c-b&gt;</kbd>: Фильтровать файлы (проиндексированные/непроиндексированные)
-  <kbd>c</kbd>: Сохранить изменения
-  <kbd>w</kbd>: Закоммитить изменения без предварительного хука коммита
-  <kbd>A</kbd>: Правка последнего коммита
-  <kbd>C</kbd>: Сохранить изменения с помощью редактора git
-  <kbd>e</kbd>: Редактировать файл
-  <kbd>o</kbd>: Открыть файл
-  <kbd>i</kbd>: Игнорировать или исключить файл
-  <kbd>r</kbd>: Обновить файлы
-  <kbd>s</kbd>: Припрятать все изменения
-  <kbd>S</kbd>: Просмотреть параметры хранилища
-  <kbd>a</kbd>: Все проиндексированные/непроиндексированные
-  <kbd>&lt;enter&gt;</kbd>: Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога
-  <kbd>g</kbd>: Просмотреть параметры сброса upstream-ветки
-  <kbd>D</kbd>: Просмотреть параметры сброса
-  <kbd>`</kbd>: Переключить вид дерева файлов
-  <kbd>M</kbd>: Открыть внешний инструмент слияния (git mergetool)
-  <kbd>f</kbd>: Получить изменения
-  <kbd>/</kbd>: Найти
-</pre>
-
-## Хранилище
-
-<pre>
-  <kbd>&lt;space&gt;</kbd>: Применить припрятанные изменения
-  <kbd>g</kbd>: Применить припрятанные изменения и тут же удалить их из хранилища
-  <kbd>d</kbd>: Удалить припрятанные изменения из хранилища
-  <kbd>n</kbd>: Новая ветка
-  <kbd>r</kbd>: Переименовать хранилище
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента
-  <kbd>/</kbd>: Filter the current view by text
-</pre>

docs/keybindings/Keybindings_zh-TW.md

@@ -1,353 +0,0 @@
-_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 鍵盤快捷鍵
-
-_說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
-
-## 全局快捷鍵
-
-<pre>
-  <kbd>&lt;c-r&gt;</kbd>: 切換到最近使用的版本庫
-  <kbd>&lt;pgup&gt;</kbd>: 向上捲動主面板 (fn+up/shift+k)
-  <kbd>&lt;pgdown&gt;</kbd>: 向下捲動主面板 (fn+down/shift+j)
-  <kbd>@</kbd>: 開啟命令記錄選單
-  <kbd>}</kbd>: 增加差異檢視中顯示變更周圍上下文的大小
-  <kbd>{</kbd>: 減小差異檢視中顯示變更周圍上下文的大小
-  <kbd>:</kbd>: 執行自訂命令
-  <kbd>&lt;c-p&gt;</kbd>: 檢視自訂補丁選項
-  <kbd>m</kbd>: 查看合併/變基選項
-  <kbd>R</kbd>: 重新整理
-  <kbd>+</kbd>: 下一個螢幕模式（常規/半螢幕/全螢幕）
-  <kbd>_</kbd>: 上一個螢幕模式
-  <kbd>?</kbd>: 開啟選單
-  <kbd>&lt;c-s&gt;</kbd>: 檢視篩選路徑選項
-  <kbd>W</kbd>: 開啟差異比較選單
-  <kbd>&lt;c-e&gt;</kbd>: 開啟差異比較選單
-  <kbd>&lt;c-w&gt;</kbd>: 切換是否在差異檢視中顯示空格變更
-  <kbd>z</kbd>: 復原
-  <kbd>&lt;c-z&gt;</kbd>: 取消復原
-  <kbd>P</kbd>: 推送
-  <kbd>p</kbd>: 拉取
-</pre>
-
-## 列表面板導航
-
-<pre>
-  <kbd>,</kbd>: 上一頁
-  <kbd>.</kbd>: 下一頁
-  <kbd>&lt;</kbd>: 捲動到頂部
-  <kbd>&gt;</kbd>: 捲動到底部
-  <kbd>/</kbd>: 開始搜尋
-  <kbd>H</kbd>: 向左捲動
-  <kbd>L</kbd>: 向右捲動
-  <kbd>]</kbd>: 下一個索引標籤
-  <kbd>[</kbd>: 上一個索引標籤
-</pre>
-
-## Reflog
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: 檢出提交
-  <kbd>y</kbd>: 複製提交屬性
-  <kbd>o</kbd>: 在瀏覽器中開啟提交
-  <kbd>n</kbd>: 從提交建立新分支
-  <kbd>g</kbd>: 檢視重設選項
-  <kbd>c</kbd>: 複製提交 (揀選)
-  <kbd>C</kbd>: 複製提交範圍 (揀選)
-  <kbd>&lt;c-r&gt;</kbd>: 重設選定的揀選 (複製) 提交
-  <kbd>&lt;enter&gt;</kbd>: 檢視提交
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 主視窗 (一般)
-
-<pre>
-  <kbd>mouse wheel down</kbd>: 向下捲動 (fn+up)
-  <kbd>mouse wheel up</kbd>: 向上捲動 (fn+down)
-</pre>
-
-## 主視窗 (合併中)
-
-<pre>
-  <kbd>e</kbd>: 編輯檔案
-  <kbd>o</kbd>: 開啟檔案
-  <kbd>&lt;left&gt;</kbd>: 選擇上一個衝突
-  <kbd>&lt;right&gt;</kbd>: 選擇下一個衝突
-  <kbd>&lt;up&gt;</kbd>: 選擇上一段
-  <kbd>&lt;down&gt;</kbd>: 選擇下一段
-  <kbd>z</kbd>: 復原
-  <kbd>M</kbd>: 開啟外部合併工具 (git mergetool)
-  <kbd>&lt;space&gt;</kbd>: 挑選程式碼片段
-  <kbd>b</kbd>: 挑選所有程式碼片段
-  <kbd>&lt;esc&gt;</kbd>: 返回檔案面板
-</pre>
-
-## 主視窗 (預存中)
-
-<pre>
-  <kbd>&lt;left&gt;</kbd>: 選擇上一段
-  <kbd>&lt;right&gt;</kbd>: 選擇下一段
-  <kbd>v</kbd>: 切換拖曳選擇
-  <kbd>V</kbd>: 切換拖曳選擇
-  <kbd>a</kbd>: 切換選擇程式碼塊
-  <kbd>&lt;c-o&gt;</kbd>: 複製所選文本至剪貼簿
-  <kbd>o</kbd>: 開啟檔案
-  <kbd>e</kbd>: 編輯檔案
-  <kbd>&lt;esc&gt;</kbd>: 返回檔案面板
-  <kbd>&lt;tab&gt;</kbd>: 切換至另一個面板 (已預存/未預存更改)
-  <kbd>&lt;space&gt;</kbd>: 切換現有行的狀態 (已預存/未預存)
-  <kbd>d</kbd>: 刪除變更 (git reset)
-  <kbd>E</kbd>: 編輯程式碼塊
-  <kbd>c</kbd>: 提交變更
-  <kbd>w</kbd>: 沒有預提交 hook 就提交更改
-  <kbd>C</kbd>: 使用 git 編輯器提交變更
-  <kbd>/</kbd>: 開始搜尋
-</pre>
-
-## 主面板 (補丁生成)
-
-<pre>
-  <kbd>&lt;left&gt;</kbd>: 選擇上一段
-  <kbd>&lt;right&gt;</kbd>: 選擇下一段
-  <kbd>v</kbd>: 切換拖曳選擇
-  <kbd>V</kbd>: 切換拖曳選擇
-  <kbd>a</kbd>: 切換選擇程式碼塊
-  <kbd>&lt;c-o&gt;</kbd>: 複製所選文本至剪貼簿
-  <kbd>o</kbd>: 開啟檔案
-  <kbd>e</kbd>: 編輯檔案
-  <kbd>&lt;space&gt;</kbd>: 向 (或從) 補丁中添加/刪除行
-  <kbd>&lt;esc&gt;</kbd>: 退出自訂補丁建立器
-  <kbd>/</kbd>: 開始搜尋
-</pre>
-
-## 功能表
-
-<pre>
-  <kbd>&lt;enter&gt;</kbd>: 執行
-  <kbd>&lt;esc&gt;</kbd>: 關閉
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 子提交
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: 檢出提交
-  <kbd>y</kbd>: 複製提交屬性
-  <kbd>o</kbd>: 在瀏覽器中開啟提交
-  <kbd>n</kbd>: 從提交建立新分支
-  <kbd>g</kbd>: 檢視重設選項
-  <kbd>c</kbd>: 複製提交 (揀選)
-  <kbd>C</kbd>: 複製提交範圍 (揀選)
-  <kbd>&lt;c-r&gt;</kbd>: 重設選定的揀選 (複製) 提交
-  <kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案
-  <kbd>/</kbd>: 開始搜尋
-</pre>
-
-## 子模組
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製子模組名稱到剪貼簿
-  <kbd>&lt;enter&gt;</kbd>: 進入子模組
-  <kbd>&lt;space&gt;</kbd>: 進入子模組
-  <kbd>d</kbd>: 移除子模組
-  <kbd>u</kbd>: 更新子模組
-  <kbd>n</kbd>: 新增子模組
-  <kbd>e</kbd>: 更新子模組 URL
-  <kbd>i</kbd>: 初始化子模組
-  <kbd>b</kbd>: 查看批量子模組選項
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 提交
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿
-  <kbd>&lt;c-r&gt;</kbd>: 重設選定的揀選 (複製) 提交
-  <kbd>b</kbd>: 查看二分選項
-  <kbd>s</kbd>: 向下壓縮
-  <kbd>f</kbd>: 修復提交 (Fixup)
-  <kbd>r</kbd>: 改寫提交
-  <kbd>R</kbd>: 使用編輯器改寫提交
-  <kbd>d</kbd>: 刪除提交
-  <kbd>e</kbd>: 編輯提交
-  <kbd>p</kbd>: 挑選提交 (於變基過程中)
-  <kbd>F</kbd>: 為此提交建立修復提交
-  <kbd>S</kbd>: 壓縮上方所有的“fixup!”提交 (自動壓縮)
-  <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>: 還原提交
-  <kbd>T</kbd>: 打標籤到提交
-  <kbd>&lt;c-l&gt;</kbd>: 開啟記錄選單
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;space&gt;</kbd>: 檢出提交
-  <kbd>y</kbd>: 複製提交屬性
-  <kbd>o</kbd>: 在瀏覽器中開啟提交
-  <kbd>n</kbd>: 從提交建立新分支
-  <kbd>g</kbd>: 檢視重設選項
-  <kbd>c</kbd>: 複製提交 (揀選)
-  <kbd>C</kbd>: 複製提交範圍 (揀選)
-  <kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案
-  <kbd>/</kbd>: 開始搜尋
-</pre>
-
-## 提交摘要
-
-<pre>
-  <kbd>&lt;enter&gt;</kbd>: 確認
-  <kbd>&lt;esc&gt;</kbd>: 關閉
-</pre>
-
-## 提交檔案
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製提交的檔案名稱到剪貼簿
-  <kbd>c</kbd>: 檢出檔案
-  <kbd>d</kbd>: 捨棄此提交對此檔案的更改
-  <kbd>o</kbd>: 開啟檔案
-  <kbd>e</kbd>: 編輯檔案
-  <kbd>&lt;space&gt;</kbd>: 切換檔案是否包含在補丁中
-  <kbd>a</kbd>: 切換所有檔案是否包含在補丁中
-  <kbd>&lt;enter&gt;</kbd>: 輸入檔案以將選定的行添加至補丁（或切換目錄折疊）
-  <kbd>`</kbd>: 切換檔案樹狀視圖
-  <kbd>/</kbd>: 開始搜尋
-</pre>
-
-## 收藏 (Stash)
-
-<pre>
-  <kbd>&lt;space&gt;</kbd>: 套用
-  <kbd>g</kbd>: 還原
-  <kbd>d</kbd>: 捨棄
-  <kbd>n</kbd>: 新分支
-  <kbd>r</kbd>: 重新命名收藏
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 本地分支
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製分支名稱到剪貼簿
-  <kbd>i</kbd>: 顯示 git-flow 選項
-  <kbd>&lt;space&gt;</kbd>: 檢出
-  <kbd>n</kbd>: 新分支
-  <kbd>o</kbd>: 建立拉取請求
-  <kbd>O</kbd>: 建立拉取請求選項
-  <kbd>&lt;c-y&gt;</kbd>: 複製拉取請求的 URL 到剪貼板
-  <kbd>c</kbd>: 根據名稱檢出
-  <kbd>F</kbd>: 強制檢出
-  <kbd>d</kbd>: View delete options
-  <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>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: 檢視提交
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 標籤
-
-<pre>
-  <kbd>&lt;space&gt;</kbd>: 檢出
-  <kbd>d</kbd>: View delete options
-  <kbd>P</kbd>: 推送標籤
-  <kbd>n</kbd>: 建立標籤
-  <kbd>g</kbd>: 檢視重設選項
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: 檢視提交
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 檔案
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製檔案名稱到剪貼簿
-  <kbd>d</kbd>: 檢視“捨棄更改”的選項
-  <kbd>&lt;space&gt;</kbd>: 切換預存
-  <kbd>&lt;c-b&gt;</kbd>: 篩選檔案 (預存/未預存)
-  <kbd>c</kbd>: 提交變更
-  <kbd>w</kbd>: 沒有預提交 hook 就提交更改
-  <kbd>A</kbd>: 修正上次提交
-  <kbd>C</kbd>: 使用 git 編輯器提交變更
-  <kbd>e</kbd>: 編輯檔案
-  <kbd>o</kbd>: 開啟檔案
-  <kbd>i</kbd>: 忽略或排除檔案
-  <kbd>r</kbd>: 重新整理檔案
-  <kbd>s</kbd>: 收藏所有變更
-  <kbd>S</kbd>: 檢視收藏選項
-  <kbd>a</kbd>: 全部預存/取消預存
-  <kbd>&lt;enter&gt;</kbd>: 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄
-  <kbd>g</kbd>: 檢視上游重設選項
-  <kbd>D</kbd>: 檢視重設選項
-  <kbd>`</kbd>: 切換檔案樹狀視圖
-  <kbd>M</kbd>: 開啟外部合併工具 (git mergetool)
-  <kbd>f</kbd>: 擷取
-  <kbd>/</kbd>: 開始搜尋
-</pre>
-
-## 狀態
-
-<pre>
-  <kbd>o</kbd>: 開啟設定檔案
-  <kbd>e</kbd>: 編輯設定檔案
-  <kbd>u</kbd>: 檢查更新
-  <kbd>&lt;enter&gt;</kbd>: 切換到最近使用的版本庫
-  <kbd>a</kbd>: 顯示所有分支日誌
-</pre>
-
-## 確認面板
-
-<pre>
-  <kbd>&lt;enter&gt;</kbd>: 確認
-  <kbd>&lt;esc&gt;</kbd>: 關閉/取消
-</pre>
-
-## 遠端
-
-<pre>
-  <kbd>f</kbd>: 擷取遠端
-  <kbd>n</kbd>: 新增遠端
-  <kbd>d</kbd>: 移除遠端
-  <kbd>e</kbd>: 編輯遠端
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## 遠端分支
-
-<pre>
-  <kbd>&lt;c-o&gt;</kbd>: 複製分支名稱到剪貼簿
-  <kbd>&lt;space&gt;</kbd>: 檢出
-  <kbd>n</kbd>: 新分支
-  <kbd>M</kbd>: 合併到當前檢出的分支
-  <kbd>r</kbd>: 將已檢出的分支變基至此分支
-  <kbd>d</kbd>: Delete remote tag
-  <kbd>u</kbd>: 將此分支設為當前分支之上游
-  <kbd>g</kbd>: 檢視重設選項
-  <kbd>w</kbd>: View worktree options
-  <kbd>&lt;enter&gt;</kbd>: 檢視提交
-  <kbd>/</kbd>: Filter the current view by text
-</pre>

docs/keybindings/Keybindings_zh.md

@@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>,</kbd>: 上一页
   <kbd>.</kbd>: 下一页
   <kbd>&lt;</kbd>: 滚动到顶部
-  <kbd>&gt;</kbd>: 滚动到底部
   <kbd>/</kbd>: 开始搜索
+  <kbd>&gt;</kbd>: 滚动到底部
   <kbd>H</kbd>: 向左滚动
   <kbd>L</kbd>: 向右滚动
   <kbd>]</kbd>: 下一个标签
@@ -48,9 +48,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: 检出提交
-  <kbd>y</kbd>: Copy commit attribute
+  <kbd>y</kbd>: copy commit attribute
   <kbd>o</kbd>: 在浏览器中打开提交
   <kbd>n</kbd>: 从提交创建新分支
   <kbd>g</kbd>: 查看重置选项
@@ -58,18 +57,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>C</kbd>: 复制提交范围（拣选）
   <kbd>&lt;c-r&gt;</kbd>: 重置已拣选（复制）的提交
   <kbd>&lt;enter&gt;</kbd>: 查看提交
-  <kbd>/</kbd>: Filter the current view by text
-</pre>
-
-## Worktrees
-
-<pre>
-  <kbd>n</kbd>: Create worktree
-  <kbd>&lt;space&gt;</kbd>: Switch to worktree
-  <kbd>&lt;enter&gt;</kbd>: Switch to worktree
-  <kbd>o</kbd>: Open in editor
-  <kbd>d</kbd>: Remove worktree
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 分支页面
@@ -84,26 +71,23 @@ _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>w</kbd>: View worktree options
+  <kbd>u</kbd>: set/unset upstream
   <kbd>&lt;enter&gt;</kbd>: 查看提交
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 子提交
 
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: 检出提交
-  <kbd>y</kbd>: Copy commit attribute
+  <kbd>y</kbd>: copy commit attribute
   <kbd>o</kbd>: 在浏览器中打开提交
   <kbd>n</kbd>: 从提交创建新分支
   <kbd>g</kbd>: 查看重置选项
@@ -111,7 +95,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>C</kbd>: 复制提交范围（拣选）
   <kbd>&lt;c-r&gt;</kbd>: 重置已拣选（复制）的提交
   <kbd>&lt;enter&gt;</kbd>: 查看提交的文件
-  <kbd>/</kbd>: 开始搜索
 </pre>
 
 ## 子模块
@@ -119,14 +102,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;c-o&gt;</kbd>: 将子模块名称复制到剪贴板
   <kbd>&lt;enter&gt;</kbd>: 输入子模块
-  <kbd>&lt;space&gt;</kbd>: 输入子模块
   <kbd>d</kbd>: 删除子模块
   <kbd>u</kbd>: 更新子模块
   <kbd>n</kbd>: 添加新的子模块
   <kbd>e</kbd>: 更新子模块 URL
   <kbd>i</kbd>: 初始化子模块
   <kbd>b</kbd>: 查看批量子模块选项
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 提交
@@ -142,27 +123,24 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>d</kbd>: 删除提交
   <kbd>e</kbd>: 编辑提交
   <kbd>p</kbd>: 选择提交（变基过程中）
-  <kbd>F</kbd>: 创建修正提交
+  <kbd>F</kbd>: 为此提交创建修正
   <kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
   <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>a</kbd>: reset commit author
   <kbd>t</kbd>: 还原提交
   <kbd>T</kbd>: 标签提交
   <kbd>&lt;c-l&gt;</kbd>: 打开日志菜单
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;space&gt;</kbd>: 检出提交
-  <kbd>y</kbd>: Copy commit attribute
+  <kbd>y</kbd>: copy commit attribute
   <kbd>o</kbd>: 在浏览器中打开提交
   <kbd>n</kbd>: 从提交创建新分支
   <kbd>g</kbd>: 查看重置选项
   <kbd>c</kbd>: 复制提交（拣选）
   <kbd>C</kbd>: 复制提交范围（拣选）
   <kbd>&lt;enter&gt;</kbd>: 查看提交的文件
-  <kbd>/</kbd>: 开始搜索
 </pre>
 
 ## 提交文件
@@ -174,10 +152,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: 打开文件
   <kbd>e</kbd>: 编辑文件
   <kbd>&lt;space&gt;</kbd>: 补丁中包含的切换文件
-  <kbd>a</kbd>: Toggle all files included in patch
+  <kbd>a</kbd>: toggle all files included in patch
   <kbd>&lt;enter&gt;</kbd>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
   <kbd>`</kbd>: 切换文件树视图
-  <kbd>/</kbd>: 开始搜索
 </pre>
 
 ## 提交讯息
@@ -193,7 +170,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;c-o&gt;</kbd>: 将文件名复制到剪贴板
   <kbd>d</kbd>: 查看'放弃更改'选项
   <kbd>&lt;space&gt;</kbd>: 切换暂存状态
-  <kbd>&lt;c-b&gt;</kbd>: Filter files by status
+  <kbd>&lt;c-b&gt;</kbd>: Filter files (staged/unstaged)
   <kbd>c</kbd>: 提交更改
   <kbd>w</kbd>: 提交更改而无需预先提交钩子
   <kbd>A</kbd>: 修补最后一次提交
@@ -211,7 +188,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>`</kbd>: 切换文件树视图
   <kbd>M</kbd>: 打开外部合并工具 (git mergetool)
   <kbd>f</kbd>: 抓取
-  <kbd>/</kbd>: 开始搜索
 </pre>
 
 ## 构建补丁中
@@ -227,20 +203,17 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>e</kbd>: 编辑文件
   <kbd>&lt;space&gt;</kbd>: 添加/移除 行到补丁
   <kbd>&lt;esc&gt;</kbd>: 退出逐行模式
-  <kbd>/</kbd>: 开始搜索
 </pre>
 
 ## 标签页面
 
 <pre>
   <kbd>&lt;space&gt;</kbd>: 检出
-  <kbd>d</kbd>: View delete options
+  <kbd>d</kbd>: 删除标签
   <kbd>P</kbd>: 推送标签
   <kbd>n</kbd>: 创建标签
   <kbd>g</kbd>: 查看重置选项
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: 查看提交
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 正在合并
@@ -274,11 +247,10 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;tab&gt;</kbd>: 切换到其他面板
   <kbd>&lt;space&gt;</kbd>: 切换行暂存状态
   <kbd>d</kbd>: 取消变更 (git reset)
-  <kbd>E</kbd>: Edit hunk
+  <kbd>E</kbd>: edit hunk
   <kbd>c</kbd>: 提交更改
   <kbd>w</kbd>: 提交更改而无需预先提交钩子
   <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
-  <kbd>/</kbd>: 开始搜索
 </pre>
 
 ## 正常
@@ -310,7 +282,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;enter&gt;</kbd>: 执行
   <kbd>&lt;esc&gt;</kbd>: 关闭
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 贮藏
@@ -320,10 +291,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>g</kbd>: 应用并删除
   <kbd>d</kbd>: 删除
   <kbd>n</kbd>: 新分支
-  <kbd>r</kbd>: Rename stash
-  <kbd>w</kbd>: View worktree options
+  <kbd>r</kbd>: rename stash
   <kbd>&lt;enter&gt;</kbd>: 查看提交的文件
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 远程分支
@@ -334,12 +303,11 @@ _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>&lt;esc&gt;</kbd>: 返回远程仓库列表
   <kbd>g</kbd>: 查看重置选项
-  <kbd>w</kbd>: View worktree options
   <kbd>&lt;enter&gt;</kbd>: 查看提交
-  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
 ## 远程页面
@@ -349,5 +317,4 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>n</kbd>: 添加新的远程仓库
   <kbd>d</kbd>: 删除远程
   <kbd>e</kbd>: 编辑远程仓库
-  <kbd>/</kbd>: Filter the current view by text
 </pre>

go.mod

@@ -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.0
+	github.com/fsmiamoto/git-todo-parser v0.0.4
+	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.20230909074155-fc7119a39341
+	github.com/jesseduffield/gocui v0.3.1-0.20230324073941-36f2e87458fa
 	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,7 +26,7 @@ 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/pmezard/go-difflib v1.0.0
 	github.com/sahilm/fuzzy v0.1.0
@@ -31,12 +34,9 @@ require (
 	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,10 +65,11 @@ require (
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // 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/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -1,43 +1,3 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OpenPeeDeeP/xdg v1.0.0 h1:UDLmNjCGFZZCaVMB74DqYEtXkHxnTxcr4FeJVF9uCn8=
 github.com/OpenPeeDeeP/xdg v1.0.0/go.mod h1:tMoSueLQlMf0TCldjrJLNIjAc5qAOIcHt5REi88/Ygo=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
@@ -46,21 +6,17 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY=
+github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aybabtme/humanlog v0.4.1 h1:D8d9um55rrthJsP8IGSHBcti9lTb/XknmDAX6Zy8tek=
 github.com/aybabtme/humanlog v0.4.1/go.mod h1:B0bnQX4FTSU3oftPMTTPvENCy8LqixLDvYJA9TUCAGo=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+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/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=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -70,104 +26,43 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.1-0.20180516100307-2d684516a886/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 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/fsmiamoto/git-todo-parser v0.0.4 h1:fzcGaoAFDHWzJRKw//CSZFrXucsLKplIvOSab3FtWWM=
+github.com/fsmiamoto/git-todo-parser v0.0.4/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.0 h1:/EuijeGOu7ckFxzhkj4CXJ8JaenxK7bKUxpPYqeLHqQ=
-github.com/go-errors/errors v1.5.0/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=
 github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M=
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
 github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
@@ -179,8 +74,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.20230909074155-fc7119a39341 h1:COQ5uU+gFCQuE878cw0HcTSpKX+xLTu0/6lNTPJStG4=
-github.com/jesseduffield/gocui v0.3.1-0.20230909074155-fc7119a39341/go.mod h1:trXE7RRGL2hTsv+Ntk+SHLtRobg9JE138n3Ug/X2Cf4=
+github.com/jesseduffield/gocui v0.3.1-0.20230324073941-36f2e87458fa h1:E9G1mj94rMal1YLaABwdxLUUgKq+xGbElFjHRNaDJUg=
+github.com/jesseduffield/gocui v0.3.1-0.20230324073941-36f2e87458fa/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
 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=
@@ -190,17 +85,13 @@ github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e/
 github.com/jesseduffield/yaml v2.1.0+incompatible h1:HWQJ1gIv2zHKbDYNp0Jwjlj24K8aqpFHnMCynY1EpmE=
 github.com/jesseduffield/yaml v2.1.0+incompatible/go.mod h1:w0xGhOSIJCGYYW+hnFPTutCy5aACpkcwbmORt5axGqk=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -212,6 +103,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,9 +115,9 @@ 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=
@@ -239,19 +131,16 @@ 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=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 github.com/samber/lo v1.31.0 h1:Sfa+/064Tdo4SvlohQUQzBhgSer9v/coGvKQI/XLWAM=
@@ -264,12 +153,8 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-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=
@@ -277,7 +162,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -289,335 +173,66 @@ github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 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=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 h1:s/+U+w0teGzcoH2mdIlFQ6KfVKGaYpgyGdUefZrn9TU=
 golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170407050850-f3918c30c5c2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.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.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.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/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 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=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-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/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=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0 h1:KzcWKJ0nMAmGoBhYVMnkWc1rXjB42lKy5aIys4TdLOA=
@@ -633,13 +248,3 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

pkg/app/app.go

@@ -10,9 +10,8 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"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"
@@ -23,7 +22,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/env"
 	"github.com/jesseduffield/lazygit/pkg/gui"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/logs"
 	"github.com/jesseduffield/lazygit/pkg/updates"
 )
 
@@ -62,7 +60,6 @@ func Run(
 
 func NewCommon(config config.AppConfigurer) (*common.Common, error) {
 	userConfig := config.GetUserConfig()
-	appState := config.GetAppState()
 
 	var err error
 	log := newLogger(config)
@@ -75,24 +72,10 @@ func NewCommon(config config.AppConfigurer) (*common.Common, error) {
 		Log:        log,
 		Tr:         tr,
 		UserConfig: userConfig,
-		AppState:   appState,
 		Debug:      config.GetDebug(),
-		Fs:         afero.NewOsFs(),
 	}, nil
 }
 
-func newLogger(cfg config.AppConfigurer) *logrus.Entry {
-	if cfg.GetDebug() {
-		logPath, err := config.LogPath()
-		if err != nil {
-			log.Fatal(err)
-		}
-		return logs.NewDevelopmentLogger(logPath)
-	} else {
-		return logs.NewProductionLogger()
-	}
-}
-
 // NewApp bootstrap a new application
 func NewApp(config config.AppConfigurer, common *common.Common) (*App, error) {
 	app := &App{
@@ -123,11 +106,6 @@ func NewApp(config config.AppConfigurer, common *common.Common) (*App, error) {
 		return app, err
 	}
 
-	// used for testing purposes
-	if os.Getenv("SHOW_RECENT_REPOS") == "true" {
-		showRecentRepos = true
-	}
-
 	app.Gui, err = gui.NewGui(common, config, gitVersion, updater, showRecentRepos, dirName)
 	if err != nil {
 		return app, err
@@ -197,7 +175,7 @@ func (app *App) setupRepo() (bool, error) {
 				fmt.Print(app.Tr.InitialBranch)
 				response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
 				if trimmedResponse := strings.Trim(response, " \r\n"); len(trimmedResponse) > 0 {
-					initialBranchArg += "--initial-branch=" + trimmedResponse
+					initialBranchArg += "--initial-branch=" + app.OSCommand.Quote(trimmedResponse)
 				}
 			}
 		case "create":
@@ -213,11 +191,7 @@ func (app *App) setupRepo() (bool, error) {
 		}
 
 		if shouldInitRepo {
-			args := []string{"git", "init"}
-			if initialBranchArg != "" {
-				args = append(args, initialBranchArg)
-			}
-			if err := app.OSCommand.Cmd.New(args).Run(); err != nil {
+			if err := app.OSCommand.Cmd.New("git init " + initialBranchArg).Run(); err != nil {
 				return false, err
 			}
 			return false, nil
@@ -268,11 +242,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()
+	})
 }

pkg/app/daemon/daemon.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"strconv"
 
 	"github.com/fsmiamoto/git-todo-parser/todo"
@@ -91,15 +90,6 @@ func getDaemonKind() DaemonKind {
 	return DaemonKind(intValue)
 }
 
-func getCommentChar() byte {
-	cmd := exec.Command("git", "config", "--get", "--null", "core.commentChar")
-	if output, err := cmd.Output(); err == nil && len(output) == 2 {
-		return output[0]
-	}
-
-	return '#'
-}
-
 // An Instruction is a command to be run by lazygit in daemon mode.
 // It is serialized to json and passed to lazygit via environment variables
 type Instruction interface {
@@ -209,7 +199,7 @@ func (self *ChangeTodoActionsInstruction) SerializedInstructions() string {
 func (self *ChangeTodoActionsInstruction) run(common *common.Common) error {
 	return handleInteractiveRebase(common, func(path string) error {
 		for _, c := range self.Changes {
-			if err := utils.EditRebaseTodo(path, c.Sha, todo.Pick, c.NewAction, getCommentChar()); err != nil {
+			if err := utils.EditRebaseTodo(path, c.Sha, todo.Pick, c.NewAction); err != nil {
 				return err
 			}
 		}
@@ -243,7 +233,7 @@ func (self *MoveFixupCommitDownInstruction) SerializedInstructions() string {
 
 func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error {
 	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveFixupCommitDown(path, self.OriginalSha, self.FixupSha, getCommentChar())
+		return utils.MoveFixupCommitDown(path, self.OriginalSha, self.FixupSha)
 	})
 }
 
@@ -267,7 +257,7 @@ func (self *MoveTodoUpInstruction) SerializedInstructions() string {
 
 func (self *MoveTodoUpInstruction) run(common *common.Common) error {
 	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveTodoUp(path, self.Sha, todo.Pick, getCommentChar())
+		return utils.MoveTodoUp(path, self.Sha, todo.Pick)
 	})
 }
 
@@ -291,7 +281,7 @@ func (self *MoveTodoDownInstruction) SerializedInstructions() string {
 
 func (self *MoveTodoDownInstruction) run(common *common.Common) error {
 	return handleInteractiveRebase(common, func(path string) error {
-		return utils.MoveTodoDown(path, self.Sha, todo.Pick, getCommentChar())
+		return utils.MoveTodoDown(path, self.Sha, todo.Pick)
 	})
 }
 

pkg/app/daemon/rebase.go

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

pkg/app/entry_point.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
@@ -17,7 +16,8 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"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/logs"
+	"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,10 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 		os.Setenv("CONFIG_DIR", cliArgs.UseConfigDir)
 	}
 
+	if cliArgs.WorkTree != "" {
+		env.SetGitWorkTreeEnv(cliArgs.WorkTree)
+	}
+
 	if cliArgs.GitDir != "" {
 		env.SetGitDirEnv(cliArgs.GitDir)
 	}
@@ -111,13 +106,14 @@ func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTes
 	}
 
 	if cliArgs.TailLogs {
-		logPath, err := config.LogPath()
-		if err != nil {
+		logs.TailLogs()
+		os.Exit(0)
+	}
+
+	if cliArgs.WorkTree != "" {
+		if err := os.Chdir(cliArgs.WorkTree); err != nil {
 			log.Fatal(err.Error())
 		}
-
-		tail.TailLogs(logPath)
-		os.Exit(0)
 	}
 
 	tempDir, err := os.MkdirTemp("", "lazygit-*")
@@ -276,7 +272,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

pkg/app/errors.go

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

pkg/app/logging.go

@@ -0,0 +1,56 @@
+package app
+
+import (
+	"io"
+	"log"
+	"os"
+
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/sirupsen/logrus"
+)
+
+func newLogger(config config.AppConfigurer) *logrus.Entry {
+	var log *logrus.Logger
+	if config.GetDebug() {
+		log = newDevelopmentLogger()
+	} else {
+		log = newProductionLogger()
+	}
+
+	// highly recommended: tail -f development.log | humanlog
+	// https://github.com/aybabtme/humanlog
+	log.Formatter = &logrus.JSONFormatter{}
+
+	return log.WithFields(logrus.Fields{})
+}
+
+func newProductionLogger() *logrus.Logger {
+	log := logrus.New()
+	log.Out = io.Discard
+	log.SetLevel(logrus.ErrorLevel)
+	return log
+}
+
+func newDevelopmentLogger() *logrus.Logger {
+	logger := logrus.New()
+	logger.SetLevel(getLogLevel())
+	logPath, err := config.LogPath()
+	if err != nil {
+		log.Fatal(err)
+	}
+	file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o666)
+	if err != nil {
+		log.Fatalf("Unable to log to log file: %v", err)
+	}
+	logger.SetOutput(file)
+	return logger
+}
+
+func getLogLevel() logrus.Level {
+	strLevel := os.Getenv("LOG_LEVEL")
+	level, err := logrus.ParseLevel(strLevel)
+	if err != nil {
+		return logrus.DebugLevel
+	}
+	return level
+}

pkg/cheatsheet/generate.go

@@ -15,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"
@@ -22,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 {
@@ -101,7 +101,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"reflogCommits":     tr.ReflogCommitsTitle,
 		"tags":              tr.TagsTitle,
 		"commitFiles":       tr.CommitFilesTitle,
-		"commitMessage":     tr.CommitSummaryTitle,
+		"commitMessage":     tr.CommitMessageTitle,
 		"commitDescription": tr.CommitDescriptionTitle,
 		"commits":           tr.CommitsTitle,
 		"confirmation":      tr.ConfirmationTitle,
@@ -116,7 +116,6 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
 		"stash":             tr.StashTitle,
 		"suggestions":       tr.SuggestionsCheatsheetTitle,
 		"extras":            tr.ExtrasTitle,
-		"worktrees":         tr.WorktreesTitle,
 	}
 
 	title, ok := contextTitleMap[str]
@@ -129,7 +128,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
 		}
@@ -162,7 +161,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,

pkg/cheatsheet/generate_test.go

@@ -54,7 +54,7 @@ func TestGetBindingSections(t *testing.T) {
 			},
 			expected: []*bindingSection{
 				{
-					title: "Global keybindings",
+					title: "Global Keybindings",
 					bindings: []*types.Binding{
 						{
 							ViewName:    "",
@@ -139,7 +139,7 @@ func TestGetBindingSections(t *testing.T) {
 			},
 			expected: []*bindingSection{
 				{
-					title: "List panel navigation",
+					title: "List Panel Navigation",
 					bindings: []*types.Binding{
 						{
 							ViewName:    "files",
@@ -215,7 +215,7 @@ func TestGetBindingSections(t *testing.T) {
 			},
 			expected: []*bindingSection{
 				{
-					title: "List panel navigation",
+					title: "List Panel Navigation",
 					bindings: []*types.Binding{
 						{
 							ViewName:    "files",

pkg/commands/git.go

@@ -2,13 +2,11 @@ package commands
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
 	"github.com/go-errors/errors"
 	"github.com/sasha-s/go-deadlock"
-	"github.com/spf13/afero"
 
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
@@ -26,7 +24,6 @@ type GitCommand struct {
 	Commit      *git_commands.CommitCommands
 	Config      *git_commands.ConfigCommands
 	Custom      *git_commands.CustomCommands
-	Diff        *git_commands.DiffCommands
 	File        *git_commands.FileCommands
 	Flow        *git_commands.FlowCommands
 	Patch       *git_commands.PatchCommands
@@ -39,9 +36,6 @@ type GitCommand struct {
 	Tag         *git_commands.TagCommands
 	WorkingTree *git_commands.WorkingTreeCommands
 	Bisect      *git_commands.BisectCommands
-	Worktree    *git_commands.WorktreeCommands
-	Version     *git_commands.GitVersion
-	RepoPaths   *git_commands.RepoPaths
 
 	Loaders Loaders
 }
@@ -55,7 +49,6 @@ type Loaders struct {
 	RemoteLoader       *git_commands.RemoteLoader
 	StashLoader        *git_commands.StashLoader
 	TagLoader          *git_commands.TagLoader
-	Worktrees          *git_commands.WorktreeLoader
 }
 
 func NewGitCommand(
@@ -65,49 +58,17 @@ func NewGitCommand(
 	gitConfig git_config.IGitConfig,
 	syncMutex *deadlock.Mutex,
 ) (*GitCommand, error) {
-	currentPath, err := os.Getwd()
-	if err != nil {
-		return nil, utils.WrapError(err)
+	if err := navigateToRepoRootDirectory(os.Stat, os.Chdir); err != nil {
+		return nil, err
 	}
 
-	// converting to forward slashes for the sake of windows (which uses backwards slashes). We want everything
-	// to have forward slashes internally
-	currentPath = filepath.ToSlash(currentPath)
-
-	gitDir := env.GetGitDirEnv()
-	if gitDir != "" {
-		// we've been given the git directory explicitly so no need to navigate to it
-		_, err := cmn.Fs.Stat(gitDir)
-		if err != nil {
-			return nil, utils.WrapError(err)
-		}
-	} else {
-		// we haven't been given the git dir explicitly so we assume it's in the current working directory as `.git/` (or an ancestor directory)
-
-		rootDirectory, err := findWorktreeRoot(cmn.Fs, currentPath)
-		if err != nil {
-			return nil, utils.WrapError(err)
-		}
-		currentPath = rootDirectory
-		err = os.Chdir(rootDirectory)
-		if err != nil {
-			return nil, utils.WrapError(err)
-		}
+	repo, err := setupRepository(gogit.PlainOpenWithOptions, gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true}, cmn.Tr.GitconfigParseErr)
+	if err != nil {
+		return nil, err
 	}
 
-	repoPaths, err := git_commands.GetRepoPaths(cmn.Fs, currentPath)
+	dotGitDir, err := findDotGitDir(os.Stat, os.ReadFile)
 	if err != nil {
-		return nil, errors.Errorf("Error getting repo paths: %v", err)
-	}
-
-	repository, err := gogit.PlainOpenWithOptions(
-		repoPaths.WorktreeGitDirPath(),
-		&gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true},
-	)
-	if err != nil {
-		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
-			return nil, errors.New(cmn.Tr.GitconfigParseErr)
-		}
 		return nil, err
 	}
 
@@ -116,8 +77,8 @@ func NewGitCommand(
 		version,
 		osCommand,
 		gitConfig,
-		repoPaths,
-		repository,
+		dotGitDir,
+		repo,
 		syncMutex,
 	), nil
 }
@@ -127,7 +88,7 @@ func NewGitCommandAux(
 	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
-	repoPaths *git_commands.RepoPaths,
+	dotGitDir string,
 	repo *gogit.Repository,
 	syncMutex *deadlock.Mutex,
 ) *GitCommand {
@@ -140,9 +101,9 @@ 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, syncMutex)
+	fileLoader := git_commands.NewFileLoader(cmn, cmd, configCommands)
 
-	fileLoader := git_commands.NewFileLoader(gitCommon, cmd, configCommands)
+	gitCommon := git_commands.NewGitCommon(cmn, version, cmd, osCommand, dotGitDir, repo, configCommands, syncMutex)
 	statusCommands := git_commands.NewStatusCommands(gitCommon)
 	flowCommands := git_commands.NewFlowCommands(gitCommon)
 	remoteCommands := git_commands.NewRemoteCommands(gitCommon)
@@ -151,7 +112,6 @@ func NewGitCommandAux(
 	tagCommands := git_commands.NewTagCommands(gitCommon)
 	commitCommands := git_commands.NewCommitCommands(gitCommon)
 	customCommands := git_commands.NewCustomCommands(gitCommon)
-	diffCommands := git_commands.NewDiffCommands(gitCommon)
 	fileCommands := git_commands.NewFileCommands(gitCommon)
 	submoduleCommands := git_commands.NewSubmoduleCommands(gitCommon)
 	workingTreeCommands := git_commands.NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
@@ -159,18 +119,18 @@ 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)
-	worktreeCommands := git_commands.NewWorktreeCommands(gitCommon)
 
-	branchLoader := git_commands.NewBranchLoader(cmn, cmd, branchCommands.CurrentBranchInfo, configCommands)
+	branchLoader := git_commands.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchInfo, configCommands)
 	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
-	commitLoader := git_commands.NewCommitLoader(cmn, cmd, statusCommands.RebaseMode, gitCommon)
+	commitLoader := git_commands.NewCommitLoader(cmn, cmd, dotGitDir, statusCommands.RebaseMode)
 	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
 	remoteLoader := git_commands.NewRemoteLoader(cmn, cmd, repo.Remotes)
-	worktreeLoader := git_commands.NewWorktreeLoader(gitCommon)
 	stashLoader := git_commands.NewStashLoader(cmn, cmd)
 	tagLoader := git_commands.NewTagLoader(cmn, cmd)
 
@@ -179,7 +139,6 @@ func NewGitCommandAux(
 		Commit:      commitCommands,
 		Config:      configCommands,
 		Custom:      customCommands,
-		Diff:        diffCommands,
 		File:        fileCommands,
 		Flow:        flowCommands,
 		Patch:       patchCommands,
@@ -192,8 +151,6 @@ func NewGitCommandAux(
 		Tag:         tagCommands,
 		Bisect:      bisectCommands,
 		WorkingTree: workingTreeCommands,
-		Worktree:    worktreeCommands,
-		Version:     version,
 		Loaders: Loaders{
 			BranchLoader:       branchLoader,
 			CommitFileLoader:   commitFileLoader,
@@ -201,40 +158,121 @@ func NewGitCommandAux(
 			FileLoader:         fileLoader,
 			ReflogCommitLoader: reflogCommitLoader,
 			RemoteLoader:       remoteLoader,
-			Worktrees:          worktreeLoader,
 			StashLoader:        stashLoader,
 			TagLoader:          tagLoader,
 		},
-		RepoPaths: repoPaths,
 	}
 }
 
-// this returns the root of the current worktree. So if you start lazygit from within
-// a subdirectory of the worktree, it will start in the context of the root of that worktree
-func findWorktreeRoot(fs afero.Fs, currentPath string) (string, error) {
+func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
+	gitDir := env.GetGitDirEnv()
+	if gitDir != "" {
+		// we've been given the git directory explicitly so no need to navigate to it
+		_, err := stat(gitDir)
+		if err != nil {
+			return utils.WrapError(err)
+		}
+
+		return nil
+	}
+
+	// we haven't been given the git dir explicitly so we assume it's in the current working directory as `.git/` (or an ancestor directory)
+
 	for {
-		// we don't care if .git is a directory or a file: either is okay.
-		_, err := fs.Stat(path.Join(currentPath, ".git"))
+		_, err := stat(".git")
 
 		if err == nil {
-			return currentPath, nil
+			return nil
 		}
 
 		if !os.IsNotExist(err) {
-			return "", utils.WrapError(err)
+			return utils.WrapError(err)
 		}
 
-		currentPath = path.Dir(currentPath)
+		if err = chdir(".."); err != nil {
+			return utils.WrapError(err)
+		}
 
-		atRoot := currentPath == path.Dir(currentPath)
+		currentPath, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		atRoot := currentPath == filepath.Dir(currentPath)
 		if atRoot {
 			// we should never really land here: the code that creates GitCommand should
 			// verify we're in a git directory
-			return "", errors.New("Must open lazygit in a git repository")
+			return errors.New("Must open lazygit in a git repository")
 		}
 	}
 }
 
+// resolvePath takes a path containing a symlink and returns the true path
+func resolvePath(path string) (string, error) {
+	l, err := os.Lstat(path)
+	if err != nil {
+		return "", err
+	}
+
+	if l.Mode()&os.ModeSymlink == 0 {
+		return path, nil
+	}
+
+	return filepath.EvalSymlinks(path)
+}
+
+func setupRepository(openGitRepository func(string, *gogit.PlainOpenOptions) (*gogit.Repository, error), options gogit.PlainOpenOptions, gitConfigParseErrorStr string) (*gogit.Repository, error) {
+	unresolvedPath := env.GetGitDirEnv()
+	if unresolvedPath == "" {
+		var err error
+		unresolvedPath, err = os.Getwd()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	path, err := resolvePath(unresolvedPath)
+	if err != nil {
+		return nil, err
+	}
+
+	repository, err := openGitRepository(path, &options)
+	if err != nil {
+		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
+			return nil, errors.New(gitConfigParseErrorStr)
+		}
+
+		return nil, err
+	}
+
+	return repository, err
+}
+
+func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filename string) ([]byte, error)) (string, error) {
+	if env.GetGitDirEnv() != "" {
+		return env.GetGitDirEnv(), nil
+	}
+
+	f, err := stat(".git")
+	if err != nil {
+		return "", err
+	}
+
+	if f.IsDir() {
+		return ".git", nil
+	}
+
+	fileBytes, err := readFile(".git")
+	if err != nil {
+		return "", err
+	}
+	fileContent := string(fileBytes)
+	if !strings.HasPrefix(fileContent, "gitdir: ") {
+		return "", errors.New(".git is a file which suggests we are in a submodule or a worktree but the file's contents do not contain a gitdir pointing to the actual .git directory")
+	}
+	return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
+}
+
 func VerifyInGitRepo(osCommand *oscommands.OSCommand) error {
-	return osCommand.Cmd.New(git_commands.NewGitCmd("rev-parse").Arg("--git-dir").ToArgv()).DontLog().Run()
+	return osCommand.Cmd.New("git rev-parse --git-dir").DontLog().Run()
 }

pkg/commands/git_cmd_obj_builder.go

@@ -30,8 +30,12 @@ func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuild
 
 var defaultEnvVar = "GIT_OPTIONAL_LOCKS=0"
 
-func (self *gitCmdObjBuilder) New(args []string) oscommands.ICmdObj {
-	return self.innerBuilder.New(args).AddEnvVars(defaultEnvVar)
+func (self *gitCmdObjBuilder) New(cmdStr string) oscommands.ICmdObj {
+	return self.innerBuilder.New(cmdStr).AddEnvVars(defaultEnvVar)
+}
+
+func (self *gitCmdObjBuilder) NewFromArgs(args []string) oscommands.ICmdObj {
+	return self.innerBuilder.NewFromArgs(args).AddEnvVars(defaultEnvVar)
 }
 
 func (self *gitCmdObjBuilder) NewShell(cmdStr string) oscommands.ICmdObj {

pkg/commands/git_cmd_obj_runner.go

@@ -1,20 +1,12 @@
 package commands
 
 import (
-	"strings"
-	"time"
-
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/sirupsen/logrus"
 )
 
 // here we're wrapping the default command runner in some git-specific stuff e.g. retry logic if we get an error due to the presence of .git/index.lock
 
-const (
-	WaitTime   = 50 * time.Millisecond
-	RetryCount = 5
-)
-
 type gitCmdObjRunner struct {
 	log         *logrus.Entry
 	innerRunner oscommands.ICmdObjRunner
@@ -26,44 +18,13 @@ func (self *gitCmdObjRunner) Run(cmdObj oscommands.ICmdObj) error {
 }
 
 func (self *gitCmdObjRunner) RunWithOutput(cmdObj oscommands.ICmdObj) (string, error) {
-	var output string
-	var err error
-	for i := 0; i < RetryCount; i++ {
-		newCmdObj := cmdObj.Clone()
-		output, err = self.innerRunner.RunWithOutput(newCmdObj)
-
-		if err == nil || !strings.Contains(output, ".git/index.lock") {
-			return output, err
-		}
-
-		// if we have an error based on the index lock, we should wait a bit and then retry
-		self.log.Warn("index.lock prevented command from running. Retrying command after a small wait")
-		time.Sleep(WaitTime)
-	}
-
-	return output, err
+	return self.innerRunner.RunWithOutput(cmdObj)
 }
 
 func (self *gitCmdObjRunner) RunWithOutputs(cmdObj oscommands.ICmdObj) (string, string, error) {
-	var stdout, stderr string
-	var err error
-	for i := 0; i < RetryCount; i++ {
-		newCmdObj := cmdObj.Clone()
-		stdout, stderr, err = self.innerRunner.RunWithOutputs(newCmdObj)
-
-		if err == nil || !strings.Contains(stdout+stderr, ".git/index.lock") {
-			return stdout, stderr, err
-		}
-
-		// if we have an error based on the index lock, we should wait a bit and then retry
-		self.log.Warn("index.lock prevented command from running. Retrying command after a small wait")
-		time.Sleep(WaitTime)
-	}
-
-	return stdout, stderr, err
+	return self.innerRunner.RunWithOutputs(cmdObj)
 }
 
-// Retry logic not implemented here, but these commands typically don't need to obtain a lock.
 func (self *gitCmdObjRunner) RunAndProcessLines(cmdObj oscommands.ICmdObj, onLine func(line string) (bool, error)) error {
 	return self.innerRunner.RunAndProcessLines(cmdObj, onLine)
 }

pkg/commands/git_commands/bisect.go

@@ -19,16 +19,12 @@ func NewBisectCommands(gitCommon *GitCommon) *BisectCommands {
 // This command is pretty cheap to run so we're not storing the result anywhere.
 // But if it becomes problematic we can chang that.
 func (self *BisectCommands) GetInfo() *BisectInfo {
-	return self.GetInfoForGitDir(self.repoPaths.WorktreeGitDirPath())
-}
-
-func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 	var err error
 	info := &BisectInfo{started: false, log: self.Log, newTerm: "bad", oldTerm: "good"}
 	// we return nil if we're not in a git bisect session.
 	// we know we're in a session by the presence of a .git/BISECT_START file
 
-	bisectStartPath := filepath.Join(gitDir, "BISECT_START")
+	bisectStartPath := filepath.Join(self.dotGitDir, "BISECT_START")
 	exists, err := self.os.FileExists(bisectStartPath)
 	if err != nil {
 		self.Log.Infof("error getting git bisect info: %s", err.Error())
@@ -48,7 +44,7 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 	info.started = true
 	info.start = strings.TrimSpace(string(startContent))
 
-	termsContent, err := os.ReadFile(filepath.Join(gitDir, "BISECT_TERMS"))
+	termsContent, err := os.ReadFile(filepath.Join(self.dotGitDir, "BISECT_TERMS"))
 	if err != nil {
 		// old git versions won't have this file so we default to bad/good
 	} else {
@@ -57,7 +53,7 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 		info.oldTerm = splitContent[1]
 	}
 
-	bisectRefsDir := filepath.Join(gitDir, "refs", "bisect")
+	bisectRefsDir := filepath.Join(self.dotGitDir, "refs", "bisect")
 	files, err := os.ReadDir(bisectRefsDir)
 	if err != nil {
 		self.Log.Infof("error getting git bisect info: %s", err.Error())
@@ -89,7 +85,7 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 		info.statusMap[sha] = status
 	}
 
-	currentContent, err := os.ReadFile(filepath.Join(gitDir, "BISECT_EXPECTED_REV"))
+	currentContent, err := os.ReadFile(filepath.Join(self.dotGitDir, "BISECT_EXPECTED_REV"))
 	if err != nil {
 		self.Log.Infof("error getting git bisect info: %s", err.Error())
 		return info
@@ -101,15 +97,15 @@ func (self *BisectCommands) GetInfoForGitDir(gitDir string) *BisectInfo {
 }
 
 func (self *BisectCommands) Reset() error {
-	cmdArgs := NewGitCmd("bisect").Arg("reset").ToArgv()
+	cmdStr := NewGitCmd("bisect").Arg("reset").ToString()
 
-	return self.cmd.New(cmdArgs).StreamOutput().Run()
+	return self.cmd.New(cmdStr).StreamOutput().Run()
 }
 
 func (self *BisectCommands) Mark(ref string, term string) error {
-	cmdArgs := NewGitCmd("bisect").Arg(term, ref).ToArgv()
+	cmdStr := NewGitCmd("bisect").Arg(term, ref).ToString()
 
-	return self.cmd.New(cmdArgs).
+	return self.cmd.New(cmdStr).
 		IgnoreEmptyError().
 		StreamOutput().
 		Run()
@@ -120,18 +116,9 @@ func (self *BisectCommands) Skip(ref string) error {
 }
 
 func (self *BisectCommands) Start() error {
-	cmdArgs := NewGitCmd("bisect").Arg("start").ToArgv()
+	cmdStr := NewGitCmd("bisect").Arg("start").ToString()
 
-	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()
+	return self.cmd.New(cmdStr).StreamOutput().Run()
 }
 
 // tells us whether we've found our problem commit(s). We return a string slice of
@@ -153,8 +140,8 @@ func (self *BisectCommands) IsDone() (bool, []string, error) {
 	done := false
 	candidates := []string{}
 
-	cmdArgs := NewGitCmd("rev-list").Arg(newSha).ToArgv()
-	err := self.cmd.New(cmdArgs).RunAndProcessLines(func(line string) (bool, error) {
+	cmdStr := NewGitCmd("rev-list").Arg(newSha).ToString()
+	err := self.cmd.New(cmdStr).RunAndProcessLines(func(line string) (bool, error) {
 		sha := strings.TrimSpace(line)
 
 		if status, ok := info.statusMap[sha]; ok {
@@ -184,11 +171,11 @@ func (self *BisectCommands) IsDone() (bool, []string, error) {
 // bisecting is actually a descendant of our current bisect commit. If it's not, we need to
 // render the commits from the bad commit.
 func (self *BisectCommands) ReachableFromStart(bisectInfo *BisectInfo) bool {
-	cmdArgs := NewGitCmd("merge-base").
+	cmdStr := NewGitCmd("merge-base").
 		Arg("--is-ancestor", bisectInfo.GetNewSha(), bisectInfo.GetStartSha()).
-		ToArgv()
+		ToString()
 
-	err := self.cmd.New(cmdArgs).DontLog().Run()
+	err := self.cmd.New(cmdStr).DontLog().Run()
 
 	return err == nil
 }

pkg/commands/git_commands/bisect_info.go

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

pkg/commands/git_commands/branch.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/mgutz/str"
 )
 
 type BranchCommands struct {
@@ -21,11 +20,11 @@ func NewBranchCommands(gitCommon *GitCommon) *BranchCommands {
 
 // New creates a new branch
 func (self *BranchCommands) New(name string, base string) error {
-	cmdArgs := NewGitCmd("checkout").
-		Arg("-b", name, base).
-		ToArgv()
+	cmdStr := NewGitCmd("checkout").
+		Arg("-b", self.cmd.Quote(name), self.cmd.Quote(base)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // CurrentBranchInfo get the current branch information.
@@ -33,7 +32,7 @@ func (self *BranchCommands) CurrentBranchInfo() (BranchInfo, error) {
 	branchName, err := self.cmd.New(
 		NewGitCmd("symbolic-ref").
 			Arg("--short", "HEAD").
-			ToArgv(),
+			ToString(),
 	).DontLog().RunWithOutput()
 	if err == nil && branchName != "HEAD\n" {
 		trimmedBranchName := strings.TrimSpace(branchName)
@@ -45,8 +44,8 @@ func (self *BranchCommands) CurrentBranchInfo() (BranchInfo, error) {
 	}
 	output, err := self.cmd.New(
 		NewGitCmd("branch").
-			Arg("--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)").
-			ToArgv(),
+			Arg("--points-at=HEAD", "--format=\"%(HEAD)%00%(objectname)%00%(refname)\"").
+			ToString(),
 	).DontLog().RunWithOutput()
 	if err != nil {
 		return BranchInfo{}, err
@@ -70,29 +69,14 @@ 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 {
-	cmdArgs := NewGitCmd("branch").
+// Delete delete branch
+func (self *BranchCommands) Delete(branch string, force bool) error {
+	cmdStr := NewGitCmd("branch").
 		ArgIfElse(force, "-D", "-d").
-		Arg(branch).
-		ToArgv()
+		Arg(self.cmd.Quote(branch)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // Checkout checks out a branch (or commit), with --force if you set the force arg to true
@@ -102,12 +86,12 @@ type CheckoutOptions struct {
 }
 
 func (self *BranchCommands) Checkout(branch string, options CheckoutOptions) error {
-	cmdArgs := NewGitCmd("checkout").
+	cmdStr := NewGitCmd("checkout").
 		ArgIf(options.Force, "--force").
-		Arg(branch).
-		ToArgv()
+		Arg(self.cmd.Quote(branch)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).
+	return self.cmd.New(cmdStr).
 		// prevents git from prompting us for input which would freeze the program
 		// TODO: see if this is actually needed here
 		AddEnvVars("GIT_TERMINAL_PROMPT=0").
@@ -127,34 +111,31 @@ func (self *BranchCommands) GetGraphCmdObj(branchName string) oscommands.ICmdObj
 	templateValues := map[string]string{
 		"branchName": self.cmd.Quote(branchName),
 	}
-
-	resolvedTemplate := utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)
-
-	return self.cmd.New(str.ToArgv(resolvedTemplate)).DontLog()
+	return self.cmd.New(utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)).DontLog()
 }
 
 func (self *BranchCommands) SetCurrentBranchUpstream(remoteName string, remoteBranchName string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", remoteName, remoteBranchName)).
-		ToArgv()
+	cmdStr := NewGitCmd("branch").
+		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", self.cmd.Quote(remoteName), self.cmd.Quote(remoteBranchName))).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *BranchCommands) SetUpstream(remoteName string, remoteBranchName string, branchName string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", remoteName, remoteBranchName)).
-		Arg(branchName).
-		ToArgv()
+	cmdStr := NewGitCmd("branch").
+		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", self.cmd.Quote(remoteName), self.cmd.Quote(remoteBranchName))).
+		Arg(self.cmd.Quote(branchName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *BranchCommands) UnsetUpstream(branchName string) error {
-	cmdArgs := NewGitCmd("branch").Arg("--unset-upstream", branchName).
-		ToArgv()
+	cmdStr := NewGitCmd("branch").Arg("--unset-upstream", self.cmd.Quote(branchName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *BranchCommands) GetCurrentBranchUpstreamDifferenceCount() (string, string) {
@@ -180,27 +161,37 @@ func (self *BranchCommands) GetCommitDifferences(from, to string) (string, strin
 }
 
 func (self *BranchCommands) countDifferences(from, to string) (string, error) {
-	cmdArgs := NewGitCmd("rev-list").
+	cmdStr := NewGitCmd("rev-list").
 		Arg(fmt.Sprintf("%s..%s", from, to)).
 		Arg("--count").
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return self.cmd.New(cmdStr).DontLog().RunWithOutput()
 }
 
 func (self *BranchCommands) IsHeadDetached() bool {
-	cmdArgs := NewGitCmd("symbolic-ref").Arg("-q", "HEAD").ToArgv()
+	cmdStr := NewGitCmd("symbolic-ref").Arg("-q", "HEAD").ToString()
 
-	err := self.cmd.New(cmdArgs).DontLog().Run()
+	err := self.cmd.New(cmdStr).DontLog().Run()
 	return err != nil
 }
 
 func (self *BranchCommands) Rename(oldName string, newName string) error {
-	cmdArgs := NewGitCmd("branch").
-		Arg("--move", oldName, newName).
-		ToArgv()
+	cmdStr := NewGitCmd("branch").
+		Arg("--move", self.cmd.Quote(oldName), self.cmd.Quote(newName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
+}
+
+func (self *BranchCommands) GetRawBranches() (string, error) {
+	cmdStr := NewGitCmd("for-each-ref").
+		Arg("--sort=-committerdate").
+		Arg(`--format="%(HEAD)%00%(refname:short)%00%(upstream:short)%00%(upstream:track)"`).
+		Arg("refs/heads").
+		ToString()
+
+	return self.cmd.New(cmdStr).DontLog().RunWithOutput()
 }
 
 type MergeOpts struct {
@@ -208,16 +199,16 @@ type MergeOpts struct {
 }
 
 func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
-	cmdArgs := NewGitCmd("merge").
+	command := NewGitCmd("merge").
 		Arg("--no-edit").
 		ArgIf(self.UserConfig.Git.Merging.Args != "", self.UserConfig.Git.Merging.Args).
 		ArgIf(opts.FastForwardOnly, "--ff-only").
-		Arg(branchName).
-		ToArgv()
+		Arg(self.cmd.Quote(branchName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(command).Run()
 }
 
 func (self *BranchCommands) AllBranchesLogCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(str.ToArgv(self.UserConfig.Git.AllBranchesLogCmd)).DontLog()
+	return self.cmd.New(self.UserConfig.Git.AllBranchesLogCmd).DontLog()
 }

pkg/commands/git_commands/branch_loader.go

@@ -1,18 +1,15 @@
 package git_commands
 
 import (
-	"fmt"
 	"regexp"
 	"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:
@@ -39,20 +36,20 @@ type BranchInfo struct {
 // BranchLoader returns a list of Branch objects for the current repo
 type BranchLoader struct {
 	*common.Common
-	cmd                  oscommands.ICmdObjBuilder
+	getRawBranches       func() (string, error)
 	getCurrentBranchInfo func() (BranchInfo, error)
 	config               BranchLoaderConfigCommands
 }
 
 func NewBranchLoader(
 	cmn *common.Common,
-	cmd oscommands.ICmdObjBuilder,
+	getRawBranches func() (string, error),
 	getCurrentBranchInfo func() (BranchInfo, error),
 	config BranchLoaderConfigCommands,
 ) *BranchLoader {
 	return &BranchLoader{
 		Common:               cmn,
-		cmd:                  cmd,
+		getRawBranches:       getRawBranches,
 		getCurrentBranchInfo: getCurrentBranchInfo,
 		config:               config,
 	}
@@ -75,26 +72,20 @@ 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
 			}
 		}
 	}
 
-	// Sort branches that don't have a recency value alphabetically
-	// (we're really doing this for the sake of deterministic behaviour across git versions)
-	slices.SortFunc(branches, func(a *models.Branch, b *models.Branch) bool {
-		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 +94,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,14 +122,14 @@ 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
 		}
 
 		split := strings.Split(line, "\x00")
-		if len(split) != len(branchFields) {
-			// Ignore line if it isn't separated into the expected number of parts
+		if len(split) != 4 {
+			// Ignore line if it isn't separated into 4 parts
 			// This is probably a warning message, for more info see:
 			// https://github.com/jesseduffield/lazygit/issues/1385#issuecomment-885580439
 			return nil, false
@@ -148,81 +139,47 @@ func (self *BranchLoader) obtainBranches() []*models.Branch {
 	})
 }
 
-func (self *BranchLoader) getRawBranches() (string, error) {
-	format := strings.Join(
-		lo.Map(branchFields, func(thing string, _ int) string {
-			return "%(" + thing + ")"
-		}),
-		"%00",
-	)
-
-	cmdArgs := NewGitCmd("for-each-ref").
-		Arg("--sort=-committerdate").
-		Arg(fmt.Sprintf("--format=%s", format)).
-		Arg("refs/heads").
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-}
-
-var branchFields = []string{
-	"HEAD",
-	"refname:short",
-	"upstream:short",
-	"upstream:track",
-	"subject",
-	"objectname",
-}
-
 // Obtain branch information from parsed line output of getRawBranches()
+// split contains the '|' separated tokens in the line of output
 func obtainBranch(split []string) *models.Branch {
-	headMarker := split[0]
-	fullName := split[1]
-	upstreamName := split[2]
-	track := split[3]
-	subject := split[4]
-	commitHash := split[5]
-
-	name := strings.TrimPrefix(fullName, "heads/")
-	pushables, pullables, gone := parseUpstreamInfo(upstreamName, track)
-
-	return &models.Branch{
-		Name:         name,
-		Pushables:    pushables,
-		Pullables:    pullables,
-		UpstreamGone: gone,
-		Head:         headMarker == "*",
-		Subject:      subject,
-		CommitHash:   commitHash,
+	name := strings.TrimPrefix(split[1], "heads/")
+	branch := &models.Branch{
+		Name:      name,
+		Pullables: "?",
+		Pushables: "?",
+		Head:      split[0] == "*",
 	}
-}
 
-func parseUpstreamInfo(upstreamName string, track string) (string, string, bool) {
+	upstreamName := split[2]
 	if upstreamName == "" {
 		// if we're here then it means we do not have a local version of the remote.
 		// The branch might still be tracking a remote though, we just don't know
 		// how many commits ahead/behind it is
-		return "?", "?", false
+		return branch
 	}
 
+	track := split[3]
 	if track == "[gone]" {
-		return "?", "?", true
-	}
-
-	pushables := parseDifference(track, `ahead (\d+)`)
-	pullables := parseDifference(track, `behind (\d+)`)
-
-	return pushables, pullables, false
-}
-
-func parseDifference(track string, regexStr string) string {
-	re := regexp.MustCompile(regexStr)
-	match := re.FindStringSubmatch(track)
-	if len(match) > 1 {
-		return match[1]
+		branch.UpstreamGone = true
 	} else {
-		return "0"
+		re := regexp.MustCompile(`ahead (\d+)`)
+		match := re.FindStringSubmatch(track)
+		if len(match) > 1 {
+			branch.Pushables = match[1]
+		} else {
+			branch.Pushables = "0"
+		}
+
+		re = regexp.MustCompile(`behind (\d+)`)
+		match = re.FindStringSubmatch(track)
+		if len(match) > 1 {
+			branch.Pullables = match[1]
+		} else {
+			branch.Pullables = "0"
+		}
 	}
+
+	return branch
 }
 
 // TODO: only look at the new reflog commits, and otherwise store the recencies in

pkg/commands/git_commands/branch_loader_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestObtainBranch(t *testing.T) {
+func TestObtainBanch(t *testing.T) {
 	type scenario struct {
 		testName       string
 		input          []string
@@ -17,65 +17,29 @@ func TestObtainBranch(t *testing.T) {
 
 	scenarios := []scenario{
 		{
-			testName: "TrimHeads",
-			input:    []string{"", "heads/a_branch", "", "", "subject", "123"},
-			expectedBranch: &models.Branch{
-				Name:       "a_branch",
-				Pushables:  "?",
-				Pullables:  "?",
-				Head:       false,
-				Subject:    "subject",
-				CommitHash: "123",
-			},
+			testName:       "TrimHeads",
+			input:          []string{"", "heads/a_branch", "", ""},
+			expectedBranch: &models.Branch{Name: "a_branch", Pushables: "?", Pullables: "?", Head: false},
 		},
 		{
-			testName: "NoUpstream",
-			input:    []string{"", "a_branch", "", "", "subject", "123"},
-			expectedBranch: &models.Branch{
-				Name:       "a_branch",
-				Pushables:  "?",
-				Pullables:  "?",
-				Head:       false,
-				Subject:    "subject",
-				CommitHash: "123",
-			},
+			testName:       "NoUpstream",
+			input:          []string{"", "a_branch", "", ""},
+			expectedBranch: &models.Branch{Name: "a_branch", Pushables: "?", Pullables: "?", Head: false},
 		},
 		{
-			testName: "IsHead",
-			input:    []string{"*", "a_branch", "", "", "subject", "123"},
-			expectedBranch: &models.Branch{
-				Name:       "a_branch",
-				Pushables:  "?",
-				Pullables:  "?",
-				Head:       true,
-				Subject:    "subject",
-				CommitHash: "123",
-			},
+			testName:       "IsHead",
+			input:          []string{"*", "a_branch", "", ""},
+			expectedBranch: &models.Branch{Name: "a_branch", Pushables: "?", Pullables: "?", Head: true},
 		},
 		{
-			testName: "IsBehindAndAhead",
-			input:    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "subject", "123"},
-			expectedBranch: &models.Branch{
-				Name:       "a_branch",
-				Pushables:  "3",
-				Pullables:  "2",
-				Head:       false,
-				Subject:    "subject",
-				CommitHash: "123",
-			},
+			testName:       "IsBehindAndAhead",
+			input:          []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]"},
+			expectedBranch: &models.Branch{Name: "a_branch", Pushables: "3", Pullables: "2", Head: false},
 		},
 		{
-			testName: "RemoteBranchIsGone",
-			input:    []string{"", "a_branch", "a_remote/a_branch", "[gone]", "subject", "123"},
-			expectedBranch: &models.Branch{
-				Name:         "a_branch",
-				UpstreamGone: true,
-				Pushables:    "?",
-				Pullables:    "?",
-				Head:         false,
-				Subject:      "subject",
-				CommitHash:   "123",
-			},
+			testName:       "RemoteBranchIsGone",
+			input:          []string{"", "a_branch", "a_remote/a_branch", "[gone]"},
+			expectedBranch: &models.Branch{Name: "a_branch", UpstreamGone: true, Pushables: "?", Pullables: "?", Head: false},
 		},
 	}
 

pkg/commands/git_commands/branch_test.go

@@ -21,21 +21,21 @@ func TestBranchGetCommitDifferences(t *testing.T) {
 		{
 			"Can't retrieve pushable count",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rev-list", "@{u}..HEAD", "--count"}, "", errors.New("error")),
+				Expect("git rev-list @{u}..HEAD --count", "", errors.New("error")),
 			"?", "?",
 		},
 		{
 			"Can't retrieve pullable count",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rev-list", "@{u}..HEAD", "--count"}, "1\n", nil).
-				ExpectGitArgs([]string{"rev-list", "HEAD..@{u}", "--count"}, "", errors.New("error")),
+				Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
+				Expect("git rev-list HEAD..@{u} --count", "", errors.New("error")),
 			"?", "?",
 		},
 		{
 			"Retrieve pullable and pushable count",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rev-list", "@{u}..HEAD", "--count"}, "1\n", nil).
-				ExpectGitArgs([]string{"rev-list", "HEAD..@{u}", "--count"}, "2\n", nil),
+				Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
+				Expect("git rev-list HEAD..@{u} --count", "2\n", nil),
 			"1", "2",
 		},
 	}
@@ -54,7 +54,7 @@ func TestBranchGetCommitDifferences(t *testing.T) {
 
 func TestBranchNewBranch(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).
-		ExpectGitArgs([]string{"checkout", "-b", "test", "refs/heads/master"}, "", nil)
+		Expect(`git checkout -b "test" "refs/heads/master"`, "", nil)
 	instance := buildBranchCommands(commonDeps{runner: runner})
 
 	assert.NoError(t, instance.New("test", "refs/heads/master"))
@@ -73,7 +73,7 @@ func TestBranchDeleteBranch(t *testing.T) {
 		{
 			"Delete a branch",
 			false,
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"branch", "-d", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git branch -d "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -81,7 +81,7 @@ func TestBranchDeleteBranch(t *testing.T) {
 		{
 			"Force delete a branch",
 			true,
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"branch", "-D", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git branch -D "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -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()
 		})
 	}
@@ -105,14 +105,14 @@ func TestBranchMerge(t *testing.T) {
 		userConfig *config.UserConfig
 		opts       MergeOpts
 		branchName string
-		expected   []string
+		expected   string
 	}{
 		{
 			testName:   "basic",
 			userConfig: &config.UserConfig{},
 			opts:       MergeOpts{},
 			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "mybranch"},
+			expected:   `git merge --no-edit "mybranch"`,
 		},
 		{
 			testName: "merging args",
@@ -125,14 +125,14 @@ func TestBranchMerge(t *testing.T) {
 			},
 			opts:       MergeOpts{},
 			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "--merging-args", "mybranch"},
+			expected:   `git merge --no-edit --merging-args "mybranch"`,
 		},
 		{
 			testName:   "fast forward only",
 			userConfig: &config.UserConfig{},
 			opts:       MergeOpts{FastForwardOnly: true},
 			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "--ff-only", "mybranch"},
+			expected:   `git merge --no-edit --ff-only "mybranch"`,
 		},
 	}
 
@@ -140,7 +140,7 @@ func TestBranchMerge(t *testing.T) {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			runner := oscommands.NewFakeRunner(t).
-				ExpectGitArgs(s.expected, "", nil)
+				Expect(s.expected, "", nil)
 			instance := buildBranchCommands(commonDeps{runner: runner, userConfig: s.userConfig})
 
 			assert.NoError(t, instance.Merge(s.branchName, s.opts))
@@ -160,7 +160,7 @@ func TestBranchCheckout(t *testing.T) {
 	scenarios := []scenario{
 		{
 			"Checkout",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"checkout", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git checkout "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -168,7 +168,7 @@ func TestBranchCheckout(t *testing.T) {
 		},
 		{
 			"Checkout forced",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"checkout", "--force", "test"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect(`git checkout --force "test"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},
@@ -214,7 +214,7 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
 	scenarios := []scenario{
 		{
 			"says we are on the master branch if we are",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "master", nil),
+			oscommands.NewFakeRunner(t).Expect(`git symbolic-ref --short HEAD`, "master", nil),
 			func(info BranchInfo, err error) {
 				assert.NoError(t, err)
 				assert.EqualValues(t, "master", info.RefName)
@@ -225,9 +225,8 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
 		{
 			"falls back to git `git branch --points-at=HEAD` if symbolic-ref fails",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"branch", "--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)"},
-					"*\x006f71c57a8d4bd6c11399c3f55f42c815527a73a4\x00(HEAD detached at 6f71c57a)\n", nil),
+				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
+				Expect(`git branch --points-at=HEAD --format="%(HEAD)%00%(objectname)%00%(refname)"`, "*\x006f71c57a8d4bd6c11399c3f55f42c815527a73a4\x00(HEAD detached at 6f71c57a)\n", nil),
 			func(info BranchInfo, err error) {
 				assert.NoError(t, err)
 				assert.EqualValues(t, "6f71c57a8d4bd6c11399c3f55f42c815527a73a4", info.RefName)
@@ -238,9 +237,9 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
 		{
 			"handles a detached head (LANG=zh_CN.UTF-8)",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "", errors.New("error")).
-				ExpectGitArgs(
-					[]string{"branch", "--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)"},
+				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
+				Expect(
+					`git branch --points-at=HEAD --format="%(HEAD)%00%(objectname)%00%(refname)"`,
 					"*\x00679b0456f3db7c505b398def84e7d023e5b55a8d\x00（头指针在 679b0456 分离）\n"+
 						" \x00679b0456f3db7c505b398def84e7d023e5b55a8d\x00refs/heads/master\n",
 					nil),
@@ -254,8 +253,8 @@ func TestBranchCurrentBranchInfo(t *testing.T) {
 		{
 			"bubbles up error if there is one",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"branch", "--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)"}, "", errors.New("error")),
+				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
+				Expect(`git branch --points-at=HEAD --format="%(HEAD)%00%(objectname)%00%(refname)"`, "", errors.New("error")),
 			func(info BranchInfo, err error) {
 				assert.Error(t, err)
 				assert.EqualValues(t, "", info.RefName)

pkg/commands/git_commands/commit.go

@@ -3,6 +3,7 @@ package git_commands
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
@@ -22,43 +23,27 @@ func NewCommitCommands(gitCommon *GitCommon) *CommitCommands {
 
 // ResetAuthor resets the author of the topmost commit
 func (self *CommitCommands) ResetAuthor() error {
-	cmdArgs := NewGitCmd("commit").
+	cmdStr := NewGitCmd("commit").
 		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--reset-author").
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // Sets the commit's author to the supplied value. Value is expected to be of the form 'Name <Email>'
 func (self *CommitCommands) SetAuthor(value string) error {
-	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--author="+value).
-		ToArgv()
+	cmdStr := NewGitCmd("commit").
+		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--author="+self.cmd.Quote(value)).
+		ToString()
 
-	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()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // ResetToCommit reset to commit
 func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars []string) error {
-	cmdArgs := NewGitCmd("reset").Arg("--"+strength, sha).ToArgv()
+	cmdStr := NewGitCmd("reset").Arg("--"+strength, sha).ToString()
 
-	return self.cmd.New(cmdArgs).
+	return self.cmd.New(cmdStr).
 		// prevents git from prompting us for input which would freeze the program
 		// TODO: see if this is actually needed here
 		AddEnvVars("GIT_TERMINAL_PROMPT=0").
@@ -66,54 +51,38 @@ func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars [
 		Run()
 }
 
-func (self *CommitCommands) CommitCmdObj(summary string, description string) oscommands.ICmdObj {
-	messageArgs := self.commitMessageArgs(summary, description)
+func (self *CommitCommands) CommitCmdObj(message string) oscommands.ICmdObj {
+	messageArgs := self.commitMessageArgs(message)
 
 	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
 
-	cmdArgs := NewGitCmd("commit").
-		ArgIf(skipHookPrefix != "" && strings.HasPrefix(summary, skipHookPrefix), "--no-verify").
+	cmdStr := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
 		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
 		Arg(messageArgs...).
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs)
-}
-
-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())
+	return self.cmd.New(cmdStr)
 }
 
 // RewordLastCommit rewords the topmost commit with the given message
-func (self *CommitCommands) RewordLastCommit(summary string, description string) error {
-	messageArgs := self.commitMessageArgs(summary, description)
+func (self *CommitCommands) RewordLastCommit(message string) error {
+	messageArgs := self.commitMessageArgs(message)
 
-	cmdArgs := NewGitCmd("commit").
+	cmdStr := NewGitCmd("commit").
 		Arg("--allow-empty", "--amend", "--only").
 		Arg(messageArgs...).
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
-func (self *CommitCommands) commitMessageArgs(summary string, description string) []string {
-	args := []string{"-m", summary}
+func (self *CommitCommands) commitMessageArgs(message string) []string {
+	msg, description, _ := strings.Cut(message, "\n")
+	args := []string{"-m", self.cmd.Quote(msg)}
 
 	if description != "" {
-		args = append(args, "-m", description)
+		args = append(args, "-m", self.cmd.Quote(description))
 	}
 
 	return args
@@ -121,11 +90,12 @@ func (self *CommitCommands) commitMessageArgs(summary string, description string
 
 // runs git commit without the -m argument meaning it will invoke the user's editor
 func (self *CommitCommands) CommitEditorCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("commit").
+	cmdStr := NewGitCmd("commit").
 		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
-		ToArgv()
+		ArgIf(self.verboseFlag() != "", self.verboseFlag()).
+		ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
 func (self *CommitCommands) signoffFlag() string {
@@ -136,20 +106,39 @@ func (self *CommitCommands) signoffFlag() string {
 	}
 }
 
-func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
-	cmdArgs := NewGitCmd("rev-list").
-		Arg("--format=%B", "--max-count=1", commitSha).
-		ToArgv()
+func (self *CommitCommands) verboseFlag() string {
+	switch self.config.UserConfig.Git.Commit.Verbose {
+	case "always":
+		return "--verbose"
+	case "never":
+		return "--no-verbose"
+	default:
+		return ""
+	}
+}
 
-	messageWithHeader, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+// Get the subject of the HEAD commit
+func (self *CommitCommands) GetHeadCommitMessage() (string, error) {
+	cmdStr := NewGitCmd("log").Arg("-1", "--pretty=%s").ToString()
+
+	message, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
+	return strings.TrimSpace(message), err
+}
+
+func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
+	cmdStr := NewGitCmd("rev-list").
+		Arg("--format=%B", "--max-count=1", commitSha).
+		ToString()
+
+	messageWithHeader, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	message := strings.Join(strings.SplitAfter(messageWithHeader, "\n")[1:], "")
 	return strings.TrimSpace(message), err
 }
 
 func (self *CommitCommands) GetCommitDiff(commitSha string) (string, error) {
-	cmdArgs := NewGitCmd("show").Arg("--no-color", commitSha).ToArgv()
+	cmdStr := NewGitCmd("show").Arg("--no-color", commitSha).ToString()
 
-	diff, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	diff, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	return diff, err
 }
 
@@ -159,11 +148,11 @@ type Author struct {
 }
 
 func (self *CommitCommands) GetCommitAuthor(commitSha string) (Author, error) {
-	cmdArgs := NewGitCmd("show").
+	cmdStr := NewGitCmd("show").
 		Arg("--no-patch", "--pretty=format:'%an%x00%ae'", commitSha).
-		ToArgv()
+		ToString()
 
-	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	output, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	if err != nil {
 		return Author{}, err
 	}
@@ -182,21 +171,21 @@ func (self *CommitCommands) GetCommitMessageFirstLine(sha string) (string, error
 }
 
 func (self *CommitCommands) GetCommitMessagesFirstLine(shas []string) (string, error) {
-	cmdArgs := NewGitCmd("show").
+	cmdStr := NewGitCmd("show").
 		Arg("--no-patch", "--pretty=format:%s").
 		Arg(shas...).
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return self.cmd.New(cmdStr).DontLog().RunWithOutput()
 }
 
 func (self *CommitCommands) GetCommitsOneline(shas []string) (string, error) {
-	cmdArgs := NewGitCmd("show").
+	cmdStr := NewGitCmd("show").
 		Arg("--no-patch", "--oneline").
 		Arg(shas...).
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return self.cmd.New(cmdStr).DontLog().RunWithOutput()
 }
 
 // AmendHead amends HEAD with whatever is staged in your working tree
@@ -205,64 +194,76 @@ func (self *CommitCommands) AmendHead() error {
 }
 
 func (self *CommitCommands) AmendHeadCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("commit").
+	cmdStr := NewGitCmd("commit").
 		Arg("--amend", "--no-edit", "--allow-empty").
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
-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").
+	cmdStr := NewGitCmd("show").
 		Arg("--submodule").
 		Arg("--color="+self.UserConfig.Git.Paging.ColorArg).
 		Arg(fmt.Sprintf("--unified=%d", contextSize)).
 		Arg("--stat").
-		Arg("--decorate").
 		Arg("-p").
 		Arg(sha).
-		ArgIf(self.AppState.IgnoreWhitespaceInDiffView, "--ignore-all-space").
-		ArgIf(filterPath != "", "--", filterPath).
-		ToArgv()
+		ArgIf(ignoreWhitespace, "--ignore-all-space").
+		ArgIf(filterPath != "", "--", self.cmd.Quote(filterPath)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog()
+	return self.cmd.New(cmdStr).DontLog()
 }
 
 // Revert reverts the selected commit by sha
 func (self *CommitCommands) Revert(sha string) error {
-	cmdArgs := NewGitCmd("revert").Arg(sha).ToArgv()
+	cmdStr := NewGitCmd("revert").Arg(sha).ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *CommitCommands) RevertMerge(sha string, parentNumber int) error {
-	cmdArgs := NewGitCmd("revert").Arg(sha, "-m", fmt.Sprintf("%d", parentNumber)).
-		ToArgv()
+	cmdStr := NewGitCmd("revert").Arg(sha, "-m", fmt.Sprintf("%d", parentNumber)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // CreateFixupCommit creates a commit that fixes up a previous commit
 func (self *CommitCommands) CreateFixupCommit(sha string) error {
-	cmdArgs := NewGitCmd("commit").Arg("--fixup=" + sha).ToArgv()
+	cmdStr := NewGitCmd("commit").Arg("--fixup=" + sha).ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // a value of 0 means the head commit, 1 is the parent commit, etc
 func (self *CommitCommands) GetCommitMessageFromHistory(value int) (string, error) {
-	cmdArgs := NewGitCmd("log").Arg("-1", fmt.Sprintf("--skip=%d", value), "--pretty=%H").
-		ToArgv()
+	cmdStr := NewGitCmd("log").Arg("-1", fmt.Sprintf("--skip=%d", value), "--pretty=%H").
+		ToString()
 
-	hash, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	hash, _ := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	formattedHash := strings.TrimSpace(hash)
 	if len(formattedHash) == 0 {
 		return "", ErrInvalidCommitIndex
 	}
 	return self.GetCommitMessage(formattedHash)
 }
+
+// Returns hashes of recent commits which changed the given file
+// Note: This does not look for the last X commits to change a file, instead
+// it looks among the last X commits and see which of them happened to have changed the file.
+// This is more efficient.
+func (self *CommitCommands) GetRecentCommitsWhichChangedFile(path string) []string {
+	t := time.Now()
+	// Checking last X commits. Funnily this seems to actually consider more than the last
+	// X, perhaps because of topological sorting.
+	cmdStr := NewGitCmd("log").Arg("HEAD~50..HEAD", "--pretty=%H", "--", self.cmd.Quote(path)).
+		ToString()
+
+	hashes, _ := self.cmd.New(cmdStr).DontLog().RunWithOutput()
+	self.Log.Warn(fmt.Sprintf("GetRecentCommitsWhichChangedFile took %s", time.Since(t)))
+	return strings.Split(strings.TrimSpace(hashes), "\n")
+}

pkg/commands/git_commands/commit_file_loader.go

@@ -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"
@@ -23,7 +24,7 @@ func NewCommitFileLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *
 
 // GetFilesInDiff get the specified commit files
 func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse bool) ([]*models.CommitFile, error) {
-	cmdArgs := NewGitCmd("diff").
+	cmdStr := NewGitCmd("diff").
 		Arg("--submodule").
 		Arg("--no-ext-diff").
 		Arg("--name-status").
@@ -32,9 +33,9 @@ func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse boo
 		ArgIf(reverse, "-R").
 		Arg(from).
 		Arg(to).
-		ToArgv()
+		ToString()
 
-	filenames, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	filenames, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	if err != nil {
 		return nil, err
 	}
@@ -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],

pkg/commands/git_commands/commit_loader.go

@@ -6,17 +6,15 @@ 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"
 	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
 )
 
@@ -35,29 +33,27 @@ type CommitLoader struct {
 	readFile      func(filename string) ([]byte, error)
 	walkFiles     func(root string, fn filepath.WalkFunc) error
 	dotGitDir     string
-	// List of main branches that exist in the repo.
+	// List of main branches that exist in the repo, quoted for direct use in a git command.
 	// We use these to obtain the merge base of the branch.
-	// When nil, we're yet to obtain the list of existing main branches.
-	// When an empty slice, we've obtained the list and it's empty.
-	mainBranches []string
-	*GitCommon
+	// When nil, we're yet to obtain the list of main branches.
+	quotedMainBranches *string
 }
 
 // making our dependencies explicit for the sake of easier testing
 func NewCommitLoader(
 	cmn *common.Common,
 	cmd oscommands.ICmdObjBuilder,
+	dotGitDir string,
 	getRebaseMode func() (enums.RebaseMode, error),
-	gitCommon *GitCommon,
 ) *CommitLoader {
 	return &CommitLoader{
-		Common:        cmn,
-		cmd:           cmd,
-		getRebaseMode: getRebaseMode,
-		readFile:      os.ReadFile,
-		walkFiles:     filepath.Walk,
-		mainBranches:  nil,
-		GitCommon:     gitCommon,
+		Common:             cmn,
+		cmd:                cmd,
+		getRebaseMode:      getRebaseMode,
+		readFile:           os.ReadFile,
+		walkFiles:          filepath.Walk,
+		dotGitDir:          dotGitDir,
+		quotedMainBranches: nil,
 	}
 }
 
@@ -66,11 +62,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
@@ -87,81 +80,31 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
 		commits = append(commits, rebasingCommits...)
 	}
 
-	wg := sync.WaitGroup{}
-
-	wg.Add(2)
-
-	var logErr error
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		logErr = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
-			commit := self.extractCommitFromLine(line, opts.RefToShowDivergenceFrom != "")
-			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
 	}
 
-	wg.Wait()
-
-	if logErr != nil {
-		return nil, logErr
-	}
-
-	for _, commit := range commits {
+	err = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
+		commit := self.extractCommitFromLine(line)
 		if commit.Sha == firstPushedCommit {
 			passedFirstPushedCommit = true
 		}
-		if commit.Status != models.StatusRebasing {
-			if passedFirstPushedCommit {
-				commit.Status = models.StatusPushed
-			} else {
-				commit.Status = models.StatusUnpushed
-			}
-		}
+		commit.Status = map[bool]models.CommitStatus{true: models.StatusUnpushed, false: models.StatusPushed}[!passedFirstPushedCommit]
+		commits = append(commits, commit)
+		return false, nil
+	})
+	if err != nil {
+		return nil, err
 	}
 
 	if len(commits) == 0 {
 		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)
-	}
+	commits = self.setCommitMergedStatuses(opts.RefName, commits)
 
 	return commits, nil
 }
@@ -201,8 +144,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,25 +154,15 @@ 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{}
 
 	if extraInfo != "" {
-		extraInfoFields := strings.Split(extraInfo, ",")
-		for _, extraInfoField := range extraInfoFields {
-			extraInfoField = strings.TrimSpace(extraInfoField)
-			re := regexp.MustCompile(`tag: (.+)`)
-			tagMatch := re.FindStringSubmatch(extraInfoField)
-			if len(tagMatch) > 1 {
-				tags = append(tags, tagMatch[1])
-			}
+		re := regexp.MustCompile(`tag: ([^,\)]+)`)
+		tagMatch := re.FindStringSubmatch(extraInfo)
+		if len(tagMatch) > 1 {
+			tags = append(tags, tagMatch[1])
 		}
-
-		extraInfo = "(" + extraInfo + ")"
 	}
 
 	unitTimestampInt, _ := strconv.Atoi(unixTimestamp)
@@ -248,7 +181,6 @@ func (self *CommitLoader) extractCommitFromLine(line string, showDivergence bool
 		AuthorName:    authorName,
 		AuthorEmail:   authorEmail,
 		Parents:       parents,
-		Divergence:    divergence,
 	}
 }
 
@@ -262,7 +194,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 != ""
 	})
 
@@ -273,12 +205,12 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode
 			Config("log.showSignature=false").
 			Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
 			Arg(commitShas...).
-			ToArgv(),
+			ToString(),
 	).DontLog()
 
 	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
 	})
@@ -286,24 +218,11 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode
 		return nil, err
 	}
 
-	findFullCommit := lo.Ternary(self.version.IsOlderThan(2, 25, 2),
-		func(sha string) *models.Commit {
-			for s, c := range fullCommits {
-				if strings.HasPrefix(s, sha) {
-					return c
-				}
-			}
-			return nil
-		},
-		func(sha string) *models.Commit {
-			return fullCommits[sha]
-		})
-
 	hydratedCommits := make([]*models.Commit, 0, len(commits))
 	for _, rebasingCommit := range commits {
 		if rebasingCommit.Sha == "" {
 			hydratedCommits = append(hydratedCommits, rebasingCommit)
-		} else if commit := findFullCommit(rebasingCommit.Sha); commit != nil {
+		} else if commit := fullCommits[rebasingCommit.Sha]; commit != nil {
 			commit.Action = rebasingCommit.Action
 			commit.Status = rebasingCommit.Status
 			hydratedCommits = append(hydratedCommits, commit)
@@ -326,7 +245,7 @@ func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) ([]*mo
 
 func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
 	rewrittenCount := 0
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply/rewritten"))
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "rebase-apply/rewritten"))
 	if err == nil {
 		content := string(bytesContent)
 		rewrittenCount = len(strings.Split(content, "\n"))
@@ -334,7 +253,7 @@ func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
 
 	// we know we're rebasing, so lets get all the files whose names have numbers
 	commits := []*models.Commit{}
-	err = self.walkFiles(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"), func(path string, f os.FileInfo, err error) error {
+	err = self.walkFiles(filepath.Join(self.dotGitDir, "rebase-apply"), func(path string, f os.FileInfo, err error) error {
 		if rewrittenCount > 0 {
 			rewrittenCount--
 			return nil
@@ -375,7 +294,7 @@ func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
 // and extracts out the sha and names of commits that we still have to go
 // in the rebase:
 func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, error) {
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"))
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo"))
 	if err != nil {
 		self.Log.Error(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error()))
 		// we assume an error means the file doesn't exist so we just return
@@ -384,23 +303,12 @@ func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, err
 
 	commits := []*models.Commit{}
 
-	todos, err := todo.Parse(bytes.NewBuffer(bytesContent), self.config.GetCoreCommentChar())
+	todos, err := todo.Parse(bytes.NewBuffer(bytesContent))
 	if err != nil {
 		self.Log.Error(fmt.Sprintf("error occurred while parsing git-rebase-todo file: %s", err.Error()))
 		return nil, nil
 	}
 
-	// See if the current commit couldn't be applied because it conflicted; if
-	// so, add a fake entry for it
-	if conflictedCommitSha := self.getConflictedCommit(todos); conflictedCommitSha != "" {
-		commits = append(commits, &models.Commit{
-			Sha:    conflictedCommitSha,
-			Name:   "",
-			Status: models.StatusRebasing,
-			Action: models.ActionConflict,
-		})
-	}
-
 	for _, t := range todos {
 		if t.Command == todo.UpdateRef {
 			t.Msg = strings.TrimPrefix(t.Ref, "refs/heads/")
@@ -408,7 +316,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,
@@ -419,93 +327,6 @@ func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, err
 	return commits, nil
 }
 
-func (self *CommitLoader) getConflictedCommit(todos []todo.Todo) string {
-	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/done"))
-	if err != nil {
-		self.Log.Error(fmt.Sprintf("error occurred reading rebase-merge/done: %s", err.Error()))
-		return ""
-	}
-
-	doneTodos, err := todo.Parse(bytes.NewBuffer(bytesContent), self.config.GetCoreCommentChar())
-	if err != nil {
-		self.Log.Error(fmt.Sprintf("error occurred while parsing rebase-merge/done file: %s", err.Error()))
-		return ""
-	}
-
-	amendFileExists := false
-	if _, err := os.Stat(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/amend")); err == nil {
-		amendFileExists = true
-	}
-
-	return self.getConflictedCommitImpl(todos, doneTodos, amendFileExists)
-}
-
-func (self *CommitLoader) getConflictedCommitImpl(todos []todo.Todo, doneTodos []todo.Todo, amendFileExists bool) string {
-	// Should never be possible, but just to be safe:
-	if len(doneTodos) == 0 {
-		self.Log.Error("no done entries in rebase-merge/done file")
-		return ""
-	}
-	lastTodo := doneTodos[len(doneTodos)-1]
-	if lastTodo.Command == todo.Break || lastTodo.Command == todo.Exec || lastTodo.Command == todo.Reword {
-		return ""
-	}
-
-	// In certain cases, git reschedules commands that failed. One example is if
-	// a patch would overwrite an untracked file (another one is an "exec" that
-	// failed, but we don't care about that here because we dealt with exec
-	// already above). To detect this, compare the last command of the "done"
-	// file against the first command of "git-rebase-todo"; if they are the
-	// same, the command was rescheduled.
-	if len(doneTodos) > 0 && len(todos) > 0 && doneTodos[len(doneTodos)-1] == todos[0] {
-		// Command was rescheduled, no need to display it
-		return ""
-	}
-
-	// Older versions of git have a bug whereby, if a command is rescheduled,
-	// the last successful command is appended to the "done" file again. To
-	// detect this, we need to compare the second-to-last done entry against the
-	// first todo entry, and also compare the last done entry against the
-	// last-but-two done entry; this latter check is needed for the following
-	// case:
-	//   pick A
-	//   exec make test
-	//   pick B
-	//   exec make test
-	// If pick B fails with conflicts, then the "done" file contains
-	//   pick A
-	//   exec make test
-	//   pick B
-	// and git-rebase-todo contains
-	//   exec make test
-	// Without the last condition we would erroneously treat this as the exec
-	// command being rescheduled, so we wouldn't display our fake entry for
-	// "pick B".
-	if len(doneTodos) >= 3 && len(todos) > 0 && doneTodos[len(doneTodos)-2] == todos[0] &&
-		doneTodos[len(doneTodos)-1] == doneTodos[len(doneTodos)-3] {
-		// Command was rescheduled, no need to display it
-		return ""
-	}
-
-	if lastTodo.Command == todo.Edit {
-		if amendFileExists {
-			// Special case for "edit": if the "amend" file exists, the "edit"
-			// command was successful, otherwise it wasn't
-			return ""
-		}
-	}
-
-	// I don't think this is ever possible, but again, just to be safe:
-	if lastTodo.Commit == "" {
-		self.Log.Error("last command in rebase-merge/done file doesn't have a commit")
-		return ""
-	}
-
-	// Any other todo that has a commit associated with it must have failed with
-	// a conflict, otherwise we wouldn't have stopped the rebase:
-	return lastTodo.Commit
-}
-
 // assuming the file starts like this:
 // From e93d4193e6dd45ca9cf3a5a273d7ba6cd8b8fb20 Mon Sep 17 00:00:00 2001
 // From: Lazygit Tester <test@example.com>
@@ -522,15 +343,14 @@ func (self *CommitLoader) commitFromPatch(content string) *models.Commit {
 	}
 }
 
-func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
+func (self *CommitLoader) setCommitMergedStatuses(refName string, commits []*models.Commit) []*models.Commit {
+	ancestor := self.getMergeBase(refName)
 	if ancestor == "" {
-		return
+		return commits
 	}
-
 	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,14 +360,15 @@ func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
 			commits[i].Status = models.StatusMerged
 		}
 	}
+	return commits
 }
 
 func (self *CommitLoader) getMergeBase(refName string) string {
-	if self.mainBranches == nil {
-		self.mainBranches = self.getExistingMainBranches()
+	if self.quotedMainBranches == nil {
+		self.quotedMainBranches = lo.ToPtr(self.getExistingMainBranches())
 	}
 
-	if len(self.mainBranches) == 0 {
+	if *self.quotedMainBranches == "" {
 		return ""
 	}
 
@@ -555,69 +376,30 @@ func (self *CommitLoader) getMergeBase(refName string) string {
 	// return the base commit for the closest one.
 
 	output, err := self.cmd.New(
-		NewGitCmd("merge-base").Arg(refName).Arg(self.mainBranches...).
-			ToArgv(),
+		NewGitCmd("merge-base").Arg(self.cmd.Quote(refName), *self.quotedMainBranches).
+			ToString(),
 	).DontLog().RunWithOutput()
 	if err != nil {
 		// If there's an error, it must be because one of the main branches that
 		// used to exist when we called getExistingMainBranches() was deleted
 		// meanwhile. To fix this for next time, throw away our cache.
-		self.mainBranches = nil
+		self.quotedMainBranches = nil
 	}
 	return ignoringWarnings(output)
 }
 
-func (self *CommitLoader) getExistingMainBranches() []string {
-	var existingBranches []string
-	var wg sync.WaitGroup
-
-	mainBranches := self.UserConfig.Git.MainBranches
-	existingBranches = make([]string, len(mainBranches))
-
-	for i, branchName := range mainBranches {
-		wg.Add(1)
-		i := i
-		branchName := branchName
-		go utils.Safe(func() {
-			defer wg.Done()
-
-			// Try to determine upstream of local main branch
-			if ref, err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--symbolic-full-name", branchName+"@{u}").ToArgv(),
-			).DontLog().RunWithOutput(); err == nil {
-				existingBranches[i] = strings.TrimSpace(ref)
-				return
-			}
-
-			// If this failed, a local branch for this main branch doesn't exist or it
-			// has no upstream configured. Try looking for one in the "origin" remote.
-			ref := "refs/remotes/origin/" + branchName
-			if err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
-			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-				return
-			}
-
-			// If this failed as well, try if we have the main branch as a local
-			// branch. This covers the case where somebody is using git locally
-			// for something, but never pushing anywhere.
-			ref = "refs/heads/" + branchName
-			if err := self.cmd.New(
-				NewGitCmd("rev-parse").Arg("--verify", "--quiet", ref).ToArgv(),
-			).DontLog().Run(); err == nil {
-				existingBranches[i] = ref
-			}
-		})
-	}
-
-	wg.Wait()
-
-	existingBranches = lo.Filter(existingBranches, func(branch string, _ int) bool {
-		return branch != ""
-	})
-
-	return existingBranches
+func (self *CommitLoader) getExistingMainBranches() string {
+	return strings.Join(
+		lo.FilterMap(self.UserConfig.Git.MainBranches,
+			func(branchName string, _ int) (string, bool) {
+				quotedRef := self.cmd.Quote("refs/heads/" + branchName)
+				if err := self.cmd.New(
+					NewGitCmd("rev-parse").Arg("--verify", "--quiet", quotedRef).ToString(),
+				).DontLog().Run(); err != nil {
+					return "", false
+				}
+				return quotedRef, true
+			}), " ")
 }
 
 func ignoringWarnings(commandOutput string) string {
@@ -633,12 +415,13 @@ func ignoringWarnings(commandOutput string) string {
 // getFirstPushedCommit returns the first commit SHA which has been pushed to the ref's upstream.
 // all commits above this are deemed unpushed and marked as such.
 func (self *CommitLoader) getFirstPushedCommit(refName string) (string, error) {
-	output, err := self.cmd.New(
-		NewGitCmd("merge-base").
-			Arg(refName).
-			Arg(strings.TrimPrefix(refName, "refs/heads/") + "@{u}").
-			ToArgv(),
-	).
+	output, err := self.cmd.
+		New(
+			NewGitCmd("merge-base").
+				Arg(self.cmd.Quote(refName)).
+				Arg(self.cmd.Quote(strings.TrimPrefix(refName, "refs/heads/")) + "@{u}").
+				ToString(),
+		).
 		DontLog().
 		RunWithOutput()
 	if err != nil {
@@ -652,13 +435,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).
+	cmdStr := NewGitCmd("log").
+		Arg(self.cmd.Quote(opts.RefName)).
 		ArgIf(config.Order != "default", "--"+config.Order).
 		ArgIf(opts.All, "--all").
 		Arg("--oneline").
@@ -667,12 +445,11 @@ 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()
+		ArgIf(opts.FilterPath != "", self.cmd.Quote(opts.FilterPath)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog()
+	return self.cmd.New(cmdStr).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"`

pkg/commands/git_commands/commit_loader_test.go

@@ -1,12 +1,11 @@
 package git_commands
 
 import (
+	"errors"
 	"path/filepath"
 	"strings"
 	"testing"
 
-	"github.com/fsmiamoto/git-todo-parser/todo"
-	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
@@ -14,16 +13,16 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-var commitsOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|better typing for rebase mode
-b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164|1640824515|Jesse Duffield|jessedduffield@gmail.com|origin/better-tests|e94e8fc5b6fab4cb755f|fix logging
-e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c|1640823749|Jesse Duffield|jessedduffield@gmail.com|tag: 123, tag: 456|d8084cd558925eb7c9c3|refactor
+var commitsOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com| (HEAD -> better-tests)|b21997d6b4cbdf84b149|better typing for rebase mode
+b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164|1640824515|Jesse Duffield|jessedduffield@gmail.com| (origin/better-tests)|e94e8fc5b6fab4cb755f|fix logging
+e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c|1640823749|Jesse Duffield|jessedduffield@gmail.com||d8084cd558925eb7c9c3|refactor
 d8084cd558925eb7c9c38afeed5725c21653ab90|1640821426|Jesse Duffield|jessedduffield@gmail.com||65f910ebd85283b5cce9|WIP
 65f910ebd85283b5cce9bf67d03d3f1a9ea3813a|1640821275|Jesse Duffield|jessedduffield@gmail.com||26c07b1ab33860a1a759|WIP
 26c07b1ab33860a1a7591a0638f9925ccf497ffa|1640750752|Jesse Duffield|jessedduffield@gmail.com||3d4470a6c072208722e5|WIP
 3d4470a6c072208722e5ae9a54bcb9634959a1c5|1640748818|Jesse Duffield|jessedduffield@gmail.com||053a66a7be3da43aacdc|WIP
 053a66a7be3da43aacdc7aa78e1fe757b82c4dd2|1640739815|Jesse Duffield|jessedduffield@gmail.com||985fe482e806b172aea4|refactoring the config struct`, "|", "\x00", -1)
 
-var singleCommitOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|better typing for rebase mode`, "|", "\x00", -1)
+var singleCommitOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com| (HEAD -> better-tests)|b21997d6b4cbdf84b149|better typing for rebase mode`, "|", "\x00", -1)
 
 func TestGetCommits(t *testing.T) {
 	type scenario struct {
@@ -42,10 +41,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),
+				Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				Expect(`git 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 +53,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),
+				Expect(`git merge-base "refs/heads/mybranch" "mybranch"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				Expect(`git 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,22 +65,18 @@ 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},
-			mainBranches: []string{"master", "main", "develop"},
+			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).
+				Expect(`git 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).
-				// 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
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/main"}, "", nil).                    // yep, origin/main exists
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "develop@{u}"}, "", errors.New("error")).                // this one doesn't, so it checks origin instead
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/develop"}, "", errors.New("error")). // doesn't exist there, either, so it checks for a local branch
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/develop"}, "", errors.New("error")).          // no local branch either
+				Expect(`git 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 exist
+				Expect(`git rev-parse --verify --quiet "refs/heads/master"`, "", nil).               // this one does
+				Expect(`git rev-parse --verify --quiet "refs/heads/main"`, "", errors.New("error")). // this one doesn't
 				// here it's seeing where our branch diverged from the master branch so that we can mark that commit and parent commits as 'merged'
-				ExpectGitArgs([]string{"merge-base", "HEAD", "refs/remotes/origin/master", "refs/remotes/origin/main"}, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
+				Expect(`git merge-base "HEAD" "refs/heads/master"`, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
 
 			expectedCommits: []*models.Commit{
 				{
@@ -117,8 +112,8 @@ func TestGetCommits(t *testing.T) {
 					Name:          "refactor",
 					Status:        models.StatusPushed,
 					Action:        models.ActionNone,
-					Tags:          []string{"123", "456"},
-					ExtraInfo:     "(tag: 123, tag: 456)",
+					Tags:          []string{},
+					ExtraInfo:     "",
 					AuthorName:    "Jesse Duffield",
 					AuthorEmail:   "jessedduffield@gmail.com",
 					UnixTimestamp: 1640823749,
@@ -203,20 +198,16 @@ 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).
+				Expect(`git 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).
+				Expect(`git 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")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/master"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "main@{u}"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/main"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/main"}, "", errors.New("error")),
+				Expect(`git rev-parse --verify --quiet "refs/heads/master"`, "", errors.New("error")).
+				Expect(`git rev-parse --verify --quiet "refs/heads/main"`, "", errors.New("error")),
 
 			expectedCommits: []*models.Commit{
 				{
@@ -240,22 +231,20 @@ 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).
+				Expect(`git 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).
+				Expect(`git 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")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/remotes/origin/main"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--verify", "--quiet", "refs/heads/main"}, "", errors.New("error")).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "develop@{u}"}, "refs/remotes/origin/develop", nil).
-				ExpectGitArgs([]string{"rev-parse", "--symbolic-full-name", "1.0-hotfixes@{u}"}, "refs/remotes/origin/1.0-hotfixes", nil).
+				Expect(`git rev-parse --verify --quiet "refs/heads/master"`, "", nil).
+				Expect(`git rev-parse --verify --quiet "refs/heads/main"`, "", errors.New("error")).
+				Expect(`git rev-parse --verify --quiet "refs/heads/develop"`, "", nil).
+				Expect(`git rev-parse --verify --quiet "refs/heads/1.0-hotfixes"`, "", nil).
 				// here it's seeing where our branch diverged from the master branch so that we can mark that commit and parent commits as 'merged'
-				ExpectGitArgs([]string{"merge-base", "HEAD", "refs/remotes/origin/master", "refs/remotes/origin/develop", "refs/remotes/origin/1.0-hotfixes"}, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
+				Expect(`git merge-base "HEAD" "refs/heads/master" "refs/heads/develop" "refs/heads/1.0-hotfixes"`, "26c07b1ab33860a1a7591a0638f9925ccf497ffa", nil),
 
 			expectedCommits: []*models.Commit{
 				{
@@ -279,10 +268,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),
+				Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				Expect(`git 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 +280,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),
+				Expect(`git merge-base "HEAD" "HEAD"@{u}`, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				Expect(`git 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,
@@ -330,227 +319,3 @@ func TestGetCommits(t *testing.T) {
 		})
 	}
 }
-
-func TestCommitLoader_getConflictedCommitImpl(t *testing.T) {
-	scenarios := []struct {
-		testName        string
-		todos           []todo.Todo
-		doneTodos       []todo.Todo
-		amendFileExists bool
-		expectedSha     string
-	}{
-		{
-			testName:        "no done todos",
-			todos:           []todo.Todo{},
-			doneTodos:       []todo.Todo{},
-			amendFileExists: false,
-			expectedSha:     "",
-		},
-		{
-			testName: "common case (conflict)",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeef",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedSha:     "fa1afe1",
-		},
-		{
-			testName: "last command was 'break'",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{Command: todo.Break},
-			},
-			amendFileExists: false,
-			expectedSha:     "",
-		},
-		{
-			testName: "last command was 'exec'",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command:     todo.Exec,
-					ExecCommand: "make test",
-				},
-			},
-			amendFileExists: false,
-			expectedSha:     "",
-		},
-		{
-			testName: "last command was 'reword'",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{Command: todo.Reword},
-			},
-			amendFileExists: false,
-			expectedSha:     "",
-		},
-		{
-			testName: "'pick' was rescheduled",
-			todos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedSha:     "",
-		},
-		{
-			testName: "'pick' was rescheduled, buggy git version",
-			todos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeaf",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeaf",
-				},
-			},
-			amendFileExists: false,
-			expectedSha:     "",
-		},
-		{
-			testName: "conflicting 'pick' after 'exec'",
-			todos: []todo.Todo{
-				{
-					Command:     todo.Exec,
-					ExecCommand: "make test",
-				},
-			},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Pick,
-					Commit:  "deadbeaf",
-				},
-				{
-					Command:     todo.Exec,
-					ExecCommand: "make test",
-				},
-				{
-					Command: todo.Pick,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedSha:     "fa1afe1",
-		},
-		{
-			testName: "'edit' with amend file",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Edit,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: true,
-			expectedSha:     "",
-		},
-		{
-			testName: "'edit' without amend file",
-			todos:    []todo.Todo{},
-			doneTodos: []todo.Todo{
-				{
-					Command: todo.Edit,
-					Commit:  "fa1afe1",
-				},
-			},
-			amendFileExists: false,
-			expectedSha:     "fa1afe1",
-		},
-	}
-	for _, scenario := range scenarios {
-		t.Run(scenario.testName, func(t *testing.T) {
-			common := utils.NewDummyCommon()
-
-			builder := &CommitLoader{
-				Common:        common,
-				cmd:           oscommands.NewDummyCmdObjBuilder(oscommands.NewFakeRunner(t)),
-				getRebaseMode: func() (enums.RebaseMode, error) { return enums.REBASE_MODE_INTERACTIVE, nil },
-				dotGitDir:     ".git",
-				readFile: func(filename string) ([]byte, error) {
-					return []byte(""), nil
-				},
-				walkFiles: func(root string, fn filepath.WalkFunc) error {
-					return nil
-				},
-			}
-
-			sha := builder.getConflictedCommitImpl(scenario.todos, scenario.doneTodos, scenario.amendFileExists)
-			assert.Equal(t, scenario.expectedSha, sha)
-		})
-	}
-}
-
-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)
-		})
-	}
-}

pkg/commands/git_commands/commit_test.go

@@ -10,23 +10,20 @@ import (
 
 func TestCommitRewordCommit(t *testing.T) {
 	type scenario struct {
-		testName    string
-		runner      *oscommands.FakeCmdObjRunner
-		summary     string
-		description string
+		testName string
+		runner   *oscommands.FakeCmdObjRunner
+		input    string
 	}
 	scenarios := []scenario{
 		{
 			"Single line reword",
 			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, "", nil),
 			"test",
-			"",
 		},
 		{
 			"Multi line reword",
 			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test", "-m", "line 2\nline 3"}, "", nil),
-			"test",
-			"line 2\nline 3",
+			"test\nline 2\nline 3",
 		},
 	}
 	for _, s := range scenarios {
@@ -34,7 +31,7 @@ func TestCommitRewordCommit(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{runner: s.runner})
 
-			assert.NoError(t, instance.RewordLastCommit(s.summary, s.description))
+			assert.NoError(t, instance.RewordLastCommit(s.input))
 			s.runner.CheckForMissingCalls()
 		})
 	}
@@ -53,49 +50,47 @@ func TestCommitResetToCommit(t *testing.T) {
 func TestCommitCommitCmdObj(t *testing.T) {
 	type scenario struct {
 		testName             string
-		summary              string
-		description          string
+		message              string
 		configSignoff        bool
 		configSkipHookPrefix string
-		expectedArgs         []string
+		expected             string
 	}
 
 	scenarios := []scenario{
 		{
 			testName:             "Commit",
-			summary:              "test",
+			message:              "test",
 			configSignoff:        false,
 			configSkipHookPrefix: "",
-			expectedArgs:         []string{"commit", "-m", "test"},
+			expected:             `git commit -m "test"`,
 		},
 		{
 			testName:             "Commit with --no-verify flag",
-			summary:              "WIP: test",
+			message:              "WIP: test",
 			configSignoff:        false,
 			configSkipHookPrefix: "WIP",
-			expectedArgs:         []string{"commit", "--no-verify", "-m", "WIP: test"},
+			expected:             `git commit --no-verify -m "WIP: test"`,
 		},
 		{
 			testName:             "Commit with multiline message",
-			summary:              "line1",
-			description:          "line2",
+			message:              "line1\nline2",
 			configSignoff:        false,
 			configSkipHookPrefix: "",
-			expectedArgs:         []string{"commit", "-m", "line1", "-m", "line2"},
+			expected:             `git commit -m "line1" -m "line2"`,
 		},
 		{
 			testName:             "Commit with signoff",
-			summary:              "test",
+			message:              "test",
 			configSignoff:        true,
 			configSkipHookPrefix: "",
-			expectedArgs:         []string{"commit", "--signoff", "-m", "test"},
+			expected:             `git commit --signoff -m "test"`,
 		},
 		{
 			testName:             "Commit with signoff and no-verify",
-			summary:              "WIP: test",
+			message:              "WIP: test",
 			configSignoff:        true,
 			configSkipHookPrefix: "WIP",
-			expectedArgs:         []string{"commit", "--no-verify", "--signoff", "-m", "WIP: test"},
+			expected:             `git commit --no-verify --signoff -m "WIP: test"`,
 		},
 	}
 
@@ -106,11 +101,10 @@ func TestCommitCommitCmdObj(t *testing.T) {
 			userConfig.Git.Commit.SignOff = s.configSignoff
 			userConfig.Git.SkipHookPrefix = s.configSkipHookPrefix
 
-			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expectedArgs, "", nil)
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})
+			instance := buildCommitCommands(commonDeps{userConfig: userConfig})
 
-			assert.NoError(t, instance.CommitCmdObj(s.summary, s.description).Run())
-			runner.CheckForMissingCalls()
+			cmdStr := instance.CommitCmdObj(s.message).ToString()
+			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
 }
@@ -119,19 +113,40 @@ func TestCommitCommitEditorCmdObj(t *testing.T) {
 	type scenario struct {
 		testName      string
 		configSignoff bool
-		expected      []string
+		configVerbose string
+		expected      string
 	}
 
 	scenarios := []scenario{
 		{
 			testName:      "Commit using editor",
 			configSignoff: false,
-			expected:      []string{"commit"},
+			configVerbose: "default",
+			expected:      `git commit`,
+		},
+		{
+			testName:      "Commit with --no-verbose flag",
+			configSignoff: false,
+			configVerbose: "never",
+			expected:      `git commit --no-verbose`,
+		},
+		{
+			testName:      "Commit with --verbose flag",
+			configSignoff: false,
+			configVerbose: "always",
+			expected:      `git commit --verbose`,
 		},
 		{
 			testName:      "Commit with --signoff",
 			configSignoff: true,
-			expected:      []string{"commit", "--signoff"},
+			configVerbose: "default",
+			expected:      `git commit --signoff`,
+		},
+		{
+			testName:      "Commit with --signoff and --no-verbose",
+			configSignoff: true,
+			configVerbose: "never",
+			expected:      `git commit --signoff --no-verbose`,
 		},
 	}
 
@@ -140,12 +155,12 @@ func TestCommitCommitEditorCmdObj(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			userConfig := config.GetDefaultConfig()
 			userConfig.Git.Commit.SignOff = s.configSignoff
+			userConfig.Git.Commit.Verbose = s.configVerbose
 
-			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expected, "", nil)
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})
+			instance := buildCommitCommands(commonDeps{userConfig: userConfig})
 
-			assert.NoError(t, instance.CommitEditorCmdObj().Run())
-			runner.CheckForMissingCalls()
+			cmdStr := instance.CommitEditorCmdObj().ToString()
+			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
 }
@@ -163,7 +178,7 @@ func TestCommitCreateFixupCommit(t *testing.T) {
 			testName: "valid case",
 			sha:      "12345",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"commit", "--fixup=12345"}, "", nil),
+				Expect(`git commit --fixup=12345`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -186,8 +201,7 @@ func TestCommitShowCmdObj(t *testing.T) {
 		filterPath       string
 		contextSize      int
 		ignoreWhitespace bool
-		extDiffCmd       string
-		expected         []string
+		expected         string
 	}
 
 	scenarios := []scenario{
@@ -196,40 +210,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:         "git show --submodule --color=always --unified=3 --stat -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:         `git show --submodule --color=always --unified=3 --stat -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:         "git show --submodule --color=always --unified=77 --stat -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:         "git show --submodule --color=always --unified=77 --stat -p 1234567890 --ignore-all-space",
 		},
 	}
 
@@ -237,16 +239,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})
 
-			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPath).Run())
-			runner.CheckForMissingCalls()
+			cmdStr := instance.ShowCmdObj("1234567890", s.filterPath, s.ignoreWhitespace).ToString()
+			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
 }
@@ -285,7 +283,7 @@ Merge pull request #1750 from mark2185/fix-issue-template
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildCommitCommands(commonDeps{
-				runner: oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"rev-list", "--format=%B", "--max-count=1", "deadbeef"}, s.input, nil),
+				runner: oscommands.NewFakeRunner(t).Expect("git rev-list --format=%B --max-count=1 deadbeef", s.input, nil),
 			})
 
 			output, err := instance.GetCommitMessage("deadbeef")
@@ -306,14 +304,14 @@ func TestGetCommitMessageFromHistory(t *testing.T) {
 	scenarios := []scenario{
 		{
 			"Empty message",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"log", "-1", "--skip=2", "--pretty=%H"}, "", nil).ExpectGitArgs([]string{"rev-list", "--format=%B", "--max-count=1"}, "", nil),
+			oscommands.NewFakeRunner(t).Expect("git log -1 --skip=2 --pretty=%H", "", nil).Expect("git rev-list --format=%B --max-count=1 ", "", nil),
 			func(output string, err error) {
 				assert.Error(t, err)
 			},
 		},
 		{
 			"Default case to retrieve a commit in history",
-			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"log", "-1", "--skip=2", "--pretty=%H"}, "sha3 \n", nil).ExpectGitArgs([]string{"rev-list", "--format=%B", "--max-count=1", "sha3"}, `commit sha3
+			oscommands.NewFakeRunner(t).Expect("git log -1 --skip=2 --pretty=%H", "sha3 \n", nil).Expect("git rev-list --format=%B --max-count=1 sha3", `commit sha3
 				use generics to DRY up context code`, nil),
 			func(output string, err error) {
 				assert.NoError(t, err)

pkg/commands/git_commands/common.go

@@ -12,7 +12,7 @@ type GitCommon struct {
 	version   *GitVersion
 	cmd       oscommands.ICmdObjBuilder
 	os        *oscommands.OSCommand
-	repoPaths *RepoPaths
+	dotGitDir string
 	repo      *gogit.Repository
 	config    *ConfigCommands
 	// mutex for doing things like push/pull/fetch
@@ -24,7 +24,7 @@ func NewGitCommon(
 	version *GitVersion,
 	cmd oscommands.ICmdObjBuilder,
 	osCommand *oscommands.OSCommand,
-	repoPaths *RepoPaths,
+	dotGitDir string,
 	repo *gogit.Repository,
 	config *ConfigCommands,
 	syncMutex *deadlock.Mutex,
@@ -34,7 +34,7 @@ func NewGitCommon(
 		version:   version,
 		cmd:       cmd,
 		os:        osCommand,
-		repoPaths: repoPaths,
+		dotGitDir: dotGitDir,
 		repo:      repo,
 		config:    config,
 		syncMutex: syncMutex,

pkg/commands/git_commands/config.go

@@ -99,15 +99,3 @@ func (self *ConfigCommands) Branches() (map[string]*config.Branch, error) {
 func (self *ConfigCommands) GetGitFlowPrefixes() string {
 	return self.gitConfig.GetGeneral("--local --get-regexp gitflow.prefix")
 }
-
-func (self *ConfigCommands) GetCoreCommentChar() byte {
-	if commentCharStr := self.gitConfig.Get("core.commentChar"); len(commentCharStr) == 1 {
-		return commentCharStr[0]
-	}
-
-	return '#'
-}
-
-func (self *ConfigCommands) GetRebaseUpdateRefs() bool {
-	return self.gitConfig.GetBool("rebase.updateRefs")
-}

pkg/commands/git_commands/custom.go

@@ -1,7 +1,5 @@
 package git_commands
 
-import "github.com/mgutz/str"
-
 type CustomCommands struct {
 	*GitCommon
 }
@@ -16,5 +14,5 @@ func NewCustomCommands(gitCommon *GitCommon) *CustomCommands {
 // If you want to run a new command, try finding a place for it in one of the neighbouring
 // files, or creating a new BlahCommands struct to hold it.
 func (self *CustomCommands) RunWithOutput(cmdStr string) (string, error) {
-	return self.cmd.New(str.ToArgv(cmdStr)).RunWithOutput()
+	return self.cmd.New(cmdStr).RunWithOutput()
 }

pkg/commands/git_commands/deps_test.go

@@ -11,21 +11,18 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/spf13/afero"
 )
 
 type commonDeps struct {
 	runner     *oscommands.FakeCmdObjRunner
 	userConfig *config.UserConfig
-	appState   *config.AppState
 	gitVersion *GitVersion
 	gitConfig  *git_config.FakeGitConfig
 	getenv     func(string) string
 	removeFile func(string) error
+	dotGitDir  string
 	common     *common.Common
 	cmd        *oscommands.CmdObjBuilder
-	fs         afero.Fs
-	repoPaths  *RepoPaths
 }
 
 func buildGitCommon(deps commonDeps) *GitCommon {
@@ -33,17 +30,7 @@ func buildGitCommon(deps commonDeps) *GitCommon {
 
 	gitCommon.Common = deps.common
 	if gitCommon.Common == nil {
-		gitCommon.Common = utils.NewDummyCommonWithUserConfigAndAppState(deps.userConfig, deps.appState)
-	}
-
-	if deps.fs != nil {
-		gitCommon.Fs = deps.fs
-	}
-
-	if deps.repoPaths != nil {
-		gitCommon.repoPaths = deps.repoPaths
-	} else {
-		gitCommon.repoPaths = MockRepoPaths(".git")
+		gitCommon.Common = utils.NewDummyCommonWithUserConfig(deps.userConfig)
 	}
 
 	runner := deps.runner
@@ -94,6 +81,11 @@ func buildGitCommon(deps commonDeps) *GitCommon {
 		TempDir:      os.TempDir(),
 	})
 
+	gitCommon.dotGitDir = deps.dotGitDir
+	if gitCommon.dotGitDir == "" {
+		gitCommon.dotGitDir = ".git"
+	}
+
 	return gitCommon
 }
 
@@ -104,7 +96,7 @@ func buildRepo() *gogit.Repository {
 }
 
 func buildFileLoader(gitCommon *GitCommon) *FileLoader {
-	return NewFileLoader(gitCommon, gitCommon.cmd, gitCommon.config)
+	return NewFileLoader(gitCommon.Common, gitCommon.cmd, gitCommon.config)
 }
 
 func buildSubmoduleCommands(deps commonDeps) *SubmoduleCommands {
@@ -126,7 +118,7 @@ func buildWorkingTreeCommands(deps commonDeps) *WorkingTreeCommands {
 	return NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
 }
 
-func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
+func buildPatchCommands(deps commonDeps) *PatchCommands {
 	gitCommon := buildGitCommon(deps)
 	rebaseCommands := buildRebaseCommands(deps)
 	commitCommands := buildCommitCommands(deps)
@@ -140,7 +132,7 @@ func buildPatchCommands(deps commonDeps) *PatchCommands { //nolint:golint,unused
 	return NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
 }
 
-func buildStatusCommands(deps commonDeps) *StatusCommands { //nolint:golint,unused
+func buildStatusCommands(deps commonDeps) *StatusCommands {
 	gitCommon := buildGitCommon(deps)
 
 	return NewStatusCommands(gitCommon)

pkg/commands/git_commands/diff.go

@@ -1,19 +0,0 @@
-package git_commands
-
-import "github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-
-type DiffCommands struct {
-	*GitCommon
-}
-
-func NewDiffCommands(gitCommon *GitCommon) *DiffCommands {
-	return &DiffCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-func (self *DiffCommands) DiffCmdObj(diffArgs []string) oscommands.ICmdObj {
-	return self.cmd.New(
-		NewGitCmd("diff").Arg("--submodule", "--no-ext-diff", "--color").Arg(diffArgs...).ToArgv(),
-	)
-}

pkg/commands/git_commands/file.go

@@ -45,7 +45,7 @@ func (self *FileCommands) GetEditCmdStrLegacy(filename string, lineNumber int) (
 		editor = self.os.Getenv("EDITOR")
 	}
 	if editor == "" {
-		if err := self.cmd.New([]string{"which", "vi"}).DontLog().Run(); err == nil {
+		if err := self.cmd.New("which vi").DontLog().Run(); err == nil {
 			editor = "vi"
 		}
 	}
@@ -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,17 +131,6 @@ 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)
-
-	templateValues := map[string]string{
-		"dir": self.cmd.Quote(path),
-	}
-
-	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
-	return cmdStr, suspend
-}
-
 func (self *FileCommands) guessDefaultEditor() string {
 	// Try to query a few places where editors get configured
 	editor := self.config.GetCoreEditor()

pkg/commands/git_commands/file_loader.go

@@ -2,11 +2,11 @@ package git_commands
 
 import (
 	"fmt"
-	"path/filepath"
 	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 )
 
 type FileLoaderConfig interface {
@@ -14,15 +14,15 @@ type FileLoaderConfig interface {
 }
 
 type FileLoader struct {
-	*GitCommon
+	*common.Common
 	cmd         oscommands.ICmdObjBuilder
 	config      FileLoaderConfig
 	getFileType func(string) string
 }
 
-func NewFileLoader(gitCommon *GitCommon, cmd oscommands.ICmdObjBuilder, config FileLoaderConfig) *FileLoader {
+func NewFileLoader(cmn *common.Common, cmd oscommands.ICmdObjBuilder, config FileLoaderConfig) *FileLoader {
 	return &FileLoader{
-		GitCommon:   gitCommon,
+		Common:      cmn,
 		cmd:         cmd,
 		getFileType: oscommands.FileType,
 		config:      config,
@@ -58,32 +58,13 @@ func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File
 			Name:          status.Name,
 			PreviousName:  status.PreviousName,
 			DisplayString: status.StatusString,
+			Type:          self.getFileType(status.Name),
 		}
 
 		models.SetStatusFields(file, status.Change)
 		files = append(files, file)
 	}
 
-	// Go through the files to see if any of these files are actually worktrees
-	// so that we can render them correctly
-	worktreePaths := linkedWortkreePaths(self.Fs, self.repoPaths.RepoGitDirPath())
-	for _, file := range files {
-		for _, worktreePath := range worktreePaths {
-			absFilePath, err := filepath.Abs(file.Name)
-			if err != nil {
-				self.Log.Error(err)
-				continue
-			}
-			if absFilePath == worktreePath {
-				file.IsWorktree = true
-				// `git status` renders this worktree as a folder with a trailing slash but we'll represent it as a singular worktree
-				// If we include the slash, it will be rendered as a folder with a null file inside.
-				file.Name = strings.TrimSuffix(file.Name, "/")
-				break
-			}
-		}
-	}
-
 	return files
 }
 
@@ -101,14 +82,14 @@ type FileStatus struct {
 }
 
 func (c *FileLoader) gitStatus(opts GitStatusOptions) ([]FileStatus, error) {
-	cmdArgs := NewGitCmd("status").
+	cmdStr := NewGitCmd("status").
 		Arg(opts.UntrackedFilesArg).
 		Arg("--porcelain").
 		Arg("-z").
 		ArgIf(opts.NoRenames, "--no-renames").
-		ToArgv()
+		ToString()
 
-	statusLines, _, err := c.cmd.New(cmdArgs).DontLog().RunWithOutputs()
+	statusLines, _, err := c.cmd.New(cmdStr).DontLog().RunWithOutputs()
 	if err != nil {
 		return []FileStatus{}, err
 	}

pkg/commands/git_commands/file_loader_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,13 +20,14 @@ func TestFileGetStatusFiles(t *testing.T) {
 		{
 			"No files found",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"}, "", nil),
+				Expect(`git status --untracked-files=yes --porcelain -z`, "", nil),
 			[]*models.File{},
 		},
 		{
 			"Several files found",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
+				Expect(
+					`git status --untracked-files=yes --porcelain -z`,
 					"MM file1.txt\x00A  file3.txt\x00AM file2.txt\x00?? file4.txt\x00UU file5.txt",
 					nil,
 				),
@@ -40,6 +42,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "MM file1.txt",
+					Type:                    "file",
 					ShortStatus:             "MM",
 				},
 				{
@@ -52,6 +55,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "A  file3.txt",
+					Type:                    "file",
 					ShortStatus:             "A ",
 				},
 				{
@@ -64,6 +68,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "AM file2.txt",
+					Type:                    "file",
 					ShortStatus:             "AM",
 				},
 				{
@@ -76,6 +81,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "?? file4.txt",
+					Type:                    "file",
 					ShortStatus:             "??",
 				},
 				{
@@ -88,6 +94,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       true,
 					HasInlineMergeConflicts: true,
 					DisplayString:           "UU file5.txt",
+					Type:                    "file",
 					ShortStatus:             "UU",
 				},
 			},
@@ -95,7 +102,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 		{
 			"File with new line char",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"}, "MM a\nb.txt", nil),
+				Expect(`git status --untracked-files=yes --porcelain -z`, "MM a\nb.txt", nil),
 			[]*models.File{
 				{
 					Name:                    "a\nb.txt",
@@ -107,6 +114,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "MM a\nb.txt",
+					Type:                    "file",
 					ShortStatus:             "MM",
 				},
 			},
@@ -114,7 +122,8 @@ func TestFileGetStatusFiles(t *testing.T) {
 		{
 			"Renamed files",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
+				Expect(
+					`git status --untracked-files=yes --porcelain -z`,
 					"R  after1.txt\x00before1.txt\x00RM after2.txt\x00before2.txt",
 					nil,
 				),
@@ -130,6 +139,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "R  before1.txt -> after1.txt",
+					Type:                    "file",
 					ShortStatus:             "R ",
 				},
 				{
@@ -143,6 +153,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "RM before2.txt -> after2.txt",
+					Type:                    "file",
 					ShortStatus:             "RM",
 				},
 			},
@@ -150,7 +161,8 @@ func TestFileGetStatusFiles(t *testing.T) {
 		{
 			"File with arrow in name",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
+				Expect(
+					`git status --untracked-files=yes --porcelain -z`,
 					`?? a -> b.txt`,
 					nil,
 				),
@@ -165,6 +177,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 					HasMergeConflicts:       false,
 					HasInlineMergeConflicts: false,
 					DisplayString:           "?? a -> b.txt",
+					Type:                    "file",
 					ShortStatus:             "??",
 				},
 			},
@@ -177,7 +190,7 @@ func TestFileGetStatusFiles(t *testing.T) {
 			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)
 
 			loader := &FileLoader{
-				GitCommon:   buildGitCommon(commonDeps{}),
+				Common:      utils.NewDummyCommon(),
 				cmd:         cmd,
 				config:      &FakeFileLoaderConfig{showUntrackedFiles: "yes"},
 				getFileType: func(string) string { return "file" },

pkg/commands/git_commands/file_test.go

@@ -27,7 +27,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			configEditCommand:         "",
 			configEditCommandTemplate: "{{editor}} {{filename}}",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectArgs([]string{"which", "vi"}, "", errors.New("error")),
+				Expect(`which vi`, "", errors.New("error")),
 			getenv: func(env string) string {
 				return ""
 			},
@@ -105,7 +105,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			configEditCommand:         "",
 			configEditCommandTemplate: "{{editor}} {{filename}}",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectArgs([]string{"which", "vi"}, "/usr/bin/vi", nil),
+				Expect(`which vi`, "/usr/bin/vi", nil),
 			getenv: func(env string) string {
 				return ""
 			},
@@ -120,7 +120,7 @@ func TestEditFileCmdStrLegacy(t *testing.T) {
 			configEditCommand:         "",
 			configEditCommandTemplate: "{{editor}} {{filename}}",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectArgs([]string{"which", "vi"}, "/usr/bin/vi", nil),
+				Expect(`which vi`, "/usr/bin/vi", nil),
 			getenv: func(env string) string {
 				return ""
 			},
@@ -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)
 	}
 }
 

pkg/commands/git_commands/flow.go

@@ -49,13 +49,13 @@ func (self *FlowCommands) FinishCmdObj(branchName string) (oscommands.ICmdObj, e
 		return nil, errors.New(self.Tr.NotAGitFlowBranch)
 	}
 
-	cmdArgs := NewGitCmd("flow").Arg(branchType, "finish", suffix).ToArgv()
+	cmdStr := NewGitCmd("flow").Arg(branchType, "finish", suffix).ToString()
 
-	return self.cmd.New(cmdArgs), nil
+	return self.cmd.New(cmdStr), nil
 }
 
 func (self *FlowCommands) StartCmdObj(branchType string, name string) oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("flow").Arg(branchType, "start", name).ToArgv()
+	cmdStr := NewGitCmd("flow").Arg(branchType, "start", name).ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }

pkg/commands/git_commands/flow_test.go

@@ -12,13 +12,13 @@ func TestStartCmdObj(t *testing.T) {
 		testName   string
 		branchType string
 		name       string
-		expected   []string
+		expected   string
 	}{
 		{
 			testName:   "basic",
 			branchType: "feature",
 			name:       "test",
-			expected:   []string{"git", "flow", "feature", "start", "test"},
+			expected:   "git flow feature start test",
 		},
 	}
 
@@ -28,7 +28,7 @@ func TestStartCmdObj(t *testing.T) {
 			instance := buildFlowCommands(commonDeps{})
 
 			assert.Equal(t,
-				instance.StartCmdObj(s.branchType, s.name).Args(),
+				instance.StartCmdObj(s.branchType, s.name).ToString(),
 				s.expected,
 			)
 		})
@@ -39,28 +39,28 @@ func TestFinishCmdObj(t *testing.T) {
 	scenarios := []struct {
 		testName               string
 		branchName             string
-		expected               []string
+		expected               string
 		expectedError          string
 		gitConfigMockResponses map[string]string
 	}{
 		{
 			testName:               "not a git flow branch",
 			branchName:             "mybranch",
-			expected:               nil,
+			expected:               "",
 			expectedError:          "This does not seem to be a git flow branch",
 			gitConfigMockResponses: nil,
 		},
 		{
 			testName:               "feature branch without config",
 			branchName:             "feature/mybranch",
-			expected:               nil,
+			expected:               "",
 			expectedError:          "This does not seem to be a git flow branch",
 			gitConfigMockResponses: nil,
 		},
 		{
 			testName:      "feature branch with config",
 			branchName:    "feature/mybranch",
-			expected:      []string{"git", "flow", "feature", "finish", "mybranch"},
+			expected:      "git flow feature finish mybranch",
 			expectedError: "",
 			gitConfigMockResponses: map[string]string{
 				"--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/",
@@ -85,7 +85,7 @@ func TestFinishCmdObj(t *testing.T) {
 				}
 			} else {
 				assert.NoError(t, err)
-				assert.Equal(t, cmd.Args(), s.expected)
+				assert.Equal(t, cmd.ToString(), s.expected)
 			}
 		})
 	}

pkg/commands/git_commands/git_command_builder.go

@@ -1,8 +1,6 @@
 package git_commands
 
-import (
-	"strings"
-)
+import "strings"
 
 // convenience struct for building git commands. Especially useful when
 // including conditional args
@@ -44,50 +42,13 @@ 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 {
+func (self *GitCommandBuilder) RepoPath(value string) *GitCommandBuilder {
 	// repo path comes before the command
-	self.args = append([]string{"-C", path}, self.args...)
+	self.args = append([]string{"-C", value}, self.args...)
 
 	return self
 }
 
-// Note, you may prefer to use the Dir method instead of this one
-func (self *GitCommandBuilder) Worktree(path string) *GitCommandBuilder {
-	// worktree arg comes before the command
-	self.args = append([]string{"--work-tree", path}, self.args...)
-
-	return self
-}
-
-// Note, you may prefer to use the Dir method instead of this one
-func (self *GitCommandBuilder) GitDir(path string) *GitCommandBuilder {
-	// git dir arg comes before the command
-	self.args = append([]string{"--git-dir", path}, self.args...)
-
-	return self
-}
-
-func (self *GitCommandBuilder) GitDirIf(condition bool, path string) *GitCommandBuilder {
-	if condition {
-		return self.GitDir(path)
-	}
-
-	return self
-}
-
-func (self *GitCommandBuilder) ToArgv() []string {
-	return append([]string{"git"}, self.args...)
-}
-
 func (self *GitCommandBuilder) ToString() string {
-	return strings.Join(self.ToArgv(), " ")
+	return "git " + strings.Join(self.args, " ")
 }

pkg/commands/git_commands/git_command_builder_test.go

@@ -8,8 +8,8 @@ import (
 
 func TestGitCommandBuilder(t *testing.T) {
 	scenarios := []struct {
-		input    []string
-		expected []string
+		input    string
+		expected string
 	}{
 		{
 			input: NewGitCmd("push").
@@ -17,36 +17,36 @@ func TestGitCommandBuilder(t *testing.T) {
 				Arg("--set-upstream").
 				Arg("origin").
 				Arg("master").
-				ToArgv(),
-			expected: []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "master"},
+				ToString(),
+			expected: "git push --force-with-lease --set-upstream origin master",
 		},
 		{
-			input:    NewGitCmd("push").ArgIf(true, "--test").ToArgv(),
-			expected: []string{"git", "push", "--test"},
+			input:    NewGitCmd("push").ArgIf(true, "--test").ToString(),
+			expected: "git push --test",
 		},
 		{
-			input:    NewGitCmd("push").ArgIf(false, "--test").ToArgv(),
-			expected: []string{"git", "push"},
+			input:    NewGitCmd("push").ArgIf(false, "--test").ToString(),
+			expected: "git push",
 		},
 		{
-			input:    NewGitCmd("push").ArgIfElse(true, "-b", "-a").ToArgv(),
-			expected: []string{"git", "push", "-b"},
+			input:    NewGitCmd("push").ArgIfElse(true, "-b", "-a").ToString(),
+			expected: "git push -b",
 		},
 		{
-			input:    NewGitCmd("push").ArgIfElse(false, "-a", "-b").ToArgv(),
-			expected: []string{"git", "push", "-b"},
+			input:    NewGitCmd("push").ArgIfElse(false, "-a", "-b").ToString(),
+			expected: "git push -b",
 		},
 		{
-			input:    NewGitCmd("push").Arg("-a", "-b").ToArgv(),
-			expected: []string{"git", "push", "-a", "-b"},
+			input:    NewGitCmd("push").Arg("-a", "-b").ToString(),
+			expected: "git push -a -b",
 		},
 		{
-			input:    NewGitCmd("push").Config("user.name=foo").Config("user.email=bar").ToArgv(),
-			expected: []string{"git", "-c", "user.email=bar", "-c", "user.name=foo", "push"},
+			input:    NewGitCmd("push").Config("user.name=foo").Config("user.email=bar").ToString(),
+			expected: "git -c user.email=bar -c user.name=foo push",
 		},
 		{
-			input:    NewGitCmd("push").Dir("a/b/c").ToArgv(),
-			expected: []string{"git", "-C", "a/b/c", "push"},
+			input:    NewGitCmd("push").RepoPath("a/b/c").ToString(),
+			expected: "git -C a/b/c push",
 		},
 	}
 

pkg/commands/git_commands/patch.go

@@ -1,6 +1,7 @@
 package git_commands
 
 import (
+	"fmt"
 	"path/filepath"
 	"time"
 
@@ -10,6 +11,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
 	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 type PatchCommands struct {
@@ -67,19 +69,19 @@ func (self *PatchCommands) ApplyPatch(patch string, opts ApplyPatchOpts) error {
 }
 
 func (self *PatchCommands) applyPatchFile(filepath string, opts ApplyPatchOpts) error {
-	cmdArgs := NewGitCmd("apply").
+	cmdStr := NewGitCmd("apply").
 		ArgIf(opts.ThreeWay, "--3way").
 		ArgIf(opts.Cached, "--cached").
 		ArgIf(opts.Index, "--index").
 		ArgIf(opts.Reverse, "--reverse").
-		Arg(filepath).
-		ToArgv()
+		Arg(self.cmd.Quote(filepath)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *PatchCommands) SaveTemporaryPatch(patch string) (string, error) {
-	filepath := filepath.Join(self.os.GetTempDir(), self.repoPaths.RepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
+	filepath := filepath.Join(self.os.GetTempDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
 	self.Log.Infof("saving temporary patch to %s", filepath)
 	if err := self.os.CreateFileWithContent(filepath, patch); err != nil {
 		return "", err
@@ -89,7 +91,7 @@ func (self *PatchCommands) SaveTemporaryPatch(patch string) (string, error) {
 
 // DeletePatchesFromCommit applies a patch in reverse for a commit
 func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, commitIndex int) error {
-	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIndex, false); err != nil {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIndex); err != nil {
 		return err
 	}
 
@@ -115,10 +117,7 @@ func (self *PatchCommands) DeletePatchesFromCommit(commits []*models.Commit, com
 
 func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, sourceCommitIdx int, destinationCommitIdx int) error {
 	if sourceCommitIdx < destinationCommitIdx {
-		// Passing true for keepCommitsThatBecomeEmpty: if the moved-from
-		// commit becomes empty, we want to keep it, mainly for consistency with
-		// moving the patch to a *later* commit, which behaves the same.
-		if err := self.rebase.BeginInteractiveRebaseForCommit(commits, destinationCommitIdx, true); err != nil {
+		if err := self.rebase.BeginInteractiveRebaseForCommit(commits, destinationCommitIdx); err != nil {
 			return err
 		}
 
@@ -219,12 +218,12 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
 
 func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitIdx int, stash bool) error {
 	if stash {
-		if err := self.stash.Push(self.Tr.StashPrefix + commits[commitIdx].Sha); err != nil {
+		if err := self.stash.Save(self.Tr.StashPrefix + commits[commitIdx].Sha); err != nil {
 			return err
 		}
 	}
 
-	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
 		return err
 	}
 
@@ -272,13 +271,8 @@ func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitId
 	return self.rebase.ContinueRebase()
 }
 
-func (self *PatchCommands) PullPatchIntoNewCommit(
-	commits []*models.Commit,
-	commitIdx int,
-	commitSummary string,
-	commitDescription string,
-) error {
-	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
+func (self *PatchCommands) PullPatchIntoNewCommit(commits []*models.Commit, commitIdx int) error {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
 		return err
 	}
 
@@ -303,7 +297,9 @@ func (self *PatchCommands) PullPatchIntoNewCommit(
 		return err
 	}
 
-	if err := self.commit.CommitCmdObj(commitSummary, commitDescription).Run(); err != nil {
+	head_message, _ := self.commit.GetHeadCommitMessage()
+	new_message := fmt.Sprintf("Split from \"%s\"", head_message)
+	if err := self.commit.CommitCmdObj(new_message).Run(); err != nil {
 		return err
 	}
 
@@ -321,7 +317,7 @@ func (self *PatchCommands) PullPatchIntoNewCommit(
 // only some lines of a range of adjacent added lines. To solve this, we
 // get the diff of HEAD and the original commit and then apply that.
 func (self *PatchCommands) diffHeadAgainstCommit(commit *models.Commit) (string, error) {
-	cmdArgs := NewGitCmd("diff").Arg("HEAD.." + commit.Sha).ToArgv()
+	cmdStr := NewGitCmd("diff").Arg("HEAD.." + commit.Sha).ToString()
 
-	return self.cmd.New(cmdArgs).RunWithOutput()
+	return self.cmd.New(cmdStr).RunWithOutput()
 }

pkg/commands/git_commands/patch_test.go

@@ -0,0 +1,66 @@
+package git_commands
+
+import (
+	"fmt"
+	"os"
+	"regexp"
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWorkingTreeApplyPatch(t *testing.T) {
+	type scenario struct {
+		testName string
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(error)
+	}
+
+	expectFn := func(regexStr string, errToReturn error) func(cmdObj oscommands.ICmdObj) (string, error) {
+		return func(cmdObj oscommands.ICmdObj) (string, error) {
+			re := regexp.MustCompile(regexStr)
+			cmdStr := cmdObj.ToString()
+			matches := re.FindStringSubmatch(cmdStr)
+			assert.Equal(t, 2, len(matches), fmt.Sprintf("unexpected command: %s", cmdStr))
+
+			filename := matches[1]
+
+			content, err := os.ReadFile(filename)
+			assert.NoError(t, err)
+
+			assert.Equal(t, "test", string(content))
+
+			return "", errToReturn
+		}
+	}
+
+	scenarios := []scenario{
+		{
+			testName: "valid case",
+			runner: oscommands.NewFakeRunner(t).
+				ExpectFunc(expectFn(`git apply --cached "(.*)"`, nil)),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			testName: "command returns error",
+			runner: oscommands.NewFakeRunner(t).
+				ExpectFunc(expectFn(`git apply --cached "(.*)"`, errors.New("error"))),
+			test: func(err error) {
+				assert.Error(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildPatchCommands(commonDeps{runner: s.runner})
+			s.test(instance.ApplyPatch("test", ApplyPatchOpts{Cached: true}))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}

pkg/commands/git_commands/rebase.go

@@ -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"
@@ -34,19 +35,19 @@ func NewRebaseCommands(
 	}
 }
 
-func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, summary string, description string) error {
+func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, message string) error {
 	if models.IsHeadCommit(commits, index) {
 		// we've selected the top commit so no rebase is required
-		return self.commit.RewordLastCommit(summary, description)
+		return self.commit.RewordLastCommit(message)
 	}
 
-	err := self.BeginInteractiveRebaseForCommit(commits, index, false)
+	err := self.BeginInteractiveRebaseForCommit(commits, index)
 	if err != nil {
 		return err
 	}
 
 	// now the selected commit should be our head so we'll amend it with the new message
-	err = self.commit.RewordLastCommit(summary, description)
+	err = self.commit.RewordLastCommit(message)
 	if err != nil {
 		return err
 	}
@@ -79,19 +80,13 @@ 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
 		return f()
 	}
 
-	err := self.BeginInteractiveRebaseForCommit(commits, index, false)
+	err := self.BeginInteractiveRebaseForCommit(commits, index)
 	if err != nil {
 		return err
 	}
@@ -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,48 +150,24 @@ 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)
 }
 
 type PrepareInteractiveRebaseCommandOpts struct {
-	baseShaOrRoot              string
-	onto                       string
-	instruction                daemon.Instruction
-	overrideEditor             bool
-	keepCommitsThatBecomeEmpty bool
+	baseShaOrRoot  string
+	instruction    daemon.Instruction
+	overrideEditor bool
 }
 
 // PrepareInteractiveRebaseCommand returns the cmd for an interactive rebase
@@ -217,25 +176,24 @@ type PrepareInteractiveRebaseCommandOpts struct {
 func (self *RebaseCommands) PrepareInteractiveRebaseCommand(opts PrepareInteractiveRebaseCommandOpts) oscommands.ICmdObj {
 	ex := oscommands.GetLazygitPath()
 
-	cmdArgs := NewGitCmd("rebase").
+	cmdStr := NewGitCmd("rebase").
 		Arg("--interactive").
 		Arg("--autostash").
 		Arg("--keep-empty").
-		ArgIf(opts.keepCommitsThatBecomeEmpty && !self.version.IsOlderThan(2, 26, 0), "--empty=keep").
+		ArgIf(!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()
+		ToString()
 
 	debug := "FALSE"
 	if self.Debug {
 		debug = "TRUE"
 	}
 
-	self.Log.WithField("command", cmdArgs).Debug("RunCommand")
+	self.Log.WithField("command", cmdStr).Debug("RunCommand")
 
-	cmdObj := self.cmd.New(cmdArgs)
+	cmdObj := self.cmd.New(cmdStr)
 
 	gitSequenceEditor := ex
 
@@ -268,8 +226,8 @@ func (self *RebaseCommands) AmendTo(commits []*models.Commit, commitIndex int) e
 	}
 
 	// Get the sha of the commit we just created
-	cmdArgs := NewGitCmd("rev-parse").Arg("--verify", "HEAD").ToArgv()
-	fixupSha, err := self.cmd.New(cmdArgs).RunWithOutput()
+	cmdStr := NewGitCmd("rev-parse").Arg("--verify", "HEAD").ToString()
+	fixupSha, err := self.cmd.New(cmdStr).RunWithOutput()
 	if err != nil {
 		return err
 	}
@@ -284,19 +242,19 @@ func (self *RebaseCommands) AmendTo(commits []*models.Commit, commitIndex int) e
 // EditRebaseTodo sets the action for a given rebase commit in the git-rebase-todo file
 func (self *RebaseCommands) EditRebaseTodo(commit *models.Commit, action todo.TodoCommand) error {
 	return utils.EditRebaseTodo(
-		filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"), commit.Sha, commit.Action, action, self.config.GetCoreCommentChar())
+		filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo"), commit.Sha, commit.Action, action)
 }
 
 // MoveTodoDown moves a rebase todo item down by one position
 func (self *RebaseCommands) MoveTodoDown(commit *models.Commit) error {
-	fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo")
-	return utils.MoveTodoDown(fileName, commit.Sha, commit.Action, self.config.GetCoreCommentChar())
+	fileName := filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo")
+	return utils.MoveTodoDown(fileName, commit.Sha, commit.Action)
 }
 
 // MoveTodoDown moves a rebase todo item down by one position
 func (self *RebaseCommands) MoveTodoUp(commit *models.Commit) error {
-	fileName := filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo")
-	return utils.MoveTodoUp(fileName, commit.Sha, commit.Action, self.config.GetCoreCommentChar())
+	fileName := filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo")
+	return utils.MoveTodoUp(fileName, commit.Sha, commit.Action)
 }
 
 // SquashAllAboveFixupCommits squashes all fixup! commits above the given one
@@ -306,18 +264,16 @@ func (self *RebaseCommands) SquashAllAboveFixupCommits(commit *models.Commit) er
 		shaOrRoot = "--root"
 	}
 
-	cmdArgs := NewGitCmd("rebase").
+	cmdStr := NewGitCmd("rebase").
 		Arg("--interactive", "--rebase-merges", "--autostash", "--autosquash", shaOrRoot).
-		ToArgv()
+		ToString()
 
-	return self.runSkipEditorCommand(self.cmd.New(cmdArgs))
+	return self.runSkipEditorCommand(self.cmd.New(cmdStr))
 }
 
 // BeginInteractiveRebaseForCommit starts an interactive rebase to edit the current
 // commit and pick all others. After this you'll want to call `self.ContinueRebase()
-func (self *RebaseCommands) BeginInteractiveRebaseForCommit(
-	commits []*models.Commit, commitIndex int, keepCommitsThatBecomeEmpty bool,
-) error {
+func (self *RebaseCommands) BeginInteractiveRebaseForCommit(commits []*models.Commit, commitIndex int) error {
 	if len(commits)-1 < commitIndex {
 		return errors.New("index outside of range of commits")
 	}
@@ -336,10 +292,9 @@ func (self *RebaseCommands) BeginInteractiveRebaseForCommit(
 	self.os.LogCommand(logTodoChanges(changes), false)
 
 	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
-		baseShaOrRoot:              getBaseShaOrRoot(commits, commitIndex+1),
-		overrideEditor:             true,
-		keepCommitsThatBecomeEmpty: keepCommitsThatBecomeEmpty,
-		instruction:                daemon.NewChangeTodoActionsInstruction(changes),
+		baseShaOrRoot:  getBaseShaOrRoot(commits, commitIndex+1),
+		overrideEditor: true,
+		instruction:    daemon.NewChangeTodoActionsInstruction(changes),
 	}).Run()
 }
 
@@ -348,17 +303,10 @@ 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()
+	cmdStr := NewGitCmd(commandType).Arg("--" + command).ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
 func (self *RebaseCommands) ContinueRebase() error {
@@ -410,14 +358,14 @@ func (self *RebaseCommands) runSkipEditorCommand(cmdObj oscommands.ICmdObj) erro
 
 // DiscardOldFileChanges discards changes to a file from an old commit
 func (self *RebaseCommands) DiscardOldFileChanges(commits []*models.Commit, commitIndex int, fileName string) error {
-	if err := self.BeginInteractiveRebaseForCommit(commits, commitIndex, false); err != nil {
+	if err := self.BeginInteractiveRebaseForCommit(commits, commitIndex); err != nil {
 		return err
 	}
 
 	// check if file exists in previous commit (this command returns an error if the file doesn't exist)
-	cmdArgs := NewGitCmd("cat-file").Arg("-e", "HEAD^:"+fileName).ToArgv()
+	cmdStr := NewGitCmd("cat-file").Arg("-e", "HEAD^:"+self.cmd.Quote(fileName)).ToString()
 
-	if err := self.cmd.New(cmdArgs).Run(); err != nil {
+	if err := self.cmd.New(cmdStr).Run(); err != nil {
 		if err := self.os.Remove(fileName); err != nil {
 			return err
 		}
@@ -443,13 +391,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",

pkg/commands/git_commands/rebase_test.go

@@ -29,7 +29,7 @@ func TestRebaseRebaseBranch(t *testing.T) {
 			arg:        "master",
 			gitVersion: &GitVersion{2, 26, 0, ""},
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "--rebase-merges", "master"}, "", nil),
+				Expect(`git rebase --interactive --autostash --keep-empty --empty=keep --no-autosquash --rebase-merges master`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -39,7 +39,7 @@ func TestRebaseRebaseBranch(t *testing.T) {
 			arg:        "master",
 			gitVersion: &GitVersion{2, 26, 0, ""},
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "--rebase-merges", "master"}, "", errors.New("error")),
+				Expect(`git rebase --interactive --autostash --keep-empty --empty=keep --no-autosquash --rebase-merges master`, "", errors.New("error")),
 			test: func(err error) {
 				assert.Error(t, err)
 			},
@@ -49,7 +49,7 @@ func TestRebaseRebaseBranch(t *testing.T) {
 			arg:        "master",
 			gitVersion: &GitVersion{2, 25, 5, ""},
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "--rebase-merges", "master"}, "", nil),
+				Expect(`git rebase --interactive --autostash --keep-empty --no-autosquash --rebase-merges master`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -59,7 +59,7 @@ func TestRebaseRebaseBranch(t *testing.T) {
 			arg:        "master",
 			gitVersion: &GitVersion{2, 21, 9, ""},
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "master"}, "", nil),
+				Expect(`git rebase --interactive --autostash --keep-empty --no-autosquash master`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -78,9 +78,9 @@ func TestRebaseRebaseBranch(t *testing.T) {
 // TestRebaseSkipEditorCommand confirms that SkipEditorCommand injects
 // environment variables that suppress an interactive editor
 func TestRebaseSkipEditorCommand(t *testing.T) {
-	cmdArgs := []string{"git", "blah"}
-	runner := oscommands.NewFakeRunner(t).ExpectFunc("matches editor env var", func(cmdObj oscommands.ICmdObj) bool {
-		assert.EqualValues(t, cmdArgs, cmdObj.Args())
+	commandStr := "git blah"
+	runner := oscommands.NewFakeRunner(t).ExpectFunc(func(cmdObj oscommands.ICmdObj) (string, error) {
+		assert.Equal(t, commandStr, cmdObj.ToString())
 		envVars := cmdObj.GetEnvVars()
 		for _, regexStr := range []string{
 			`^VISUAL=.*$`,
@@ -94,13 +94,13 @@ func TestRebaseSkipEditorCommand(t *testing.T) {
 				return regexp.MustCompile(regexStr).MatchString(envVar)
 			})
 			if !foundMatch {
-				return false
+				t.Errorf("expected environment variable %s to be set", regexStr)
 			}
 		}
-		return true
-	}, "", nil)
+		return "", nil
+	})
 	instance := buildRebaseCommands(commonDeps{runner: runner})
-	err := instance.runSkipEditorCommand(instance.cmd.New(cmdArgs))
+	err := instance.runSkipEditorCommand(instance.cmd.New(commandStr))
 	assert.NoError(t, err)
 	runner.CheckForMissingCalls()
 }
@@ -149,11 +149,11 @@ func TestRebaseDiscardOldFileChanges(t *testing.T) {
 			commitIndex: 0,
 			fileName:    "test999.txt",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "--rebase-merges", "abcdef"}, "", nil).
-				ExpectGitArgs([]string{"cat-file", "-e", "HEAD^:test999.txt"}, "", nil).
-				ExpectGitArgs([]string{"checkout", "HEAD^", "--", "test999.txt"}, "", nil).
-				ExpectGitArgs([]string{"commit", "--amend", "--no-edit", "--allow-empty"}, "", nil).
-				ExpectGitArgs([]string{"rebase", "--continue"}, "", nil),
+				Expect(`git rebase --interactive --autostash --keep-empty --empty=keep --no-autosquash --rebase-merges abcdef`, "", nil).
+				Expect(`git cat-file -e HEAD^:"test999.txt"`, "", nil).
+				Expect(`git checkout HEAD^ -- "test999.txt"`, "", nil).
+				Expect(`git commit --amend --no-edit --allow-empty`, "", nil).
+				Expect(`git rebase --continue`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},

pkg/commands/git_commands/reflog_commit_loader.go

@@ -1,6 +1,7 @@
 package git_commands
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -26,28 +27,40 @@ func NewReflogCommitLoader(common *common.Common, cmd oscommands.ICmdObjBuilder)
 func (self *ReflogCommitLoader) GetReflogCommits(lastReflogCommit *models.Commit, filterPath string) ([]*models.Commit, bool, error) {
 	commits := make([]*models.Commit, 0)
 
-	cmdArgs := NewGitCmd("log").
-		Config("log.showSignature=false").
-		Arg("-g").
-		Arg("--abbrev=40").
-		Arg("--format=%h%x00%ct%x00%gs%x00%p").
-		ArgIf(filterPath != "", "--follow", "--", filterPath).
-		ToArgv()
-
-	cmdObj := self.cmd.New(cmdArgs).DontLog()
+	filterPathArg := ""
+	if filterPath != "" {
+		filterPathArg = fmt.Sprintf(" --follow -- %s", self.cmd.Quote(filterPath))
+	}
 
+	cmdObj := self.cmd.New(fmt.Sprintf(`git -c log.showSignature=false log -g --abbrev=40 --format="%s"%s`, "%h%x00%ct%x00%gs%x00%p", filterPathArg)).DontLog()
 	onlyObtainedNewReflogCommits := false
 	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
-		commit, ok := self.parseLine(line)
-		if !ok {
+		fields := strings.SplitN(line, "\x00", 4)
+		if len(fields) <= 3 {
 			return false, nil
 		}
 
+		unixTimestamp, _ := strconv.Atoi(fields[1])
+
+		parentHashes := fields[3]
+		parents := []string{}
+		if len(parentHashes) > 0 {
+			parents = strings.Split(parentHashes, " ")
+		}
+
+		commit := &models.Commit{
+			Sha:           fields[0],
+			Name:          fields[2],
+			UnixTimestamp: int64(unixTimestamp),
+			Status:        models.StatusReflog,
+			Parents:       parents,
+		}
+
 		// note that the unix timestamp here is the timestamp of the COMMIT, not the reflog entry itself,
 		// so two consecutive reflog entries may have both the same SHA and therefore same timestamp.
 		// We use the reflog message to disambiguate, and fingers crossed that we never see the same of those
 		// twice in a row. Reason being that it would mean we'd be erroneously exiting early.
-		if lastReflogCommit != nil && self.sameReflogCommit(commit, lastReflogCommit) {
+		if lastReflogCommit != nil && commit.Sha == lastReflogCommit.Sha && commit.UnixTimestamp == lastReflogCommit.UnixTimestamp && commit.Name == lastReflogCommit.Name {
 			onlyObtainedNewReflogCommits = true
 			// after this point we already have these reflogs loaded so we'll simply return the new ones
 			return true, nil
@@ -62,30 +75,3 @@ func (self *ReflogCommitLoader) GetReflogCommits(lastReflogCommit *models.Commit
 
 	return commits, onlyObtainedNewReflogCommits, nil
 }
-
-func (self *ReflogCommitLoader) sameReflogCommit(a *models.Commit, b *models.Commit) bool {
-	return a.Sha == b.Sha && a.UnixTimestamp == b.UnixTimestamp && a.Name == b.Name
-}
-
-func (self *ReflogCommitLoader) parseLine(line string) (*models.Commit, bool) {
-	fields := strings.SplitN(line, "\x00", 4)
-	if len(fields) <= 3 {
-		return nil, false
-	}
-
-	unixTimestamp, _ := strconv.Atoi(fields[1])
-
-	parentHashes := fields[3]
-	parents := []string{}
-	if len(parentHashes) > 0 {
-		parents = strings.Split(parentHashes, " ")
-	}
-
-	return &models.Commit{
-		Sha:           fields[0],
-		Name:          fields[2],
-		UnixTimestamp: int64(unixTimestamp),
-		Status:        models.StatusReflog,
-		Parents:       parents,
-	}, true
-}

pkg/commands/git_commands/reflog_commit_loader_test.go

@@ -34,7 +34,7 @@ func TestGetReflogCommits(t *testing.T) {
 		{
 			testName: "no reflog entries",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%p"}, "", nil),
+				Expect(`git -c log.showSignature=false log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, "", nil),
 
 			lastReflogCommit:        nil,
 			expectedCommits:         []*models.Commit{},
@@ -44,7 +44,7 @@ func TestGetReflogCommits(t *testing.T) {
 		{
 			testName: "some reflog entries",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%p"}, reflogOutput, nil),
+				Expect(`git -c log.showSignature=false log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, reflogOutput, nil),
 
 			lastReflogCommit: nil,
 			expectedCommits: []*models.Commit{
@@ -90,7 +90,7 @@ func TestGetReflogCommits(t *testing.T) {
 		{
 			testName: "some reflog entries where last commit is given",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%p"}, reflogOutput, nil),
+				Expect(`git -c log.showSignature=false log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, reflogOutput, nil),
 
 			lastReflogCommit: &models.Commit{
 				Sha:           "c3c4b66b64c97ffeecde",
@@ -114,7 +114,7 @@ func TestGetReflogCommits(t *testing.T) {
 		{
 			testName: "when passing filterPath",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%p", "--follow", "--", "path"}, reflogOutput, nil),
+				Expect(`git -c log.showSignature=false log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p" --follow -- "path"`, reflogOutput, nil),
 
 			lastReflogCommit: &models.Commit{
 				Sha:           "c3c4b66b64c97ffeecde",
@@ -139,7 +139,7 @@ func TestGetReflogCommits(t *testing.T) {
 		{
 			testName: "when command returns error",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"-c", "log.showSignature=false", "log", "-g", "--abbrev=40", "--format=%h%x00%ct%x00%gs%x00%p"}, "", errors.New("haha")),
+				Expect(`git -c log.showSignature=false log -g --abbrev=40 --format="%h%x00%ct%x00%gs%x00%p"`, "", errors.New("haha")),
 
 			lastReflogCommit:        nil,
 			filterPath:              "",

pkg/commands/git_commands/remote.go

@@ -2,8 +2,6 @@ package git_commands
 
 import (
 	"fmt"
-
-	"github.com/jesseduffield/gocui"
 )
 
 type RemoteCommands struct {
@@ -17,60 +15,52 @@ func NewRemoteCommands(gitCommon *GitCommon) *RemoteCommands {
 }
 
 func (self *RemoteCommands) AddRemote(name string, url string) error {
-	cmdArgs := NewGitCmd("remote").
-		Arg("add", name, url).
-		ToArgv()
+	cmdStr := NewGitCmd("remote").
+		Arg("add", self.cmd.Quote(name), self.cmd.Quote(url)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *RemoteCommands) RemoveRemote(name string) error {
-	cmdArgs := NewGitCmd("remote").
-		Arg("remove", name).
-		ToArgv()
+	cmdStr := NewGitCmd("remote").
+		Arg("remove", self.cmd.Quote(name)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *RemoteCommands) RenameRemote(oldRemoteName string, newRemoteName string) error {
-	cmdArgs := NewGitCmd("remote").
-		Arg("rename", oldRemoteName, newRemoteName).
-		ToArgv()
+	cmdStr := NewGitCmd("remote").
+		Arg("rename", self.cmd.Quote(oldRemoteName), self.cmd.Quote(newRemoteName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *RemoteCommands) UpdateRemoteUrl(remoteName string, updatedUrl string) error {
-	cmdArgs := NewGitCmd("remote").
-		Arg("set-url", remoteName, updatedUrl).
-		ToArgv()
+	cmdStr := NewGitCmd("remote").
+		Arg("set-url", self.cmd.Quote(remoteName), self.cmd.Quote(updatedUrl)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
-func (self *RemoteCommands) DeleteRemoteBranch(task gocui.Task, remoteName string, branchName string) error {
-	cmdArgs := NewGitCmd("push").
-		Arg(remoteName, "--delete", branchName).
-		ToArgv()
+func (self *RemoteCommands) DeleteRemoteBranch(remoteName string, branchName string) error {
+	cmdStr := NewGitCmd("push").
+		Arg(self.cmd.Quote(remoteName), "--delete", self.cmd.Quote(branchName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).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).WithMutex(self.syncMutex).Run()
+	return self.cmd.New(cmdStr).PromptOnCredentialRequest().WithMutex(self.syncMutex).Run()
 }
 
 // CheckRemoteBranchExists Returns remote branch
 func (self *RemoteCommands) CheckRemoteBranchExists(branchName string) bool {
-	cmdArgs := NewGitCmd("show-ref").
-		Arg("--verify", "--", fmt.Sprintf("refs/remotes/origin/%s", branchName)).
-		ToArgv()
+	cmdStr := NewGitCmd("show-ref").
+		Arg("--verify", "--", fmt.Sprintf("refs/remotes/origin/%s", self.cmd.Quote(branchName))).
+		ToString()
 
-	_, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	_, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 
 	return err == nil
 }

pkg/commands/git_commands/remote_loader.go

@@ -1,16 +1,15 @@
 package git_commands
 
 import (
+	"fmt"
+	"regexp"
 	"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 {
@@ -32,31 +31,29 @@ func NewRemoteLoader(
 }
 
 func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-
-	var remoteBranchesByRemoteName map[string][]*models.RemoteBranch
-	var remoteBranchesErr error
-	go utils.Safe(func() {
-		defer wg.Done()
-
-		remoteBranchesByRemoteName, remoteBranchesErr = self.getRemoteBranchesByRemoteName()
-	})
+	cmdStr := NewGitCmd("branch").Arg("-r").ToString()
+	remoteBranchesStr, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
+	if err != nil {
+		return nil, err
+	}
 
 	goGitRemotes, err := self.getGoGitRemotes()
 	if err != nil {
 		return nil, err
 	}
 
-	wg.Wait()
-
-	if remoteBranchesErr != nil {
-		return nil, remoteBranchesErr
-	}
-
-	remotes := lo.Map(goGitRemotes, func(goGitRemote *gogit.Remote, _ int) *models.Remote {
+	// first step is to get our remotes from go-git
+	remotes := slices.Map(goGitRemotes, func(goGitRemote *gogit.Remote) *models.Remote {
 		remoteName := goGitRemote.Config().Name
-		branches := remoteBranchesByRemoteName[remoteName]
+
+		re := regexp.MustCompile(fmt.Sprintf(`(?m)^\s*%s\/([\S]+)`, regexp.QuoteMeta(remoteName)))
+		matches := re.FindAllStringSubmatch(remoteBranchesStr, -1)
+		branches := slices.Map(matches, func(match []string) *models.RemoteBranch {
+			return &models.RemoteBranch{
+				Name:       match[1],
+				RemoteName: remoteName,
+			}
+		})
 
 		return &models.Remote{
 			Name:     goGitRemote.Config().Name,
@@ -79,42 +76,3 @@ func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
 
 	return remotes, nil
 }
-
-func (self *RemoteLoader) getRemoteBranchesByRemoteName() (map[string][]*models.RemoteBranch, error) {
-	remoteBranchesByRemoteName := make(map[string][]*models.RemoteBranch)
-
-	cmdArgs := NewGitCmd("branch").Arg("-r").ToArgv()
-	err := self.cmd.New(cmdArgs).DontLog().RunAndProcessLines(func(line string) (bool, error) {
-		// excluding lines like 'origin/HEAD -> origin/master' (there will be a separate
-		// line for 'origin/master')
-		if strings.Contains(line, "->") {
-			return false, nil
-		}
-
-		line = strings.TrimSpace(line)
-
-		split := strings.SplitN(line, "/", 2)
-		if len(split) != 2 {
-			return false, nil
-		}
-		remoteName := split[0]
-		name := split[1]
-
-		_, ok := remoteBranchesByRemoteName[remoteName]
-		if !ok {
-			remoteBranchesByRemoteName[remoteName] = []*models.RemoteBranch{}
-		}
-
-		remoteBranchesByRemoteName[remoteName] = append(remoteBranchesByRemoteName[remoteName],
-			&models.RemoteBranch{
-				Name:       name,
-				RemoteName: remoteName,
-			})
-		return false, nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return remoteBranchesByRemoteName, nil
-}

pkg/commands/git_commands/repo_paths.go

@@ -1,280 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	ioFs "io/fs"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/samber/lo"
-	"github.com/spf13/afero"
-)
-
-type RepoPaths struct {
-	currentPath        string
-	worktreePath       string
-	worktreeGitDirPath string
-	repoPath           string
-	repoGitDirPath     string
-	repoName           string
-}
-
-// Current working directory of the program. Currently, this will always
-// be the same as WorktreePath(), but in future we may support running
-// lazygit from inside a subdirectory of the worktree.
-func (self *RepoPaths) CurrentPath() string {
-	return self.currentPath
-}
-
-// Path to the current worktree. If we're in the main worktree, this will
-// be the same as RepoPath()
-func (self *RepoPaths) WorktreePath() string {
-	return self.worktreePath
-}
-
-// Path of the worktree's git dir.
-// If we're in the main worktree, this will be the .git dir under the RepoPath().
-// If we're in a linked worktree, it will be the directory pointed at by the worktree's .git file
-func (self *RepoPaths) WorktreeGitDirPath() string {
-	return self.worktreeGitDirPath
-}
-
-// Path of the repo. If we're in a the main worktree, this will be the same as WorktreePath()
-// If we're in a bare repo, it will be the parent folder of the bare repo
-func (self *RepoPaths) RepoPath() string {
-	return self.repoPath
-}
-
-// path of the git-dir for the repo.
-// If this is a bare repo, it will be the location of the bare repo
-// If this is a non-bare repo, it will be the location of the .git dir in
-// the main worktree.
-func (self *RepoPaths) RepoGitDirPath() string {
-	return self.repoGitDirPath
-}
-
-// Name of the repo. Basename of the folder containing the repo.
-func (self *RepoPaths) RepoName() string {
-	return self.repoName
-}
-
-// Returns the repo paths for a typical repo
-func MockRepoPaths(currentPath string) *RepoPaths {
-	return &RepoPaths{
-		currentPath:        currentPath,
-		worktreePath:       currentPath,
-		worktreeGitDirPath: path.Join(currentPath, ".git"),
-		repoPath:           currentPath,
-		repoGitDirPath:     path.Join(currentPath, ".git"),
-		repoName:           "lazygit",
-	}
-}
-
-func GetRepoPaths(
-	fs afero.Fs,
-	currentPath string,
-) (*RepoPaths, error) {
-	return getRepoPathsAux(afero.NewOsFs(), resolveSymlink, currentPath)
-}
-
-func getRepoPathsAux(
-	fs afero.Fs,
-	resolveSymlinkFn func(string) (string, error),
-	currentPath string,
-) (*RepoPaths, error) {
-	worktreePath := currentPath
-	repoGitDirPath, repoPath, err := getCurrentRepoGitDirPath(fs, resolveSymlinkFn, currentPath)
-	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)
-		}
-	}
-
-	repoName := path.Base(repoPath)
-
-	return &RepoPaths{
-		currentPath:        currentPath,
-		worktreePath:       worktreePath,
-		worktreeGitDirPath: worktreeGitDirPath,
-		repoPath:           repoPath,
-		repoGitDirPath:     repoGitDirPath,
-		repoName:           repoName,
-	}, nil
-}
-
-// 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) {
-	// if .git is a file, we're in a linked worktree, otherwise we're in
-	// the main worktree
-	dotGitPath := path.Join(worktreePath, ".git")
-	gitFileInfo, err := fs.Stat(dotGitPath)
-	if err != nil {
-		return "", err
-	}
-
-	if gitFileInfo.IsDir() {
-		return dotGitPath, nil
-	}
-
-	return linkedWorktreeGitDirPath(fs, worktreePath)
-}
-
-func linkedWorktreeGitDirPath(fs afero.Fs, worktreePath string) (string, error) {
-	dotGitPath := path.Join(worktreePath, ".git")
-	gitFileContents, err := afero.ReadFile(fs, dotGitPath)
-	if err != nil {
-		return "", err
-	}
-
-	// The file will have `gitdir: /path/to/.git/worktrees/<worktree-name>`
-	gitDirLine := lo.Filter(strings.Split(string(gitFileContents), "\n"), func(line string, _ int) bool {
-		return strings.HasPrefix(line, "gitdir: ")
-	})
-
-	if len(gitDirLine) == 0 {
-		return "", errors.New(fmt.Sprintf("%s is a file which suggests we are in a submodule or a worktree but the file's contents do not contain a gitdir pointing to the actual .git directory", dotGitPath))
-	}
-
-	gitDir := strings.TrimPrefix(gitDirLine[0], "gitdir: ")
-
-	gitDir = filepath.Clean(gitDir)
-	// For windows support
-	gitDir = filepath.ToSlash(gitDir)
-
-	return gitDir, nil
-}
-
-func getCurrentRepoGitDirPath(
-	fs afero.Fs,
-	resolveSymlinkFn func(string) (string, error),
-	currentPath string,
-) (string, string, error) {
-	var unresolvedGitPath string
-	if env.GetGitDirEnv() != "" {
-		unresolvedGitPath = env.GetGitDirEnv()
-	} else {
-		unresolvedGitPath = path.Join(currentPath, ".git")
-	}
-
-	gitPath, err := resolveSymlinkFn(unresolvedGitPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	// check if .git is a file or a directory
-	gitFileInfo, err := fs.Stat(gitPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	if gitFileInfo.IsDir() {
-		// must be in the main worktree
-		return gitPath, path.Dir(gitPath), nil
-	}
-
-	// either in a submodule, or worktree
-	worktreeGitPath, err := linkedWorktreeGitDirPath(fs, currentPath)
-	if err != nil {
-		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
-	parent := path.Dir(worktreeGitPath)
-	if path.Base(parent) == "worktrees" {
-		gitDirPath := path.Dir(parent)
-		return gitDirPath, path.Dir(gitDirPath), nil
-	}
-
-	// 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
-		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)
-}
-
-// takes a path containing a symlink and returns the true path
-func resolveSymlink(path string) (string, error) {
-	l, err := os.Lstat(path)
-	if err != nil {
-		return "", err
-	}
-
-	if l.Mode()&os.ModeSymlink == 0 {
-		return path, nil
-	}
-
-	return filepath.EvalSymlinks(path)
-}
-
-// Returns the paths of linked worktrees
-func linkedWortkreePaths(fs afero.Fs, repoGitDirPath string) []string {
-	result := []string{}
-	// For each directory in this path we're going to cat the `gitdir` file and append its contents to our result
-	// That file points us to the `.git` file in the worktree.
-	worktreeGitDirsPath := path.Join(repoGitDirPath, "worktrees")
-
-	// ensure the directory exists
-	_, err := fs.Stat(worktreeGitDirsPath)
-	if err != nil {
-		return result
-	}
-
-	_ = afero.Walk(fs, worktreeGitDirsPath, func(currPath string, info ioFs.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if !info.IsDir() {
-			return nil
-		}
-
-		gitDirPath := path.Join(currPath, "gitdir")
-		gitDirBytes, err := afero.ReadFile(fs, gitDirPath)
-		if err != nil {
-			// ignoring error
-			return nil
-		}
-		trimmedGitDir := strings.TrimSpace(string(gitDirBytes))
-		// removing the .git part
-		worktreeDir := path.Dir(trimmedGitDir)
-		result = append(result, worktreeDir)
-		return nil
-	})
-
-	return result
-}

pkg/commands/git_commands/repo_paths_test.go

@@ -1,163 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/go-errors/errors"
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-)
-
-func mockResolveSymlinkFn(p string) (string, error) { return p, nil }
-
-type Scenario struct {
-	Name       string
-	BeforeFunc func(fs afero.Fs)
-	Path       string
-	Expected   *RepoPaths
-	Err        error
-}
-
-func TestGetRepoPathsAux(t *testing.T) {
-	scenarios := []Scenario{
-		{
-			Name: "typical case",
-			BeforeFunc: func(fs afero.Fs) {
-				// setup for main worktree
-				_ = fs.MkdirAll("/path/to/repo/.git", 0o755)
-			},
-			Path: "/path/to/repo",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo",
-				worktreePath:       "/path/to/repo",
-				worktreeGitDirPath: "/path/to/repo/.git",
-				repoPath:           "/path/to/repo",
-				repoGitDirPath:     "/path/to/repo/.git",
-				repoName:           "repo",
-			},
-			Err: nil,
-		},
-		{
-			Name: "linked worktree",
-			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 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) {
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/worktree2", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/worktree2/.git", []byte("blah"), 0o644)
-			},
-			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: /path/to/repo/worktree2/.git is a file which suggests we are in a submodule or a worktree but the file's contents do not contain a gitdir pointing to the actual .git directory"),
-		},
-		{
-			Name: "worktree .git file gitdir directive points to a non-existing directory",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git/worktrees/worktree2", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/worktree2/.git", []byte("gitdir: /nonexistant"), 0o644)
-			},
-			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"),
-		},
-		{
-			Name: "submodule",
-			BeforeFunc: func(fs afero.Fs) {
-				_ = fs.MkdirAll("/path/to/repo/.git/modules/submodule1", 0o755)
-				_ = afero.WriteFile(fs, "/path/to/repo/submodule1/.git", []byte("gitdir: /path/to/repo/.git/modules/submodule1"), 0o644)
-			},
-			Path: "/path/to/repo/submodule1",
-			Expected: &RepoPaths{
-				currentPath:        "/path/to/repo/submodule1",
-				worktreePath:       "/path/to/repo/submodule1",
-				worktreeGitDirPath: "/path/to/repo/.git/modules/submodule1",
-				repoPath:           "/path/to/repo/submodule1",
-				repoGitDirPath:     "/path/to/repo/.git/modules/submodule1",
-				repoName:           "submodule1",
-			},
-			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 {
-		s := s
-		t.Run(s.Name, func(t *testing.T) {
-			fs := afero.NewMemMapFs()
-
-			// prepare the filesystem for the scenario
-			s.BeforeFunc(fs)
-
-			// run the function with the scenario path
-			repoPaths, err := getRepoPathsAux(fs, mockResolveSymlinkFn, s.Path)
-
-			// check the error and the paths
-			if s.Err != nil {
-				assert.Error(t, err)
-				assert.EqualError(t, err, s.Err.Error())
-			} else {
-				assert.Nil(t, err)
-				assert.Equal(t, s.Expected, repoPaths)
-			}
-		})
-	}
-}

pkg/commands/git_commands/stash.go

@@ -26,94 +26,93 @@ func NewStashCommands(
 }
 
 func (self *StashCommands) DropNewest() error {
-	cmdArgs := NewGitCmd("stash").Arg("drop").ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("drop").ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *StashCommands) Drop(index int) error {
-	cmdArgs := NewGitCmd("stash").Arg("drop", fmt.Sprintf("stash@{%d}", index)).
-		ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("drop", fmt.Sprintf("stash@{%d}", index)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *StashCommands) Pop(index int) error {
-	cmdArgs := NewGitCmd("stash").Arg("pop", fmt.Sprintf("stash@{%d}", index)).
-		ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("pop", fmt.Sprintf("stash@{%d}", index)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *StashCommands) Apply(index int) error {
-	cmdArgs := NewGitCmd("stash").Arg("apply", fmt.Sprintf("stash@{%d}", index)).
-		ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("apply", fmt.Sprintf("stash@{%d}", index)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
-// Push push stash
-func (self *StashCommands) Push(message string) error {
-	cmdArgs := NewGitCmd("stash").Arg("push", "-m", message).
-		ToArgv()
+// Save save stash
+func (self *StashCommands) Save(message string) error {
+	cmdStr := NewGitCmd("stash").Arg("save", self.cmd.Quote(message)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *StashCommands) Store(sha string, message string) error {
 	trimmedMessage := strings.Trim(message, " \t")
 
-	cmdArgs := NewGitCmd("stash").Arg("store").
-		ArgIf(trimmedMessage != "", "-m", trimmedMessage).
-		Arg(sha).
-		ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("store", self.cmd.Quote(sha)).
+		ArgIf(trimmedMessage != "", "-m", self.cmd.Quote(trimmedMessage)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *StashCommands) Sha(index int) (string, error) {
-	cmdArgs := NewGitCmd("rev-parse").
+	cmdStr := NewGitCmd("rev-parse").
 		Arg(fmt.Sprintf("refs/stash@{%d}", index)).
-		ToArgv()
+		ToString()
 
-	sha, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs()
+	sha, _, err := self.cmd.New(cmdStr).DontLog().RunWithOutputs()
 	return strings.Trim(sha, "\r\n"), err
 }
 
-func (self *StashCommands) ShowStashEntryCmdObj(index int) oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("stash").Arg("show").
+func (self *StashCommands) ShowStashEntryCmdObj(index int, ignoreWhitespace bool) oscommands.ICmdObj {
+	cmdStr := 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()
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog()
+	return self.cmd.New(cmdStr).DontLog()
 }
 
 func (self *StashCommands) StashAndKeepIndex(message string) error {
-	cmdArgs := NewGitCmd("stash").Arg("push", "--keep-index", "-m", message).
-		ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("save", self.cmd.Quote(message), "--keep-index").
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *StashCommands) StashUnstagedChanges(message string) error {
 	if err := self.cmd.New(
 		NewGitCmd("commit").
-			Arg("--no-verify", "-m", "[lazygit] stashing unstaged changes").
-			ToArgv(),
+			Arg("--no-verify", "-m", self.cmd.Quote("[lazygit] stashing unstaged changes")).
+			ToString(),
 	).Run(); err != nil {
 		return err
 	}
-	if err := self.Push(message); err != nil {
+	if err := self.Save(message); err != nil {
 		return err
 	}
 
 	if err := self.cmd.New(
-		NewGitCmd("reset").Arg("--soft", "HEAD^").ToArgv(),
+		NewGitCmd("reset").Arg("--soft", "HEAD^").ToString(),
 	).Run(); err != nil {
 		return err
 	}
@@ -125,30 +124,30 @@ func (self *StashCommands) StashUnstagedChanges(message string) error {
 func (self *StashCommands) SaveStagedChanges(message string) error {
 	// wrap in 'writing', which uses a mutex
 	if err := self.cmd.New(
-		NewGitCmd("stash").Arg("--keep-index").ToArgv(),
+		NewGitCmd("stash").Arg("--keep-index").ToString(),
 	).Run(); err != nil {
 		return err
 	}
 
-	if err := self.Push(message); err != nil {
+	if err := self.Save(message); err != nil {
 		return err
 	}
 
 	if err := self.cmd.New(
-		NewGitCmd("stash").Arg("apply", "stash@{1}").ToArgv(),
+		NewGitCmd("stash").Arg("apply", "stash@{1}").ToString(),
 	).Run(); err != nil {
 		return err
 	}
 
 	if err := self.os.PipeCommands(
-		self.cmd.New(NewGitCmd("stash").Arg("show", "-p").ToArgv()),
-		self.cmd.New(NewGitCmd("apply").Arg("-R").ToArgv()),
+		NewGitCmd("stash").Arg("show", "-p").ToString(),
+		NewGitCmd("apply").Arg("-R").ToString(),
 	); err != nil {
 		return err
 	}
 
 	if err := self.cmd.New(
-		NewGitCmd("stash").Arg("drop", "stash@{1}").ToArgv(),
+		NewGitCmd("stash").Arg("drop", "stash@{1}").ToString(),
 	).Run(); err != nil {
 		return err
 	}
@@ -172,8 +171,8 @@ func (self *StashCommands) SaveStagedChanges(message string) error {
 
 func (self *StashCommands) StashIncludeUntrackedChanges(message string) error {
 	return self.cmd.New(
-		NewGitCmd("stash").Arg("push", "--include-untracked", "-m", message).
-			ToArgv(),
+		NewGitCmd("stash").Arg("save", self.cmd.Quote(message), "--include-untracked").
+			ToString(),
 	).Run()
 }
 

pkg/commands/git_commands/stash_loader.go

@@ -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 {
@@ -32,8 +32,8 @@ func (self *StashLoader) GetStashEntries(filterPath string) []*models.StashEntry
 		return self.getUnfilteredStashEntries()
 	}
 
-	cmdArgs := NewGitCmd("stash").Arg("list", "--name-only").ToArgv()
-	rawString, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	cmdStr := NewGitCmd("stash").Arg("list", "--name-only").ToString()
+	rawString, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	if err != nil {
 		return self.getUnfilteredStashEntries()
 	}
@@ -66,10 +66,10 @@ outer:
 }
 
 func (self *StashLoader) getUnfilteredStashEntries() []*models.StashEntry {
-	cmdArgs := NewGitCmd("stash").Arg("list", "-z", "--pretty=%gs").ToArgv()
+	cmdStr := NewGitCmd("stash").Arg("list", "-z", "--pretty='%gs'").ToString()
 
-	rawString, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	return lo.Map(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
+	rawString, _ := self.cmd.New(cmdStr).DontLog().RunWithOutput()
+	return slices.MapWithIndex(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
 		return self.stashEntryFromLine(line, index)
 	})
 }

pkg/commands/git_commands/stash_loader_test.go

@@ -22,14 +22,15 @@ func TestGetStashEntries(t *testing.T) {
 			"No stash entries found",
 			"",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"stash", "list", "-z", "--pretty=%gs"}, "", nil),
+				Expect(`git stash list -z --pretty='%gs'`, "", nil),
 			[]*models.StashEntry{},
 		},
 		{
 			"Several stash entries found",
 			"",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"stash", "list", "-z", "--pretty=%gs"},
+				Expect(
+					`git stash list -z --pretty='%gs'`,
 					"WIP on add-pkg-commands-test: 55c6af2 increase parallel build\x00WIP on master: bb86a3f update github template\x00",
 					nil,
 				),

pkg/commands/git_commands/stash_test.go

@@ -37,10 +37,10 @@ func TestStashPop(t *testing.T) {
 
 func TestStashSave(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).
-		ExpectGitArgs([]string{"stash", "push", "-m", "A stash message"}, "", nil)
+		ExpectGitArgs([]string{"stash", "save", "A stash message"}, "", nil)
 	instance := buildStashCommands(commonDeps{runner: runner})
 
-	assert.NoError(t, instance.Push("A stash message"))
+	assert.NoError(t, instance.Save("A stash message"))
 	runner.CheckForMissingCalls()
 }
 
@@ -57,7 +57,7 @@ func TestStashStore(t *testing.T) {
 			testName: "Non-empty message",
 			sha:      "0123456789abcdef",
 			message:  "New stash name",
-			expected: []string{"stash", "store", "-m", "New stash name", "0123456789abcdef"},
+			expected: []string{"stash", "store", "0123456789abcdef", "-m", "New stash name"},
 		},
 		{
 			testName: "Empty message",
@@ -103,7 +103,7 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 		index            int
 		contextSize      int
 		ignoreWhitespace bool
-		expected         []string
+		expected         string
 	}
 
 	scenarios := []scenario{
@@ -112,21 +112,21 @@ func TestStashStashEntryCmdObj(t *testing.T) {
 			index:            5,
 			contextSize:      3,
 			ignoreWhitespace: false,
-			expected:         []string{"git", "stash", "show", "-p", "--stat", "--color=always", "--unified=3", "stash@{5}"},
+			expected:         "git stash show -p --stat --color=always --unified=3 stash@{5}",
 		},
 		{
 			testName:         "Show diff with custom context size",
 			index:            5,
 			contextSize:      77,
 			ignoreWhitespace: false,
-			expected:         []string{"git", "stash", "show", "-p", "--stat", "--color=always", "--unified=77", "stash@{5}"},
+			expected:         "git stash show -p --stat --color=always --unified=77 stash@{5}",
 		},
 		{
 			testName:         "Default case",
 			index:            5,
 			contextSize:      3,
 			ignoreWhitespace: true,
-			expected:         []string{"git", "stash", "show", "-p", "--stat", "--color=always", "--unified=3", "--ignore-all-space", "stash@{5}"},
+			expected:         "git stash show -p --stat --color=always --unified=3 --ignore-all-space stash@{5}",
 		},
 	}
 
@@ -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).ToString()
 			assert.Equal(t, s.expected, cmdStr)
 		})
 	}
@@ -164,7 +162,7 @@ func TestStashRename(t *testing.T) {
 			expectedShaCmd:   []string{"rev-parse", "refs/stash@{3}"},
 			shaResult:        "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd\n",
 			expectedDropCmd:  []string{"stash", "drop", "stash@{3}"},
-			expectedStoreCmd: []string{"stash", "store", "-m", "New message", "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd"},
+			expectedStoreCmd: []string{"stash", "store", "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd", "-m", "New message"},
 		},
 		{
 			testName:         "Empty message",

pkg/commands/git_commands/status.go

@@ -1,7 +1,6 @@
 package git_commands
 
 import (
-	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -25,14 +24,14 @@ func NewStatusCommands(
 // RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
 // and "interactive" for interactive rebase
 func (self *StatusCommands) RebaseMode() (enums.RebaseMode, error) {
-	exists, err := self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"))
+	exists, err := self.os.FileExists(filepath.Join(self.dotGitDir, "rebase-apply"))
 	if err != nil {
 		return enums.REBASE_MODE_NONE, err
 	}
 	if exists {
 		return enums.REBASE_MODE_NORMAL, nil
 	}
-	exists, err = self.os.FileExists(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge"))
+	exists, err = self.os.FileExists(filepath.Join(self.dotGitDir, "rebase-merge"))
 	if exists {
 		return enums.REBASE_MODE_INTERACTIVE, err
 	} else {
@@ -58,7 +57,7 @@ func (self *StatusCommands) IsBareRepo() (bool, error) {
 
 func IsBareRepo(osCommand *oscommands.OSCommand) (bool, error) {
 	res, err := osCommand.Cmd.New(
-		NewGitCmd("rev-parse").Arg("--is-bare-repository").ToArgv(),
+		NewGitCmd("rev-parse").Arg("--is-bare-repository").ToString(),
 	).DontLog().RunWithOutput()
 	if err != nil {
 		return false, err
@@ -70,16 +69,5 @@ func IsBareRepo(osCommand *oscommands.OSCommand) (bool, error) {
 
 // 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 ""
+	return self.os.FileExists(filepath.Join(self.dotGitDir, "MERGE_HEAD"))
 }

pkg/commands/git_commands/submodule.go

@@ -81,27 +81,27 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 		return nil
 	}
 
-	cmdArgs := NewGitCmd("stash").
-		Dir(submodule.Path).
+	cmdStr := NewGitCmd("stash").
+		RepoPath(self.cmd.Quote(submodule.Path)).
 		Arg("--include-untracked").
-		ToArgv()
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) Reset(submodule *models.SubmoduleConfig) error {
-	cmdArgs := NewGitCmd("submodule").
-		Arg("update", "--init", "--force", "--", submodule.Path).
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").
+		Arg("update", "--init", "--force", "--", self.cmd.Quote(submodule.Path)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) UpdateAll() error {
 	// not doing an --init here because the user probably doesn't want that
-	cmdArgs := NewGitCmd("submodule").Arg("update", "--force").ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("update", "--force").ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
@@ -109,7 +109,7 @@ func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 
 	if err := self.cmd.New(
 		NewGitCmd("submodule").
-			Arg("deinit", "--force", "--", submodule.Path).ToArgv(),
+			Arg("deinit", "--force", "--", self.cmd.Quote(submodule.Path)).ToString(),
 	).Run(); err != nil {
 		if !strings.Contains(err.Error(), "did not match any file(s) known to git") {
 			return err
@@ -117,61 +117,59 @@ func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 
 		if err := self.cmd.New(
 			NewGitCmd("config").
-				Arg("--file", ".gitmodules", "--remove-section", "submodule."+submodule.Path).
-				ToArgv(),
+				Arg("--file", ".gitmodules", "--remove-section", "submodule."+self.cmd.Quote(submodule.Path)).
+				ToString(),
 		).Run(); err != nil {
 			return err
 		}
 
 		if err := self.cmd.New(
 			NewGitCmd("config").
-				Arg("--remove-section", "submodule."+submodule.Path).
-				ToArgv(),
+				Arg("--remove-section", "submodule."+self.cmd.Quote(submodule.Path)).
+				ToString(),
 		).Run(); err != nil {
 			return err
 		}
 	}
 
 	if err := self.cmd.New(
-		NewGitCmd("rm").Arg("--force", "-r", submodule.Path).ToArgv(),
+		NewGitCmd("rm").Arg("--force", "-r", submodule.Path).ToString(),
 	).Run(); err != nil {
 		// if the directory isn't there then that's fine
 		self.Log.Error(err)
 	}
 
-	// We may in fact want to use the repo's git dir path but git docs say not to
-	// mix submodules and worktrees anyway.
-	return os.RemoveAll(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "modules", submodule.Path))
+	return os.RemoveAll(filepath.Join(self.dotGitDir, "modules", submodule.Path))
 }
 
 func (self *SubmoduleCommands) Add(name string, path string, url string) error {
-	cmdArgs := NewGitCmd("submodule").
+	cmdStr := NewGitCmd("submodule").
 		Arg("add").
 		Arg("--force").
 		Arg("--name").
-		Arg(name).
+		Arg(self.cmd.Quote(name)).
 		Arg("--").
-		Arg(url).
-		Arg(path).
-		ToArgv()
+		Arg(self.cmd.Quote(url)).
+		Arg(self.cmd.Quote(path)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) UpdateUrl(name string, path string, newUrl string) error {
 	setUrlCmdStr := NewGitCmd("config").
 		Arg(
-			"--file", ".gitmodules", "submodule."+name+".url", newUrl,
+			"--file", ".gitmodules", "submodule."+self.cmd.Quote(name)+".url", self.cmd.Quote(newUrl),
 		).
-		ToArgv()
+		ToString()
 
 	// the set-url command is only for later git versions so we're doing it manually here
 	if err := self.cmd.New(setUrlCmdStr).Run(); err != nil {
 		return err
 	}
 
-	syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", path).
-		ToArgv()
+	syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", self.cmd.Quote(path)).
+		ToString()
 
 	if err := self.cmd.New(syncCmdStr).Run(); err != nil {
 		return err
@@ -181,45 +179,45 @@ func (self *SubmoduleCommands) UpdateUrl(name string, path string, newUrl string
 }
 
 func (self *SubmoduleCommands) Init(path string) error {
-	cmdArgs := NewGitCmd("submodule").Arg("init", "--", path).
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("init", "--", self.cmd.Quote(path)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) Update(path string) error {
-	cmdArgs := NewGitCmd("submodule").Arg("update", "--init", "--", path).
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("update", "--init", "--", self.cmd.Quote(path)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *SubmoduleCommands) BulkInitCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("submodule").Arg("init").
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("init").
+		ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
 func (self *SubmoduleCommands) BulkUpdateCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("submodule").Arg("update").
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("update").
+		ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
 func (self *SubmoduleCommands) ForceBulkUpdateCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("submodule").Arg("update", "--force").
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("update", "--force").
+		ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
 func (self *SubmoduleCommands) BulkDeinitCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("submodule").Arg("deinit", "--all", "--force").
-		ToArgv()
+	cmdStr := NewGitCmd("submodule").Arg("deinit", "--all", "--force").
+		ToString()
 
-	return self.cmd.New(cmdArgs)
+	return self.cmd.New(cmdStr)
 }
 
 func (self *SubmoduleCommands) ResetSubmodules(submodules []*models.SubmoduleConfig) error {

pkg/commands/git_commands/sync.go

@@ -2,7 +2,6 @@ package git_commands
 
 import (
 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 )
 
@@ -24,24 +23,24 @@ type PushOpts struct {
 	SetUpstream    bool
 }
 
-func (self *SyncCommands) PushCmdObj(task gocui.Task, opts PushOpts) (oscommands.ICmdObj, error) {
+func (self *SyncCommands) PushCmdObj(opts PushOpts) (oscommands.ICmdObj, error) {
 	if opts.UpstreamBranch != "" && opts.UpstreamRemote == "" {
 		return nil, errors.New(self.Tr.MustSpecifyOriginError)
 	}
 
-	cmdArgs := NewGitCmd("push").
+	cmdStr := NewGitCmd("push").
 		ArgIf(opts.Force, "--force-with-lease").
 		ArgIf(opts.SetUpstream, "--set-upstream").
-		ArgIf(opts.UpstreamRemote != "", opts.UpstreamRemote).
-		ArgIf(opts.UpstreamBranch != "", opts.UpstreamBranch).
-		ToArgv()
+		ArgIf(opts.UpstreamRemote != "", self.cmd.Quote(opts.UpstreamRemote)).
+		ArgIf(opts.UpstreamBranch != "", self.cmd.Quote(opts.UpstreamBranch)).
+		ToString()
 
-	cmdObj := self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex)
+	cmdObj := self.cmd.New(cmdStr).PromptOnCredentialRequest().WithMutex(self.syncMutex)
 	return cmdObj, nil
 }
 
-func (self *SyncCommands) Push(task gocui.Task, opts PushOpts) error {
-	cmdObj, err := self.PushCmdObj(task, opts)
+func (self *SyncCommands) Push(opts PushOpts) error {
+	cmdObj, err := self.PushCmdObj(opts)
 	if err != nil {
 		return err
 	}
@@ -49,74 +48,60 @@ func (self *SyncCommands) Push(task gocui.Task, opts PushOpts) error {
 	return cmdObj.Run()
 }
 
-func (self *SyncCommands) FetchCmdObj(task gocui.Task) oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("fetch").
-		ArgIf(self.UserConfig.Git.FetchAll, "--all").
-		ToArgv()
-
-	cmdObj := self.cmd.New(cmdArgs)
-	cmdObj.PromptOnCredentialRequest(task)
-	return cmdObj
+type FetchOptions struct {
+	Background bool
+	RemoteName string
+	BranchName string
 }
 
-func (self *SyncCommands) Fetch(task gocui.Task) error {
-	return self.FetchCmdObj(task).Run()
-}
+// Fetch fetch git repo
+func (self *SyncCommands) Fetch(opts FetchOptions) error {
+	cmdStr := NewGitCmd("fetch").
+		ArgIf(opts.RemoteName != "", self.cmd.Quote(opts.RemoteName)).
+		ArgIf(opts.BranchName != "", self.cmd.Quote(opts.BranchName)).
+		ToString()
 
-func (self *SyncCommands) FetchBackgroundCmdObj() oscommands.ICmdObj {
-	cmdArgs := NewGitCmd("fetch").
-		ArgIf(self.UserConfig.Git.FetchAll, "--all").
-		ToArgv()
-
-	cmdObj := self.cmd.New(cmdArgs)
-	cmdObj.DontLog().FailOnCredentialRequest()
-	cmdObj.WithMutex(self.syncMutex)
-	return cmdObj
-}
-
-func (self *SyncCommands) FetchBackground() error {
-	return self.FetchBackgroundCmdObj().Run()
+	cmdObj := self.cmd.New(cmdStr)
+	if opts.Background {
+		cmdObj.DontLog().FailOnCredentialRequest()
+	} else {
+		cmdObj.PromptOnCredentialRequest()
+	}
+	return cmdObj.WithMutex(self.syncMutex).Run()
 }
 
 type PullOptions struct {
 	RemoteName      string
 	BranchName      string
 	FastForwardOnly bool
-	WorktreeGitDir  string
 }
 
-func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
-	cmdArgs := NewGitCmd("pull").
+func (self *SyncCommands) Pull(opts PullOptions) error {
+	cmdStr := NewGitCmd("pull").
 		Arg("--no-edit").
 		ArgIf(opts.FastForwardOnly, "--ff-only").
-		ArgIf(opts.RemoteName != "", opts.RemoteName).
-		ArgIf(opts.BranchName != "", opts.BranchName).
-		GitDirIf(opts.WorktreeGitDir != "", opts.WorktreeGitDir).
-		ToArgv()
+		ArgIf(opts.RemoteName != "", self.cmd.Quote(opts.RemoteName)).
+		ArgIf(opts.BranchName != "", self.cmd.Quote(opts.BranchName)).
+		ToString()
 
 	// 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).WithMutex(self.syncMutex).Run()
+	return self.cmd.New(cmdStr).AddEnvVars("GIT_SEQUENCE_EDITOR=:").PromptOnCredentialRequest().WithMutex(self.syncMutex).Run()
 }
 
-func (self *SyncCommands) FastForward(
-	task gocui.Task,
-	branchName string,
-	remoteName string,
-	remoteBranchName string,
-) error {
-	cmdArgs := NewGitCmd("fetch").
-		Arg(remoteName).
-		Arg(remoteBranchName + ":" + branchName).
-		ToArgv()
+func (self *SyncCommands) FastForward(branchName string, remoteName string, remoteBranchName string) error {
+	cmdStr := NewGitCmd("fetch").
+		Arg(self.cmd.Quote(remoteName)).
+		Arg(self.cmd.Quote(remoteBranchName) + ":" + self.cmd.Quote(branchName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
+	return self.cmd.New(cmdStr).PromptOnCredentialRequest().WithMutex(self.syncMutex).Run()
 }
 
-func (self *SyncCommands) FetchRemote(task gocui.Task, remoteName string) error {
-	cmdArgs := NewGitCmd("fetch").
-		Arg(remoteName).
-		ToArgv()
+func (self *SyncCommands) FetchRemote(remoteName string) error {
+	cmdStr := NewGitCmd("fetch").
+		Arg(self.cmd.Quote(remoteName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
+	return self.cmd.New(cmdStr).PromptOnCredentialRequest().WithMutex(self.syncMutex).Run()
 }

pkg/commands/git_commands/sync_test.go

@@ -3,7 +3,6 @@ package git_commands
 import (
 	"testing"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/stretchr/testify/assert"
 )
@@ -20,7 +19,7 @@ func TestSyncPush(t *testing.T) {
 			testName: "Push with force disabled",
 			opts:     PushOpts{Force: false},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push"})
+				assert.Equal(t, cmdObj.ToString(), "git push")
 				assert.NoError(t, err)
 			},
 		},
@@ -28,7 +27,7 @@ func TestSyncPush(t *testing.T) {
 			testName: "Push with force enabled",
 			opts:     PushOpts{Force: true},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease"})
+				assert.Equal(t, cmdObj.ToString(), "git push --force-with-lease")
 				assert.NoError(t, err)
 			},
 		},
@@ -40,7 +39,7 @@ func TestSyncPush(t *testing.T) {
 				UpstreamBranch: "master",
 			},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "origin", "master"})
+				assert.Equal(t, cmdObj.ToString(), `git push "origin" "master"`)
 				assert.NoError(t, err)
 			},
 		},
@@ -53,7 +52,7 @@ func TestSyncPush(t *testing.T) {
 				SetUpstream:    true,
 			},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--set-upstream", "origin", "master"})
+				assert.Equal(t, cmdObj.ToString(), `git push --set-upstream "origin" "master"`)
 				assert.NoError(t, err)
 			},
 		},
@@ -66,7 +65,7 @@ func TestSyncPush(t *testing.T) {
 				SetUpstream:    true,
 			},
 			test: func(cmdObj oscommands.ICmdObj, err error) {
-				assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "master"})
+				assert.Equal(t, cmdObj.ToString(), `git push --force-with-lease --set-upstream "origin" "master"`)
 				assert.NoError(t, err)
 			},
 		},
@@ -89,85 +88,7 @@ func TestSyncPush(t *testing.T) {
 		s := s
 		t.Run(s.testName, func(t *testing.T) {
 			instance := buildSyncCommands(commonDeps{})
-			task := gocui.NewFakeTask()
-			s.test(instance.PushCmdObj(task, s.opts))
-		})
-	}
-}
-
-func TestSyncFetch(t *testing.T) {
-	type scenario struct {
-		testName       string
-		fetchAllConfig bool
-		test           func(oscommands.ICmdObj)
-	}
-
-	scenarios := []scenario{
-		{
-			testName:       "Fetch in foreground (all=false)",
-			fetchAllConfig: false,
-			test: func(cmdObj oscommands.ICmdObj) {
-				assert.True(t, cmdObj.ShouldLog())
-				assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.PROMPT)
-				assert.Equal(t, cmdObj.Args(), []string{"git", "fetch"})
-			},
-		},
-		{
-			testName:       "Fetch in foreground (all=true)",
-			fetchAllConfig: true,
-			test: func(cmdObj oscommands.ICmdObj) {
-				assert.True(t, cmdObj.ShouldLog())
-				assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.PROMPT)
-				assert.Equal(t, cmdObj.Args(), []string{"git", "fetch", "--all"})
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s := s
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildSyncCommands(commonDeps{})
-			instance.UserConfig.Git.FetchAll = s.fetchAllConfig
-			task := gocui.NewFakeTask()
-			s.test(instance.FetchCmdObj(task))
-		})
-	}
-}
-
-func TestSyncFetchBackground(t *testing.T) {
-	type scenario struct {
-		testName       string
-		fetchAllConfig bool
-		test           func(oscommands.ICmdObj)
-	}
-
-	scenarios := []scenario{
-		{
-			testName:       "Fetch in background (all=false)",
-			fetchAllConfig: false,
-			test: func(cmdObj oscommands.ICmdObj) {
-				assert.False(t, cmdObj.ShouldLog())
-				assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.FAIL)
-				assert.Equal(t, cmdObj.Args(), []string{"git", "fetch"})
-			},
-		},
-		{
-			testName:       "Fetch in background (all=true)",
-			fetchAllConfig: true,
-			test: func(cmdObj oscommands.ICmdObj) {
-				assert.False(t, cmdObj.ShouldLog())
-				assert.Equal(t, cmdObj.GetCredentialStrategy(), oscommands.FAIL)
-				assert.Equal(t, cmdObj.Args(), []string{"git", "fetch", "--all"})
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s := s
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildSyncCommands(commonDeps{})
-			instance.UserConfig.Git.FetchAll = s.fetchAllConfig
-			s.test(instance.FetchBackgroundCmdObj())
+			s.test(instance.PushCmdObj(s.opts))
 		})
 	}
 }

pkg/commands/git_commands/tag.go

@@ -1,7 +1,5 @@
 package git_commands
 
-import "github.com/jesseduffield/gocui"
-
 type TagCommands struct {
 	*GitCommon
 }
@@ -12,45 +10,33 @@ func NewTagCommands(gitCommon *GitCommon) *TagCommands {
 	}
 }
 
-func (self *TagCommands) CreateLightweight(tagName string, ref string, force bool) error {
-	cmdArgs := NewGitCmd("tag").
-		ArgIf(force, "--force").
-		Arg("--", tagName).
-		ArgIf(len(ref) > 0, ref).
-		ToArgv()
+func (self *TagCommands) CreateLightweight(tagName string, ref string) error {
+	cmdStr := NewGitCmd("tag").Arg("--", self.cmd.Quote(tagName)).
+		ArgIf(len(ref) > 0, self.cmd.Quote(ref)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
-func (self *TagCommands) CreateAnnotated(tagName, ref, msg string, force bool) error {
-	cmdArgs := NewGitCmd("tag").Arg(tagName).
-		ArgIf(force, "--force").
-		ArgIf(len(ref) > 0, ref).
-		Arg("-m", msg).
-		ToArgv()
+func (self *TagCommands) CreateAnnotated(tagName, ref, msg string) error {
+	cmdStr := NewGitCmd("tag").Arg(self.cmd.Quote(tagName)).
+		ArgIf(len(ref) > 0, self.cmd.Quote(ref)).
+		Arg("-m", self.cmd.Quote(msg)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
-func (self *TagCommands) HasTag(tagName string) bool {
-	cmdArgs := NewGitCmd("show-ref").
-		Arg("--tags", "--quiet", "--verify", "--").
-		Arg("refs/tags/" + tagName).
-		ToArgv()
+func (self *TagCommands) Delete(tagName string) error {
+	cmdStr := NewGitCmd("tag").Arg("-d", self.cmd.Quote(tagName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run() == nil
+	return self.cmd.New(cmdStr).Run()
 }
 
-func (self *TagCommands) LocalDelete(tagName string) error {
-	cmdArgs := NewGitCmd("tag").Arg("-d", tagName).
-		ToArgv()
+func (self *TagCommands) Push(remoteName string, tagName string) error {
+	cmdStr := NewGitCmd("push").Arg(self.cmd.Quote(remoteName), "tag", self.cmd.Quote(tagName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func (self *TagCommands) Push(task gocui.Task, remoteName string, tagName string) error {
-	cmdArgs := NewGitCmd("push").Arg(remoteName, "tag", tagName).
-		ToArgv()
-
-	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).WithMutex(self.syncMutex).Run()
+	return self.cmd.New(cmdStr).PromptOnCredentialRequest().WithMutex(self.syncMutex).Run()
 }

pkg/commands/git_commands/tag_loader.go

@@ -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 {
@@ -28,8 +28,8 @@ func NewTagLoader(
 func (self *TagLoader) GetTags() ([]*models.Tag, error) {
 	// get remote branches, sorted  by creation date (descending)
 	// see: https://git-scm.com/docs/git-tag#Documentation/git-tag.txt---sortltkeygt
-	cmdArgs := NewGitCmd("tag").Arg("--list", "-n", "--sort=-creatordate").ToArgv()
-	tagsOutput, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	cmdStr := NewGitCmd("tag").Arg("--list", "-n", "--sort=-creatordate").ToString()
+	tagsOutput, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
 	if err != nil {
 		return nil, err
 	}
@@ -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 := ""

pkg/commands/git_commands/tag_loader_test.go

@@ -26,14 +26,14 @@ func TestGetTags(t *testing.T) {
 		{
 			testName: "should return no tags if there are none",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"tag", "--list", "-n", "--sort=-creatordate"}, "", nil),
+				Expect(`git tag --list -n --sort=-creatordate`, "", nil),
 			expectedTags:  []*models.Tag{},
 			expectedError: nil,
 		},
 		{
 			testName: "should return tags if present",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"tag", "--list", "-n", "--sort=-creatordate"}, tagsOutput, nil),
+				Expect(`git tag --list -n --sort=-creatordate`, tagsOutput, nil),
 			expectedTags: []*models.Tag{
 				{Name: "tag1", Message: "this is my message"},
 				{Name: "tag2", Message: ""},

pkg/commands/git_commands/version.go

@@ -15,7 +15,7 @@ type GitVersion struct {
 }
 
 func GetGitVersion(osCommand *oscommands.OSCommand) (*GitVersion, error) {
-	versionStr, _, err := osCommand.Cmd.New(NewGitCmd("--version").ToArgv()).RunWithOutputs()
+	versionStr, _, err := osCommand.Cmd.New(NewGitCmd("--version").ToString()).RunWithOutputs()
 	if err != nil {
 		return nil, err
 	}

pkg/commands/git_commands/working_tree.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/go-errors/errors"
+	"github.com/jesseduffield/generics/slices"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 )
@@ -28,7 +29,7 @@ func NewWorkingTreeCommands(
 }
 
 func (self *WorkingTreeCommands) OpenMergeToolCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(NewGitCmd("mergetool").ToArgv())
+	return self.cmd.New(NewGitCmd("mergetool").ToString())
 }
 
 func (self *WorkingTreeCommands) OpenMergeTool() error {
@@ -41,21 +42,25 @@ func (self *WorkingTreeCommands) StageFile(path string) error {
 }
 
 func (self *WorkingTreeCommands) StageFiles(paths []string) error {
-	cmdArgs := NewGitCmd("add").Arg("--").Arg(paths...).ToArgv()
+	quotedPaths := slices.Map(paths, func(path string) string {
+		return self.cmd.Quote(path)
+	})
 
-	return self.cmd.New(cmdArgs).Run()
+	cmdStr := NewGitCmd("add").Arg("--").Arg(quotedPaths...).ToString()
+
+	return self.cmd.New(cmdStr).Run()
 }
 
 // StageAll stages all files
 func (self *WorkingTreeCommands) StageAll() error {
-	cmdArgs := NewGitCmd("add").Arg("-A").ToArgv()
+	cmdStr := NewGitCmd("add").Arg("-A").ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // UnstageAll unstages all files
 func (self *WorkingTreeCommands) UnstageAll() error {
-	return self.cmd.New(NewGitCmd("reset").ToArgv()).Run()
+	return self.cmd.New(NewGitCmd("reset").ToString()).Run()
 }
 
 // UnStageFile unstages a file
@@ -63,14 +68,14 @@ func (self *WorkingTreeCommands) UnstageAll() error {
 // we accept the current name and the previous name
 func (self *WorkingTreeCommands) UnStageFile(fileNames []string, reset bool) error {
 	for _, name := range fileNames {
-		var cmdArgs []string
+		var cmdStr string
 		if reset {
-			cmdArgs = NewGitCmd("reset").Arg("HEAD", "--", name).ToArgv()
+			cmdStr = NewGitCmd("reset").Arg("HEAD", "--", self.cmd.Quote(name)).ToString()
 		} else {
-			cmdArgs = NewGitCmd("rm").Arg("--cached", "--force", "--", name).ToArgv()
+			cmdStr = NewGitCmd("rm").Arg("--cached", "--force", "--", self.cmd.Quote(name)).ToString()
 		}
 
-		err := self.cmd.New(cmdArgs).Run()
+		err := self.cmd.New(cmdStr).Run()
 		if err != nil {
 			return err
 		}
@@ -132,15 +137,17 @@ func (self *WorkingTreeCommands) DiscardAllFileChanges(file *models.File) error
 		return nil
 	}
 
+	quotedFileName := self.cmd.Quote(file.Name)
+
 	if file.ShortStatus == "AA" {
 		if err := self.cmd.New(
-			NewGitCmd("checkout").Arg("--ours", "--", file.Name).ToArgv(),
+			NewGitCmd("checkout").Arg("--ours", "--", quotedFileName).ToString(),
 		).Run(); err != nil {
 			return err
 		}
 
 		if err := self.cmd.New(
-			NewGitCmd("add").Arg("--", file.Name).ToArgv(),
+			NewGitCmd("add").Arg("--", quotedFileName).ToString(),
 		).Run(); err != nil {
 			return err
 		}
@@ -149,14 +156,14 @@ func (self *WorkingTreeCommands) DiscardAllFileChanges(file *models.File) error
 
 	if file.ShortStatus == "DU" {
 		return self.cmd.New(
-			NewGitCmd("rm").Arg("--", file.Name).ToArgv(),
+			NewGitCmd("rm").Arg("rm", "--", quotedFileName).ToString(),
 		).Run()
 	}
 
 	// if the file isn't tracked, we assume you want to delete it
 	if file.HasStagedChanges || file.HasMergeConflicts {
 		if err := self.cmd.New(
-			NewGitCmd("reset").Arg("--", file.Name).ToArgv(),
+			NewGitCmd("reset").Arg("--", quotedFileName).ToString(),
 		).Run(); err != nil {
 			return err
 		}
@@ -188,8 +195,9 @@ func (self *WorkingTreeCommands) DiscardUnstagedDirChanges(node IFileNode) error
 		return err
 	}
 
-	cmdArgs := NewGitCmd("checkout").Arg("--", node.GetPath()).ToArgv()
-	if err := self.cmd.New(cmdArgs).Run(); err != nil {
+	quotedPath := self.cmd.Quote(node.GetPath())
+	cmdStr := NewGitCmd("checkout").Arg("--", quotedPath).ToString()
+	if err := self.cmd.New(cmdStr).Run(); err != nil {
 		return err
 	}
 
@@ -213,8 +221,9 @@ func (self *WorkingTreeCommands) RemoveUntrackedDirFiles(node IFileNode) error {
 
 // DiscardUnstagedFileChanges directly
 func (self *WorkingTreeCommands) DiscardUnstagedFileChanges(file *models.File) error {
-	cmdArgs := NewGitCmd("checkout").Arg("--", file.Name).ToArgv()
-	return self.cmd.New(cmdArgs).Run()
+	quotedFileName := self.cmd.Quote(file.Name)
+	cmdStr := NewGitCmd("checkout").Arg("--", quotedFileName).ToString()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // Ignore adds a file to the gitignore for the repo
@@ -228,106 +237,103 @@ 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").
+	cmdStr := NewGitCmd("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("--").
 		ArgIf(noIndex, "/dev/null").
-		Arg(node.GetPath()).
-		ArgIf(prevPath != "", prevPath).
-		ToArgv()
+		Arg(self.cmd.Quote(node.GetPath())).
+		ArgIf(prevPath != "", self.cmd.Quote(prevPath)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog()
+	return self.cmd.New(cmdStr).DontLog()
 }
 
 // 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").
+	cmdStr := NewGitCmd("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()
+		Arg(self.cmd.Quote(fileName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).DontLog()
+	return self.cmd.New(cmdStr).DontLog()
 }
 
 // CheckoutFile checks out the file for the given commit
 func (self *WorkingTreeCommands) CheckoutFile(commitSha, fileName string) error {
-	cmdArgs := NewGitCmd("checkout").Arg(commitSha, "--", fileName).
-		ToArgv()
+	cmdStr := NewGitCmd("checkout").Arg(commitSha, "--", self.cmd.Quote(fileName)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // DiscardAnyUnstagedFileChanges discards any unstaged file changes via `git checkout -- .`
 func (self *WorkingTreeCommands) DiscardAnyUnstagedFileChanges() error {
-	cmdArgs := NewGitCmd("checkout").Arg("--", ".").
-		ToArgv()
+	cmdStr := NewGitCmd("checkout").Arg("--", ".").
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // RemoveTrackedFiles will delete the given file(s) even if they are currently tracked
 func (self *WorkingTreeCommands) RemoveTrackedFiles(name string) error {
-	cmdArgs := NewGitCmd("rm").Arg("-r", "--cached", "--", name).
-		ToArgv()
+	cmdStr := NewGitCmd("rm").Arg("-r", "--cached", "--", self.cmd.Quote(name)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // RemoveUntrackedFiles runs `git clean -fd`
 func (self *WorkingTreeCommands) RemoveUntrackedFiles() error {
-	cmdArgs := NewGitCmd("clean").Arg("-fd").ToArgv()
+	cmdStr := NewGitCmd("clean").Arg("-fd").ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // ResetAndClean removes all unstaged changes and removes all untracked files
@@ -352,23 +358,23 @@ func (self *WorkingTreeCommands) ResetAndClean() error {
 
 // ResetHardHead runs `git reset --hard`
 func (self *WorkingTreeCommands) ResetHard(ref string) error {
-	cmdArgs := NewGitCmd("reset").Arg("--hard", ref).
-		ToArgv()
+	cmdStr := NewGitCmd("reset").Arg("--hard", self.cmd.Quote(ref)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 // ResetSoft runs `git reset --soft HEAD`
 func (self *WorkingTreeCommands) ResetSoft(ref string) error {
-	cmdArgs := NewGitCmd("reset").Arg("--soft", ref).
-		ToArgv()
+	cmdStr := NewGitCmd("reset").Arg("--soft", self.cmd.Quote(ref)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }
 
 func (self *WorkingTreeCommands) ResetMixed(ref string) error {
-	cmdArgs := NewGitCmd("reset").Arg("--mixed", ref).
-		ToArgv()
+	cmdStr := NewGitCmd("reset").Arg("--mixed", self.cmd.Quote(ref)).
+		ToString()
 
-	return self.cmd.New(cmdArgs).Run()
+	return self.cmd.New(cmdStr).Run()
 }

pkg/commands/git_commands/working_tree_test.go

@@ -13,7 +13,7 @@ import (
 
 func TestWorkingTreeStageFile(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).
-		ExpectGitArgs([]string{"add", "--", "test.txt"}, "", nil)
+		Expect(`git add -- "test.txt"`, "", nil)
 
 	instance := buildWorkingTreeCommands(commonDeps{runner: runner})
 
@@ -23,7 +23,7 @@ func TestWorkingTreeStageFile(t *testing.T) {
 
 func TestWorkingTreeStageFiles(t *testing.T) {
 	runner := oscommands.NewFakeRunner(t).
-		ExpectGitArgs([]string{"add", "--", "test.txt", "test2.txt"}, "", nil)
+		Expect(`git add -- "test.txt" "test2.txt"`, "", nil)
 
 	instance := buildWorkingTreeCommands(commonDeps{runner: runner})
 
@@ -44,7 +44,7 @@ func TestWorkingTreeUnstageFile(t *testing.T) {
 			testName: "Remove an untracked file from staging",
 			reset:    false,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"rm", "--cached", "--force", "--", "test.txt"}, "", nil),
+				Expect(`git rm --cached --force -- "test.txt"`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -53,7 +53,7 @@ func TestWorkingTreeUnstageFile(t *testing.T) {
 			testName: "Remove a tracked file from staging",
 			reset:    true,
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reset", "HEAD", "--", "test.txt"}, "", nil),
+				Expect(`git reset HEAD -- "test.txt"`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -90,7 +90,7 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 			},
 			removeFile: func(string) error { return nil },
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reset", "--", "test"}, "", errors.New("error")),
+				Expect(`git reset -- "test"`, "", errors.New("error")),
 			expectedError: "error",
 		},
 		{
@@ -115,7 +115,7 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 			},
 			removeFile: func(string) error { return nil },
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"checkout", "--", "test"}, "", errors.New("error")),
+				Expect(`git checkout -- "test"`, "", errors.New("error")),
 			expectedError: "error",
 		},
 		{
@@ -127,7 +127,7 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 			},
 			removeFile: func(string) error { return nil },
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"checkout", "--", "test"}, "", nil),
+				Expect(`git checkout -- "test"`, "", nil),
 			expectedError: "",
 		},
 		{
@@ -139,8 +139,8 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 			},
 			removeFile: func(string) error { return nil },
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reset", "--", "test"}, "", nil).
-				ExpectGitArgs([]string{"checkout", "--", "test"}, "", nil),
+				Expect(`git reset -- "test"`, "", nil).
+				Expect(`git checkout -- "test"`, "", nil),
 			expectedError: "",
 		},
 		{
@@ -152,8 +152,8 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 			},
 			removeFile: func(string) error { return nil },
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reset", "--", "test"}, "", nil).
-				ExpectGitArgs([]string{"checkout", "--", "test"}, "", nil),
+				Expect(`git reset -- "test"`, "", nil).
+				Expect(`git checkout -- "test"`, "", nil),
 			expectedError: "",
 		},
 		{
@@ -169,7 +169,7 @@ func TestWorkingTreeDiscardAllFileChanges(t *testing.T) {
 				return nil
 			},
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reset", "--", "test"}, "", nil),
+				Expect(`git reset -- "test"`, "", nil),
 			expectedError: "",
 		},
 		{
@@ -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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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),
+				Expect(`git 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()
@@ -404,7 +400,7 @@ func TestWorkingTreeCheckoutFile(t *testing.T) {
 			commitSha: "11af912",
 			fileName:  "test999.txt",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"checkout", "11af912", "--", "test999.txt"}, "", nil),
+				Expect(`git checkout 11af912 -- "test999.txt"`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -414,7 +410,7 @@ func TestWorkingTreeCheckoutFile(t *testing.T) {
 			commitSha: "11af912",
 			fileName:  "test999.txt",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"checkout", "11af912", "--", "test999.txt"}, "", errors.New("error")),
+				Expect(`git checkout 11af912 -- "test999.txt"`, "", errors.New("error")),
 			test: func(err error) {
 				assert.Error(t, err)
 			},
@@ -445,7 +441,7 @@ func TestWorkingTreeDiscardUnstagedFileChanges(t *testing.T) {
 			testName: "valid case",
 			file:     &models.File{Name: "test.txt"},
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"checkout", "--", "test.txt"}, "", nil),
+				Expect(`git checkout -- "test.txt"`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -473,7 +469,7 @@ func TestWorkingTreeDiscardAnyUnstagedFileChanges(t *testing.T) {
 		{
 			testName: "valid case",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"checkout", "--", "."}, "", nil),
+				Expect(`git checkout -- .`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -501,7 +497,7 @@ func TestWorkingTreeRemoveUntrackedFiles(t *testing.T) {
 		{
 			testName: "valid case",
 			runner: oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"clean", "-fd"}, "", nil),
+				Expect(`git clean -fd`, "", nil),
 			test: func(err error) {
 				assert.NoError(t, err)
 			},
@@ -531,7 +527,7 @@ func TestWorkingTreeResetHard(t *testing.T) {
 			"valid case",
 			"HEAD",
 			oscommands.NewFakeRunner(t).
-				ExpectGitArgs([]string{"reset", "--hard", "HEAD"}, "", nil),
+				Expect(`git reset --hard "HEAD"`, "", nil),
 			func(err error) {
 				assert.NoError(t, err)
 			},

pkg/commands/git_commands/worktree.go

@@ -1,74 +0,0 @@
-package git_commands
-
-import (
-	"path/filepath"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-)
-
-type WorktreeCommands struct {
-	*GitCommon
-}
-
-func NewWorktreeCommands(gitCommon *GitCommon) *WorktreeCommands {
-	return &WorktreeCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-type NewWorktreeOpts struct {
-	// required. The path of the new worktree.
-	Path string
-	// required. The base branch/ref.
-	Base string
-
-	// if true, ends up with a detached head
-	Detach bool
-
-	// optional. if empty, and if detach is false, we will checkout the base
-	Branch string
-}
-
-func (self *WorktreeCommands) New(opts NewWorktreeOpts) error {
-	if opts.Detach && opts.Branch != "" {
-		panic("cannot specify branch when detaching")
-	}
-
-	cmdArgs := NewGitCmd("worktree").Arg("add").
-		ArgIf(opts.Detach, "--detach").
-		ArgIf(opts.Branch != "", "-b", opts.Branch).
-		Arg(opts.Path, opts.Base)
-
-	return self.cmd.New(cmdArgs.ToArgv()).Run()
-}
-
-func (self *WorktreeCommands) Delete(worktreePath string, force bool) error {
-	cmdArgs := NewGitCmd("worktree").Arg("remove").ArgIf(force, "-f").Arg(worktreePath).ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func (self *WorktreeCommands) Detach(worktreePath string) error {
-	cmdArgs := NewGitCmd("checkout").Arg("--detach").GitDir(filepath.Join(worktreePath, ".git")).ToArgv()
-
-	return self.cmd.New(cmdArgs).Run()
-}
-
-func WorktreeForBranch(branch *models.Branch, worktrees []*models.Worktree) (*models.Worktree, bool) {
-	for _, worktree := range worktrees {
-		if worktree.Branch == branch.Name {
-			return worktree, true
-		}
-	}
-
-	return nil, false
-}
-
-func CheckedOutByOtherWorktree(branch *models.Branch, worktrees []*models.Worktree) bool {
-	worktree, ok := WorktreeForBranch(branch, worktrees)
-	if !ok {
-		return false
-	}
-
-	return !worktree.IsCurrent
-}