WIP

Also, we shouldn't pass the initial branch arg if it's empty.

.devcontainer/Dockerfile

@@ -0,0 +1,13 @@
+# adapted from https://github.com/devcontainers/images/blob/main/src/go/.devcontainer/Dockerfile
+
+# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.19, 1.18, 1-bullseye, 1.19-bullseye, 1.18-bullseye, 1-buster, 1.19-buster, 1.18-buster
+ARG VARIANT=1-bullseye
+FROM golang:${VARIANT}
+
+RUN go install mvdan.cc/gofumpt@latest
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.0
+RUN golangci-lint --version
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>

.devcontainer/devcontainer.json

@@ -0,0 +1,69 @@
+// adapted from https://github.com/devcontainers/images/blob/main/src/go/.devcontainer/devcontainer.json
+{
+  "build": {
+      "dockerfile": "./Dockerfile",
+      "context": "."
+  },
+  "features": {
+      "ghcr.io/devcontainers/features/common-utils:1": {
+          "installZsh": "true",
+          "username": "vscode",
+          "uid": "1000",
+          "gid": "1000",
+          "upgradePackages": "true"
+      },
+      "ghcr.io/devcontainers/features/go:1": {
+          "version": "none"
+      },
+      "ghcr.io/devcontainers/features/git:1": {
+          "version": "latest",
+          "ppa": "false"
+      }
+  },
+  "overrideFeatureInstallOrder": [
+      "ghcr.io/devcontainers/features/common-utils"
+  ],
+  // not sure if we actually need these
+  "runArgs": [
+      "--cap-add=SYS_PTRACE",
+      "--security-opt",
+      "seccomp=unconfined"
+  ],
+  // Configure tool-specific properties.
+  "customizations": {
+      // Configure properties specific to VS Code.
+      "vscode": {
+          // Set *default* container specific settings.json values on container create.
+          "settings": {
+              "go.toolsManagement.checkForUpdates": "local",
+              "go.useLanguageServer": true,
+              "go.gopath": "/go",
+              "[go]": {
+                "editor.formatOnSave": true,
+                "editor.codeActionsOnSave": {
+                  "source.organizeImports": true
+                }
+              },
+              "go.lintTool": "golangci-lint",
+              "gopls": {
+                "formatting.gofumpt": true,
+                "usePlaceholders": false // add parameter placeholders when completing a function
+              },
+              "files.eol": "\n"
+          },
+          // Add the IDs of extensions you want installed when the container is created.
+          "extensions": [
+              "golang.Go"
+          ]
+      }
+  },
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "go version",
+
+  // See https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ for the safe.directory part
+  // The defaultBranch part is required for our deprecated integration tests.
+  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master",
+
+  // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode"
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,7 +4,6 @@ about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
-
 ---
 
 **Describe the bug**
@@ -12,6 +11,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -23,10 +23,15 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. Windows]
- - Lazygit Version [e.g. v0.1.45]
- - The last commit id if you built project from sources (run : ```git-rev parse HEAD```)
+**Version info:**
+_Run `lazygit --version` and paste the result here_
+_Run `git --version` and paste the result here_
 
 **Additional context**
 Add any other context about the problem here.
+
+**Note:** please try updating to the latest version or [manually building](https://github.com/jesseduffield/lazygit/#manual) the latest `master` to see if the issue still occurs.
+
+<!--
+If you want to try and debug this issue yourself, you can run `lazygit --debug` in one terminal panel and `lazygit --logs` in another to view the logs.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,7 +4,6 @@ about: Suggest an idea for this project
 title: ''
 labels: enhancement
 assignees: ''
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
@@ -18,3 +17,13 @@ A clear and concise description of any alternative solutions or features you've
 
 **Additional context**
 Add any other context or screenshots about the feature request here.
+
+<!--
+You may be able to add your desired feature with a custom command. Check out the examples here: https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium
+
+If a custom command does what you want but you still want to see the feature built-in to lazygit, feel free to paste the custom command into the issue to help us better understand the functionality you want.
+
+We also encourage you to put up a PR yourself! Who cares if you've never written Go before, neither did any of the existing contributors before their first lazygit PR! Check out the PR tutorial here: https://www.youtube.com/watch?v=kNavnhzZHtk&ab_channel=JesseDuffield
+
+Also check out the contributing guide here: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md
+-->

.github/pull_request_template.md

@@ -0,0 +1,10 @@
+- **PR Description**
+
+- **Please check if the PR fulfills these requirements**
+
+* [ ] Cheatsheets are up-to-date (run `go run scripts/cheatsheet/main.go generate`)
+* [ ] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
+* [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide)
+* [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
+* [ ] Docs (specifically `docs/Config.md`) have been updated if necessary
+* [ ] You've read through your own file changes for silly mistakes etc

.github/workflows/automerge.yml

@@ -1,28 +0,0 @@
-name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: automerge
-        uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: rebase

.github/workflows/cd.yml

@@ -10,19 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Unshallow repo
         run: git fetch --prune --unshallow
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - name: Run goreleaser
         uses: goreleaser/goreleaser-action@v1
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
   homebrew:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Bump Homebrew formula
         uses: dawidd6/action-homebrew-bump-formula@v3

.github/workflows/ci.yml

@@ -1,5 +1,8 @@
 name: Continuous Integration
 
+env:
+  GO_VERSION: 1.18
+
 on:
   push:
     branches:
@@ -7,34 +10,102 @@ on:
   pull_request:
 
 jobs:
-  ci:
+  unit-tests:
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
           - windows-latest
+        include:
+          - os: ubuntu-latest
+            cache_path: ~/.cache/go-build
+          - os: windows-latest
+            cache_path: ~\AppData\Local\go-build
     name: ci - ${{matrix.os}}
     runs-on: ${{matrix.os}}
     env:
       GOFLAGS: -mod=vendor
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - name: Cache build
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
-          path: ~/.cache/go-build
+          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: |
-          bash ./test.sh
+          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}}"
+    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}}
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-test
+          restore-keys: |
+            ${{runner.os}}-go-
+      - name: Print git version
+        run: git --version
+      - name: Test code
+        run: |
+          ./scripts/run_integration_tests.sh
   build:
     runs-on: ubuntu-latest
     env:
@@ -42,15 +113,17 @@ jobs:
       GOARCH: amd64
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - name: Cache build
         uses: actions/cache@v1
         with:
-          path: ~/.cache/go-build
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
           key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
           restore-keys: |
             ${{runner.os}}-go-
@@ -63,3 +136,71 @@ jobs:
       - name: Build darwin binary
         run: |
           GOOS=darwin go build
+      - name: Build integration test binary
+        run: |
+          GOOS=linux go build cmd/integration_test/main.go
+      - name: Build integration test injector
+        run: |
+          GOOS=linux go build pkg/integration/clients/injector/main.go
+  check-codebase:
+    runs-on: ubuntu-latest
+    env:
+      GOFLAGS: -mod=vendor
+      GOARCH: amd64
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.18.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
+          restore-keys: |
+            ${{runner.os}}-go-
+      - name: Check Cheatsheet
+        run: |
+          go run scripts/cheatsheet/main.go check
+      - name: Check Vendor Directory
+        # ensure our vendor directory matches up with our go modules
+        run: |
+          go mod vendor && git diff --exit-code || (echo "Unexpected change to vendor directory. Run 'go mod vendor' locally and commit the changes" && exit 1)
+      - name: Check Integration Test List
+        # ensure our integration test list is up to date
+        run: |
+          go generate pkg/integration/tests/tests.go && git diff --exit-code || (echo "Integration test list not up to date. Run 'go generate pkg/integration/tests/tests.go' locally and commit the changes" && exit 1)
+        shell: bash # needed so that we get "-o pipefail"
+      - name: Check Filenames
+        run: scripts/check_filenames.sh
+  lint:
+    runs-on: ubuntu-latest
+    env:
+      GOFLAGS: -mod=vendor
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          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.1.0
+        with:
+          version: latest
+      - name: errors
+        run: golangci-lint run
+        if: ${{ failure() }}

.github/workflows/lint.yml

@@ -1,20 +0,0 @@
-name: Lint
-
-on: pull_request
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: latest
-      - name: Format code
-        run: |
-          if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
-           find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
-           exit 1
-          fi

.github/workflows/sponsors.yml

@@ -0,0 +1,28 @@
+# see https://github.com/JamesIves/github-sponsors-readme-action
+name: Generate Sponsors README
+on:
+  push:
+    branches:
+      - master
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Generate Sponsors 💖
+        uses: JamesIves/github-sponsors-readme-action@v1.0.8
+        with:
+          token: ${{ secrets.SPONSORS_TOKEN }}
+          file: 'README.md'
+        if: ${{ github.repository == 'jesseduffield/lazygit' }}
+
+      - name: Commit and push if changed
+        run: |-
+          git diff
+          git config --global user.email "actions@users.noreply.github.com"
+          git config --global user.name "README-bot"
+          git add README.md
+          git commit -m "Updated README.md" || exit 0
+          git push

.gitignore

@@ -18,19 +18,24 @@ coverage.txt
 
 # Binaries
 lazygit
+lazygit.exe
 
 # Exceptions
 !.gitignore
 !.goreleaser.yml
+!.golangci.yml
 !.circleci/
 !.github/
+!.vscode/
+!.devcontainer/
+
+# these are for our integration tests
+!.git_keep
+!.gitmodules_keep
 
 test/git_server/data
-test/integration/*/actual/
-test/integration/*/actual_remote/
-test/integration/*/used_config/
-# these sample hooks waste too much space
-test/integration/*/expected/.git_keep/hooks/
-test/integration/*/expected_remote/hooks/
-!.git_keep/
-lazygit.exe
+
+test/results/**
+
+oryxBuildBinary
+__debug_bin

.golangci.yml

@@ -0,0 +1,29 @@
+linters:
+  disable:
+    - structcheck # gives false positives
+  enable:
+    - gofumpt
+    - thelper
+    - goimports
+    - tparallel
+    - wastedassign
+    - exportloopref
+    - unparam
+    - prealloc
+    - unconvert
+    - exhaustive
+    - makezero
+    - nakedret
+    # - goconst # TODO: enable and fix issues
+  fast: false
+
+linters-settings:
+  exhaustive:
+    default-signifies-exhaustive: true
+
+  nakedret:
+    # the gods will judge me but I just don't like naked returns at all
+    max-func-lines: 0
+
+run:
+  go: 1.18

.goreleaser.yml

@@ -32,12 +32,8 @@ checksum:
 snapshot:
   name_template: '{{ .Tag }}-next'
 changelog:
+  use: github-native
   sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
-      - '^bump'
 brews:
   -
     # Repository to push the tap to.

.vscode/debugger_config.yml

@@ -0,0 +1 @@
+disableStartupPopups: true

.vscode/launch.json

@@ -0,0 +1,36 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug Lazygit",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "main.go",
+      "args": ["--debug", "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"],
+      "console": "integratedTerminal",
+      "presentation": {
+        "hidden": true
+      }
+    },
+    {
+      "name": "Tail Lazygit logs",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "main.go",
+      "args": ["--logs", "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"],
+      "console": "integratedTerminal",
+      "presentation": {
+        "hidden": true
+      }
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Run with logs",
+      "configurations": ["Tail Lazygit logs", "Debug Lazygit"],
+      "stopAll": true
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,86 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Generate cheatsheet",
+      "type": "shell",
+      "command": "go run scripts/cheatsheet/main.go generate",
+      "problemMatcher": [],
+    },
+    {
+      "label": "Bump gocui",
+      "type": "shell",
+      "command": "./scripts/bump_gocui.sh",
+      "problemMatcher": [],
+    },
+    {
+      "label": "Bump lazycore",
+      "type": "shell",
+      "command": "./scripts/bump_lazycore.sh",
+      "problemMatcher": [],
+    },
+    {
+      "label": "Run current file integration test",
+      "type": "shell",
+      "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli ${relativeFile}",
+      "problemMatcher": [],
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "focus": true
+      }
+    },
+    {
+      "label": "Run current file integration test (slow)",
+      "type": "shell",
+      "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --slow ${relativeFile}",
+      "problemMatcher": [],
+      "group": {
+        "kind": "test",
+      },
+      "presentation": {
+        "focus": true
+      }
+    },
+    {
+      "label": "Run current file integration test (sandbox)",
+      "type": "shell",
+      "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --sandbox ${relativeFile}",
+      "problemMatcher": [],
+      "group": {
+        "kind": "test",
+      },
+      "presentation": {
+        "focus": true
+      }
+    },
+    {
+      "label": "Open deprecated test TUI",
+      "type": "shell",
+      "command": "go run pkg/integration/deprecated/cmd/tui/main.go",
+      "problemMatcher": [],
+      "group": {
+        "kind": "test",
+      },
+      "presentation": {
+        "focus": true
+      }
+    },
+    {
+      "label": "Sync tests list",
+      "type": "shell",
+      "command": "go generate pkg/integration/tests/tests.go",
+      "problemMatcher": [],
+      "group": {
+        "kind": "test",
+      },
+      "presentation": {
+        "focus": true
+      }
+    },
+  ],
+}

CODE-OF-CONDUCT.md

@@ -1,74 +1,3 @@
-# Contributor Covenant Code of Conduct
+# Lazygit Code of Conduct
 
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the [project leader](https://github.com/jesseduffield). 
-All complaints will be reviewed and investigated and will result in a response that
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
+Be nice, or face the wrath of the maintainer.

CONTRIBUTING.md

@@ -6,7 +6,11 @@ When contributing to this repository, please first discuss the change you wish
 to make via issue, email, or any other method with the owners of this repository
 before making a change.
 
-## So all code changes happen through Pull Requests
+## PR walkthrough
+
+[This video](https://www.youtube.com/watch?v=kNavnhzZHtk) walks through the process of adding a small feature to lazygit. If you have no idea where to start, watching that video is a good first step.
+
+## All code changes happen through Pull Requests
 
 Pull requests are the best way to propose changes to the codebase. We actively
 welcome your pull requests:
@@ -14,10 +18,32 @@ welcome your pull requests:
 1. Fork the repo and create your branch from `master`.
 2. If you've added code that should be tested, add tests.
 3. If you've added code that need documentation, update the documentation.
-4. Make sure your code follows the [effective go](https://golang.org/doc/effective_go.html) guidelines as much as possible.
-5. Be sure to test your modifications.
-6. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-7. Issue that pull request!
+4. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+5. Issue that pull request!
+
+If you've never written Go in your life, then join the club! Lazygit was the maintainer's first Go program, and most contributors have never used Go before. Go is widely considered an easy-to-learn language, so if you're looking for an open source project to gain dev experience, you've come to the right place.
+
+## Running in a VSCode dev container
+
+If you want to spare yourself the hassle of setting up your dev environment yourself (i.e. installing Go, extensions, and extra tools), you can run the Lazygit code in a VSCode dev container like so:
+
+![image](https://user-images.githubusercontent.com/8456633/201500508-0d55f99f-5035-4a6f-a0f8-eaea5c003e5d.png)
+
+This requires that:
+* you have docker installed
+* you have the dev containers extension installed in VSCode
+
+See [here](https://code.visualstudio.com/docs/devcontainers/containers) for more info about dev containers.
+
+## Running in a Github Codespace
+
+If you want to start contributing to Lazygit with the click of a button, you can open the lazygit codebase in a Codespace. First fork the repo, then click to create a codespace:
+
+![image](https://user-images.githubusercontent.com/8456633/201500566-ffe9105d-6030-4cc7-a525-6570b0b413a2.png)
+
+To run lazygit from within the integrated terminal just go `go run main.go`
+
+This allows you to contribute to Lazygit without needing to install anything on your local machine. The Codespace has all the necessary tools and extensions pre-installed.
 
 ## Code of conduct
 
@@ -36,17 +62,145 @@ covers the project. Feel free to contact the maintainers if that's a concern.
 We use GitHub issues to track public bugs. Report a bug by [opening a new
 issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!
 
+## Go
+
+This project is written in Go. Go is an opinionated language with strict idioms, but some of those idioms are a little extreme. Some things we do differently:
+
+1. There is no shame in using `self` as a receiver name in a struct method. In fact we encourage it
+2. There is no shame in prefixing an interface with 'I' instead of suffixing with 'er' when there are several methods on the interface.
+3. If a struct implements an interface, we make it explicit with something like:
+
+```go
+var _ MyInterface = &MyStruct{}
+```
+
+This makes the intent clearer and means that if we fail to satisfy the interface we'll get an error in the file that needs fixing.
+
+### Code Formatting
+
+To check code formatting [gofumpt](https://pkg.go.dev/mvdan.cc/gofumpt#section-readme) (which is a bit stricter than [gofmt](https://pkg.go.dev/cmd/gofmt)) is used.
+VSCode will format the code correctly if you tell the Go extension to use `gofumpt` via your [`settings.json`](https://code.visualstudio.com/docs/getstarted/settings#_settingsjson)
+by setting [`formatting.gofumpt`](https://github.com/golang/tools/blob/master/gopls/doc/settings.md#gofumpt-bool) to `true`:
+
+```jsonc
+// .vscode/settings.json
+{
+  "gopls": {
+    "formatting.gofumpt": true
+  }
+}
+```
+
+To run gofumpt from your terminal go:
+
+```
+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')
+
+## 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")`.
+
+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 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!
+
+### VSCode debugger
+
+If you want to trigger a debug session from VSCode, you can use the following snippet. Note that the `console` key is, at the time of writing, still an experimental feature.
+
+```jsonc
+// .vscode/launch.json
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "debug lazygit",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "main.go",
+      "args": ["--debug"],
+      "console": "externalTerminal" // <-- you need this to actually see the lazygit UI in a window while debugging
+    }
+  ]
+}
+```
+
+## Profiling
+
+If you want to investigate what's contributing to CPU usage you can add the following to the top of the `main()` function in `main.go`
+
+```go
+import "runtime/pprof"
+
+func main() {
+	f, err := os.Create("cpu.prof")
+	if err != nil {
+		log.Fatal("could not create CPU profile: ", err)
+	}
+	defer f.Close()
+	if err := pprof.StartCPUProfile(f); err != nil {
+		log.Fatal("could not start CPU profile: ", err)
+	}
+	defer pprof.StopCPUProfile()
+	...
+```
+
+Then run lazygit, and afterwards, from your terminal, run:
+
+```sh
+go tool pprof --web cpu.prof
+```
+
+That should open an application which allows you to view the breakdown of CPU usage.
+
+## Testing
+
+Lazygit has two kinds of tests: unit tests and integration tests. Unit tests go in files that end in `_test.go`, and are written in Go. For integration tests, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
+
 ## Updating Gocui
 
-Sometimes you will need to make a change in the gocui fork (https://github.com/jesseduffield/gocui). Gocui is the package responsible for rending windows and handling user input. Here's the typical process to follow:
+Sometimes you will need to make a change in the gocui fork (https://github.com/jesseduffield/gocui). Gocui is the package responsible for rendering windows and handling user input. Here's the typical process to follow:
 
-1. Make the changes in gocui inside the vendor directory so it's easy to test against lazygit
+1. Make the changes in gocui inside lazygit's vendor directory so it's easy to test against lazygit
 2. Copy the changes over to the actual gocui repo (clone it if you haven't already, and use the `awesome` branch, not `master`)
 3. Raise a PR on the gocui repo with your changes
 4. After that PR is merged, make a PR in lazygit bumping the gocui version. You can bump the version by running the following at the lazygit repo root:
 
 ```sh
-./bump_gocui.sh
+./scripts/bump_gocui.sh
 ```
 
 5. Raise a PR in lazygit with those changes
+
+## Updating Lazycore
+
+[Lazycore](https://github.com/jesseduffield/lazycore) is a repo containing shared functionality between lazygit and lazydocker. Sometimes you will need to make a change to that repo and import the changes into lazygit. Similar to updating Gocui, here's what you do:
+
+1. Make the changes in lazycore inside lazygit's vendor directory so it's easy to test against lazygit
+2. Copy the changes over to the actual lazycore repo (clone it if you haven't already, and use the `master` branch)
+3. Raise a PR on the lazycore repo with your changes
+4. After that PR is merged, make a PR in lazygit bumping the lazycore version. You can bump the version by running the following at the lazygit repo root:
+
+```sh
+./scripts/bump_lazycore.sh
+```
+
+Or if you're using VSCode, there is a bump lazycore task you can find by going `cmd+shift+p` and typing 'Run task'
+
+5. Raise a PR in lazygit with those changes
+
+## Improvements
+
+If you can think of any way to improve these docs let us know.

Dockerfile

@@ -2,16 +2,18 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh
 
-FROM golang:1.14-alpine3.11
+FROM golang:1.18 as build 
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
-COPY ./ .
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build
 
-FROM alpine:3.11
-RUN apk add -U git xdg-utils
+FROM alpine:3.15
+RUN apk add --no-cache -U git xdg-utils
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
-COPY --from=0 /go/src/github.com/jesseduffield/lazygit /go/src/github.com/jesseduffield/lazygit
-COPY --from=0 /go/src/github.com/jesseduffield/lazygit/lazygit /bin/
+COPY --from=build /go/src/github.com/jesseduffield/lazygit ./
+COPY --from=build /go/src/github.com/jesseduffield/lazygit/lazygit /bin/
 RUN echo "alias gg=lazygit" >> ~/.profile
 
 ENTRYPOINT [ "lazygit" ]

bump_gocui.sh

@@ -1,5 +0,0 @@
-# Go's proxy servers are not very up-to-date so that's why we use `GOPROXY=direct`
-# We specify the `awesome` branch to avoid the default behaviour of looking for a semver tag.
-GOPROXY=direct go get -u github.com/jesseduffield/gocui@awesome && go mod vendor && go mod tidy
-
-# Note to self if you ever want to fork a repo be sure to use this same approach: it's important to use the branch name (e.g. master)

cmd/integration_test/main.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/jesseduffield/lazygit/pkg/integration/clients"
+)
+
+var usage = `
+Usage:
+	See https://github.com/jesseduffield/lazygit/tree/master/pkg/integration/README.md
+
+	CLI mode:
+		> 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:
+	KEY_PRESS_DELAY (e.g. 200): the number of milliseconds to wait between keypresses
+
+	TUI mode:
+		> go run cmd/integration_test/main.go tui
+	This will open up a terminal UI where you can run tests
+
+	Help:
+		> go run cmd/integration_test/main.go help
+`
+
+func main() {
+	if len(os.Args) < 2 {
+		log.Fatal(usage)
+	}
+
+	switch os.Args[1] {
+	case "help":
+		fmt.Println(usage)
+	case "cli":
+		testNames := os.Args[2:]
+		slow := false
+		sandbox := false
+		// get the next arg if it's --slow
+		if len(os.Args) > 2 {
+			if os.Args[2] == "--slow" || os.Args[2] == "-slow" {
+				testNames = os.Args[3:]
+				slow = true
+			} else if os.Args[2] == "--sandbox" || os.Args[2] == "-sandbox" {
+				testNames = os.Args[3:]
+				sandbox = true
+			}
+		}
+
+		clients.RunCLI(testNames, slow, sandbox)
+	case "tui":
+		clients.RunTUI()
+	default:
+		log.Fatal(usage)
+	}
+}

docs/Config.md

@@ -9,89 +9,122 @@ Default path for the config file:
 For old installations (slightly embarrassing: I didn't realise at the time that you didn't need to supply a vendor name to the path so I just used my name):
 
 - Linux: `~/.config/jesseduffield/lazygit/config.yml`
-- MacOS: `~/Library/Application Support/jesseduffield/lazygit/config.yml`
+- MacOS: `~/Library/Application\ Support/jesseduffield/lazygit/config.yml`
 - Windows: `%APPDATA%\jesseduffield\lazygit\config.yml`
 
+If you want to change the config directory:
+
+- MacOS: `export XDG_CONFIG_HOME="$HOME/.config"`
+
 ## Default
 
 ```yaml
 gui:
   # stuff relating to the UI
+  windowSize: 'normal' # one of 'normal' | 'half' | 'full' default is 'normal'
   scrollHeight: 2 # how many lines you scroll by
   scrollPastBottom: true # enable scrolling past the bottom
   sidePanelWidth: 0.3333 # number from 0 to 1
   expandFocusedSidePanel: false
   mainPanelSplitMode: 'flexible' # one of 'horizontal' | 'flexible' | 'vertical'
-  language: 'auto' # one of 'auto' | 'en' | 'zh' | 'pl' | 'nl'
+  language: 'auto' # one of 'auto' | 'en' | 'zh' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
+  timeFormat: '02 Jan 06' # https://pkg.go.dev/time#Time.Format
+  shortTimeFormat: '3:04PM'
   theme:
-    lightTheme: false # For terminals with a light background
     activeBorderColor:
-      - white
+      - green
       - bold
     inactiveBorderColor:
-      - green
+      - white
+    searchingActiveBorderColor:
+      - cyan
+      - bold
     optionsTextColor:
       - blue
     selectedLineBgColor:
-      - default
+      - blue # set to `default` to have no background colour
     selectedRangeBgColor:
       - blue
     cherryPickedCommitBgColor:
-      - blue
-    cherryPickedCommitFgColor:
       - cyan
+    cherryPickedCommitFgColor:
+      - blue
+    unstagedChangesColor:
+      - red
+    defaultFgColor:
+      - default
   commitLength:
     show: true
   mouseEvents: true
-  skipUnstageLineWarning: false
-  skipStashWarning: true
-  showFileTree: false # for rendering changes files in a tree format
+  skipDiscardChangeWarning: false
+  skipStashWarning: false
+  showFileTree: true # for rendering changes files in a tree format
   showListFooter: true # for seeing the '5 of 20' message in list panels
   showRandomTip: true
+  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)
   showCommandLog: true
+  showIcons: false # deprecated: use nerdFontsVersion instead
+  nerdFontsVersion: "" # nerd fonts version to use ("2" or "3"); empty means don't show nerd font icons
   commandLogSize: 8
-  authorColors: # in case you're not happy with the randomly assigned colour
-    'John Smith': '#ff0000'
+  splitDiff: 'auto' # one of 'auto' | 'always'
+  skipRewordInEditorWarning: false # for skipping the confirmation before launching the reword editor
+  border: 'single' # one of 'single' | 'double' | 'rounded' | 'hidden'
 git:
   paging:
     colorArg: always
     useConfig: false
+  commit:
+    signOff: false
+    verbose: default # one of 'default' | 'always' | 'never'
   merging:
     # only applicable to unix users
     manualCommit: false
     # extra args passed to `git merge`, e.g. --no-ff
     args: ''
   log:
-    # one of date-order, author-date-order, topo-order.
+    # one of date-order, author-date-order, topo-order or default.
     # topo-order makes it easier to read the git log graph, but commits may not
     # appear chronologically. See https://git-scm.com/docs/git-log#_commit_ordering
     order: 'topo-order'
     # one of always, never, when-maximised
     # this determines whether the git graph is rendered in the commits panel
     showGraph: 'when-maximised'
+    # displays the whole git graph by default in the commits panel (equivalent to passing the `--all` argument to `git log`)
+    showWholeGraph: false
   skipHookPrefix: WIP
+  # The main branches. We colour commits green if they belong to one of these branches,
+  # so that you can easily see which commits are unique to your branch (coloured in yellow)
+  mainBranches: [master, main]
   autoFetch: true
+  autoRefresh: true
+  fetchAll: true # Pass --all flag when running git fetch. Set to false to fetch only origin (or the current branch's upstream remote if there is one)
   branchLogCmd: 'git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --'
   allBranchesLogCmd: 'git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium'
   overrideGpg: false # prevents lazygit from spawning a separate process when using GPG
   disableForcePushing: false
   parseEmoji: false
+  diffContextSize: 3 # how many lines of context are shown around a change in diffs
 os:
-  editCommand: '' # see 'Configuring File Editing' section
-  editCommandTemplate: '{{editor}} {{filename}}'
-  openCommand: ''
+  editPreset: '' # see 'Configuring File Editing' section
+  edit: ''
+  editAtLine: ''
+  editAtLineAndWait: ''
+  open: ''
+  openLink: ''
 refresher:
-  refreshInterval: 10 # file/submodule refresh interval in seconds
-  fetchInterval: 60 # re-fetch interval in seconds
+  refreshInterval: 10 # File/submodule refresh interval in seconds. Auto-refresh can be disabled via option 'git.autoRefresh'.
+  fetchInterval: 60 # Re-fetch interval in seconds. Auto-fetch can be disabled via option 'git.autoFetch'.
 update:
   method: prompt # can be: prompt | background | never
   days: 14 # how often an update is checked for
-reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined'
 confirmOnQuit: false
 # determines whether hitting 'esc' will quit the application when there is nothing to cancel/close
 quitOnTopLevelReturn: false
 disableStartupPopups: false
-notARepository: 'prompt' # one of: 'prompt' | 'create' | 'skip'
+notARepository: 'prompt' # one of: 'prompt' | 'create' | 'skip' | 'quit'
+promptToReturnFromSubprocess: true # display confirmation when subprocess terminates
 keybinding:
   universal:
     quit: 'q'
@@ -116,13 +149,12 @@ keybinding:
     jumpToBlock: ['1', '2', '3', '4', '5'] # goto the Nth block / panel
     nextMatch: 'n'
     prevMatch: 'N'
-    optionMenu: 'x' # show help menu
+    optionMenu: null # show help menu
     optionMenu-alt1: '?' # show help menu
     select: '<space>'
     goInto: '<enter>'
     openRecentRepos: '<c-r>'
     confirm: '<enter>'
-    confirm-alt1: 'y'
     remove: 'd'
     new: 'n'
     edit: 'e'
@@ -150,9 +182,10 @@ keybinding:
     diffingMenu-alt: '<c-e>' # deprecated
     copyToClipboard: '<c-o>'
     submitEditorText: '<enter>'
-    appendNewline: '<a-enter>'
     extrasMenu: '@'
     toggleWhitespaceInDiffView: '<c-w>'
+    increaseContextInDiffView: '}'
+    decreaseContextInDiffView: '{'
   status:
     checkForUpdate: 'u'
     recentRepos: '<enter>'
@@ -169,15 +202,19 @@ keybinding:
     viewResetOptions: 'D'
     fetch: 'f'
     toggleTreeView: '`'
+    openMergeTool: 'M'
+    openStatusFilter: '<c-b>'
   branches:
     createPullRequest: 'o'
     viewPullRequestOptions: 'O'
     checkoutBranchByName: 'c'
     forceCheckoutBranch: 'F'
     rebaseBranch: 'r'
+    renameBranch: 'R'
     mergeIntoCurrentBranch: 'M'
     viewGitFlowOptions: 'i'
     fastForward: 'f' # fast-forward this branch from its upstream
+    createTag: 'T'
     pushTag: 'P'
     setUpstream: 'u' # set as upstream of checked-out branch
     fetchRemote: 'f'
@@ -202,8 +239,10 @@ keybinding:
     resetCherryPick: '<c-R>'
     copyCommitMessageToClipboard: '<c-y>'
     openLogMenu: '<c-l>'
+    viewBisectOptions: 'b'
   stash:
     popStash: 'g'
+    renameStash: 'r'
   commitFiles:
     checkoutCommitFile: 'c'
   main:
@@ -223,81 +262,73 @@ keybinding:
 
 ```yaml
 os:
-  openCommand: 'start "" {{filename}}'
+  open: 'start "" {{filename}}'
 ```
 
 ### Linux
 
 ```yaml
 os:
-  openCommand: 'xdg-open {{filename}} >/dev/null'
+  open: 'xdg-open {{filename}} >/dev/null'
 ```
 
 ### OSX
 
 ```yaml
 os:
-  openCommand: 'open {{filename}}'
+  open: 'open {{filename}}'
 ```
 
 ### Configuring File Editing
 
-Lazygit will edit a file with the first set editor in the following:
+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.
 
-1. config.yaml
+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:
-  editCommand: 'vim' # as an example
+  editPreset: 'vscode'
 ```
 
-2. \$(git config core.editor)
-3. \$GIT_EDITOR
-4. \$VISUAL
-5. \$EDITOR
-6. \$(which vi)
+Supported presets are `vim`, `nvim`, `emacs`, `nano`, `vscode`, `sublime`, `bbedit`,
+`kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset
+from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR.
 
-Lazygit will log an error if none of these options are set.
-
-You can specify a line number you are currently at when in the line-by-line mode.
+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:
-  editCommand: 'vim'
-  editCommandTemplate: '{{editor}} +{{line}} {{filename}}'
+  edit: 'myeditor {{filename}}'
+  editAtLine: 'myeditor --line={{line}} {{filename}}'
+  editAtLineAndWait: 'myeditor --block --line={{line}} {{filename}}'
+  editInTerminal: true
 ```
 
-or
+The `editInTerminal` option is used to decide whether lazygit needs to suspend
+itself to the background before calling the editor.
 
-```yaml
-os:
-  editCommand: 'code'
-  editCommandTemplate: '{{editor}} --goto {{filename}}:{{line}}'
-```
-
-`{{editor}}` in `editCommandTemplate` is replaced with the value of `editCommand`.
+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
 
-To override the default config directory, use `$CONFIG_DIR="~/.config/lazygit"`. This directory contains the config file in addition to some other files lazygit uses to keep track of state across sessions.
+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.
 
 To override the individual config file used, use the `--use-config-file` arg or the `LG_CONFIG_FILE` env var.
 
 If you want to merge a specific config file into a more general config file, perhaps for the sake of setting some theme-specific options, you can supply a list of comma-separated config file paths, like so:
 
 ```sh
-lazygit --use-config-file=~/.base_lg_conf,~/.light_theme_lg_conf
+lazygit --use-config-file="$HOME/.base_lg_conf,$HOME/.light_theme_lg_conf"
 or
-LG_CONFIG_FILE="~/.base_lg_conf,~/.light_theme_lg_conf" lazygit
-```
-
-### Recommended Config Values
-
-for users of VSCode
-
-```yaml
-os:
-  openCommand: 'code -rg {{filename}}'
+LG_CONFIG_FILE="$HOME/.base_lg_conf,$HOME/.light_theme_lg_conf" lazygit
 ```
 
 ## Color Attributes
@@ -323,27 +354,22 @@ The available attributes are:
 - default
 - reverse # useful for high-contrast
 - underline
+- strikethrough
 
-## Light terminal theme
+## Highlighting the selected line
 
-If you have issues with a light terminal theme where you can't read / see the text add these settings
+If you don't like the default behaviour of highlighting the selected line with a blue background, you can use the `selectedLineBgColor` and `selectedRangeBgColor` keys to customise the behaviour. If you just want to embolden the selected line (this was the original default), you can do the following:
 
 ```yaml
 gui:
   theme:
-    lightTheme: true
-    activeBorderColor:
-      - black
-      - bold
-    inactiveBorderColor:
-      - black
     selectedLineBgColor:
       - default
+    selectedRangeBgColor:
+      - default
 ```
 
-## Struggling to see selected line
-
-If you struggle to see the selected line I recommend using the reverse attribute on selected lines like so:
+You can also use the reverse attribute like so:
 
 ```yaml
 gui:
@@ -354,33 +380,68 @@ gui:
       - reverse
 ```
 
-The following has also worked for a couple of people:
+## Custom Author Color
+
+Lazygit will assign a random color for every commit author in the commits pane by default.
+
+You can customize the color in case you're not happy with the randomly assigned one:
 
 ```yaml
 gui:
-  theme:
-    activeBorderColor:
-      - white
-      - bold
-    inactiveBorderColor:
-      - white
-    selectedLineBgColor:
-      - reverse
-      - blue
+  authorColors:
+    'John Smith': 'red' # use red for John Smith
+    'Alan Smithee': '#00ff00' # use green for Alan Smithee
 ```
 
-Alternatively you may have bold fonts disabled in your terminal, in which case enabling bold fonts should solve the problem.
+You can use wildcard to set a unified color in case your are lazy to customize the color for every author or you just want a single color for all/other authors:
 
-If you're still having trouble please raise an issue.
+```yaml
+gui:
+  authorColors:
+    # use red for John Smith
+    'John Smith': 'red'
+    # use blue for other authors
+    '*': '#0000ff'
+```
+
+## Custom Branch Color
+
+You can customize the color of branches based on the branch prefix:
+
+```yaml
+gui:
+  branchColors:
+    'docs': '#11aaff' # use a light blue for branches beginning with 'docs/'
+```
 
 ## Example Coloring
 
 ![border example](../../assets/colored-border-example.png)
 
+## Display Nerd Fonts Icons
+
+If you are using [Nerd Fonts](https://www.nerdfonts.com), you can display icons.
+
+```yaml
+gui:
+  nerdFontsVersion: "3"
+```
+
+Supported versions are "2" and "3". The deprecated config `showIcons` sets the
+version to "2" for backwards compatibility.
+
 ## Keybindings
 
 For all possible keybinding options, check [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md)
 
+You can disable certain key bindings by specifying `null`.
+
+```yaml
+keybinding:
+  universal:
+    edit: null # disable 'edit file'
+```
+
 ### Example Keybindings For Colemak Users
 
 ```yaml
@@ -427,7 +488,7 @@ services:
 Where:
 
 - `gitDomain` stands for the domain used by git itself (i.e. the one present on clone URLs), e.g. `git.work.com`
-- `provider` is one of `github`, `bitbucket` or `gitlab`
+- `provider` is one of `github`, `bitbucket`, `bitbucketServer`, `azuredevops`, `gitlab` or `gitea`
 - `webDomain` is the URL where your git service exposes a web interface and APIs, e.g. `gitservice.work.com`
 
 ## Predefined commit message prefix
@@ -481,3 +542,8 @@ notARepository: 'create'
 # to skip without creating a new repo
 notARepository: 'skip'
 ```
+
+```yaml
+# to exit immediately if run outside of the Git repository
+notARepository: 'quit'
+```

docs/Custom_Command_Keybindings.md

@@ -5,20 +5,22 @@ You can add custom command keybindings in your config.yml (accessible by pressin
 ```yml
 customCommands:
   - key: '<c-r>'
-    command: 'hub browse -- "commit/{{.SelectedLocalCommit.Sha}}"'
     context: 'commits'
+    command: 'hub browse -- "commit/{{.SelectedLocalCommit.Sha}}"'
   - key: 'a'
-    command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name}}"
     context: 'files'
-    description: 'toggle file staged'
+    command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name | quote}}"
+    description: 'Toggle file staged'
   - key: 'C'
-    command: "git commit"
     context: 'global'
+    command: "git commit"
     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'
@@ -31,119 +33,261 @@ customCommands:
             value: 'release'
       - type: 'input'
         title: 'What is the new branch name?'
+        key: 'BranchName'
         initialValue: ''
-    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 }}'
+    command: "git flow {{.Form.BranchType}} start {{.Form.BranchName}}"
+    loadingText: 'Creating branch'
 ```
 
 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 options menu by pressing 'x':
+Custom command keybindings will appear alongside inbuilt keybindings when you view the keybindings menu by pressing '?':
 
 ![](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 | 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 |
+| 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 |
 
-### Contexts
+## Contexts
 
 The permitted contexts are:
 
 | _context_      | _description_                                                                                            |
 | -------------- | -------------------------------------------------------------------------------------------------------- |
-| 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                                                              |
+| 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
 
-The permitted prompt fields are:
+### Common fields
 
-| _field_           | _description_                                                                    | _required_ |
-| ------------      | -------------------------------------------------------------------------------- | ---------- |
-| type              | one of 'input' or 'menu'                                                         | 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         |
-| 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      | yes        |
-|                   | groups which are going to be kept from the command's output                      |            |
-| valueFormat       | (only applicable to 'menuFromCommand' prompts) how to format matched groups from | yes        |
-|                   | 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                                           |            |
-| labelFormat       | (only applicable to 'menuFromCommand' prompts) how to format matched groups from | no         |
-|                   | 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                                           |            |
+These fields are applicable to all prompts.
+
+| _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         |
 
 The permitted option fields are:
 | _field_ | _description_ | _required_ |
 |-----------------|----------------------|-|
-| 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 |
+| 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 |
 
 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'
 ```
 
-### Placeholder values
+Here's an example of supplying more detail for each option:
 
-Your commands can contain placeholder strings using Go's [template syntax](https://jan.newmarch.name/go/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:
+```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
+
+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:
 
 ```
 SelectedLocalCommit
 SelectedReflogCommit
 SelectedSubCommit
 SelectedFile
+SelectedPath
 SelectedLocalBranch
 SelectedRemoteBranch
 SelectedRemote
@@ -153,16 +297,16 @@ SelectedCommitFile
 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 `{{.SelectedBranch.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 `subprocess: 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
+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.
 
-### 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/Integration_Tests.md

@@ -1,88 +0,0 @@
-# How To Make And Run Integration Tests For lazygit
-
-Integration tests are located in `test/integration`. Each test will run a bash script to prepare a test repo, then replay a recorded lazygit session from within that repo, and then the resultant repo will be compared to an expected repo that was created upon the initial recording. Each integration test lives in its own directory, and the name of the directory becomes the name of the test. Within the directory must be the following files:
-
-### `test.json`
-
-An example of a `test.json` is:
-
-```
-{ "description": "stage a file and commit the change", "speed": 20 }
-```
-
-The `speed` key refers to the playback speed as a multiple of the original recording speed. So 20 means the test will run 20 times faster than the original recording speed. If a test fails for a given speed, it will drop the speed and re-test, until finally attempting the test at the original speed. If you omit the speed, it will default to 10.
-
-### `setup.sh`
-
-This is a bash script containing the instructions for creating the test repo from scratch. For example:
-
-```
-#!/bin/sh
-
-cd $1
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-echo test1 > myfile1
-git add .
-git commit -am "myfile1"
-```
-
-## Running tests
-
-To run all tests
-```
-go test pkg/gui/gui_test.go
-```
-
-To run them in parallel
-```
-PARALLEL=true go test pkg/gui/gui_test.go
-```
-
-To run a single test
-```
-go test pkg/gui/gui_test.go -run /<test name>
-```
-
-To run a test at a certain speed
-```
-SPEED=2 go test pkg/gui/gui_test.go -run /<test name>
-```
-
-To update a snapshot
-```
-UPDATE_SNAPSHOTS=true go test pkg/gui/gui_test.go -run /<test name>
-```
-
-## Creating a new test
-
-To create a new test:
-1) Copy and paste an existing test directory and rename the new directory to whatever you want the test name to be. Update the test.json file's description to describe your test.
-2) Update the `setup.sh` any way you like
-3) If you want to have a config folder for just that test, create a `config` directory to contain a `config.yml` and optionally a `state.yml` file. Otherwise, the `test/default_test_config` directory will be used.
-4) From the lazygit root directory, run:
-```
-RECORD_EVENTS=true go test pkg/gui/gui_test.go -run /<test name>
-```
-5) Feel free to re-attempt recording as many times as you like. In the absence of a proper testing framework, the more deliberate your keypresses, the better!
-6) Once satisfied with the recording, stage all the newly created files: `test.json`, `setup.sh`, `recording.json` and the `expected` directory that contains a copy of the repo you created.
-
-The resulting directory will look like:
-```
-actual/ (the resulting repo after running the test, ignored by git)
-expected/ (the 'snapshot' repo)
-config/ (need not be present)
-test.json
-setup.sh
-recording.json
-```
-
-Feel free to create a hierarchy of directories in the `test/integration` directory to group tests by feature.
-
-## Feedback
-
-If you think this process can be improved, let me know! It shouldn't be too hard to change things.

docs/README.md

@@ -1,7 +1,9 @@
-# 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)
+* [Dev docs](./dev)

docs/Searching.md

@@ -0,0 +1,21 @@
+# 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/dev/Busy.md

@@ -0,0 +1,78 @@
+# 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/Integration_Tests.md

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

docs/dev/README.md

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

docs/keybindings/Keybindings_en.md

@@ -1,287 +1,333 @@
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
+
 # Lazygit Keybindings
 
-## Global Keybindings
+_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
+
+## Global keybindings
 
 <pre>
-  <kbd>ctrl+r</kbd>: switch to a recent repo (<c-r>)
-  <kbd>pgup</kbd>: scroll up main panel (fn+up)
-  <kbd>pgdown</kbd>: scroll down main panel (fn+down)
-  <kbd>m</kbd>: view merge/rebase options
-  <kbd>ctrl+p</kbd>: view custom patch options
-  <kbd>P</kbd>: push
-  <kbd>p</kbd>: pull
-  <kbd>R</kbd>: refresh
-  <kbd>x</kbd>: open menu
-  <kbd>z</kbd>: undo (via reflog) (experimental)
-  <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
-  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
-  <kbd>_</kbd>: prev screen mode
-  <kbd>:</kbd>: execute custom command
-  <kbd>ctrl+s</kbd>: view filter-by-path options
-  <kbd>W</kbd>: open diff menu
-  <kbd>ctrl+e</kbd>: open diff menu
-  <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>&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
 </pre>
 
-## List Panel Navigation
+## List panel navigation
 
 <pre>
-  <kbd>.</kbd>: next page
-  <kbd>,</kbd>: previous page
-  <kbd><</kbd>: scroll to top
-  <kbd>></kbd>: scroll to bottom
-  <kbd>/</kbd>: start search
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
+  <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
 </pre>
 
-## Branches Panel (Branches Tab)
+## Commit files
 
 <pre>
-  <kbd>space</kbd>: checkout
-  <kbd>o</kbd>: create pull request
-  <kbd>O</kbd>: create pull request options
-  <kbd>ctrl+y</kbd>: copy pull request URL to clipboard
-  <kbd>c</kbd>: checkout by name
-  <kbd>F</kbd>: force checkout
-  <kbd>n</kbd>: new branch
-  <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>i</kbd>: show git-flow options
-  <kbd>f</kbd>: fast-forward this branch from its upstream
-  <kbd>g</kbd>: view reset options
-  <kbd>R</kbd>: rename branch
-  <kbd>ctrl+o</kbd>: copy branch name to clipboard
-  <kbd>enter</kbd>: view commits
+  <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
 </pre>
 
-## Branches Panel (Remote Branches (in Remotes tab))
+## Commit summary
 
 <pre>
-  <kbd>esc</kbd>: Return to remotes list
-  <kbd>g</kbd>: view reset options
-  <kbd>enter</kbd>: view commits
-  <kbd>space</kbd>: checkout
-  <kbd>n</kbd>: new branch
-  <kbd>M</kbd>: merge into currently checked out branch
-  <kbd>d</kbd>: delete branch
-  <kbd>r</kbd>: rebase checked-out branch onto this branch
-  <kbd>u</kbd>: set as upstream of checked-out branch
+  <kbd>&lt;enter&gt;</kbd>: Confirm
+  <kbd>&lt;esc&gt;</kbd>: Close
 </pre>
 
-## Branches Panel (Remotes Tab)
+## Commits
 
 <pre>
-  <kbd>f</kbd>: fetch remote
-  <kbd>n</kbd>: add new remote
-  <kbd>d</kbd>: remove remote
-  <kbd>e</kbd>: edit remote
+  <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>: Set/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
+  <kbd>/</kbd>: Search the current view by text
 </pre>
 
-## Branches Panel (Sub-commits)
+## Confirmation panel
 
 <pre>
-  <kbd>enter</kbd>: view commit's files
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: view reset options
-  <kbd>n</kbd>: new branch
-  <kbd>c</kbd>: copy commit (cherry-pick)
-  <kbd>C</kbd>: copy commit range (cherry-pick)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+  <kbd>&lt;enter&gt;</kbd>: Confirm
+  <kbd>&lt;esc&gt;</kbd>: Close/Cancel
 </pre>
 
-## Branches Panel (Tags Tab)
+## Files
 
 <pre>
-  <kbd>space</kbd>: checkout
-  <kbd>d</kbd>: delete tag
-  <kbd>P</kbd>: push tag
-  <kbd>n</kbd>: create tag
-  <kbd>g</kbd>: view reset options
-  <kbd>enter</kbd>: view commits
+  <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
 </pre>
 
-## Commit Files Panel
+## Local branches
 
 <pre>
-  <kbd>ctrl+o</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>space</kbd>: toggle file included in patch
-  <kbd>enter</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
-  <kbd>`</kbd>: toggle file tree view
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Commits Panel (Commits)
+## Main panel (merging)
 
 <pre>
-  <kbd>s</kbd>: squash down
-  <kbd>r</kbd>: reword commit
-  <kbd>R</kbd>: rename commit with editor
-  <kbd>g</kbd>: reset to this commit
-  <kbd>f</kbd>: fixup commit
-  <kbd>F</kbd>: create fixup commit for this commit
-  <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
-  <kbd>d</kbd>: delete commit
-  <kbd>ctrl+j</kbd>: move commit down one
-  <kbd>ctrl+k</kbd>: move commit up one
-  <kbd>e</kbd>: edit commit
-  <kbd>A</kbd>: amend commit with staged changes
-  <kbd>p</kbd>: pick commit (when mid-rebase)
-  <kbd>t</kbd>: revert commit
-  <kbd>c</kbd>: copy commit (cherry-pick)
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
-  <kbd>C</kbd>: copy commit range (cherry-pick)
-  <kbd>v</kbd>: paste commits (cherry-pick)
-  <kbd>enter</kbd>: view commit's files
-  <kbd>space</kbd>: checkout commit
-  <kbd>n</kbd>: create new branch off of commit
-  <kbd>T</kbd>: tag commit
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+y</kbd>: copy commit message to clipboard
+  <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>
 
-## Commits Panel (Reflog Tab)
+## Main panel (normal)
 
 <pre>
-  <kbd>enter</kbd>: view commit's files
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: view reset options
-  <kbd>c</kbd>: copy commit (cherry-pick)
-  <kbd>C</kbd>: copy commit range (cherry-pick)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+  <kbd>mouse wheel down</kbd>: Scroll down (fn+up)
+  <kbd>mouse wheel up</kbd>: Scroll up (fn+down)
 </pre>
 
-## Extras Panel
+## Main panel (patch building)
 
 <pre>
-  <kbd>@</kbd>: open command log menu
+  <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
 </pre>
 
-## Files Panel (Files)
+## Main panel (staging)
 
 <pre>
-  <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>space</kbd>: toggle staged
-  <kbd>d</kbd>: view 'discard changes' options
-  <kbd>e</kbd>: edit file
-  <kbd>o</kbd>: open file
-  <kbd>i</kbd>: add to .gitignore
-  <kbd>r</kbd>: refresh files
-  <kbd>s</kbd>: stash changes
-  <kbd>S</kbd>: view stash options
-  <kbd>a</kbd>: stage/unstage all
-  <kbd>D</kbd>: view reset options
-  <kbd>enter</kbd>: stage individual hunks/lines for file, or collapse/expand for directory
-  <kbd>f</kbd>: fetch
-  <kbd>ctrl+o</kbd>: copy the file name to the clipboard
-  <kbd>g</kbd>: view upstream reset options
-  <kbd>`</kbd>: toggle file tree view
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
+  <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
 </pre>
 
-## Files Panel (Submodules)
+## Menu
 
 <pre>
-  <kbd>ctrl+o</kbd>: copy submodule name to clipboard
-  <kbd>enter</kbd>: enter submodule
-  <kbd>d</kbd>: view reset and remove submodule options
-  <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>&lt;enter&gt;</kbd>: Execute
+  <kbd>&lt;esc&gt;</kbd>: Close
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Main Panel (Merging)
+## Reflog
 
 <pre>
-  <kbd>esc</kbd>: return to files panel
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>space</kbd>: pick hunk
-  <kbd>b</kbd>: pick all hunks
-  <kbd>◄</kbd>: select previous conflict
-  <kbd>►</kbd>: select next conflict
-  <kbd>▲</kbd>: select previous hunk
-  <kbd>▼</kbd>: select next hunk
-  <kbd>z</kbd>: undo
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Main Panel (Normal)
+## Remote branches
 
 <pre>
-  <kbd>Ő</kbd>: scroll down (fn+up)
-  <kbd>ő</kbd>: scroll up (fn+down)
+  <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>g</kbd>: View reset options
+  <kbd>&lt;enter&gt;</kbd>: View commits
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Main Panel (Patch Building)
+## Remotes
 
 <pre>
-  <kbd>esc</kbd>: exit line-by-line mode
-  <kbd>o</kbd>: open file
-  <kbd>▲</kbd>: select previous line
-  <kbd>▼</kbd>: select next line
-  <kbd>◄</kbd>: select previous hunk
-  <kbd>►</kbd>: select next hunk
-  <kbd>space</kbd>: add/remove line(s) to patch
-  <kbd>v</kbd>: toggle drag select
-  <kbd>V</kbd>: toggle drag select
-  <kbd>a</kbd>: toggle select hunk
+  <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
 </pre>
 
-## Main Panel (Staging)
+## Stash
 
 <pre>
-  <kbd>esc</kbd>: return to files panel
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
-  <kbd>tab</kbd>: switch to other panel
-  <kbd>o</kbd>: open file
-  <kbd>▲</kbd>: select previous line
-  <kbd>▼</kbd>: select next line
-  <kbd>◄</kbd>: select previous hunk
-  <kbd>►</kbd>: select next hunk
-  <kbd>e</kbd>: edit file
-  <kbd>o</kbd>: open file
-  <kbd>v</kbd>: toggle drag select
-  <kbd>V</kbd>: toggle drag select
-  <kbd>a</kbd>: toggle select hunk
-  <kbd>c</kbd>: commit changes
-  <kbd>w</kbd>: commit changes without pre-commit hook
-  <kbd>C</kbd>: commit changes using git editor
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Menu Panel
+## Status
 
 <pre>
-  <kbd>esc</kbd>: close menu
+  <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>
 
-## Stash Panel
+## Sub-commits
 
 <pre>
-  <kbd>enter</kbd>: view stash entry's files
-  <kbd>space</kbd>: apply
-  <kbd>g</kbd>: pop
-  <kbd>d</kbd>: drop
-  <kbd>n</kbd>: new branch
+  <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
+  <kbd>/</kbd>: Search the current view by text
 </pre>
 
-## Status Panel
+## Submodules
 
 <pre>
-  <kbd>e</kbd>: edit config file
-  <kbd>o</kbd>: open config file
-  <kbd>u</kbd>: check for update
-  <kbd>enter</kbd>: switch to a recent repo
-  <kbd>a</kbd>: show all branch logs
+  <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
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## Tags
+
+<pre>
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>

docs/keybindings/Keybindings_ja.md

@@ -0,0 +1,333 @@
+_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 キーバインド
+
+_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means 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>: 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>R</kbd>: リフレッシュ
+  <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen)
+  <kbd>_</kbd>: 前のスクリーンモード
+  <kbd>?</kbd>: メニューを開く
+  <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
+</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>
+
+## Stash
+
+<pre>
+  <kbd>&lt;space&gt;</kbd>: 適用
+  <kbd>g</kbd>: Pop
+  <kbd>d</kbd>: Drop
+  <kbd>n</kbd>: 新しいブランチを作成
+  <kbd>r</kbd>: Stashを変更
+  <kbd>&lt;enter&gt;</kbd>: View selected item's files
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## Sub-commits
+
+<pre>
+  <kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー
+  <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
+  <kbd>y</kbd>: コミットの情報をコピー
+  <kbd>o</kbd>: ブラウザでコミットを開く
+  <kbd>n</kbd>: コミットにブランチを作成
+  <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>
+
+## コミット
+
+<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>r</kbd>: コミットメッセージを変更
+  <kbd>R</kbd>: エディタでコミットメッセージを編集
+  <kbd>d</kbd>: コミットを削除
+  <kbd>e</kbd>: コミットを編集
+  <kbd>p</kbd>: Pick commit (when mid-rebase)
+  <kbd>F</kbd>: このコミットに対するfixupコミットを作成
+  <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>A</kbd>: ステージされた変更でamendコミット
+  <kbd>a</kbd>: Set/Reset commit author
+  <kbd>t</kbd>: コミットをrevert
+  <kbd>T</kbd>: タグを作成
+  <kbd>&lt;c-l&gt;</kbd>: ログメニューを開く
+  <kbd>&lt;space&gt;</kbd>: コミットをチェックアウト
+  <kbd>y</kbd>: コミットの情報をコピー
+  <kbd>o</kbd>: ブラウザでコミットを開く
+  <kbd>n</kbd>: コミットにブランチを作成
+  <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>: 検索を開始
+</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>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>`</kbd>: ファイルツリーの表示を切り替え
+  <kbd>/</kbd>: 検索を開始
+</pre>
+
+## コミットメッセージ
+
+<pre>
+  <kbd>&lt;enter&gt;</kbd>: 確認
+  <kbd>&lt;esc&gt;</kbd>: 閉じる
+</pre>
+
+## サブモジュール
+
+<pre>
+  <kbd>&lt;c-o&gt;</kbd>: サブモジュール名をクリップボードにコピー
+  <kbd>&lt;enter&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
+</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>: タグを削除
+  <kbd>P</kbd>: タグをpush
+  <kbd>n</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>: ファイル名をクリップボードにコピー
+  <kbd>d</kbd>: View 'discard changes' options
+  <kbd>&lt;space&gt;</kbd>: ステージ/アンステージ
+  <kbd>&lt;c-b&gt;</kbd>: ファイルをフィルタ (ステージ/アンステージ)
+  <kbd>c</kbd>: 変更をコミット
+  <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット
+  <kbd>A</kbd>: 最新のコミットにamend
+  <kbd>C</kbd>: gitエディタを使用して変更をコミット
+  <kbd>e</kbd>: ファイルを編集
+  <kbd>o</kbd>: ファイルを開く
+  <kbd>i</kbd>: ファイルをignore
+  <kbd>r</kbd>: ファイルをリフレッシュ
+  <kbd>s</kbd>: 変更をstash
+  <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>`</kbd>: ファイルツリーの表示を切り替え
+  <kbd>M</kbd>: Git mergetoolを開く
+  <kbd>f</kbd>: Fetch
+  <kbd>/</kbd>: 検索を開始
+</pre>
+
+## ブランチ
+
+<pre>
+  <kbd>&lt;c-o&gt;</kbd>: ブランチ名をクリップボードにコピー
+  <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>&lt;c-y&gt;</kbd>: Pull RequestのURLをクリップボードにコピー
+  <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>T</kbd>: タグを作成
+  <kbd>g</kbd>: View reset options
+  <kbd>R</kbd>: ブランチ名を変更
+  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>&lt;enter&gt;</kbd>: コミットを閲覧
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## メインパネル (Merging)
+
+<pre>
+  <kbd>e</kbd>: ファイルを編集
+  <kbd>o</kbd>: ファイルを開く
+  <kbd>&lt;left&gt;</kbd>: 前のコンフリクトを選択
+  <kbd>&lt;right&gt;</kbd>: 次のコンフリクトを選択
+  <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>&lt;esc&gt;</kbd>: ファイル一覧に戻る
+</pre>
+
+## メインパネル (Normal)
+
+<pre>
+  <kbd>mouse wheel down</kbd>: 下にスクロール (fn+up)
+  <kbd>mouse wheel up</kbd>: 上にスクロール (fn+down)
+</pre>
+
+## メインパネル (Patch Building)
+
+<pre>
+  <kbd>&lt;left&gt;</kbd>: 前のhunkを選択
+  <kbd>&lt;right&gt;</kbd>: 次のhunkを選択
+  <kbd>v</kbd>: 範囲選択を切り替え
+  <kbd>V</kbd>: 範囲選択を切り替え
+  <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>: 検索を開始
+</pre>
+
+## メインパネル (Staging)
+
+<pre>
+  <kbd>&lt;left&gt;</kbd>: 前のhunkを選択
+  <kbd>&lt;right&gt;</kbd>: 次のhunkを選択
+  <kbd>v</kbd>: 範囲選択を切り替え
+  <kbd>V</kbd>: 範囲選択を切り替え
+  <kbd>a</kbd>: Hunk選択を切り替え
+  <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>: Edit hunk
+  <kbd>c</kbd>: 変更をコミット
+  <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット
+  <kbd>C</kbd>: gitエディタを使用して変更をコミット
+  <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>f</kbd>: リモートをfetch
+  <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>: Rebase checked-out branch onto this branch
+  <kbd>d</kbd>: ブランチを削除
+  <kbd>u</kbd>: Set as upstream of checked-out branch
+  <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;space&gt;</kbd>: コミットをチェックアウト
+  <kbd>y</kbd>: コミットの情報をコピー
+  <kbd>o</kbd>: ブラウザでコミットを開く
+  <kbd>n</kbd>: コミットにブランチを作成
+  <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>: コミットを閲覧
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## 確認パネル
+
+<pre>
+  <kbd>&lt;enter&gt;</kbd>: 確認
+  <kbd>&lt;esc&gt;</kbd>: 閉じる/キャンセル
+</pre>

docs/keybindings/Keybindings_ko.md

@@ -0,0 +1,333 @@
+_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 키 바인딩
+
+_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means 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>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기
+  <kbd>{</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기
+  <kbd>:</kbd>: Execute custom command
+  <kbd>&lt;c-p&gt;</kbd>: 커스텀 Patch 옵션 보기
+  <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>W</kbd>: Diff 메뉴 열기
+  <kbd>&lt;c-e&gt;</kbd>: Diff 메뉴 열기
+  <kbd>&lt;c-w&gt;</kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환
+  <kbd>z</kbd>: 되돌리기 (reflog) (실험적)
+  <kbd>&lt;c-z&gt;</kbd>: 다시 실행 (reflog) (실험적)
+  <kbd>P</kbd>: 푸시
+  <kbd>p</kbd>: 업데이트
+</pre>
+
+## List panel navigation
+
+<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>&lt;space&gt;</kbd>: 커밋을 체크아웃
+  <kbd>y</kbd>: 커밋 attribute 복사
+  <kbd>o</kbd>: 브라우저에서 커밋 열기
+  <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
+  <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>: 커밋 보기
+  <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>n</kbd>: 새 브랜치 생성
+  <kbd>r</kbd>: Rename stash
+  <kbd>&lt;enter&gt;</kbd>: View selected item's files
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## Sub-commits
+
+<pre>
+  <kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사
+  <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
+  <kbd>y</kbd>: 커밋 attribute 복사
+  <kbd>o</kbd>: 브라우저에서 커밋 열기
+  <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
+  <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>
+
+## 메뉴
+
+<pre>
+  <kbd>&lt;enter&gt;</kbd>: 실행
+  <kbd>&lt;esc&gt;</kbd>: 닫기
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## 메인 패널 (Merging)
+
+<pre>
+  <kbd>e</kbd>: 파일 편집
+  <kbd>o</kbd>: 파일 닫기
+  <kbd>&lt;left&gt;</kbd>: 이전 충돌을 선택
+  <kbd>&lt;right&gt;</kbd>: 다음 충돌을 선택
+  <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>&lt;esc&gt;</kbd>: 파일 목록으로 돌아가기
+</pre>
+
+## 메인 패널 (Normal)
+
+<pre>
+  <kbd>mouse wheel down</kbd>: 아래로 스크롤 (fn+up)
+  <kbd>mouse wheel up</kbd>: 위로 스크롤 (fn+down)
+</pre>
+
+## 메인 패널 (Patch Building)
+
+<pre>
+  <kbd>&lt;left&gt;</kbd>: 이전 hunk를 선택
+  <kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택
+  <kbd>v</kbd>: 드래그 선택 전환
+  <kbd>V</kbd>: 드래그 선택 전환
+  <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>: 검색 시작
+</pre>
+
+## 메인 패널 (Staging)
+
+<pre>
+  <kbd>&lt;left&gt;</kbd>: 이전 hunk를 선택
+  <kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택
+  <kbd>v</kbd>: 드래그 선택 전환
+  <kbd>V</kbd>: 드래그 선택 전환
+  <kbd>a</kbd>: Toggle select hunk
+  <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>: 선택한 행을 staged / unstaged
+  <kbd>d</kbd>: 변경을 삭제 (git reset)
+  <kbd>E</kbd>: Edit hunk
+  <kbd>c</kbd>: 커밋 변경내용
+  <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>&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>: 브랜치 삭제
+  <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
+  <kbd>M</kbd>: 현재 브랜치에 병합
+  <kbd>f</kbd>: Fast-forward this branch from its upstream
+  <kbd>T</kbd>: 태그를 생성
+  <kbd>g</kbd>: View reset options
+  <kbd>R</kbd>: 브랜치 이름 변경
+  <kbd>u</kbd>: Set/Unset upstream
+  <kbd>&lt;enter&gt;</kbd>: 커밋 보기
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## 상태
+
+<pre>
+  <kbd>o</kbd>: 설정 파일 열기
+  <kbd>e</kbd>: 설정 파일 수정
+  <kbd>u</kbd>: 업데이트 확인
+  <kbd>&lt;enter&gt;</kbd>: 최근에 사용한 저장소로 전환
+  <kbd>a</kbd>: 모든 브랜치 로그 표시
+</pre>
+
+## 서브모듈
+
+<pre>
+  <kbd>&lt;c-o&gt;</kbd>: 서브모듈 이름을 클립보드에 복사
+  <kbd>&lt;enter&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
+</pre>
+
+## 원격
+
+<pre>
+  <kbd>f</kbd>: 원격을 업데이트
+  <kbd>n</kbd>: 새로운 Remote 추가
+  <kbd>d</kbd>: Remote를 삭제
+  <kbd>e</kbd>: Remote를 수정
+  <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>: 브랜치 삭제
+  <kbd>u</kbd>: Set as upstream of checked-out branch
+  <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>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>&lt;c-j&gt;</kbd>: 커밋을 1개 아래로 이동
+  <kbd>&lt;c-k&gt;</kbd>: 커밋을 1개 위로 이동
+  <kbd>v</kbd>: 커밋을 붙여넣기 (cherry-pick)
+  <kbd>A</kbd>: Amend commit with staged changes
+  <kbd>a</kbd>: Set/Reset commit author
+  <kbd>t</kbd>: 커밋 되돌리기
+  <kbd>T</kbd>: Tag commit
+  <kbd>&lt;c-l&gt;</kbd>: 로그 메뉴 열기
+  <kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃
+  <kbd>y</kbd>: 커밋 attribute 복사
+  <kbd>o</kbd>: 브라우저에서 커밋 열기
+  <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
+  <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>: 검색 시작
+</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>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>`</kbd>: 파일 트리뷰로 전환
+  <kbd>/</kbd>: 검색 시작
+</pre>
+
+## 커밋메시지
+
+<pre>
+  <kbd>&lt;enter&gt;</kbd>: 확인
+  <kbd>&lt;esc&gt;</kbd>: 닫기
+</pre>
+
+## 태그
+
+<pre>
+  <kbd>&lt;space&gt;</kbd>: 체크아웃
+  <kbd>d</kbd>: 태그 삭제
+  <kbd>P</kbd>: 태그를 push
+  <kbd>n</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>: 파일명을 클립보드에 복사
+  <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>A</kbd>: 마지맛 커밋 수정
+  <kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
+  <kbd>e</kbd>: 파일 편집
+  <kbd>o</kbd>: 파일 닫기
+  <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>`</kbd>: 파일 트리뷰로 전환
+  <kbd>M</kbd>: Git mergetool를 열기
+  <kbd>f</kbd>: Fetch
+  <kbd>/</kbd>: 검색 시작
+</pre>
+
+## 확인 패널
+
+<pre>
+  <kbd>&lt;enter&gt;</kbd>: 확인
+  <kbd>&lt;esc&gt;</kbd>: 닫기/취소
+</pre>

docs/keybindings/Keybindings_nl.md

@@ -1,287 +1,333 @@
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
+
 # Lazygit Sneltoetsen
 
-## Globale Sneltoetsen
+_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
+
+## Globale sneltoetsen
 
 <pre>
-  <kbd>ctrl+r</kbd>: wissel naar een recente repo (<c-r>)
-  <kbd>pgup</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+up)
-  <kbd>pgdown</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+down)
-  <kbd>m</kbd>: bekijk merge/rebase opties
-  <kbd>ctrl+p</kbd>: bekijk aangepaste patch opties
-  <kbd>P</kbd>: push
-  <kbd>p</kbd>: pull
-  <kbd>R</kbd>: verversen
-  <kbd>x</kbd>: open menu
-  <kbd>z</kbd>: ongedaan maken (via reflog) (experimenteel)
-  <kbd>ctrl+z</kbd>: redo (via reflog) (experimenteel)
-  <kbd>+</kbd>: volgende scherm modus (normaal/half/groot)
-  <kbd>_</kbd>: vorige scherm modus
-  <kbd>:</kbd>: voor aangepaste commando uit
-  <kbd>ctrl+s</kbd>: bekijk scoping opties
-  <kbd>W</kbd>: open diff menu
-  <kbd>ctrl+e</kbd>: open diff menu
-  <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>&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
 </pre>
 
-## Lijstpaneel Navigatie
+## Lijstpaneel navigatie
 
 <pre>
-  <kbd>.</kbd>: volgende pagina
-  <kbd>,</kbd>: vorige pagina
-  <kbd><</kbd>: scroll naar boven
-  <kbd>></kbd>: scroll naar beneden
-  <kbd>/</kbd>: start met zoeken
-  <kbd>]</kbd>: volgende tabblad
-  <kbd>[</kbd>: vorige tabblad
+  <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
 </pre>
 
-## Branches Paneel (Branches Tabblad)
+## Bestanden
 
 <pre>
-  <kbd>space</kbd>: uitchecken
-  <kbd>o</kbd>: maak een pull-request
-  <kbd>O</kbd>: bekijk opties voor pull-aanvraag
-  <kbd>ctrl+y</kbd>: kopieer de URL van het pull-verzoek naar het klembord
-  <kbd>c</kbd>: uitchecken bij naam
-  <kbd>F</kbd>: forceer checkout
-  <kbd>n</kbd>: nieuwe branch
-  <kbd>d</kbd>: verwijder branch
-  <kbd>r</kbd>: rebase branch
-  <kbd>M</kbd>: merge in met huidige checked out branch
-  <kbd>i</kbd>: laat git-flow opties zien
-  <kbd>f</kbd>: fast-forward deze branch vanaf zijn upstream
-  <kbd>g</kbd>: bekijk reset opties
-  <kbd>R</kbd>: hernoem branch
-  <kbd>ctrl+o</kbd>: kopieer branch name naar klembord
-  <kbd>enter</kbd>: bekijk commits
+  <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
 </pre>
 
-## Branches Paneel (Remote Branches (in Remotes tabblad))
+## Bevestigingspaneel
 
 <pre>
-  <kbd>esc</kbd>: Ga terug naar remotes lijst
-  <kbd>g</kbd>: bekijk reset opties
-  <kbd>enter</kbd>: bekijk commits
-  <kbd>space</kbd>: uitchecken
-  <kbd>n</kbd>: nieuwe branch
-  <kbd>M</kbd>: merge in met huidige checked out branch
-  <kbd>d</kbd>: verwijder branch
-  <kbd>r</kbd>: rebase branch
-  <kbd>u</kbd>: stel in als upstream van uitgecheckte branch
+  <kbd>&lt;enter&gt;</kbd>: Bevestig
+  <kbd>&lt;esc&gt;</kbd>: Sluiten
 </pre>
 
-## Branches Paneel (Remotes Tabblad)
+## Branches
 
 <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>&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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Branches Paneel (Sub-commits)
+## Commit bericht
 
 <pre>
-  <kbd>enter</kbd>: bekijk gecommite bestanden
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: bekijk reset opties
-  <kbd>n</kbd>: nieuwe branch
-  <kbd>c</kbd>: kopieer commit (cherry-pick)
-  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
-  <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
+  <kbd>&lt;enter&gt;</kbd>: Bevestig
+  <kbd>&lt;esc&gt;</kbd>: Sluiten
 </pre>
 
-## Branches Paneel (Tags Tabblad)
+## Commit bestanden
 
 <pre>
-  <kbd>space</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>enter</kbd>: bekijk commits
+  <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
 </pre>
 
-## Commit bestanden Paneel
+## Commits
 
 <pre>
-  <kbd>ctrl+o</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>space</kbd>: toggle bestand inbegrepen in patch
-  <kbd>enter</kbd>: enter bestand om geselecteerde regels toe te voegen aan de patch
-  <kbd>`</kbd>: toggle bestandsboom weergave
-</pre>
-
-## Commits Paneel (Commits)
-
-<pre>
-  <kbd>s</kbd>: squash beneden
-  <kbd>r</kbd>: hernoem commit
-  <kbd>R</kbd>: hernoem commit met editor
-  <kbd>g</kbd>: reset naar deze commit
+  <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>F</kbd>: creëer fixup commit voor deze commit
-  <kbd>S</kbd>: squash bovenstaande commits
-  <kbd>d</kbd>: verwijder commit
-  <kbd>ctrl+j</kbd>: verplaats commit 1 naar beneden
-  <kbd>ctrl+k</kbd>: verplaats commit 1 naar boven
-  <kbd>e</kbd>: wijzig commit
-  <kbd>A</kbd>: wijzig commit met staged veranderingen
-  <kbd>p</kbd>: kies commit (wanneer midden in rebase)
-  <kbd>t</kbd>: commit ongedaan maken
-  <kbd>c</kbd>: kopieer commit (cherry-pick)
-  <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
-  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
-  <kbd>v</kbd>: plak commits (cherry-pick)
-  <kbd>enter</kbd>: bekijk gecommite bestanden
-  <kbd>space</kbd>: checkout commit
-  <kbd>n</kbd>: creëer nieuwe branch van commit
-  <kbd>T</kbd>: tag commit
-  <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
-  <kbd>ctrl+y</kbd>: kopieer commit bericht naar klembord
+  <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>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>&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
 </pre>
 
-## Commits Paneel (Reflog Tabblad)
+## Menu
 
 <pre>
-  <kbd>enter</kbd>: bekijk gecommite bestanden
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: bekijk reset opties
-  <kbd>c</kbd>: kopieer commit (cherry-pick)
-  <kbd>C</kbd>: kopieer commit reeks (cherry-pick)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
-  <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
+  <kbd>&lt;enter&gt;</kbd>: Uitvoeren
+  <kbd>&lt;esc&gt;</kbd>: Sluiten
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Extras Paneel
+## Mergen
 
 <pre>
-  <kbd>@</kbd>: open command log menu
+  <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
 </pre>
 
-## Bestanden Paneel (Bestanden)
+## Normaal
 
 <pre>
+  <kbd>mouse wheel down</kbd>: Scroll omlaag (fn+up)
+  <kbd>mouse wheel up</kbd>: Scroll omhoog (fn+down)
+</pre>
+
+## 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
+</pre>
+
+## Reflog
+
+<pre>
+  <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
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## 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>: Verwijder branch
+  <kbd>u</kbd>: Stel in als upstream van uitgecheckte branch
+  <kbd>g</kbd>: Bekijk reset opties
+  <kbd>&lt;enter&gt;</kbd>: Bekijk commits
+  <kbd>/</kbd>: Filter the current view by text
+</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
+</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>A</kbd>: wijzig laatste commit
-  <kbd>C</kbd>: commit veranderingen met de git editor
-  <kbd>space</kbd>: toggle staged
-  <kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties
-  <kbd>e</kbd>: verander bestand
-  <kbd>o</kbd>: open bestand
-  <kbd>i</kbd>: voeg toe aan .gitignore
-  <kbd>r</kbd>: refresh bestanden
-  <kbd>s</kbd>: stash-bestanden
-  <kbd>S</kbd>: bekijk stash opties
-  <kbd>a</kbd>: toggle staged alle
-  <kbd>D</kbd>: bekijk reset opties
-  <kbd>enter</kbd>: stage individuele hunks/lijnen
-  <kbd>f</kbd>: fetch
-  <kbd>ctrl+o</kbd>: kopieer de bestandsnaam naar het klembord
-  <kbd>g</kbd>: bekijk upstream reset opties
-  <kbd>`</kbd>: toggle bestandsboom weergave
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
+  <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook
+  <kbd>C</kbd>: Commit veranderingen met de git editor
+  <kbd>/</kbd>: Start met zoeken
 </pre>
 
-## Bestanden Paneel (Submodules)
+## Stash
 
 <pre>
-  <kbd>ctrl+o</kbd>: kopieer submodule naam naar klembord
-  <kbd>enter</kbd>: enter submodule
-  <kbd>d</kbd>: bekijk reset en verwijder submodule opties
-  <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>&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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Hoofd Paneel (Mergen)
+## Status
 
 <pre>
-  <kbd>esc</kbd>: ga terug naar het bestanden paneel
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>space</kbd>: kies hunk
-  <kbd>b</kbd>: kies bijde hunks
-  <kbd>◄</kbd>: selecteer voorgaand conflict
-  <kbd>►</kbd>: selecteer volgende conflict
-  <kbd>▲</kbd>: selecteer bovenste hunk
-  <kbd>▼</kbd>: selecteer onderste hunk
-  <kbd>z</kbd>: ongedaan maken
+  <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>
 
-## Hoofd Paneel (Normaal)
+## Sub-commits
 
 <pre>
-  <kbd>Ő</kbd>: scroll omlaag (fn+up)
-  <kbd>ő</kbd>: scroll omhoog (fn+down)
+  <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
+  <kbd>/</kbd>: Start met zoeken
 </pre>
 
-## Hoofd Paneel (Patch Bouwen)
+## Submodules
 
 <pre>
-  <kbd>esc</kbd>: sluit lijn-bij-lijn modus
-  <kbd>o</kbd>: open bestand
-  <kbd>▲</kbd>: selecteer de vorige lijn
-  <kbd>▼</kbd>: selecteer de volgende lijn
-  <kbd>◄</kbd>: selecteer de vorige hunk
-  <kbd>►</kbd>: selecteer de volgende hunk
-  <kbd>space</kbd>: voeg toe/verwijder lijn(en) in patch
-  <kbd>v</kbd>: toggle drag selecteer
-  <kbd>V</kbd>: toggle drag selecteer
-  <kbd>a</kbd>: toggle selecteer hunk
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Hoofd Paneel (Staging)
+## Tags
 
 <pre>
-  <kbd>esc</kbd>: ga terug naar het bestanden paneel
-  <kbd>space</kbd>: toggle lijnen staged / unstaged
-  <kbd>d</kbd>: verwijdert change (git reset)
-  <kbd>tab</kbd>: ga naar een ander paneel
-  <kbd>o</kbd>: open bestand
-  <kbd>▲</kbd>: selecteer de vorige lijn
-  <kbd>▼</kbd>: selecteer de volgende lijn
-  <kbd>◄</kbd>: selecteer de vorige hunk
-  <kbd>►</kbd>: selecteer de volgende hunk
-  <kbd>e</kbd>: verander bestand
-  <kbd>o</kbd>: open bestand
-  <kbd>v</kbd>: toggle drag selecteer
-  <kbd>V</kbd>: toggle drag selecteer
-  <kbd>a</kbd>: toggle selecteer 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>
-
-## Menu Paneel
-
-<pre>
-  <kbd>esc</kbd>: sluit menu
-</pre>
-
-## Stash Paneel
-
-<pre>
-  <kbd>enter</kbd>: bekijk bestanden van stash entry
-  <kbd>space</kbd>: toepassen
-  <kbd>g</kbd>: pop
-  <kbd>d</kbd>: laten vallen
-  <kbd>n</kbd>: nieuwe branch
-</pre>
-
-## Status Paneel
-
-<pre>
-  <kbd>e</kbd>: verander config bestand
-  <kbd>o</kbd>: open config bestand
-  <kbd>u</kbd>: check voor updates
-  <kbd>enter</kbd>: wissel naar een recente repo
-  <kbd>a</kbd>: alle logs van de branch laten zien
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>

docs/keybindings/Keybindings_pl.md

@@ -1,287 +1,333 @@
+_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
+
 # Lazygit Keybindings
 
+_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
+
 ## Globalne
 
 <pre>
-  <kbd>ctrl+r</kbd>: switch to a recent repo (<c-r>)
-  <kbd>pgup</kbd>: scroll up main panel (fn+up)
-  <kbd>pgdown</kbd>: scroll down main panel (fn+down)
-  <kbd>m</kbd>: view merge/rebase options
-  <kbd>ctrl+p</kbd>: view custom patch options
-  <kbd>P</kbd>: push
-  <kbd>p</kbd>: pull
-  <kbd>R</kbd>: odśwież
-  <kbd>x</kbd>: open menu
-  <kbd>z</kbd>: undo (via reflog) (experimental)
-  <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
-  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
-  <kbd>_</kbd>: prev screen mode
-  <kbd>:</kbd>: execute custom command
-  <kbd>ctrl+s</kbd>: view filter-by-path options
-  <kbd>W</kbd>: open diff menu
-  <kbd>ctrl+e</kbd>: open diff menu
-  <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>&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
 </pre>
 
-## List Panel Navigation
+## List panel navigation
 
 <pre>
-  <kbd>.</kbd>: next page
-  <kbd>,</kbd>: previous page
-  <kbd><</kbd>: scroll to top
-  <kbd>></kbd>: scroll to bottom
-  <kbd>/</kbd>: start search
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
+  <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
 </pre>
 
-## Gałęzie Panel (Branches Tab)
+## Commit summary
 
 <pre>
-  <kbd>space</kbd>: przełącz
-  <kbd>o</kbd>: utwórz żądanie wyciągnięcia
-  <kbd>O</kbd>: utwórz opcje żądania ściągnięcia
-  <kbd>ctrl+y</kbd>: skopiuj adres URL żądania ściągnięcia do schowka
-  <kbd>c</kbd>: przełącz używając nazwy
-  <kbd>F</kbd>: wymuś przełączenie
-  <kbd>n</kbd>: nowa gałąź
-  <kbd>d</kbd>: usuń gałąź
-  <kbd>r</kbd>: rebase branch
-  <kbd>M</kbd>: scal do obecnej gałęzi
-  <kbd>i</kbd>: show git-flow options
-  <kbd>f</kbd>: fast-forward this branch from its upstream
-  <kbd>g</kbd>: view reset options
-  <kbd>R</kbd>: rename branch
-  <kbd>ctrl+o</kbd>: copy branch name to clipboard
-  <kbd>enter</kbd>: view commits
+  <kbd>&lt;enter&gt;</kbd>: Potwierdź
+  <kbd>&lt;esc&gt;</kbd>: Zamknij
 </pre>
 
-## Gałęzie Panel (Remote Branches (in Remotes tab))
+## Commity
 
 <pre>
-  <kbd>esc</kbd>: return to remotes list
-  <kbd>g</kbd>: view reset options
-  <kbd>enter</kbd>: view commits
-  <kbd>space</kbd>: przełącz
-  <kbd>n</kbd>: nowa gałąź
-  <kbd>M</kbd>: scal do obecnej gałęzi
-  <kbd>d</kbd>: usuń gałąź
-  <kbd>r</kbd>: rebase branch
-  <kbd>u</kbd>: set as upstream of checked-out branch
+  <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>: Set/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
+  <kbd>/</kbd>: Search the current view by text
 </pre>
 
-## Gałęzie Panel (Remotes Tab)
+## Confirmation panel
 
 <pre>
-  <kbd>f</kbd>: fetch remote
-  <kbd>n</kbd>: add new remote
-  <kbd>d</kbd>: remove remote
-  <kbd>e</kbd>: edit remote
+  <kbd>&lt;enter&gt;</kbd>: Potwierdź
+  <kbd>&lt;esc&gt;</kbd>: Zamknij
 </pre>
 
-## Gałęzie Panel (Sub-commits)
+## Local branches
 
 <pre>
-  <kbd>enter</kbd>: view commit's files
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: view reset options
-  <kbd>n</kbd>: nowa gałąź
-  <kbd>c</kbd>: copy commit (cherry-pick)
-  <kbd>C</kbd>: copy commit range (cherry-pick)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Gałęzie Panel (Tags Tab)
+## Main panel (patch building)
 
 <pre>
-  <kbd>space</kbd>: przełącz
-  <kbd>d</kbd>: delete tag
-  <kbd>P</kbd>: push tag
-  <kbd>n</kbd>: create tag
-  <kbd>g</kbd>: view reset options
-  <kbd>enter</kbd>: view commits
+  <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
 </pre>
 
-## Commit files Panel
+## Menu
 
 <pre>
-  <kbd>ctrl+o</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>: otwórz plik
-  <kbd>e</kbd>: edytuj plik
-  <kbd>space</kbd>: toggle file included in patch
-  <kbd>enter</kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
-  <kbd>`</kbd>: toggle file tree view
+  <kbd>&lt;enter&gt;</kbd>: Wykonaj
+  <kbd>&lt;esc&gt;</kbd>: Zamknij
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Commity Panel (Commity)
+## Pliki
 
 <pre>
-  <kbd>s</kbd>: ściśnij w dół
-  <kbd>r</kbd>: przemianuj commit
-  <kbd>R</kbd>: przemianuj commit w edytorze
-  <kbd>g</kbd>: zresetuj do tego commita
-  <kbd>f</kbd>: napraw commit
-  <kbd>F</kbd>: create fixup commit for this commit
-  <kbd>S</kbd>: squash all 'fixup!' commits above selected commits (autosquash)
-  <kbd>d</kbd>: delete commit
-  <kbd>ctrl+j</kbd>: move commit down one
-  <kbd>ctrl+k</kbd>: move commit up one
-  <kbd>e</kbd>: edit commit
-  <kbd>A</kbd>: amend commit with staged changes
-  <kbd>p</kbd>: pick commit (when mid-rebase)
-  <kbd>t</kbd>: revert commit
-  <kbd>c</kbd>: copy commit (cherry-pick)
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
-  <kbd>C</kbd>: copy commit range (cherry-pick)
-  <kbd>v</kbd>: paste commits (cherry-pick)
-  <kbd>enter</kbd>: view commit's files
-  <kbd>space</kbd>: checkout commit
-  <kbd>n</kbd>: create new branch off of commit
-  <kbd>T</kbd>: tag commit
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+y</kbd>: copy commit message to clipboard
+  <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>c</kbd>: Zatwierdź zmiany
+  <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
 </pre>
 
-## Commity Panel (Reflog Tab)
+## Pliki commita
 
 <pre>
-  <kbd>enter</kbd>: view commit's files
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: view reset options
-  <kbd>c</kbd>: copy commit (cherry-pick)
-  <kbd>C</kbd>: copy commit range (cherry-pick)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
+  <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
 </pre>
 
-## Extras Panel
+## Poczekalnia
 
 <pre>
-  <kbd>@</kbd>: open command log menu
+  <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>c</kbd>: Zatwierdź zmiany
+  <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>
 
-## Pliki Panel (Pliki)
+## Reflog
 
 <pre>
-  <kbd>c</kbd>: commituj zmiany
-  <kbd>w</kbd>: commit changes without pre-commit hook
-  <kbd>A</kbd>: zmień ostatnie zatwierdzenie
-  <kbd>C</kbd>: commituj zmiany używając edytora z gita
-  <kbd>space</kbd>: przełącz zatwierdzenie
-  <kbd>d</kbd>: view 'discard changes' options
-  <kbd>e</kbd>: edytuj plik
-  <kbd>o</kbd>: otwórz plik
-  <kbd>i</kbd>: dodaj do .gitignore
-  <kbd>r</kbd>: odśwież pliki
-  <kbd>s</kbd>: przechowaj pliki
-  <kbd>S</kbd>: view stash options
-  <kbd>a</kbd>: przełącz wszystkie zatwierdzenia
-  <kbd>D</kbd>: view reset options
-  <kbd>enter</kbd>: zatwierdź pojedyncze linie
-  <kbd>f</kbd>: fetch
-  <kbd>ctrl+o</kbd>: copy the file name to the clipboard
-  <kbd>g</kbd>: view upstream reset options
-  <kbd>`</kbd>: toggle file tree view
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Pliki Panel (Submodules)
+## Remote branches
 
 <pre>
-  <kbd>ctrl+o</kbd>: copy submodule name to clipboard
-  <kbd>enter</kbd>: enter submodule
-  <kbd>d</kbd>: view reset and remove submodule options
-  <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>&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>g</kbd>: Wyświetl opcje resetu
+  <kbd>&lt;enter&gt;</kbd>: View commits
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Main Panel (Merging)
+## Remotes
 
 <pre>
-  <kbd>esc</kbd>: wróć do panelu plików
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>space</kbd>: pick hunk
-  <kbd>b</kbd>: pick all hunks
-  <kbd>◄</kbd>: select previous conflict
-  <kbd>►</kbd>: select next conflict
-  <kbd>▲</kbd>: select previous hunk
-  <kbd>▼</kbd>: select next hunk
-  <kbd>z</kbd>: cofnij
+  <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
 </pre>
 
-## Main Panel (Normal)
+## Scalanie
 
 <pre>
-  <kbd>Ő</kbd>: scroll down (fn+up)
-  <kbd>ő</kbd>: scroll up (fn+down)
+  <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
 </pre>
 
-## Main Panel (Patch Building)
+## Schowek
 
 <pre>
-  <kbd>esc</kbd>: exit line-by-line mode
-  <kbd>o</kbd>: otwórz plik
-  <kbd>▲</kbd>: select previous line
-  <kbd>▼</kbd>: select next line
-  <kbd>◄</kbd>: select previous hunk
-  <kbd>►</kbd>: select next hunk
-  <kbd>space</kbd>: add/remove line(s) to patch
-  <kbd>v</kbd>: toggle drag select
-  <kbd>V</kbd>: toggle drag select
-  <kbd>a</kbd>: toggle select hunk
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Main Panel (Zatwierdzanie)
+## Status
 
 <pre>
-  <kbd>esc</kbd>: wróć do panelu plików
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
-  <kbd>tab</kbd>: switch to other panel
-  <kbd>o</kbd>: otwórz plik
-  <kbd>▲</kbd>: select previous line
-  <kbd>▼</kbd>: select next line
-  <kbd>◄</kbd>: select previous hunk
-  <kbd>►</kbd>: select next hunk
-  <kbd>e</kbd>: edytuj plik
-  <kbd>o</kbd>: otwórz plik
-  <kbd>v</kbd>: toggle drag select
-  <kbd>V</kbd>: toggle drag select
-  <kbd>a</kbd>: toggle select hunk
-  <kbd>c</kbd>: commituj zmiany
-  <kbd>w</kbd>: commit changes without pre-commit hook
-  <kbd>C</kbd>: commituj zmiany używając edytora z gita
+  <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>
 
-## Menu Panel
+## Sub-commits
 
 <pre>
-  <kbd>esc</kbd>: close menu
+  <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
+  <kbd>/</kbd>: Search the current view by text
 </pre>
 
-## Schowek Panel
+## Submodules
 
 <pre>
-  <kbd>enter</kbd>: view stash entry's files
-  <kbd>space</kbd>: zastosuj
-  <kbd>g</kbd>: wyciągnij
-  <kbd>d</kbd>: porzuć
-  <kbd>n</kbd>: nowa gałąź
+  <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
+  <kbd>/</kbd>: Filter the current view by text
 </pre>
 
-## Status Panel
+## Tags
 
 <pre>
-  <kbd>e</kbd>: edytuj plik konfiguracyjny
-  <kbd>o</kbd>: otwórz plik konfiguracyjny
-  <kbd>u</kbd>: sprawdź aktualizacje
-  <kbd>enter</kbd>: switch to a recent repo
-  <kbd>a</kbd>: pokazywać wszystkie logi branżowe
+  <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
+  <kbd>/</kbd>: Filter the current view by text
+</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)
 </pre>

docs/keybindings/Keybindings_ru.md

@@ -0,0 +1,333 @@
+_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>
+
+## Главная панель (Индексирование)
+
+<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>&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>A</kbd>: Править последний коммит с проиндексированными изменениями
+  <kbd>a</kbd>: Установить/убрать автора коммита
+  <kbd>t</kbd>: Отменить коммит
+  <kbd>T</kbd>: Пометить коммит тегом
+  <kbd>&lt;c-l&gt;</kbd>: Открыть меню журнала
+  <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>: Удалить ветку
+  <kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку
+  <kbd>M</kbd>: Слияние с текущей переключённой веткой
+  <kbd>f</kbd>: Перемотать эту ветку вперёд из её upstream-ветки
+  <kbd>T</kbd>: Создать тег
+  <kbd>g</kbd>: Просмотреть параметры сброса
+  <kbd>R</kbd>: Переименовать ветку
+  <kbd>u</kbd>: Установить/убрать upstream-ветку
+  <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>&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>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>: Удалить тег
+  <kbd>P</kbd>: Отправить тег
+  <kbd>n</kbd>: Создать тег
+  <kbd>g</kbd>: Просмотреть параметры сброса
+  <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>: Удалить ветку
+  <kbd>u</kbd>: Установить как upstream-ветку переключённую ветку
+  <kbd>g</kbd>: Просмотреть параметры сброса
+  <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>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента
+  <kbd>/</kbd>: Filter the current view by text
+</pre>

docs/keybindings/Keybindings_zh-CN.md

@@ -0,0 +1,333 @@
+_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 按键绑定
+
+_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means 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>: 打开 diff 菜单
+  <kbd>&lt;c-e&gt;</kbd>: 打开 diff 菜单
+  <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>
+
+## Reflog 页面
+
+<pre>
+  <kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板
+  <kbd>&lt;space&gt;</kbd>: 检出提交
+  <kbd>y</kbd>: Copy commit attribute
+  <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>
+
+## 分支页面
+
+<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>: 删除分支
+  <kbd>r</kbd>: 将已检出的分支变基到该分支
+  <kbd>M</kbd>: 合并到当前检出的分支
+  <kbd>f</kbd>: 从上游快进此分支
+  <kbd>T</kbd>: 创建标签
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>R</kbd>: 重命名分支
+  <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>&lt;space&gt;</kbd>: 检出提交
+  <kbd>y</kbd>: Copy commit attribute
+  <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>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>A</kbd>: 用已暂存的更改来修补提交
+  <kbd>a</kbd>: Set/Reset commit author
+  <kbd>t</kbd>: 还原提交
+  <kbd>T</kbd>: 标签提交
+  <kbd>&lt;c-l&gt;</kbd>: 打开日志菜单
+  <kbd>&lt;space&gt;</kbd>: 检出提交
+  <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>
+
+## 提交文件
+
+<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>: Toggle all files included in patch
+  <kbd>&lt;enter&gt;</kbd>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
+  <kbd>`</kbd>: 切换文件树视图
+  <kbd>/</kbd>: 开始搜索
+</pre>
+
+## 提交讯息
+
+<pre>
+  <kbd>&lt;enter&gt;</kbd>: 确认
+  <kbd>&lt;esc&gt;</kbd>: 关闭
+</pre>
+
+## 文件
+
+<pre>
+  <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>c</kbd>: 提交更改
+  <kbd>w</kbd>: 提交更改而无需预先提交钩子
+  <kbd>A</kbd>: 修补最后一次提交
+  <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
+  <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>&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;space&gt;</kbd>: 检出
+  <kbd>d</kbd>: 删除标签
+  <kbd>P</kbd>: 推送标签
+  <kbd>n</kbd>: 创建标签
+  <kbd>g</kbd>: 查看重置选项
+  <kbd>&lt;enter&gt;</kbd>: 查看提交
+  <kbd>/</kbd>: Filter the current view by text
+</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>: Edit hunk
+  <kbd>c</kbd>: 提交更改
+  <kbd>w</kbd>: 提交更改而无需预先提交钩子
+  <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
+  <kbd>/</kbd>: 开始搜索
+</pre>
+
+## 正常
+
+<pre>
+  <kbd>mouse wheel down</kbd>: 向下滚动 (fn+up)
+  <kbd>mouse wheel up</kbd>: 向上滚动 (fn+down)
+</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>&lt;enter&gt;</kbd>: 执行
+  <kbd>&lt;esc&gt;</kbd>: 关闭
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## 贮藏
+
+<pre>
+  <kbd>&lt;space&gt;</kbd>: 应用
+  <kbd>g</kbd>: 应用并删除
+  <kbd>d</kbd>: 删除
+  <kbd>n</kbd>: 新分支
+  <kbd>r</kbd>: Rename stash
+  <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>: 删除分支
+  <kbd>u</kbd>: 设置为检出分支的上游
+  <kbd>g</kbd>: 查看重置选项
+  <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>

docs/keybindings/Keybindings_zh-TW.md

@@ -0,0 +1,333 @@
+_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>&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>
+
+## 主視窗 (一般)
+
+<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>&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>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>A</kbd>: 使用已預存的更改修正提交
+  <kbd>a</kbd>: 設置/重設提交作者
+  <kbd>t</kbd>: 還原提交
+  <kbd>T</kbd>: 打標籤到提交
+  <kbd>&lt;c-l&gt;</kbd>: 開啟記錄選單
+  <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>&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>: 刪除分支
+  <kbd>r</kbd>: 將已檢出的分支變基至此分支
+  <kbd>M</kbd>: 合併到當前檢出的分支
+  <kbd>f</kbd>: 從上游快進此分支
+  <kbd>T</kbd>: 建立標籤
+  <kbd>g</kbd>: 檢視重設選項
+  <kbd>R</kbd>: 重新命名分支
+  <kbd>u</kbd>: 設定/取消設定上游
+  <kbd>&lt;enter&gt;</kbd>: 檢視提交
+  <kbd>/</kbd>: Filter the current view by text
+</pre>
+
+## 標籤
+
+<pre>
+  <kbd>&lt;space&gt;</kbd>: 檢出
+  <kbd>d</kbd>: 刪除標籤
+  <kbd>P</kbd>: 推送標籤
+  <kbd>n</kbd>: 建立標籤
+  <kbd>g</kbd>: 檢視重設選項
+  <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>: 刪除分支
+  <kbd>u</kbd>: 將此分支設為當前分支之上游
+  <kbd>g</kbd>: 檢視重設選項
+  <kbd>&lt;enter&gt;</kbd>: 檢視提交
+  <kbd>/</kbd>: Filter the current view by text
+</pre>

go.mod

@@ -1,47 +1,74 @@
 module github.com/jesseduffield/lazygit
 
-go 1.14
+go 1.18
 
 require (
 	github.com/OpenPeeDeeP/xdg v1.0.0
-	github.com/atotto/clipboard v0.1.2
+	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/fatih/color v1.9.0 // indirect
+	github.com/fsmiamoto/git-todo-parser v0.0.5
 	github.com/fsnotify/fsnotify v1.4.7
-	github.com/go-errors/errors v1.4.1
-	github.com/go-logfmt/logfmt v0.5.0 // indirect
-	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
-	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
+	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/go-git/v5 v5.1.2-0.20201006095850-341962be15a4
-	github.com/jesseduffield/gocui v0.3.1-0.20211102104458-40df0be5a474
+	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.20230710004407-9bbfd873713b
+	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
-	github.com/jesseduffield/yaml v2.1.0+incompatible
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/kyokomi/emoji/v2 v2.2.8
 	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/mattn/go-colorable v0.1.11 // indirect
-	github.com/mattn/go-runewidth v0.0.13
+	github.com/mattn/go-runewidth v0.0.14
 	github.com/mgutz/str v1.2.0
-	github.com/onsi/ginkgo v1.10.3 // indirect
-	github.com/onsi/gomega v1.7.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0
 	github.com/sahilm/fuzzy v0.1.0
+	github.com/samber/lo v1.31.0
+	github.com/sanity-io/litter v1.5.2
+	github.com/sasha-s/go-deadlock v0.3.1
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.0
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
-	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
-	golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c // indirect
-	golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/gdamore/encoding v1.0.0 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.0.0 // indirect
+	github.com/go-logfmt/logfmt v0.5.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/mattn/go-colorable v0.1.11 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/onsi/ginkgo v1.10.3 // indirect
+	github.com/onsi/gomega v1.7.1 // indirect
+	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/xanzy/ssh-agent v0.2.1 // 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.7.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -6,8 +6,8 @@ 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=
@@ -18,6 +18,7 @@ github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod
 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=
+github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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=
@@ -26,19 +27,21 @@ github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3
 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 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/fsmiamoto/git-todo-parser v0.0.5 h1:Bhzd/vz/6Qm3udfkd6NO9fWfD3TpwR9ucp3N75/J5I8=
+github.com/fsmiamoto/git-todo-parser v0.0.5/go.mod h1:B+AgTbNE2BARvJqzXygThzqxLIaEWvwr2sxKYYb0Fas=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/tcell/v2 v2.4.0 h1:W6dxJEmaxYvhICFoTY3WrLLEXsQ11SaFnKGVEXW57KM=
 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.4.1 h1:IvVlgbzSsaUNudsw5dcXSzF3EWyXTi5XrAdngnuhRyg=
-github.com/go-errors/errors v1.4.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
 github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM=
@@ -50,11 +53,7 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih
 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-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
-github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 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=
@@ -69,14 +68,18 @@ github.com/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM
 github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4 h1:GOQrmaE8i+KEdB8NzAegKYd4tPn/inM0I1uo0NXFerg=
-github.com/jesseduffield/go-git/v5 v5.1.2-0.20201006095850-341962be15a4/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20211102104458-40df0be5a474 h1:4H/oJcUmwJpqyXzqfn+lsjQ/bjpm/HszzLrVbCjgqj4=
-github.com/jesseduffield/gocui v0.3.1-0.20211102104458-40df0be5a474/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
+github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8TIcC6Y4RI+1ZbJDOHfGJ570tPeYVCqo7/tws=
+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.20230710004407-9bbfd873713b h1:8FmmdaYHes1m3oNyNdS+VIgkgkFpNZAWuwTnvp0tG14=
+github.com/jesseduffield/gocui v0.3.1-0.20230710004407-9bbfd873713b/go.mod h1:dJ/BEUt3OWtaRg/PmuJWendRqREhre9JQ1SLvqrVJ8s=
+github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
+github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
+github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
+github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5/go.mod h1:qxN4mHOAyeIDLP7IK7defgPClM/z1Kze8VVQiaEjzsQ=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e h1:uw/oo+kg7t/oeMs6sqlAwr85ND/9cpO3up3VxphxY0U=
 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e/go.mod h1:u60qdFGXRd36jyEXxetz0vQceQIxzI13lIo3EFUDf4I=
-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/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=
@@ -109,8 +112,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 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.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+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/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=
@@ -122,15 +125,26 @@ github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 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/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/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 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/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=
+github.com/samber/lo v1.31.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
+github.com/sanity-io/litter v1.5.2 h1:AnC8s9BMORWH5a4atZ4D6FPVvKGzHcnc5/IVTa87myw=
+github.com/sanity-io/litter v1.5.2/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0=
+github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
+github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
 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=
@@ -138,31 +152,43 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+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.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 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=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
 github.com/urfave/cli v1.20.1-0.20180226030253-8e01ec4cd3e2/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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-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-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
-golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+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/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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20201002202402-0a1ea396d57c h1:dk0ukUIHmGHqASjP0iue2261isepFCC6XRCSd1nHgDw=
-golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod h1:iQL9McJNjoIa5mjH6nYTCTZXUN6RP+XW3eib7Ya3XcI=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+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/sync v0.0.0-20180314180146-1d60e4601c6f/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-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-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -172,23 +198,34 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/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-20210330210617-4fbd30eecc44/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-20211102061401-a2f17f7b995c h1:QOfDMdrf/UwlVR0UBq2Mpr58UzNtvgJRXA4BgPfFACs=
-golang.org/x/sys v0.0.0-20211102061401-a2f17f7b995c/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.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 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.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/text v0.3.0/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.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.3/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.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -206,5 +243,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 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=

main.go

@@ -1,147 +1,24 @@
 package main
 
 import (
-	"bytes"
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/go-errors/errors"
-	"github.com/integrii/flaggy"
 	"github.com/jesseduffield/lazygit/pkg/app"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/constants"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	yaml "github.com/jesseduffield/yaml"
 )
 
+// These values may be set by the build script via the LDFLAGS argument
 var (
 	commit      string
-	version     = "unversioned"
 	date        string
+	version     string
 	buildSource = "unknown"
 )
 
 func main() {
-	flaggy.DefaultParser.ShowVersionWithVersionFlag = false
-
-	repoPath := ""
-	flaggy.String(&repoPath, "p", "path", "Path of git repo. (equivalent to --work-tree=<path> --git-dir=<path>/.git/)")
-
-	filterPath := ""
-	flaggy.String(&filterPath, "f", "filter", "Path to filter on in `git log -- <path>`. When in filter mode, the commits, reflog, and stash are filtered based on the given path, and some operations are restricted")
-
-	dump := ""
-	flaggy.AddPositionalValue(&dump, "gitargs", 1, false, "Todo file")
-	flaggy.DefaultParser.PositionalFlags[0].Hidden = true
-
-	versionFlag := false
-	flaggy.Bool(&versionFlag, "v", "version", "Print the current version")
-
-	debuggingFlag := false
-	flaggy.Bool(&debuggingFlag, "d", "debug", "Run in debug mode with logging (see --logs flag below). Use the LOG_LEVEL env var to set the log level (debug/info/warn/error)")
-
-	logFlag := false
-	flaggy.Bool(&logFlag, "l", "logs", "Tail lazygit logs (intended to be used when `lazygit --debug` is called in a separate terminal tab)")
-
-	configFlag := false
-	flaggy.Bool(&configFlag, "c", "config", "Print the default config")
-
-	configDirFlag := false
-	flaggy.Bool(&configDirFlag, "cd", "print-config-dir", "Print the config directory")
-
-	useConfigDir := ""
-	flaggy.String(&useConfigDir, "ucd", "use-config-dir", "override default config directory with provided directory")
-
-	workTree := ""
-	flaggy.String(&workTree, "w", "work-tree", "equivalent of the --work-tree git argument")
-
-	gitDir := ""
-	flaggy.String(&gitDir, "g", "git-dir", "equivalent of the --git-dir git argument")
-
-	customConfig := ""
-	flaggy.String(&customConfig, "ucf", "use-config-file", "Comma seperated list to custom config file(s)")
-
-	flaggy.Parse()
-
-	if repoPath != "" {
-		if workTree != "" || gitDir != "" {
-			log.Fatal("--path option is incompatible with the --work-tree and --git-dir options")
-		}
-
-		workTree = repoPath
-		gitDir = filepath.Join(repoPath, ".git")
+	ldFlagsBuildInfo := &app.BuildInfo{
+		Commit:      commit,
+		Date:        date,
+		Version:     version,
+		BuildSource: buildSource,
 	}
 
-	if customConfig != "" {
-		os.Setenv("LG_CONFIG_FILE", customConfig)
-	}
-
-	if useConfigDir != "" {
-		os.Setenv("CONFIG_DIR", useConfigDir)
-	}
-
-	if workTree != "" {
-		env.SetGitWorkTreeEnv(workTree)
-	}
-
-	if gitDir != "" {
-		env.SetGitDirEnv(gitDir)
-	}
-
-	if versionFlag {
-		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s\n", commit, date, buildSource, version, runtime.GOOS, runtime.GOARCH)
-		os.Exit(0)
-	}
-
-	if configFlag {
-		var buf bytes.Buffer
-		encoder := yaml.NewEncoder(&buf)
-		err := encoder.Encode(config.GetDefaultConfig())
-		if err != nil {
-			log.Fatal(err.Error())
-		}
-		fmt.Printf("%s\n", buf.String())
-		os.Exit(0)
-	}
-
-	if configDirFlag {
-		fmt.Printf("%s\n", config.ConfigDir())
-		os.Exit(0)
-	}
-
-	if logFlag {
-		app.TailLogs()
-		os.Exit(0)
-	}
-
-	if workTree != "" {
-		if err := os.Chdir(workTree); err != nil {
-			log.Fatal(err.Error())
-		}
-	}
-
-	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, buildSource, debuggingFlag)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	app, err := app.NewApp(appConfig, filterPath)
-
-	if err == nil {
-		err = app.Run()
-	}
-
-	if err != nil {
-		if errorMessage, known := app.KnownError(err); known {
-			log.Fatal(errorMessage)
-		}
-		newErr := errors.Wrap(err, 0)
-		stackTrace := newErr.ErrorStack()
-		app.Log.Error(stackTrace)
-
-		log.Fatal(fmt.Sprintf("%s: %s\n\n%s", app.Tr.ErrorOccurred, constants.Links.Issues, stackTrace))
-	}
+	app.Start(ldFlagsBuildInfo, nil)
 }

pkg/app/app.go

@@ -2,122 +2,115 @@ package app
 
 import (
 	"bufio"
-	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
-	"regexp"
-	"strconv"
 	"strings"
 
-	"github.com/aybabtme/humanlog"
+	"github.com/go-errors/errors"
+	"github.com/sirupsen/logrus"
+
+	"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_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/constants"
 	"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"
-	"github.com/sirupsen/logrus"
 )
 
-// App struct
+// App is the struct that's instantiated from within main.go and it manages
+// bootstrapping and running the application.
 type App struct {
-	closers []io.Closer
-
-	Config        config.AppConfigurer
-	Log           *logrus.Entry
-	OSCommand     *oscommands.OSCommand
-	GitCommand    *commands.GitCommand
-	Gui           *gui.Gui
-	Tr            *i18n.TranslationSet
-	Updater       *updates.Updater // may only need this on the Gui
-	ClientContext string
+	*common.Common
+	closers   []io.Closer
+	Config    config.AppConfigurer
+	OSCommand *oscommands.OSCommand
+	Gui       *gui.Gui
 }
 
-type errorMapping struct {
-	originalError string
-	newError      string
-}
+func Run(
+	config config.AppConfigurer,
+	common *common.Common,
+	startArgs appTypes.StartArgs,
+) {
+	app, err := NewApp(config, common)
 
-func newProductionLogger(config config.AppConfigurer) *logrus.Logger {
-	log := logrus.New()
-	log.Out = ioutil.Discard
-	log.SetLevel(logrus.ErrorLevel)
-	return log
-}
-
-func getLogLevel() logrus.Level {
-	strLevel := os.Getenv("LOG_LEVEL")
-	level, err := logrus.ParseLevel(strLevel)
-	if err != nil {
-		return logrus.DebugLevel
+	if err == nil {
+		err = app.Run(startArgs)
+	}
+
+	if err != nil {
+		if errorMessage, known := knownError(common.Tr, err); known {
+			log.Fatal(errorMessage)
+		}
+		newErr := errors.Wrap(err, 0)
+		stackTrace := newErr.ErrorStack()
+		app.Log.Error(stackTrace)
+
+		log.Fatalf("%s: %s\n\n%s", common.Tr.ErrorOccurred, constants.Links.Issues, stackTrace)
 	}
-	return level
 }
 
-func newDevelopmentLogger(configurer config.AppConfigurer) *logrus.Logger {
-	logger := logrus.New()
-	logger.SetLevel(getLogLevel())
-	logPath, err := config.LogPath()
+func NewCommon(config config.AppConfigurer) (*common.Common, error) {
+	userConfig := config.GetUserConfig()
+
+	var err error
+	log := newLogger(config)
+	tr, err := i18n.NewTranslationSetFromConfig(log, userConfig.Gui.Language)
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
-	file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		panic("unable to log to file") // TODO: don't panic (also, remove this call to the `panic` function)
-	}
-	logger.SetOutput(file)
-	return logger
+
+	return &common.Common{
+		Log:        log,
+		Tr:         tr,
+		UserConfig: userConfig,
+		Debug:      config.GetDebug(),
+	}, nil
 }
 
-func newLogger(config config.AppConfigurer) *logrus.Entry {
-	var log *logrus.Logger
-	if config.GetDebug() || os.Getenv("DEBUG") == "TRUE" {
-		log = newDevelopmentLogger(config)
+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 {
-		log = newProductionLogger(config)
+		return logs.NewProductionLogger()
 	}
-
-	// highly recommended: tail -f development.log | humanlog
-	// https://github.com/aybabtme/humanlog
-	log.Formatter = &logrus.JSONFormatter{}
-
-	return log.WithFields(logrus.Fields{
-		"debug":     config.GetDebug(),
-		"version":   config.GetVersion(),
-		"commit":    config.GetCommit(),
-		"buildDate": config.GetBuildDate(),
-	})
 }
 
 // NewApp bootstrap a new application
-func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
-
+func NewApp(config config.AppConfigurer, common *common.Common) (*App, error) {
 	app := &App{
 		closers: []io.Closer{},
 		Config:  config,
+		Common:  common,
 	}
-	var err error
-	app.Log = newLogger(config)
-	app.Tr, err = i18n.NewTranslationSetFromConfig(app.Log, config.GetUserConfig().Gui.Language)
+
+	app.OSCommand = oscommands.NewOSCommand(common, config, oscommands.GetPlatform(), oscommands.NewNullGuiIO(app.Log))
+
+	updater, err := updates.NewUpdater(common, config, app.OSCommand)
 	if err != nil {
 		return app, err
 	}
 
-	// if we are being called in 'demon' mode, we can just return here
-	app.ClientContext = os.Getenv("LAZYGIT_CLIENT_COMMAND")
-	if app.ClientContext != "" {
-		return app, nil
+	dirName, err := os.Getwd()
+	if err != nil {
+		return app, err
 	}
 
-	app.OSCommand = oscommands.NewOSCommand(app.Log, config)
-
-	app.Updater, err = updates.NewUpdater(app.Log, config, app.OSCommand, app.Tr)
+	gitVersion, err := app.validateGitVersion()
 	if err != nil {
 		return app, err
 	}
@@ -127,67 +120,53 @@ func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
 		return app, err
 	}
 
-	app.GitCommand, err = commands.NewGitCommand(
-		app.Log,
-		app.OSCommand,
-		app.Tr,
-		app.Config,
-		git_config.NewStdCachedGitConfig(app.Log),
-	)
-	if err != nil {
-		return app, err
+	// used for testing purposes
+	if os.Getenv("SHOW_RECENT_REPOS") == "true" {
+		showRecentRepos = true
 	}
 
-	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater, filterPath, showRecentRepos)
+	app.Gui, err = gui.NewGui(common, config, gitVersion, updater, showRecentRepos, dirName)
 	if err != nil {
 		return app, err
 	}
 	return app, nil
 }
 
-func (app *App) validateGitVersion() error {
-	output, err := app.OSCommand.RunCommandWithOutput("git --version")
+func (app *App) validateGitVersion() (*git_commands.GitVersion, error) {
+	version, err := git_commands.GetGitVersion(app.OSCommand)
 	// if we get an error anywhere here we'll show the same status
 	minVersionError := errors.New(app.Tr.MinGitVersionError)
 	if err != nil {
-		return minVersionError
+		return nil, minVersionError
 	}
 
-	if isGitVersionValid(output) {
-		return nil
+	if version.IsOlderThan(2, 20, 0) {
+		return nil, minVersionError
 	}
 
-	return minVersionError
+	return version, nil
 }
 
-func isGitVersionValid(versionStr string) bool {
-	// output should be something like: 'git version 2.23.0 (blah)'
-	re := regexp.MustCompile(`[^\d]+([\d\.]+)`)
-	matches := re.FindStringSubmatch(versionStr)
+func isDirectoryAGitRepository(dir string) (bool, error) {
+	info, err := os.Stat(filepath.Join(dir, ".git"))
+	return info != nil, err
+}
 
-	if len(matches) == 0 {
-		return false
+func openRecentRepo(app *App) bool {
+	for _, repoDir := range app.Config.GetAppState().RecentRepos {
+		if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo {
+			if err := os.Chdir(repoDir); err == nil {
+				return true
+			}
+		}
 	}
 
-	gitVersion := matches[1]
-	majorVersion, err := strconv.Atoi(gitVersion[0:1])
-	if err != nil {
-		return false
-	}
-	if majorVersion < 2 {
-		return false
-	}
-
-	return true
+	return false
 }
 
 func (app *App) setupRepo() (bool, error) {
-	if err := app.validateGitVersion(); err != nil {
-		return false, err
-	}
-
 	if env.GetGitDirEnv() != "" {
-		// we've been given the git dir directly. We'll verify this dir when initializing our GitCommand object
+		// we've been given the git dir directly. We'll verify this dir when initializing our Git object
 		return false, nil
 	}
 
@@ -197,146 +176,96 @@ func (app *App) setupRepo() (bool, error) {
 		if err != nil {
 			return false, err
 		}
-		info, _ := os.Stat(filepath.Join(cwd, ".git"))
-		if info != nil && info.IsDir() {
-			return false, err // Current directory appears to be a git repository.
+
+		if isRepo, err := isDirectoryAGitRepository(cwd); isRepo {
+			return false, err
 		}
 
-		shouldInitRepo := true
-		notARepository := app.Config.GetUserConfig().NotARepository
-		if notARepository == "prompt" {
+		var shouldInitRepo bool
+		initialBranchArg := ""
+		switch app.UserConfig.NotARepository {
+		case "prompt":
 			// Offer to initialize a new repository in current directory.
 			fmt.Print(app.Tr.CreateRepo)
 			response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
-			if strings.Trim(response, " \n") != "y" {
-				shouldInitRepo = false
-			}
-		} else if notARepository == "skip" {
-			shouldInitRepo = false
-		}
-
-		if !shouldInitRepo {
-			// check if we have a recent repo we can open
-			recentRepos := app.Config.GetAppState().RecentRepos
-			if len(recentRepos) > 0 {
-				var err error
-				// try opening each repo in turn, in case any have been deleted
-				for _, repoDir := range recentRepos {
-					if err = os.Chdir(repoDir); err == nil {
-						return true, nil
-					}
+			shouldInitRepo = (strings.Trim(response, " \r\n") == "y")
+			if shouldInitRepo {
+				// Ask for the initial branch name
+				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
 				}
-				return false, err
 			}
-
+		case "create":
+			shouldInitRepo = true
+		case "skip":
+			shouldInitRepo = false
+		case "quit":
+			fmt.Fprintln(os.Stderr, app.Tr.NotARepository)
+			os.Exit(1)
+		default:
+			fmt.Fprintln(os.Stderr, app.Tr.IncorrectNotARepository)
 			os.Exit(1)
 		}
-		if err := app.OSCommand.RunCommand("git init"); err != nil {
+
+		if shouldInitRepo {
+			args := []string{"git", "init"}
+			if initialBranchArg != "" {
+				args = append(args, initialBranchArg)
+			}
+			if err := app.OSCommand.Cmd.New(args).Run(); err != nil {
+				return false, err
+			}
+			return false, nil
+		}
+
+		// check if we have a recent repo we can open
+		for _, repoDir := range app.Config.GetAppState().RecentRepos {
+			if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo {
+				if err := os.Chdir(repoDir); err == nil {
+					return true, nil
+				}
+			}
+		}
+
+		fmt.Fprintln(os.Stderr, app.Tr.NoRecentRepositories)
+		os.Exit(1)
+	}
+
+	// Run this afterward so that the previous repo creation steps can run without this interfering
+	if isBare, err := git_commands.IsBareRepo(app.OSCommand); isBare {
+		if err != nil {
 			return false, err
 		}
+
+		fmt.Print(app.Tr.BareRepo)
+
+		response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
+
+		if shouldOpenRecent := strings.Trim(response, " \r\n") == "y"; !shouldOpenRecent {
+			os.Exit(0)
+		}
+
+		if didOpenRepo := openRecentRepo(app); didOpenRepo {
+			return true, nil
+		}
+
+		fmt.Println(app.Tr.NoRecentRepositories)
+		os.Exit(1)
 	}
 
 	return false, nil
 }
 
-func (app *App) Run() error {
-	if app.ClientContext == "INTERACTIVE_REBASE" {
-		return app.Rebase()
-	}
-
-	if app.ClientContext == "EXIT_IMMEDIATELY" {
-		os.Exit(0)
-	}
-
-	err := app.Gui.RunAndHandleError()
+func (app *App) Run(startArgs appTypes.StartArgs) error {
+	err := app.Gui.RunAndHandleError(startArgs)
 	return err
 }
 
-func gitDir() string {
-	dir := env.GetGitDirEnv()
-	if dir == "" {
-		return ".git"
-	}
-	return dir
-}
-
-// Rebase contains logic for when we've been run in demon mode, meaning we've
-// given lazygit as a command for git to call e.g. to edit a file
-func (app *App) Rebase() error {
-	app.Log.Info("Lazygit invoked as interactive rebase demon")
-	app.Log.Info("args: ", os.Args)
-
-	if strings.HasSuffix(os.Args[1], "git-rebase-todo") {
-		if err := ioutil.WriteFile(os.Args[1], []byte(os.Getenv("LAZYGIT_REBASE_TODO")), 0644); err != nil {
-			return err
-		}
-
-	} else if strings.HasSuffix(os.Args[1], filepath.Join(gitDir(), "COMMIT_EDITMSG")) { // TODO: test
-		// if we are rebasing and squashing, we'll see a COMMIT_EDITMSG
-		// but in this case we don't need to edit it, so we'll just return
-	} else {
-		app.Log.Info("Lazygit demon did not match on any use cases")
-	}
-
-	return nil
-}
-
 // Close closes any resources
 func (app *App) Close() error {
-	for _, closer := range app.closers {
-		err := closer.Close()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// KnownError takes an error and tells us whether it's an error that we know about where we can print a nicely formatted version of it rather than panicking with a stack trace
-func (app *App) KnownError(err error) (string, bool) {
-	errorMessage := err.Error()
-
-	knownErrorMessages := []string{app.Tr.MinGitVersionError}
-
-	for _, message := range knownErrorMessages {
-		if errorMessage == message {
-			return message, true
-		}
-	}
-
-	mappings := []errorMapping{
-		{
-			originalError: "fatal: not a git repository",
-			newError:      app.Tr.NotARepository,
-		},
-	}
-
-	for _, mapping := range mappings {
-		if strings.Contains(errorMessage, mapping.originalError) {
-			return mapping.newError, true
-		}
-	}
-	return "", false
-}
-
-func TailLogs() {
-	logFilePath, err := config.LogPath()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Printf("Tailing log file %s\n\n", logFilePath)
-
-	opts := humanlog.DefaultOptions
-	opts.Truncates = false
-
-	_, err = os.Stat(logFilePath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			log.Fatal("Log file does not exist. Run `lazygit --debug` first to create the log file")
-		}
-		log.Fatal(err)
-	}
-
-	TailLogsForPlatform(logFilePath, opts)
+	return slices.TryForEach(app.closers, func(closer io.Closer) error {
+		return closer.Close()
+	})
 }

pkg/app/app_test.go

@@ -1,44 +0,0 @@
-package app
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIsGitVersionValid(t *testing.T) {
-	type scenario struct {
-		versionStr     string
-		expectedResult bool
-	}
-
-	scenarios := []scenario{
-		{
-			"",
-			false,
-		},
-		{
-			"git version 1.9.0",
-			false,
-		},
-		{
-			"git version 1.9.0 (Apple Git-128)",
-			false,
-		},
-		{
-			"git version 2.4.0",
-			true,
-		},
-		{
-			"git version 2.24.3 (Apple Git-128)",
-			true,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.versionStr, func(t *testing.T) {
-			result := isGitVersionValid(s.versionStr)
-			assert.Equal(t, result, s.expectedResult)
-		})
-	}
-}

pkg/app/daemon/daemon.go

@@ -0,0 +1,316 @@
+package daemon
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"os"
+	"strconv"
+
+	"github.com/fsmiamoto/git-todo-parser/todo"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/secureexec"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/samber/lo"
+)
+
+// Sometimes lazygit will be invoked in daemon mode from a parent lazygit process.
+// We do this when git lets us supply a program to run within a git command.
+// For example, if we want to ensure that a git command doesn't hang due to
+// waiting for an editor to save a commit message, we can tell git to invoke lazygit
+// as the editor via 'GIT_EDITOR=lazygit', and use the env var
+// 'LAZYGIT_DAEMON_KIND=1' (exit immediately) to specify that we want to run lazygit
+// as a daemon which simply exits immediately.
+//
+// 'Daemon' is not the best name for this, because it's not a persistent background
+// process, but it's close enough.
+
+type DaemonKind int
+
+const (
+	// for when we fail to parse the daemon kind
+	DaemonKindUnknown DaemonKind = iota
+
+	DaemonKindExitImmediately
+	DaemonKindCherryPick
+	DaemonKindMoveTodoUp
+	DaemonKindMoveTodoDown
+	DaemonKindInsertBreak
+	DaemonKindChangeTodoActions
+	DaemonKindMoveFixupCommitDown
+)
+
+const (
+	DaemonKindEnvKey string = "LAZYGIT_DAEMON_KIND"
+
+	// Contains json-encoded arguments to the daemon
+	DaemonInstructionEnvKey string = "LAZYGIT_DAEMON_INSTRUCTION"
+)
+
+func getInstruction() Instruction {
+	jsonData := os.Getenv(DaemonInstructionEnvKey)
+
+	mapping := map[DaemonKind]func(string) Instruction{
+		DaemonKindExitImmediately:     deserializeInstruction[*ExitImmediatelyInstruction],
+		DaemonKindCherryPick:          deserializeInstruction[*CherryPickCommitsInstruction],
+		DaemonKindChangeTodoActions:   deserializeInstruction[*ChangeTodoActionsInstruction],
+		DaemonKindMoveFixupCommitDown: deserializeInstruction[*MoveFixupCommitDownInstruction],
+		DaemonKindMoveTodoUp:          deserializeInstruction[*MoveTodoUpInstruction],
+		DaemonKindMoveTodoDown:        deserializeInstruction[*MoveTodoDownInstruction],
+		DaemonKindInsertBreak:         deserializeInstruction[*InsertBreakInstruction],
+	}
+
+	return mapping[getDaemonKind()](jsonData)
+}
+
+func Handle(common *common.Common) {
+	if !InDaemonMode() {
+		return
+	}
+
+	instruction := getInstruction()
+
+	if err := instruction.run(common); err != nil {
+		log.Fatal(err)
+	}
+
+	os.Exit(0)
+}
+
+func InDaemonMode() bool {
+	return getDaemonKind() != DaemonKindUnknown
+}
+
+func getDaemonKind() DaemonKind {
+	intValue, err := strconv.Atoi(os.Getenv(DaemonKindEnvKey))
+	if err != nil {
+		return DaemonKindUnknown
+	}
+
+	return DaemonKind(intValue)
+}
+
+func getCommentChar() byte {
+	cmd := secureexec.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 {
+	Kind() DaemonKind
+	SerializedInstructions() string
+
+	// runs the instruction
+	run(common *common.Common) error
+}
+
+func serializeInstruction[T any](instruction T) string {
+	jsonData, err := json.Marshal(instruction)
+	if err != nil {
+		// this should never happen
+		panic(err)
+	}
+
+	return string(jsonData)
+}
+
+func deserializeInstruction[T Instruction](jsonData string) Instruction {
+	var instruction T
+	err := json.Unmarshal([]byte(jsonData), &instruction)
+	if err != nil {
+		panic(err)
+	}
+
+	return instruction
+}
+
+func ToEnvVars(instruction Instruction) []string {
+	return []string{
+		fmt.Sprintf("%s=%d", DaemonKindEnvKey, instruction.Kind()),
+		fmt.Sprintf("%s=%s", DaemonInstructionEnvKey, instruction.SerializedInstructions()),
+	}
+}
+
+type ExitImmediatelyInstruction struct{}
+
+func (self *ExitImmediatelyInstruction) Kind() DaemonKind {
+	return DaemonKindExitImmediately
+}
+
+func (self *ExitImmediatelyInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+func (self *ExitImmediatelyInstruction) run(common *common.Common) error {
+	return nil
+}
+
+func NewExitImmediatelyInstruction() Instruction {
+	return &ExitImmediatelyInstruction{}
+}
+
+type CherryPickCommitsInstruction struct {
+	Todo string
+}
+
+func NewCherryPickCommitsInstruction(commits []*models.Commit) Instruction {
+	todoLines := lo.Map(commits, func(commit *models.Commit, _ int) TodoLine {
+		return TodoLine{
+			Action: "pick",
+			Commit: commit,
+		}
+	})
+
+	todo := TodoLinesToString(todoLines)
+
+	return &CherryPickCommitsInstruction{
+		Todo: todo,
+	}
+}
+
+func (self *CherryPickCommitsInstruction) Kind() DaemonKind {
+	return DaemonKindCherryPick
+}
+
+func (self *CherryPickCommitsInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+func (self *CherryPickCommitsInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.PrependStrToTodoFile(path, []byte(self.Todo))
+	})
+}
+
+type ChangeTodoActionsInstruction struct {
+	Changes []ChangeTodoAction
+}
+
+func NewChangeTodoActionsInstruction(changes []ChangeTodoAction) Instruction {
+	return &ChangeTodoActionsInstruction{
+		Changes: changes,
+	}
+}
+
+func (self *ChangeTodoActionsInstruction) Kind() DaemonKind {
+	return DaemonKindChangeTodoActions
+}
+
+func (self *ChangeTodoActionsInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+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 {
+				return err
+			}
+		}
+
+		return nil
+	})
+}
+
+// Takes the sha of some commit, and the sha of a fixup commit that was created
+// at the end of the branch, then moves the fixup commit down to right after the
+// original commit, changing its type to "fixup"
+type MoveFixupCommitDownInstruction struct {
+	OriginalSha string
+	FixupSha    string
+}
+
+func NewMoveFixupCommitDownInstruction(originalSha string, fixupSha string) Instruction {
+	return &MoveFixupCommitDownInstruction{
+		OriginalSha: originalSha,
+		FixupSha:    fixupSha,
+	}
+}
+
+func (self *MoveFixupCommitDownInstruction) Kind() DaemonKind {
+	return DaemonKindMoveFixupCommitDown
+}
+
+func (self *MoveFixupCommitDownInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.MoveFixupCommitDown(path, self.OriginalSha, self.FixupSha, getCommentChar())
+	})
+}
+
+type MoveTodoUpInstruction struct {
+	Sha string
+}
+
+func NewMoveTodoUpInstruction(sha string) Instruction {
+	return &MoveTodoUpInstruction{
+		Sha: sha,
+	}
+}
+
+func (self *MoveTodoUpInstruction) Kind() DaemonKind {
+	return DaemonKindMoveTodoUp
+}
+
+func (self *MoveTodoUpInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+func (self *MoveTodoUpInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.MoveTodoUp(path, self.Sha, todo.Pick, getCommentChar())
+	})
+}
+
+type MoveTodoDownInstruction struct {
+	Sha string
+}
+
+func NewMoveTodoDownInstruction(sha string) Instruction {
+	return &MoveTodoDownInstruction{
+		Sha: sha,
+	}
+}
+
+func (self *MoveTodoDownInstruction) Kind() DaemonKind {
+	return DaemonKindMoveTodoDown
+}
+
+func (self *MoveTodoDownInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+func (self *MoveTodoDownInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.MoveTodoDown(path, self.Sha, todo.Pick, getCommentChar())
+	})
+}
+
+type InsertBreakInstruction struct{}
+
+func NewInsertBreakInstruction() Instruction {
+	return &InsertBreakInstruction{}
+}
+
+func (self *InsertBreakInstruction) Kind() DaemonKind {
+	return DaemonKindInsertBreak
+}
+
+func (self *InsertBreakInstruction) SerializedInstructions() string {
+	return serializeInstruction(self)
+}
+
+func (self *InsertBreakInstruction) run(common *common.Common) error {
+	return handleInteractiveRebase(common, func(path string) error {
+		return utils.PrependStrToTodoFile(path, []byte("break\n"))
+	})
+}

pkg/app/daemon/rebase.go

@@ -0,0 +1,64 @@
+package daemon
+
+import (
+	"os"
+	"path/filepath"
+	"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"
+)
+
+type TodoLine struct {
+	Action string
+	Commit *models.Commit
+}
+
+func (self *TodoLine) ToString() string {
+	if self.Action == "break" {
+		return self.Action + "\n"
+	} else {
+		return self.Action + " " + self.Commit.Sha + " " + self.Commit.Name + "\n"
+	}
+}
+
+func TodoLinesToString(todoLines []TodoLine) string {
+	lines := slices.Map(todoLines, func(todoLine TodoLine) string {
+		return todoLine.ToString()
+	})
+
+	return strings.Join(slices.Reverse(lines), "")
+}
+
+type ChangeTodoAction struct {
+	Sha       string
+	NewAction todo.TodoCommand
+}
+
+func handleInteractiveRebase(common *common.Common, f func(path string) error) error {
+	common.Log.Info("Lazygit invoked as interactive rebase demon")
+	common.Log.Info("args: ", os.Args)
+	path := os.Args[1]
+
+	if strings.HasSuffix(path, "git-rebase-todo") {
+		return f(path)
+	} else if strings.HasSuffix(path, filepath.Join(gitDir(), "COMMIT_EDITMSG")) { // TODO: test
+		// if we are rebasing and squashing, we'll see a COMMIT_EDITMSG
+		// but in this case we don't need to edit it, so we'll just return
+	} else {
+		common.Log.Info("Lazygit demon did not match on any use cases")
+	}
+
+	return nil
+}
+
+func gitDir() string {
+	dir := env.GetGitDirEnv()
+	if dir == "" {
+		return ".git"
+	}
+	return dir
+}

pkg/app/entry_point.go

@@ -0,0 +1,284 @@
+package app
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"runtime"
+	"runtime/debug"
+	"strings"
+
+	"github.com/integrii/flaggy"
+	"github.com/jesseduffield/lazygit/pkg/app/daemon"
+	appTypes "github.com/jesseduffield/lazygit/pkg/app/types"
+	"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/secureexec"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/samber/lo"
+	"gopkg.in/yaml.v3"
+)
+
+type cliArgs struct {
+	RepoPath           string
+	FilterPath         string
+	GitArg             string
+	PrintVersionInfo   bool
+	Debug              bool
+	TailLogs           bool
+	PrintDefaultConfig bool
+	PrintConfigDir     bool
+	UseConfigDir       string
+	WorkTree           string
+	GitDir             string
+	CustomConfigFile   string
+}
+
+type BuildInfo struct {
+	Commit      string
+	Date        string
+	Version     string
+	BuildSource string
+}
+
+func Start(buildInfo *BuildInfo, integrationTest integrationTypes.IntegrationTest) {
+	cliArgs := parseCliArgsAndEnvVars()
+	mergeBuildInfo(buildInfo)
+
+	if cliArgs.RepoPath != "" {
+		if cliArgs.WorkTree != "" || cliArgs.GitDir != "" {
+			log.Fatal("--path option is incompatible with the --work-tree and --git-dir options")
+		}
+
+		absRepoPath, err := filepath.Abs(cliArgs.RepoPath)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		if isRepo, err := isDirectoryAGitRepository(absRepoPath); err != nil || !isRepo {
+			log.Fatal(absRepoPath + " is not a valid git repository.")
+		}
+
+		cliArgs.WorkTree = absRepoPath
+		cliArgs.GitDir = filepath.Join(absRepoPath, ".git")
+	}
+
+	if cliArgs.CustomConfigFile != "" {
+		os.Setenv("LG_CONFIG_FILE", cliArgs.CustomConfigFile)
+	}
+
+	if cliArgs.UseConfigDir != "" {
+		os.Setenv("CONFIG_DIR", cliArgs.UseConfigDir)
+	}
+
+	if cliArgs.WorkTree != "" {
+		env.SetGitWorkTreeEnv(cliArgs.WorkTree)
+	}
+
+	if cliArgs.GitDir != "" {
+		env.SetGitDirEnv(cliArgs.GitDir)
+	}
+
+	if cliArgs.PrintVersionInfo {
+		gitVersion := getGitVersionInfo()
+		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s, git version=%s\n", buildInfo.Commit, buildInfo.Date, buildInfo.BuildSource, buildInfo.Version, runtime.GOOS, runtime.GOARCH, gitVersion)
+		os.Exit(0)
+	}
+
+	if cliArgs.PrintDefaultConfig {
+		var buf bytes.Buffer
+		encoder := yaml.NewEncoder(&buf)
+		err := encoder.Encode(config.GetDefaultConfig())
+		if err != nil {
+			log.Fatal(err.Error())
+		}
+		fmt.Printf("%s\n", buf.String())
+		os.Exit(0)
+	}
+
+	if cliArgs.PrintConfigDir {
+		fmt.Printf("%s\n", config.ConfigDir())
+		os.Exit(0)
+	}
+
+	if cliArgs.TailLogs {
+		logPath, err := config.LogPath()
+		if err != nil {
+			log.Fatal(err.Error())
+		}
+
+		tail.TailLogs(logPath)
+		os.Exit(0)
+	}
+
+	if cliArgs.WorkTree != "" {
+		if err := os.Chdir(cliArgs.WorkTree); err != nil {
+			log.Fatal(err.Error())
+		}
+	}
+
+	tempDir, err := os.MkdirTemp("", "lazygit-*")
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+	defer os.RemoveAll(tempDir)
+
+	appConfig, err := config.NewAppConfig("lazygit", buildInfo.Version, buildInfo.Commit, buildInfo.Date, buildInfo.BuildSource, cliArgs.Debug, tempDir)
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	if integrationTest != nil {
+		integrationTest.SetupConfig(appConfig)
+	}
+
+	common, err := NewCommon(appConfig)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if daemon.InDaemonMode() {
+		daemon.Handle(common)
+		return
+	}
+
+	parsedGitArg := parseGitArg(cliArgs.GitArg)
+
+	Run(appConfig, common, appTypes.NewStartArgs(cliArgs.FilterPath, parsedGitArg, integrationTest))
+}
+
+func parseCliArgsAndEnvVars() *cliArgs {
+	flaggy.DefaultParser.ShowVersionWithVersionFlag = false
+
+	repoPath := ""
+	flaggy.String(&repoPath, "p", "path", "Path of git repo. (equivalent to --work-tree=<path> --git-dir=<path>/.git/)")
+
+	filterPath := ""
+	flaggy.String(&filterPath, "f", "filter", "Path to filter on in `git log -- <path>`. When in filter mode, the commits, reflog, and stash are filtered based on the given path, and some operations are restricted")
+
+	gitArg := ""
+	flaggy.AddPositionalValue(&gitArg, "git-arg", 1, false, "Panel to focus upon opening lazygit. Accepted values (based on git terminology): status, branch, log, stash. Ignored if --filter arg is passed.")
+
+	printVersionInfo := false
+	flaggy.Bool(&printVersionInfo, "v", "version", "Print the current version")
+
+	debug := false
+	flaggy.Bool(&debug, "d", "debug", "Run in debug mode with logging (see --logs flag below). Use the LOG_LEVEL env var to set the log level (debug/info/warn/error)")
+
+	tailLogs := false
+	flaggy.Bool(&tailLogs, "l", "logs", "Tail lazygit logs (intended to be used when `lazygit --debug` is called in a separate terminal tab)")
+
+	printDefaultConfig := false
+	flaggy.Bool(&printDefaultConfig, "c", "config", "Print the default config")
+
+	printConfigDir := false
+	flaggy.Bool(&printConfigDir, "cd", "print-config-dir", "Print the config directory")
+
+	useConfigDir := ""
+	flaggy.String(&useConfigDir, "ucd", "use-config-dir", "override default config directory with provided directory")
+
+	workTree := ""
+	flaggy.String(&workTree, "w", "work-tree", "equivalent of the --work-tree git argument")
+
+	gitDir := ""
+	flaggy.String(&gitDir, "g", "git-dir", "equivalent of the --git-dir git argument")
+
+	customConfigFile := ""
+	flaggy.String(&customConfigFile, "ucf", "use-config-file", "Comma separated list to custom config file(s)")
+
+	flaggy.Parse()
+
+	if os.Getenv("DEBUG") == "TRUE" {
+		debug = true
+	}
+
+	return &cliArgs{
+		RepoPath:           repoPath,
+		FilterPath:         filterPath,
+		GitArg:             gitArg,
+		PrintVersionInfo:   printVersionInfo,
+		Debug:              debug,
+		TailLogs:           tailLogs,
+		PrintDefaultConfig: printDefaultConfig,
+		PrintConfigDir:     printConfigDir,
+		UseConfigDir:       useConfigDir,
+		WorkTree:           workTree,
+		GitDir:             gitDir,
+		CustomConfigFile:   customConfigFile,
+	}
+}
+
+func parseGitArg(gitArg string) appTypes.GitArg {
+	typedArg := appTypes.GitArg(gitArg)
+
+	// using switch so that linter catches when a new git arg value is defined but not handled here
+	switch typedArg {
+	case appTypes.GitArgNone, appTypes.GitArgStatus, appTypes.GitArgBranch, appTypes.GitArgLog, appTypes.GitArgStash:
+		return typedArg
+	}
+
+	permittedValues := []string{
+		string(appTypes.GitArgStatus),
+		string(appTypes.GitArgBranch),
+		string(appTypes.GitArgLog),
+		string(appTypes.GitArgStash),
+	}
+
+	log.Fatalf("Invalid git arg value: '%s'. Must be one of the following values: %s. e.g. 'lazygit status'. See 'lazygit --help'.",
+		gitArg,
+		strings.Join(permittedValues, ", "),
+	)
+
+	panic("unreachable")
+}
+
+// the buildInfo struct we get passed in is based on what's baked into the lazygit
+// binary via the LDFLAGS argument. Some lazygit distributions will make use of these
+// arguments and some will not. Go recently started baking in build info
+// into the binary by default e.g. the git commit hash. So in this function
+// we merge the two together, giving priority to the stuff set by LDFLAGS.
+// Note: this mutates the argument passed in
+func mergeBuildInfo(buildInfo *BuildInfo) {
+	// if the version has already been set by build flags then we'll honour that.
+	// chances are it's something like v0.31.0 which is more informative than a
+	// commit hash.
+	if buildInfo.Version != "" {
+		return
+	}
+
+	buildInfo.Version = "unversioned"
+
+	goBuildInfo, ok := debug.ReadBuildInfo()
+	if !ok {
+		return
+	}
+
+	revision, ok := lo.Find(goBuildInfo.Settings, func(setting debug.BuildSetting) bool {
+		return setting.Key == "vcs.revision"
+	})
+	if ok {
+		buildInfo.Commit = revision.Value
+		// if lazygit was built from source we'll show the version as the
+		// abbreviated commit hash
+		buildInfo.Version = utils.ShortSha(revision.Value)
+	}
+
+	// if version hasn't been set we assume that neither has the date
+	time, ok := lo.Find(goBuildInfo.Settings, func(setting debug.BuildSetting) bool {
+		return setting.Key == "vcs.time"
+	})
+	if ok {
+		buildInfo.Date = time.Value
+	}
+}
+
+func getGitVersionInfo() string {
+	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

@@ -0,0 +1,39 @@
+package app
+
+import (
+	"strings"
+
+	"github.com/jesseduffield/generics/slices"
+	"github.com/jesseduffield/lazygit/pkg/i18n"
+)
+
+type errorMapping struct {
+	originalError string
+	newError      string
+}
+
+// knownError takes an error and tells us whether it's an error that we know about where we can print a nicely formatted version of it rather than panicking with a stack trace
+func knownError(tr *i18n.TranslationSet, err error) (string, bool) {
+	errorMessage := err.Error()
+
+	knownErrorMessages := []string{tr.MinGitVersionError}
+
+	if slices.Contains(knownErrorMessages, errorMessage) {
+		return errorMessage, true
+	}
+
+	mappings := []errorMapping{
+		{
+			originalError: "fatal: not a git repository",
+			newError:      tr.NotARepository,
+		},
+	}
+
+	if mapping, ok := slices.Find(mappings, func(mapping errorMapping) bool {
+		return strings.Contains(errorMessage, mapping.originalError)
+	}); ok {
+		return mapping.newError, true
+	}
+
+	return "", false
+}

pkg/app/logging.go

@@ -1,30 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package app
-
-import (
-	"github.com/aybabtme/humanlog"
-	"github.com/jesseduffield/lazygit/pkg/secureexec"
-	"log"
-	"os"
-)
-
-func TailLogsForPlatform(logFilePath string, opts *humanlog.HandlerOptions) {
-	cmd := secureexec.Command("tail", "-f", logFilePath)
-
-	stdout, _ := cmd.StdoutPipe()
-	if err := cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-
-	if err := humanlog.Scanner(stdout, os.Stdout, opts); err != nil {
-		log.Fatal(err)
-	}
-
-	if err := cmd.Wait(); err != nil {
-		log.Fatal(err)
-	}
-
-	os.Exit(0)
-}

pkg/app/logging_windows.go

@@ -1,72 +0,0 @@
-//go:build windows
-// +build windows
-
-package app
-
-import (
-	"bufio"
-	"github.com/aybabtme/humanlog"
-	"log"
-	"os"
-	"strings"
-	"time"
-)
-
-func TailLogsForPlatform(logFilePath string, opts *humanlog.HandlerOptions) {
-	var lastModified int64 = 0
-	var lastOffset int64 = 0
-	for {
-		stat, err := os.Stat(logFilePath)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if stat.ModTime().Unix() > lastModified {
-			err = TailFrom(lastOffset, logFilePath, opts)
-			if err != nil {
-				log.Fatal(err)
-			}
-		}
-		lastOffset = stat.Size()
-		time.Sleep(1 * time.Second)
-	}
-}
-
-func OpenAndSeek(filepath string, offset int64) (*os.File, error) {
-	file, err := os.Open(filepath)
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = file.Seek(offset, 0)
-	if err != nil {
-		_ = file.Close()
-		return nil, err
-	}
-	return file, nil
-}
-
-func TailFrom(lastOffset int64, logFilePath string, opts *humanlog.HandlerOptions) error {
-	file, err := OpenAndSeek(logFilePath, lastOffset)
-	if err != nil {
-		return err
-	}
-
-	fileScanner := bufio.NewScanner(file)
-	var lines []string
-	for fileScanner.Scan() {
-		lines = append(lines, fileScanner.Text())
-	}
-	file.Close()
-	lineCount := len(lines)
-	lastTen := lines
-	if lineCount > 10 {
-		lastTen = lines[lineCount-10:]
-	}
-	for _, line := range lastTen {
-		reader := strings.NewReader(line)
-		if err := humanlog.Scanner(reader, os.Stdout, opts); err != nil {
-			log.Fatal(err)
-		}
-	}
-	return nil
-}

pkg/app/types/types.go

@@ -0,0 +1,33 @@
+package app
+
+import (
+	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
+)
+
+// StartArgs is the struct that represents some things we want to do on program start
+type StartArgs struct {
+	// FilterPath determines which path we're going to filter on so that we only see commits from that file.
+	FilterPath string
+	// GitArg determines what context we open in
+	GitArg GitArg
+	// integration test (only relevant when invoking lazygit in the context of an integration test)
+	IntegrationTest integrationTypes.IntegrationTest
+}
+
+type GitArg string
+
+const (
+	GitArgNone   GitArg = ""
+	GitArgStatus GitArg = "status"
+	GitArgBranch GitArg = "branch"
+	GitArgLog    GitArg = "log"
+	GitArgStash  GitArg = "stash"
+)
+
+func NewStartArgs(filterPath string, gitArg GitArg, test integrationTypes.IntegrationTest) StartArgs {
+	return StartArgs{
+		FilterPath:      filterPath,
+		GitArg:          gitArg,
+		IntegrationTest: test,
+	}
+}

pkg/cheatsheet/check.go

@@ -0,0 +1,77 @@
+package cheatsheet
+
+import (
+	"fmt"
+	"io/fs"
+	"log"
+	"os"
+	"path/filepath"
+	"regexp"
+
+	"github.com/pmezard/go-difflib/difflib"
+)
+
+func Check() {
+	dir := GetKeybindingsDir()
+	tmpDir := filepath.Join(os.TempDir(), "lazygit_cheatsheet")
+	err := os.RemoveAll(tmpDir)
+	if err != nil {
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+	}
+	err = os.Mkdir(tmpDir, 0o700)
+	if err != nil {
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+	}
+
+	generateAtDir(tmpDir)
+	defer os.RemoveAll(tmpDir)
+
+	actualContent := obtainContent(dir)
+	expectedContent := obtainContent(tmpDir)
+
+	if expectedContent == "" {
+		log.Fatal("empty expected content")
+	}
+
+	if actualContent != expectedContent {
+		err := difflib.WriteUnifiedDiff(os.Stdout, difflib.UnifiedDiff{
+			A:        difflib.SplitLines(expectedContent),
+			B:        difflib.SplitLines(actualContent),
+			FromFile: "Expected",
+			FromDate: "",
+			ToFile:   "Actual",
+			ToDate:   "",
+			Context:  1,
+		})
+		if err != nil {
+			log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+		}
+		fmt.Printf("\nCheatsheets are out of date. Please run `%s` at the project root and commit the changes. If you run the script and no keybindings files are updated as a result, try rebasing onto master and trying again.\n", CommandToRun())
+		os.Exit(1)
+	}
+
+	fmt.Println("\nCheatsheets are up to date")
+}
+
+func obtainContent(dir string) string {
+	re := regexp.MustCompile(`Keybindings_\w+\.md$`)
+
+	content := ""
+	err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
+		if re.MatchString(path) {
+			bytes, err := os.ReadFile(path)
+			if err != nil {
+				log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+			}
+			content += fmt.Sprintf("\n%s\n\n", filepath.Base(path))
+			content += string(bytes)
+		}
+
+		return nil
+	})
+	if err != nil {
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
+	}
+
+	return content
+}

pkg/cheatsheet/generate.go

@@ -0,0 +1,223 @@
+// This "script" generates a file called Keybindings_{{.LANG}}.md
+// in current working directory.
+//
+// The content of this generated file is a keybindings cheatsheet.
+//
+// To generate cheatsheet in english run:
+//   go run scripts/generate_cheatsheet.go
+
+package cheatsheet
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"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"
+	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/i18n"
+	"github.com/samber/lo"
+)
+
+type bindingSection struct {
+	title    string
+	bindings []*types.Binding
+}
+
+type header struct {
+	// priority decides the order of the headers in the cheatsheet (lower means higher)
+	priority int
+	title    string
+}
+
+type headerWithBindings struct {
+	header   header
+	bindings []*types.Binding
+}
+
+func CommandToRun() string {
+	return "go run scripts/cheatsheet/main.go generate"
+}
+
+func GetKeybindingsDir() string {
+	return utils.GetLazyRootDirectory() + "/docs/keybindings"
+}
+
+func generateAtDir(cheatsheetDir string) {
+	translationSetsByLang := i18n.GetTranslationSets()
+	mConfig := config.NewDummyAppConfig()
+
+	for lang := range translationSetsByLang {
+		mConfig.GetUserConfig().Gui.Language = lang
+		common, err := app.NewCommon(mConfig)
+		if err != nil {
+			log.Fatal(err)
+		}
+		mApp, _ := app.NewApp(mConfig, common)
+		path := cheatsheetDir + "/Keybindings_" + lang + ".md"
+		file, err := os.Create(path)
+		if err != nil {
+			panic(err)
+		}
+
+		bindings := mApp.Gui.GetCheatsheetKeybindings()
+		bindingSections := getBindingSections(bindings, mApp.Tr)
+		content := formatSections(mApp.Tr, bindingSections)
+		content = fmt.Sprintf("_This file is auto-generated. To update, make the changes in the "+
+			"pkg/i18n directory and then run `%s` from the project root._\n\n%s", CommandToRun(), content)
+		writeString(file, content)
+	}
+}
+
+func Generate() {
+	generateAtDir(GetKeybindingsDir())
+}
+
+func writeString(file *os.File, str string) {
+	_, err := file.WriteString(str)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func localisedTitle(tr *i18n.TranslationSet, str string) string {
+	contextTitleMap := map[string]string{
+		"global":            tr.GlobalTitle,
+		"navigation":        tr.NavigationTitle,
+		"branches":          tr.BranchesTitle,
+		"localBranches":     tr.LocalBranchesTitle,
+		"files":             tr.FilesTitle,
+		"status":            tr.StatusTitle,
+		"submodules":        tr.SubmodulesTitle,
+		"subCommits":        tr.SubCommitsTitle,
+		"remoteBranches":    tr.RemoteBranchesTitle,
+		"remotes":           tr.RemotesTitle,
+		"reflogCommits":     tr.ReflogCommitsTitle,
+		"tags":              tr.TagsTitle,
+		"commitFiles":       tr.CommitFilesTitle,
+		"commitMessage":     tr.CommitMessageTitle,
+		"commitDescription": tr.CommitDescriptionTitle,
+		"commits":           tr.CommitsTitle,
+		"confirmation":      tr.ConfirmationTitle,
+		"information":       tr.InformationTitle,
+		"main":              tr.NormalTitle,
+		"patchBuilding":     tr.PatchBuildingTitle,
+		"mergeConflicts":    tr.MergingTitle,
+		"staging":           tr.StagingTitle,
+		"menu":              tr.MenuTitle,
+		"search":            tr.SearchTitle,
+		"secondary":         tr.SecondaryTitle,
+		"stash":             tr.StashTitle,
+		"suggestions":       tr.SuggestionsCheatsheetTitle,
+		"extras":            tr.ExtrasTitle,
+	}
+
+	title, ok := contextTitleMap[str]
+	if !ok {
+		panic(fmt.Sprintf("title not found for %s", str))
+	}
+
+	return title
+}
+
+func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*bindingSection {
+	excludedViews := []string{"stagingSecondary", "patchBuildingSecondary"}
+	bindingsToDisplay := slices.Filter(bindings, func(binding *types.Binding) bool {
+		if lo.Contains(excludedViews, binding.ViewName) {
+			return false
+		}
+
+		return (binding.Description != "" || binding.Alternative != "") && binding.Key != nil
+	})
+
+	bindingsByHeader := lo.GroupBy(bindingsToDisplay, func(binding *types.Binding) header {
+		return getHeader(binding, tr)
+	})
+
+	bindingGroups := maps.MapToSlice(
+		bindingsByHeader,
+		func(header header, hBindings []*types.Binding) headerWithBindings {
+			uniqBindings := lo.UniqBy(hBindings, func(binding *types.Binding) string {
+				return binding.Description + keybindings.LabelFromKey(binding.Key)
+			})
+
+			return headerWithBindings{
+				header:   header,
+				bindings: uniqBindings,
+			}
+		},
+	)
+
+	slices.SortFunc(bindingGroups, func(a, b headerWithBindings) bool {
+		if a.header.priority != b.header.priority {
+			return a.header.priority > b.header.priority
+		}
+		return a.header.title < b.header.title
+	})
+
+	return slices.Map(bindingGroups, func(hb headerWithBindings) *bindingSection {
+		return &bindingSection{
+			title:    hb.header.title,
+			bindings: hb.bindings,
+		}
+	})
+}
+
+func getHeader(binding *types.Binding, tr *i18n.TranslationSet) header {
+	if binding.Tag == "navigation" {
+		return header{priority: 2, title: localisedTitle(tr, "navigation")}
+	}
+
+	if binding.ViewName == "" {
+		return header{priority: 3, title: localisedTitle(tr, "global")}
+	}
+
+	return header{priority: 1, title: localisedTitle(tr, binding.ViewName)}
+}
+
+func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) string {
+	content := fmt.Sprintf("# Lazygit %s\n", tr.Keybindings)
+
+	content += fmt.Sprintf("\n%s\n", italicize(tr.KeybindingsLegend))
+
+	for _, section := range bindingSections {
+		content += formatTitle(section.title)
+		content += "<pre>\n"
+		for _, binding := range section.bindings {
+			content += formatBinding(binding)
+		}
+		content += "</pre>\n"
+	}
+
+	return content
+}
+
+func formatTitle(title string) string {
+	return fmt.Sprintf("\n## %s\n\n", title)
+}
+
+func formatBinding(binding *types.Binding) string {
+	result := fmt.Sprintf("  <kbd>%s</kbd>: %s", escapeAngleBrackets(keybindings.LabelFromKey(binding.Key)), binding.Description)
+	if binding.Alternative != "" {
+		result += fmt.Sprintf(" (%s)", binding.Alternative)
+	}
+	result += "\n"
+
+	return result
+}
+
+func escapeAngleBrackets(str string) string {
+	result := strings.ReplaceAll(str, ">", "&gt;")
+	result = strings.ReplaceAll(result, "<", "&lt;")
+	return result
+}
+
+func italicize(str string) string {
+	return fmt.Sprintf("_%s_", str)
+}

pkg/cheatsheet/generate_test.go

@@ -0,0 +1,269 @@
+package cheatsheet
+
+import (
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/i18n"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetBindingSections(t *testing.T) {
+	tr := i18n.EnglishTranslationSet()
+
+	tests := []struct {
+		testName string
+		bindings []*types.Binding
+		expected []*bindingSection
+	}{
+		{
+			testName: "no bindings",
+			bindings: []*types.Binding{},
+			expected: []*bindingSection{},
+		},
+		{
+			testName: "one binding",
+			bindings: []*types.Binding{
+				{
+					ViewName:    "files",
+					Description: "stage file",
+					Key:         'a',
+				},
+			},
+			expected: []*bindingSection{
+				{
+					title: "Files",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "files",
+							Description: "stage file",
+							Key:         'a',
+						},
+					},
+				},
+			},
+		},
+		{
+			testName: "global binding",
+			bindings: []*types.Binding{
+				{
+					ViewName:    "",
+					Description: "quit",
+					Key:         'a',
+				},
+			},
+			expected: []*bindingSection{
+				{
+					title: "Global keybindings",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "",
+							Description: "quit",
+							Key:         'a',
+						},
+					},
+				},
+			},
+		},
+		{
+			testName: "grouped bindings",
+			bindings: []*types.Binding{
+				{
+					ViewName:    "files",
+					Description: "stage file",
+					Key:         'a',
+				},
+				{
+					ViewName:    "files",
+					Description: "unstage file",
+					Key:         'a',
+				},
+				{
+					ViewName:    "submodules",
+					Description: "drop submodule",
+					Key:         'a',
+				},
+			},
+			expected: []*bindingSection{
+				{
+					title: "Files",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "files",
+							Description: "stage file",
+							Key:         'a',
+						},
+						{
+							ViewName:    "files",
+							Description: "unstage file",
+							Key:         'a',
+						},
+					},
+				},
+				{
+					title: "Submodules",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "submodules",
+							Description: "drop submodule",
+							Key:         'a',
+						},
+					},
+				},
+			},
+		},
+		{
+			testName: "with navigation bindings",
+			bindings: []*types.Binding{
+				{
+					ViewName:    "files",
+					Description: "stage file",
+					Key:         'a',
+				},
+				{
+					ViewName:    "files",
+					Description: "unstage file",
+					Key:         'a',
+				},
+				{
+					ViewName:    "files",
+					Description: "scroll",
+					Key:         'a',
+					Tag:         "navigation",
+				},
+				{
+					ViewName:    "commits",
+					Description: "revert commit",
+					Key:         'a',
+				},
+			},
+			expected: []*bindingSection{
+				{
+					title: "List panel navigation",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "files",
+							Description: "scroll",
+							Key:         'a',
+							Tag:         "navigation",
+						},
+					},
+				},
+				{
+					title: "Commits",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "commits",
+							Description: "revert commit",
+							Key:         'a',
+						},
+					},
+				},
+				{
+					title: "Files",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "files",
+							Description: "stage file",
+							Key:         'a',
+						},
+						{
+							ViewName:    "files",
+							Description: "unstage file",
+							Key:         'a',
+						},
+					},
+				},
+			},
+		},
+		{
+			testName: "with duplicate navigation bindings",
+			bindings: []*types.Binding{
+				{
+					ViewName:    "files",
+					Description: "stage file",
+					Key:         'a',
+				},
+				{
+					ViewName:    "files",
+					Description: "unstage file",
+					Key:         'a',
+				},
+				{
+					ViewName:    "files",
+					Description: "scroll",
+					Key:         'a',
+					Tag:         "navigation",
+				},
+				{
+					ViewName:    "commits",
+					Description: "revert commit",
+					Key:         'a',
+				},
+				{
+					ViewName:    "commits",
+					Description: "scroll",
+					Key:         'a',
+					Tag:         "navigation",
+				},
+				{
+					ViewName:    "commits",
+					Description: "page up",
+					Key:         'a',
+					Tag:         "navigation",
+				},
+			},
+			expected: []*bindingSection{
+				{
+					title: "List panel navigation",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "files",
+							Description: "scroll",
+							Key:         'a',
+							Tag:         "navigation",
+						},
+						{
+							ViewName:    "commits",
+							Description: "page up",
+							Key:         'a',
+							Tag:         "navigation",
+						},
+					},
+				},
+				{
+					title: "Commits",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "commits",
+							Description: "revert commit",
+							Key:         'a',
+						},
+					},
+				},
+				{
+					title: "Files",
+					bindings: []*types.Binding{
+						{
+							ViewName:    "files",
+							Description: "stage file",
+							Key:         'a',
+						},
+						{
+							ViewName:    "files",
+							Description: "unstage file",
+							Key:         'a',
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.testName, func(t *testing.T) {
+			actual := getBindingSections(test.bindings, &tr)
+			assert.EqualValues(t, test.expected, actual)
+		})
+	}
+}

pkg/commands/branches.go

@@ -1,161 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// NewBranch create new branch
-func (c *GitCommand) NewBranch(name string, base string) error {
-	return c.RunCommand("git checkout -b %s %s", c.OSCommand.Quote(name), c.OSCommand.Quote(base))
-}
-
-// CurrentBranchName get the current branch name and displayname.
-// the first returned string is the name and the second is the displayname
-// e.g. name is 123asdf and displayname is '(HEAD detached at 123asdf)'
-func (c *GitCommand) CurrentBranchName() (string, string, error) {
-	branchName, err := c.RunCommandWithOutput("git symbolic-ref --short HEAD")
-	if err == nil && branchName != "HEAD\n" {
-		trimmedBranchName := strings.TrimSpace(branchName)
-		return trimmedBranchName, trimmedBranchName, nil
-	}
-	output, err := c.RunCommandWithOutput("git branch --contains")
-	if err != nil {
-		return "", "", err
-	}
-	for _, line := range utils.SplitLines(output) {
-		re := regexp.MustCompile(CurrentBranchNameRegex)
-		match := re.FindStringSubmatch(line)
-		if len(match) > 0 {
-			branchName = match[1]
-			displayBranchName := match[0][2:]
-			return branchName, displayBranchName, nil
-		}
-	}
-	return "HEAD", "HEAD", nil
-}
-
-// DeleteBranch delete branch
-func (c *GitCommand) DeleteBranch(branch string, force bool) error {
-	command := "git branch -d"
-
-	if force {
-		command = "git branch -D"
-	}
-
-	return c.OSCommand.RunCommand("%s %s", command, c.OSCommand.Quote(branch))
-}
-
-// Checkout checks out a branch (or commit), with --force if you set the force arg to true
-type CheckoutOptions struct {
-	Force   bool
-	EnvVars []string
-}
-
-func (c *GitCommand) Checkout(branch string, options CheckoutOptions) error {
-	forceArg := ""
-	if options.Force {
-		forceArg = " --force"
-	}
-	return c.OSCommand.RunCommandWithOptions(fmt.Sprintf("git checkout%s %s", forceArg, c.OSCommand.Quote(branch)), oscommands.RunCommandOptions{EnvVars: options.EnvVars})
-}
-
-// GetBranchGraph gets the color-formatted graph of the log for the given branch
-// Currently it limits the result to 100 commits, but when we get async stuff
-// working we can do lazy loading
-func (c *GitCommand) GetBranchGraph(branchName string) (string, error) {
-	cmdStr := c.GetBranchGraphCmdStr(branchName)
-	return c.OSCommand.RunCommandWithOutput(cmdStr)
-}
-
-func (c *GitCommand) GetUpstreamForBranch(branchName string) (string, error) {
-	output, err := c.RunCommandWithOutput("git rev-parse --abbrev-ref --symbolic-full-name %s@{u}", c.OSCommand.Quote(branchName))
-	return strings.TrimSpace(output), err
-}
-
-func (c *GitCommand) GetBranchGraphCmdStr(branchName string) string {
-	branchLogCmdTemplate := c.Config.GetUserConfig().Git.BranchLogCmd
-	templateValues := map[string]string{
-		"branchName": c.OSCommand.Quote(branchName),
-	}
-	return utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)
-}
-
-func (c *GitCommand) SetUpstreamBranch(upstream string) error {
-	return c.RunCommand("git branch -u %s", c.OSCommand.Quote(upstream))
-}
-
-func (c *GitCommand) SetBranchUpstream(remoteName string, remoteBranchName string, branchName string) error {
-	return c.RunCommand("git branch --set-upstream-to=%s/%s %s", c.OSCommand.Quote(remoteName), c.OSCommand.Quote(remoteBranchName), c.OSCommand.Quote(branchName))
-}
-
-func (c *GitCommand) GetCurrentBranchUpstreamDifferenceCount() (string, string) {
-	return c.GetCommitDifferences("HEAD", "HEAD@{u}")
-}
-
-func (c *GitCommand) GetBranchUpstreamDifferenceCount(branchName string) (string, string) {
-	return c.GetCommitDifferences(branchName, branchName+"@{u}")
-}
-
-// GetCommitDifferences checks how many pushables/pullables there are for the
-// current branch
-func (c *GitCommand) GetCommitDifferences(from, to string) (string, string) {
-	command := "git rev-list %s..%s --count"
-	pushableCount, err := c.OSCommand.RunCommandWithOutput(command, to, from)
-	if err != nil {
-		return "?", "?"
-	}
-	pullableCount, err := c.OSCommand.RunCommandWithOutput(command, from, to)
-	if err != nil {
-		return "?", "?"
-	}
-	return strings.TrimSpace(pushableCount), strings.TrimSpace(pullableCount)
-}
-
-type MergeOpts struct {
-	FastForwardOnly bool
-}
-
-// Merge merge
-func (c *GitCommand) Merge(branchName string, opts MergeOpts) error {
-	mergeArgs := c.Config.GetUserConfig().Git.Merging.Args
-
-	command := fmt.Sprintf("git merge --no-edit %s %s", mergeArgs, c.OSCommand.Quote(branchName))
-	if opts.FastForwardOnly {
-		command = fmt.Sprintf("%s --ff-only", command)
-	}
-
-	return c.OSCommand.RunCommand(command)
-}
-
-// AbortMerge abort merge
-func (c *GitCommand) AbortMerge() error {
-	return c.RunCommand("git merge --abort")
-}
-
-func (c *GitCommand) IsHeadDetached() bool {
-	err := c.RunCommand("git symbolic-ref -q HEAD")
-	return err != nil
-}
-
-// ResetHardHead runs `git reset --hard`
-func (c *GitCommand) ResetHard(ref string) error {
-	return c.RunCommand("git reset --hard " + c.OSCommand.Quote(ref))
-}
-
-// ResetSoft runs `git reset --soft HEAD`
-func (c *GitCommand) ResetSoft(ref string) error {
-	return c.RunCommand("git reset --soft " + c.OSCommand.Quote(ref))
-}
-
-func (c *GitCommand) ResetMixed(ref string) error {
-	return c.RunCommand("git reset --mixed " + c.OSCommand.Quote(ref))
-}
-
-func (c *GitCommand) RenameBranch(oldName string, newName string) error {
-	return c.RunCommand("git branch --move %s %s", c.OSCommand.Quote(oldName), c.OSCommand.Quote(newName))
-}

pkg/commands/branches_test.go

@@ -1,338 +0,0 @@
-package commands
-
-import (
-	"os/exec"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/secureexec"
-	"github.com/jesseduffield/lazygit/pkg/test"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestGitCommandGetCommitDifferences is a function.
-func TestGitCommandGetCommitDifferences(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(string, string)
-	}
-
-	scenarios := []scenario{
-		{
-			"Can't retrieve pushable count",
-			func(string, ...string) *exec.Cmd {
-				return secureexec.Command("test")
-			},
-			func(pushableCount string, pullableCount string) {
-				assert.EqualValues(t, "?", pushableCount)
-				assert.EqualValues(t, "?", pullableCount)
-			},
-		},
-		{
-			"Can't retrieve pullable count",
-			func(cmd string, args ...string) *exec.Cmd {
-				if args[1] == "HEAD..@{u}" {
-					return secureexec.Command("test")
-				}
-
-				return secureexec.Command("echo")
-			},
-			func(pushableCount string, pullableCount string) {
-				assert.EqualValues(t, "?", pushableCount)
-				assert.EqualValues(t, "?", pullableCount)
-			},
-		},
-		{
-			"Retrieve pullable and pushable count",
-			func(cmd string, args ...string) *exec.Cmd {
-				if args[1] == "HEAD..@{u}" {
-					return secureexec.Command("echo", "10")
-				}
-
-				return secureexec.Command("echo", "11")
-			},
-			func(pushableCount string, pullableCount string) {
-				assert.EqualValues(t, "11", pushableCount)
-				assert.EqualValues(t, "10", pullableCount)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.GetCommitDifferences("HEAD", "@{u}"))
-		})
-	}
-}
-
-// TestGitCommandNewBranch is a function.
-func TestGitCommandNewBranch(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"checkout", "-b", "test", "master"}, args)
-
-		return secureexec.Command("echo")
-	}
-
-	assert.NoError(t, gitCmd.NewBranch("test", "master"))
-}
-
-// TestGitCommandDeleteBranch is a function.
-func TestGitCommandDeleteBranch(t *testing.T) {
-	type scenario struct {
-		testName string
-		branch   string
-		force    bool
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"Delete a branch",
-			"test",
-			false,
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"branch", "-d", "test"}, args)
-
-				return secureexec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"Force delete a branch",
-			"test",
-			true,
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"branch", "-D", "test"}, args)
-
-				return secureexec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.DeleteBranch(s.branch, s.force))
-		})
-	}
-}
-
-// TestGitCommandMerge is a function.
-func TestGitCommandMerge(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"merge", "--no-edit", "test"}, args)
-
-		return secureexec.Command("echo")
-	}
-
-	assert.NoError(t, gitCmd.Merge("test", MergeOpts{}))
-}
-
-// TestGitCommandCheckout is a function.
-func TestGitCommandCheckout(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-		force    bool
-	}
-
-	scenarios := []scenario{
-		{
-			"Checkout",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"checkout", "test"}, args)
-
-				return secureexec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-			false,
-		},
-		{
-			"Checkout forced",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"checkout", "--force", "test"}, args)
-
-				return secureexec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-			true,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.Checkout("test", CheckoutOptions{Force: s.force}))
-		})
-	}
-}
-
-// TestGitCommandGetBranchGraph is a function.
-func TestGitCommandGetBranchGraph(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"log", "--graph", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test", "--"}, args)
-		return secureexec.Command("echo")
-	}
-	_, err := gitCmd.GetBranchGraph("test")
-	assert.NoError(t, err)
-}
-
-func TestGitCommandGetAllBranchGraph(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"log", "--graph", "--all", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium"}, args)
-		return secureexec.Command("echo")
-	}
-	cmdStr := gitCmd.Config.GetUserConfig().Git.AllBranchesLogCmd
-	_, err := gitCmd.OSCommand.RunCommandWithOutput(cmdStr)
-	assert.NoError(t, err)
-}
-
-// TestGitCommandCurrentBranchName is a function.
-func TestGitCommandCurrentBranchName(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(string, string, error)
-	}
-
-	scenarios := []scenario{
-		{
-			"says we are on the master branch if we are",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.Equal(t, "git", cmd)
-				return secureexec.Command("echo", "master")
-			},
-			func(name string, displayname string, err error) {
-				assert.NoError(t, err)
-				assert.EqualValues(t, "master", name)
-				assert.EqualValues(t, "master", displayname)
-			},
-		},
-		{
-			"falls back to git `git branch --contains` if symbolic-ref fails",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-
-				switch args[0] {
-				case "symbolic-ref":
-					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
-					return secureexec.Command("test")
-				case "branch":
-					assert.EqualValues(t, []string{"branch", "--contains"}, args)
-					return secureexec.Command("echo", "* master")
-				}
-
-				return nil
-			},
-			func(name string, displayname string, err error) {
-				assert.NoError(t, err)
-				assert.EqualValues(t, "master", name)
-				assert.EqualValues(t, "master", displayname)
-			},
-		},
-		{
-			"handles a detached head",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-
-				switch args[0] {
-				case "symbolic-ref":
-					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
-					return secureexec.Command("test")
-				case "branch":
-					assert.EqualValues(t, []string{"branch", "--contains"}, args)
-					return secureexec.Command("echo", "* (HEAD detached at 123abcd)")
-				}
-
-				return nil
-			},
-			func(name string, displayname string, err error) {
-				assert.NoError(t, err)
-				assert.EqualValues(t, "123abcd", name)
-				assert.EqualValues(t, "(HEAD detached at 123abcd)", displayname)
-			},
-		},
-		{
-			"bubbles up error if there is one",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.Equal(t, "git", cmd)
-				return secureexec.Command("test")
-			},
-			func(name string, displayname string, err error) {
-				assert.Error(t, err)
-				assert.EqualValues(t, "", name)
-				assert.EqualValues(t, "", displayname)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.CurrentBranchName())
-		})
-	}
-}
-
-// TestGitCommandResetHard is a function.
-func TestGitCommandResetHard(t *testing.T) {
-	type scenario struct {
-		testName string
-		ref      string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"valid case",
-			"HEAD",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  `git reset --hard HEAD`,
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.ResetHard(s.ref))
-		})
-	}
-}

pkg/commands/commits.go

@@ -1,98 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-)
-
-// RenameCommit renames the topmost commit with the given name
-func (c *GitCommand) RenameCommit(name string) error {
-	return c.RunCommand("git commit --allow-empty --amend --only -m %s", c.OSCommand.Quote(name))
-}
-
-// ResetToCommit reset to commit
-func (c *GitCommand) ResetToCommit(sha string, strength string, options oscommands.RunCommandOptions) error {
-	return c.OSCommand.RunCommandWithOptions(fmt.Sprintf("git reset --%s %s", strength, sha), options)
-}
-
-func (c *GitCommand) CommitCmdStr(message string, flags string) string {
-	splitMessage := strings.Split(message, "\n")
-	lineArgs := ""
-	for _, line := range splitMessage {
-		lineArgs += fmt.Sprintf(" -m %s", c.OSCommand.Quote(line))
-	}
-
-	flagsStr := ""
-	if flags != "" {
-		flagsStr = fmt.Sprintf(" %s", flags)
-	}
-
-	return fmt.Sprintf("git commit%s%s", flagsStr, lineArgs)
-}
-
-// Get the subject of the HEAD commit
-func (c *GitCommand) GetHeadCommitMessage() (string, error) {
-	cmdStr := "git log -1 --pretty=%s"
-	message, err := c.OSCommand.RunCommandWithOutput(cmdStr)
-	return strings.TrimSpace(message), err
-}
-
-func (c *GitCommand) GetCommitMessage(commitSha string) (string, error) {
-	cmdStr := "git rev-list --format=%B --max-count=1 " + commitSha
-	messageWithHeader, err := c.OSCommand.RunCommandWithOutput(cmdStr)
-	message := strings.Join(strings.SplitAfter(messageWithHeader, "\n")[1:], "\n")
-	return strings.TrimSpace(message), err
-}
-
-func (c *GitCommand) GetCommitMessageFirstLine(sha string) (string, error) {
-	return c.RunCommandWithOutput("git show --no-patch --pretty=format:%%s %s", sha)
-}
-
-// AmendHead amends HEAD with whatever is staged in your working tree
-func (c *GitCommand) AmendHead() error {
-	return c.OSCommand.RunCommand(c.AmendHeadCmdStr())
-}
-
-func (c *GitCommand) AmendHeadCmdStr() string {
-	return "git commit --amend --no-edit --allow-empty"
-}
-
-func (c *GitCommand) ShowCmdStr(sha string, filterPath string) string {
-	filterPathArg := ""
-	if filterPath != "" {
-		filterPathArg = fmt.Sprintf(" -- %s", c.OSCommand.Quote(filterPath))
-	}
-	return fmt.Sprintf("git show --submodule --color=%s --no-renames --stat -p %s %s", c.colorArg(), sha, filterPathArg)
-}
-
-// Revert reverts the selected commit by sha
-func (c *GitCommand) Revert(sha string) error {
-	return c.RunCommand("git revert %s", sha)
-}
-
-func (c *GitCommand) RevertMerge(sha string, parentNumber int) error {
-	return c.RunCommand("git revert %s -m %d", sha, parentNumber)
-}
-
-// CherryPickCommits begins an interactive rebase with the given shas being cherry picked onto HEAD
-func (c *GitCommand) CherryPickCommits(commits []*models.Commit) error {
-	todo := ""
-	for _, commit := range commits {
-		todo = "pick " + commit.Sha + " " + commit.Name + "\n" + todo
-	}
-
-	cmd, err := c.PrepareInteractiveRebaseCommand("HEAD", todo, false)
-	if err != nil {
-		return err
-	}
-
-	return c.OSCommand.RunPreparedCommand(cmd)
-}
-
-// CreateFixupCommit creates a commit that fixes up a previous commit
-func (c *GitCommand) CreateFixupCommit(sha string) error {
-	return c.RunCommand("git commit --fixup=%s", sha)
-}

pkg/commands/commits_test.go

@@ -1,112 +0,0 @@
-package commands
-
-import (
-	"os/exec"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/secureexec"
-	"github.com/jesseduffield/lazygit/pkg/test"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestGitCommandRenameCommit is a function.
-func TestGitCommandRenameCommit(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, args)
-
-		return secureexec.Command("echo")
-	}
-
-	assert.NoError(t, gitCmd.RenameCommit("test"))
-}
-
-// TestGitCommandResetToCommit is a function.
-func TestGitCommandResetToCommit(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"reset", "--hard", "78976bc"}, args)
-
-		return secureexec.Command("echo")
-	}
-
-	assert.NoError(t, gitCmd.ResetToCommit("78976bc", "hard", oscommands.RunCommandOptions{}))
-}
-
-// TestGitCommandCommitStr is a function.
-func TestGitCommandCommitStr(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-
-	type scenario struct {
-		testName string
-		message  string
-		flags    string
-		expected string
-	}
-
-	scenarios := []scenario{
-		{
-			testName: "Commit",
-			message:  "test",
-			flags:    "",
-			expected: "git commit -m " + gitCmd.OSCommand.Quote("test"),
-		},
-		{
-			testName: "Commit with --no-verify flag",
-			message:  "test",
-			flags:    "--no-verify",
-			expected: "git commit --no-verify -m " + gitCmd.OSCommand.Quote("test"),
-		},
-		{
-			testName: "Commit with multiline message",
-			message:  "line1\nline2",
-			flags:    "",
-			expected: "git commit -m " + gitCmd.OSCommand.Quote("line1") + " -m " + gitCmd.OSCommand.Quote("line2"),
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			cmdStr := gitCmd.CommitCmdStr(s.message, s.flags)
-			assert.Equal(t, s.expected, cmdStr)
-		})
-	}
-}
-
-// TestGitCommandCreateFixupCommit is a function.
-func TestGitCommandCreateFixupCommit(t *testing.T) {
-	type scenario struct {
-		testName string
-		sha      string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"valid case",
-			"12345",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  `git commit --fixup=12345`,
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.CreateFixupCommit(s.sha))
-		})
-	}
-}

pkg/commands/config.go

@@ -1,50 +0,0 @@
-package commands
-
-import (
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func (c *GitCommand) ConfiguredPager() string {
-	if os.Getenv("GIT_PAGER") != "" {
-		return os.Getenv("GIT_PAGER")
-	}
-	if os.Getenv("PAGER") != "" {
-		return os.Getenv("PAGER")
-	}
-	output := c.GitConfig.Get("core.pager")
-	return strings.Split(output, "\n")[0]
-}
-
-func (c *GitCommand) GetPager(width int) string {
-	useConfig := c.Config.GetUserConfig().Git.Paging.UseConfig
-	if useConfig {
-		pager := c.ConfiguredPager()
-		return strings.Split(pager, "| less")[0]
-	}
-
-	templateValues := map[string]string{
-		"columnWidth": strconv.Itoa(width/2 - 6),
-	}
-
-	pagerTemplate := c.Config.GetUserConfig().Git.Paging.Pager
-	return utils.ResolvePlaceholderString(pagerTemplate, templateValues)
-}
-
-func (c *GitCommand) colorArg() string {
-	return c.Config.GetUserConfig().Git.Paging.ColorArg
-}
-
-// UsingGpg tells us whether the user has gpg enabled so that we can know
-// whether we need to run a subprocess to allow them to enter their password
-func (c *GitCommand) UsingGpg() bool {
-	overrideGpg := c.Config.GetUserConfig().Git.OverrideGpg
-	if overrideGpg {
-		return false
-	}
-
-	return c.GitConfig.GetBool("commit.gpgsign")
-}

pkg/commands/dummies.go

@@ -1,30 +0,0 @@
-package commands
-
-import (
-	"io"
-	"io/ioutil"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// NewDummyGitCommand creates a new dummy GitCommand for testing
-func NewDummyGitCommand() *GitCommand {
-	return NewDummyGitCommandWithOSCommand(oscommands.NewDummyOSCommand())
-}
-
-// NewDummyGitCommandWithOSCommand creates a new dummy GitCommand for testing
-func NewDummyGitCommandWithOSCommand(osCommand *oscommands.OSCommand) *GitCommand {
-	newAppConfig := config.NewDummyAppConfig()
-	return &GitCommand{
-		Log:          utils.NewDummyLog(),
-		OSCommand:    osCommand,
-		Tr:           i18n.NewTranslationSet(utils.NewDummyLog(), newAppConfig.GetUserConfig().Gui.Language),
-		Config:       newAppConfig,
-		GitConfig:    git_config.NewFakeGitConfig(map[string]string{}),
-		GetCmdWriter: func() io.Writer { return ioutil.Discard },
-	}
-}

pkg/commands/files.go

@@ -1,363 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"time"
-
-	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/gui/filetree"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// CatFile obtains the content of a file
-func (c *GitCommand) CatFile(fileName string) (string, error) {
-	buf, err := ioutil.ReadFile(fileName)
-	if err != nil {
-		return "", nil
-	}
-	return string(buf), nil
-}
-
-func (c *GitCommand) OpenMergeToolCmd() string {
-	return "git mergetool"
-}
-
-func (c *GitCommand) OpenMergeTool() error {
-	return c.OSCommand.RunCommand("git mergetool")
-}
-
-// StageFile stages a file
-func (c *GitCommand) StageFile(fileName string) error {
-	return c.RunCommand("git add -- %s", c.OSCommand.Quote(fileName))
-}
-
-// StageAll stages all files
-func (c *GitCommand) StageAll() error {
-	return c.RunCommand("git add -A")
-}
-
-// UnstageAll unstages all files
-func (c *GitCommand) UnstageAll() error {
-	return c.RunCommand("git reset")
-}
-
-// UnStageFile unstages a file
-// we accept an array of filenames for the cases where a file has been renamed i.e.
-// we accept the current name and the previous name
-func (c *GitCommand) UnStageFile(fileNames []string, reset bool) error {
-	command := "git rm --cached --force -- %s"
-	if reset {
-		command = "git reset HEAD -- %s"
-	}
-
-	for _, name := range fileNames {
-		if err := c.OSCommand.RunCommand(command, c.OSCommand.Quote(name)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c *GitCommand) BeforeAndAfterFileForRename(file *models.File) (*models.File, *models.File, error) {
-
-	if !file.IsRename() {
-		return nil, nil, errors.New("Expected renamed file")
-	}
-
-	// we've got a file that represents a rename from one file to another. Here we will refetch
-	// all files, passing the --no-renames flag and then recursively call the function
-	// again for the before file and after file.
-
-	filesWithoutRenames := c.GetStatusFiles(GetStatusFileOptions{NoRenames: true})
-	var beforeFile *models.File
-	var afterFile *models.File
-	for _, f := range filesWithoutRenames {
-		if f.Name == file.PreviousName {
-			beforeFile = f
-		}
-
-		if f.Name == file.Name {
-			afterFile = f
-		}
-	}
-
-	if beforeFile == nil || afterFile == nil {
-		return nil, nil, errors.New("Could not find deleted file or new file for file rename")
-	}
-
-	if beforeFile.IsRename() || afterFile.IsRename() {
-		// probably won't happen but we want to ensure we don't get an infinite loop
-		return nil, nil, errors.New("Nested rename found")
-	}
-
-	return beforeFile, afterFile, nil
-}
-
-// DiscardAllFileChanges directly
-func (c *GitCommand) DiscardAllFileChanges(file *models.File) error {
-	if file.IsRename() {
-		beforeFile, afterFile, err := c.BeforeAndAfterFileForRename(file)
-		if err != nil {
-			return err
-		}
-
-		if err := c.DiscardAllFileChanges(beforeFile); err != nil {
-			return err
-		}
-
-		if err := c.DiscardAllFileChanges(afterFile); err != nil {
-			return err
-		}
-
-		return nil
-	}
-
-	quotedFileName := c.OSCommand.Quote(file.Name)
-
-	if file.ShortStatus == "AA" {
-		if err := c.RunCommand("git checkout --ours --  %s", quotedFileName); err != nil {
-			return err
-		}
-		if err := c.RunCommand("git add -- %s", quotedFileName); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	if file.ShortStatus == "DU" {
-		return c.RunCommand("git rm -- %s", quotedFileName)
-	}
-
-	// if the file isn't tracked, we assume you want to delete it
-	if file.HasStagedChanges || file.HasMergeConflicts {
-		if err := c.RunCommand("git reset -- %s", quotedFileName); err != nil {
-			return err
-		}
-	}
-
-	if file.ShortStatus == "DD" || file.ShortStatus == "AU" {
-		return nil
-	}
-
-	if file.Added {
-		return c.OSCommand.RemoveFile(file.Name)
-	}
-	return c.DiscardUnstagedFileChanges(file)
-}
-
-func (c *GitCommand) DiscardAllDirChanges(node *filetree.FileNode) error {
-	// this could be more efficient but we would need to handle all the edge cases
-	return node.ForEachFile(c.DiscardAllFileChanges)
-}
-
-func (c *GitCommand) DiscardUnstagedDirChanges(node *filetree.FileNode) error {
-	if err := c.RemoveUntrackedDirFiles(node); err != nil {
-		return err
-	}
-
-	quotedPath := c.OSCommand.Quote(node.GetPath())
-	if err := c.RunCommand("git checkout -- %s", quotedPath); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *GitCommand) RemoveUntrackedDirFiles(node *filetree.FileNode) error {
-	untrackedFilePaths := node.GetPathsMatching(
-		func(n *filetree.FileNode) bool { return n.File != nil && !n.File.GetIsTracked() },
-	)
-
-	for _, path := range untrackedFilePaths {
-		err := os.Remove(path)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// DiscardUnstagedFileChanges directly
-func (c *GitCommand) DiscardUnstagedFileChanges(file *models.File) error {
-	quotedFileName := c.OSCommand.Quote(file.Name)
-	return c.RunCommand("git checkout -- %s", quotedFileName)
-}
-
-// Ignore adds a file to the gitignore for the repo
-func (c *GitCommand) Ignore(filename string) error {
-	return c.OSCommand.AppendLineToFile(".gitignore", filename)
-}
-
-// WorktreeFileDiff returns the diff of a file
-func (c *GitCommand) WorktreeFileDiff(file *models.File, plain bool, cached bool, ignoreWhitespace bool) string {
-	// for now we assume an error means the file was deleted
-	s, _ := c.OSCommand.RunCommandWithOutput(c.WorktreeFileDiffCmdStr(file, plain, cached, ignoreWhitespace))
-	return s
-}
-
-func (c *GitCommand) WorktreeFileDiffCmdStr(node models.IFile, plain bool, cached bool, ignoreWhitespace bool) string {
-	cachedArg := ""
-	trackedArg := "--"
-	colorArg := c.colorArg()
-	quotedPath := c.OSCommand.Quote(node.GetPath())
-	ignoreWhitespaceArg := ""
-	if cached {
-		cachedArg = "--cached"
-	}
-	if !node.GetIsTracked() && !node.GetHasStagedChanges() && !cached {
-		trackedArg = "--no-index -- /dev/null"
-	}
-	if plain {
-		colorArg = "never"
-	}
-	if ignoreWhitespace {
-		ignoreWhitespaceArg = "--ignore-all-space"
-	}
-
-	return fmt.Sprintf("git diff --submodule --no-ext-diff --color=%s %s %s %s %s", colorArg, ignoreWhitespaceArg, cachedArg, trackedArg, quotedPath)
-}
-
-func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
-	filepath := filepath.Join(c.Config.GetTempDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
-	c.Log.Infof("saving temporary patch to %s", filepath)
-	if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil {
-		return err
-	}
-
-	flagStr := ""
-	for _, flag := range flags {
-		flagStr += " --" + flag
-	}
-
-	return c.RunCommand("git apply %s %s", flagStr, c.OSCommand.Quote(filepath))
-}
-
-// 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 (c *GitCommand) ShowFileDiff(from string, to string, reverse bool, fileName string, plain bool) (string, error) {
-	cmdStr := c.ShowFileDiffCmdStr(from, to, reverse, fileName, plain)
-	return c.OSCommand.RunCommandWithOutput(cmdStr)
-}
-
-func (c *GitCommand) ShowFileDiffCmdStr(from string, to string, reverse bool, fileName string, plain bool) string {
-	colorArg := c.colorArg()
-	if plain {
-		colorArg = "never"
-	}
-
-	reverseFlag := ""
-	if reverse {
-		reverseFlag = " -R "
-	}
-
-	return fmt.Sprintf("git diff --submodule --no-ext-diff --no-renames --color=%s %s %s %s -- %s", colorArg, from, to, reverseFlag, c.OSCommand.Quote(fileName))
-}
-
-// CheckoutFile checks out the file for the given commit
-func (c *GitCommand) CheckoutFile(commitSha, fileName string) error {
-	return c.RunCommand("git checkout %s -- %s", commitSha, c.OSCommand.Quote(fileName))
-}
-
-// DiscardOldFileChanges discards changes to a file from an old commit
-func (c *GitCommand) DiscardOldFileChanges(commits []*models.Commit, commitIndex int, fileName string) error {
-	if err := c.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)
-	if err := c.RunCommand("git cat-file -e HEAD^:%s", c.OSCommand.Quote(fileName)); err != nil {
-		if err := c.OSCommand.Remove(fileName); err != nil {
-			return err
-		}
-		if err := c.StageFile(fileName); err != nil {
-			return err
-		}
-	} else if err := c.CheckoutFile("HEAD^", fileName); err != nil {
-		return err
-	}
-
-	// amend the commit
-	err := c.AmendHead()
-	if err != nil {
-		return err
-	}
-
-	// continue
-	return c.GenericMergeOrRebaseAction("rebase", "continue")
-}
-
-// DiscardAnyUnstagedFileChanges discards any unstages file changes via `git checkout -- .`
-func (c *GitCommand) DiscardAnyUnstagedFileChanges() error {
-	return c.RunCommand("git checkout -- .")
-}
-
-// RemoveTrackedFiles will delete the given file(s) even if they are currently tracked
-func (c *GitCommand) RemoveTrackedFiles(name string) error {
-	return c.RunCommand("git rm -r --cached -- %s", c.OSCommand.Quote(name))
-}
-
-// RemoveUntrackedFiles runs `git clean -fd`
-func (c *GitCommand) RemoveUntrackedFiles() error {
-	return c.RunCommand("git clean -fd")
-}
-
-// ResetAndClean removes all unstaged changes and removes all untracked files
-func (c *GitCommand) ResetAndClean() error {
-	submoduleConfigs, err := c.GetSubmoduleConfigs()
-	if err != nil {
-		return err
-	}
-
-	if len(submoduleConfigs) > 0 {
-		if err := c.ResetSubmodules(submoduleConfigs); err != nil {
-			return err
-		}
-	}
-
-	if err := c.ResetHard("HEAD"); err != nil {
-		return err
-	}
-
-	return c.RemoveUntrackedFiles()
-}
-
-func (c *GitCommand) EditFileCmdStr(filename string, lineNumber int) (string, error) {
-	editor := c.Config.GetUserConfig().OS.EditCommand
-
-	if editor == "" {
-		editor = c.GitConfig.Get("core.editor")
-	}
-
-	if editor == "" {
-		editor = c.OSCommand.Getenv("GIT_EDITOR")
-	}
-	if editor == "" {
-		editor = c.OSCommand.Getenv("VISUAL")
-	}
-	if editor == "" {
-		editor = c.OSCommand.Getenv("EDITOR")
-	}
-	if editor == "" {
-		if err := c.OSCommand.RunCommand("which vi"); err == nil {
-			editor = "vi"
-		}
-	}
-	if editor == "" {
-		return "", errors.New("No editor defined in config file, $GIT_EDITOR, $VISUAL, $EDITOR, or git config")
-	}
-
-	templateValues := map[string]string{
-		"editor":   editor,
-		"filename": c.OSCommand.Quote(filename),
-		"line":     strconv.Itoa(lineNumber),
-	}
-
-	editCmdTemplate := c.Config.GetUserConfig().OS.EditCommandTemplate
-	return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil
-}

pkg/commands/files_test.go

@@ -1,878 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os/exec"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/jesseduffield/lazygit/pkg/secureexec"
-	"github.com/jesseduffield/lazygit/pkg/test"
-	"github.com/stretchr/testify/assert"
-)
-
-// TestGitCommandStageFile is a function.
-func TestGitCommandStageFile(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-	gitCmd.OSCommand.Command = func(cmd string, args ...string) *exec.Cmd {
-		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"add", "--", "test.txt"}, args)
-
-		return secureexec.Command("echo")
-	}
-
-	assert.NoError(t, gitCmd.StageFile("test.txt"))
-}
-
-// TestGitCommandUnstageFile is a function.
-func TestGitCommandUnstageFile(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-		reset    bool
-	}
-
-	scenarios := []scenario{
-		{
-			"Remove an untracked file from staging",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"rm", "--cached", "--force", "--", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-			false,
-		},
-		{
-			"Remove a tracked file from staging",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"reset", "HEAD", "--", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-			true,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.UnStageFile([]string{"test.txt"}, s.reset))
-		})
-	}
-}
-
-// TestGitCommandDiscardAllFileChanges is a function.
-// these tests don't cover everything, in part because we already have an integration
-// test which does cover everything. I don't want to unnecessarily assert on the 'how'
-// when the 'what' is what matters
-func TestGitCommandDiscardAllFileChanges(t *testing.T) {
-	type scenario struct {
-		testName   string
-		command    func() (func(string, ...string) *exec.Cmd, *[][]string)
-		test       func(*[][]string, error)
-		file       *models.File
-		removeFile func(string) error
-	}
-
-	scenarios := []scenario{
-		{
-			"An error occurred when resetting",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("test")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.Error(t, err)
-				assert.Len(t, *cmdsCalled, 1)
-				assert.EqualValues(t, *cmdsCalled, [][]string{
-					{"reset", "--", "test"},
-				})
-			},
-			&models.File{
-				Name:             "test",
-				HasStagedChanges: true,
-			},
-			func(string) error {
-				return nil
-			},
-		},
-		{
-			"An error occurred when removing file",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("test")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.Error(t, err)
-				assert.EqualError(t, err, "an error occurred when removing file")
-				assert.Len(t, *cmdsCalled, 0)
-			},
-			&models.File{
-				Name:    "test",
-				Tracked: false,
-				Added:   true,
-			},
-			func(string) error {
-				return fmt.Errorf("an error occurred when removing file")
-			},
-		},
-		{
-			"An error occurred with checkout",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("test")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.Error(t, err)
-				assert.Len(t, *cmdsCalled, 1)
-				assert.EqualValues(t, *cmdsCalled, [][]string{
-					{"checkout", "--", "test"},
-				})
-			},
-			&models.File{
-				Name:             "test",
-				Tracked:          true,
-				HasStagedChanges: false,
-			},
-			func(string) error {
-				return nil
-			},
-		},
-		{
-			"Checkout only",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("echo")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.NoError(t, err)
-				assert.Len(t, *cmdsCalled, 1)
-				assert.EqualValues(t, *cmdsCalled, [][]string{
-					{"checkout", "--", "test"},
-				})
-			},
-			&models.File{
-				Name:             "test",
-				Tracked:          true,
-				HasStagedChanges: false,
-			},
-			func(string) error {
-				return nil
-			},
-		},
-		{
-			"Reset and checkout staged changes",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("echo")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.NoError(t, err)
-				assert.Len(t, *cmdsCalled, 2)
-				assert.EqualValues(t, *cmdsCalled, [][]string{
-					{"reset", "--", "test"},
-					{"checkout", "--", "test"},
-				})
-			},
-			&models.File{
-				Name:             "test",
-				Tracked:          true,
-				HasStagedChanges: true,
-			},
-			func(string) error {
-				return nil
-			},
-		},
-		{
-			"Reset and checkout merge conflicts",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("echo")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.NoError(t, err)
-				assert.Len(t, *cmdsCalled, 2)
-				assert.EqualValues(t, *cmdsCalled, [][]string{
-					{"reset", "--", "test"},
-					{"checkout", "--", "test"},
-				})
-			},
-			&models.File{
-				Name:              "test",
-				Tracked:           true,
-				HasMergeConflicts: true,
-			},
-			func(string) error {
-				return nil
-			},
-		},
-		{
-			"Reset and remove",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("echo")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.NoError(t, err)
-				assert.Len(t, *cmdsCalled, 1)
-				assert.EqualValues(t, *cmdsCalled, [][]string{
-					{"reset", "--", "test"},
-				})
-			},
-			&models.File{
-				Name:             "test",
-				Tracked:          false,
-				Added:            true,
-				HasStagedChanges: true,
-			},
-			func(filename string) error {
-				assert.Equal(t, "test", filename)
-				return nil
-			},
-		},
-		{
-			"Remove only",
-			func() (func(string, ...string) *exec.Cmd, *[][]string) {
-				cmdsCalled := [][]string{}
-				return func(cmd string, args ...string) *exec.Cmd {
-					cmdsCalled = append(cmdsCalled, args)
-
-					return secureexec.Command("echo")
-				}, &cmdsCalled
-			},
-			func(cmdsCalled *[][]string, err error) {
-				assert.NoError(t, err)
-				assert.Len(t, *cmdsCalled, 0)
-			},
-			&models.File{
-				Name:             "test",
-				Tracked:          false,
-				Added:            true,
-				HasStagedChanges: false,
-			},
-			func(filename string) error {
-				assert.Equal(t, "test", filename)
-				return nil
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			var cmdsCalled *[][]string
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command, cmdsCalled = s.command()
-			gitCmd.OSCommand.SetRemoveFile(s.removeFile)
-			s.test(cmdsCalled, gitCmd.DiscardAllFileChanges(s.file))
-		})
-	}
-}
-
-// TestGitCommandDiff is a function.
-func TestGitCommandDiff(t *testing.T) {
-	type scenario struct {
-		testName         string
-		command          func(string, ...string) *exec.Cmd
-		file             *models.File
-		plain            bool
-		cached           bool
-		ignoreWhitespace bool
-	}
-
-	scenarios := []scenario{
-		{
-			"Default case",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--submodule", "--no-ext-diff", "--color=always", "--", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			&models.File{
-				Name:             "test.txt",
-				HasStagedChanges: false,
-				Tracked:          true,
-			},
-			false,
-			false,
-			false,
-		},
-		{
-			"cached",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--submodule", "--no-ext-diff", "--color=always", "--cached", "--", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			&models.File{
-				Name:             "test.txt",
-				HasStagedChanges: false,
-				Tracked:          true,
-			},
-			false,
-			true,
-			false,
-		},
-		{
-			"plain",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--submodule", "--no-ext-diff", "--color=never", "--", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			&models.File{
-				Name:             "test.txt",
-				HasStagedChanges: false,
-				Tracked:          true,
-			},
-			true,
-			false,
-			false,
-		},
-		{
-			"File not tracked and file has no staged changes",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--submodule", "--no-ext-diff", "--color=always", "--no-index", "--", "/dev/null", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			&models.File{
-				Name:             "test.txt",
-				HasStagedChanges: false,
-				Tracked:          false,
-			},
-			false,
-			false,
-			false,
-		},
-		{
-			"Default case (ignore whitespace)",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--submodule", "--no-ext-diff", "--color=always", "--ignore-all-space", "--", "test.txt"}, args)
-
-				return secureexec.Command("echo")
-			},
-			&models.File{
-				Name:             "test.txt",
-				HasStagedChanges: false,
-				Tracked:          true,
-			},
-			false,
-			false,
-			true,
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			gitCmd.WorktreeFileDiff(s.file, s.plain, s.cached, s.ignoreWhitespace)
-		})
-	}
-}
-
-// TestGitCommandCheckoutFile is a function.
-func TestGitCommandCheckoutFile(t *testing.T) {
-	type scenario struct {
-		testName  string
-		commitSha string
-		fileName  string
-		command   func(string, ...string) *exec.Cmd
-		test      func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"typical case",
-			"11af912",
-			"test999.txt",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  "git checkout 11af912 -- test999.txt",
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"returns error if there is one",
-			"11af912",
-			"test999.txt",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  "git checkout 11af912 -- test999.txt",
-					Replace: "test",
-				},
-			}),
-			func(err error) {
-				assert.Error(t, err)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.CheckoutFile(s.commitSha, s.fileName))
-		})
-	}
-}
-
-func TestGitCommandApplyPatch(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"valid case",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.Equal(t, "git", cmd)
-				assert.EqualValues(t, []string{"apply", "--cached"}, args[0:2])
-				filename := args[2]
-				content, err := ioutil.ReadFile(filename)
-				assert.NoError(t, err)
-
-				assert.Equal(t, "test", string(content))
-
-				return secureexec.Command("echo", "done")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"command returns error",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.Equal(t, "git", cmd)
-				assert.EqualValues(t, []string{"apply", "--cached"}, args[0:2])
-				filename := args[2]
-				// TODO: Ideally we want to mock out OSCommand here so that we're not
-				// double handling testing it's CreateTempFile functionality,
-				// but it is going to take a bit of work to make a proper mock for it
-				// so I'm leaving it for another PR
-				content, err := ioutil.ReadFile(filename)
-				assert.NoError(t, err)
-
-				assert.Equal(t, "test", string(content))
-
-				return secureexec.Command("test")
-			},
-			func(err error) {
-				assert.Error(t, err)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd := NewDummyGitCommand()
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.ApplyPatch("test", "cached"))
-		})
-	}
-}
-
-func TestGitCommandDiscardOldFileChanges(t *testing.T) {
-	type scenario struct {
-		testName               string
-		gitConfigMockResponses map[string]string
-		commits                []*models.Commit
-		commitIndex            int
-		fileName               string
-		command                func(string, ...string) *exec.Cmd
-		test                   func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"returns error when index outside of range of commits",
-			nil,
-			[]*models.Commit{},
-			0,
-			"test999.txt",
-			nil,
-			func(err error) {
-				assert.Error(t, err)
-			},
-		},
-		{
-			"returns error when using gpg",
-			map[string]string{"commit.gpgsign": "true"},
-			[]*models.Commit{{Name: "commit", Sha: "123456"}},
-			0,
-			"test999.txt",
-			nil,
-			func(err error) {
-				assert.Error(t, err)
-			},
-		},
-		{
-			"checks out file if it already existed",
-			nil,
-			[]*models.Commit{
-				{Name: "commit", Sha: "123456"},
-				{Name: "commit2", Sha: "abcdef"},
-			},
-			0,
-			"test999.txt",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  "git rebase --interactive --autostash --keep-empty abcdef",
-					Replace: "echo",
-				},
-				{
-					Expect:  "git cat-file -e HEAD^:test999.txt",
-					Replace: "echo",
-				},
-				{
-					Expect:  "git checkout HEAD^ -- test999.txt",
-					Replace: "echo",
-				},
-				{
-					Expect:  "git commit --amend --no-edit --allow-empty",
-					Replace: "echo",
-				},
-				{
-					Expect:  "git rebase --continue",
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-		// test for when the file was created within the commit requires a refactor to support proper mocks
-		// currently we'd need to mock out the os.Remove function and that's gonna introduce tech debt
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			gitCmd.GitConfig = git_config.NewFakeGitConfig(s.gitConfigMockResponses)
-			s.test(gitCmd.DiscardOldFileChanges(s.commits, s.commitIndex, s.fileName))
-		})
-	}
-}
-
-// TestGitCommandDiscardUnstagedFileChanges is a function.
-func TestGitCommandDiscardUnstagedFileChanges(t *testing.T) {
-	type scenario struct {
-		testName string
-		file     *models.File
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"valid case",
-			&models.File{Name: "test.txt"},
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  `git checkout -- "test.txt"`,
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.DiscardUnstagedFileChanges(s.file))
-		})
-	}
-}
-
-// TestGitCommandDiscardAnyUnstagedFileChanges is a function.
-func TestGitCommandDiscardAnyUnstagedFileChanges(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"valid case",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  `git checkout -- .`,
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.DiscardAnyUnstagedFileChanges())
-		})
-	}
-}
-
-// TestGitCommandRemoveUntrackedFiles is a function.
-func TestGitCommandRemoveUntrackedFiles(t *testing.T) {
-	type scenario struct {
-		testName string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"valid case",
-			test.CreateMockCommand(t, []*test.CommandSwapper{
-				{
-					Expect:  `git clean -fd`,
-					Replace: "echo",
-				},
-			}),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	gitCmd := NewDummyGitCommand()
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			gitCmd.OSCommand.Command = s.command
-			s.test(gitCmd.RemoveUntrackedFiles())
-		})
-	}
-}
-
-// TestEditFileCmdStr is a function.
-func TestEditFileCmdStr(t *testing.T) {
-	gitCmd := NewDummyGitCommand()
-
-	type scenario struct {
-		filename                  string
-		configEditCommand         string
-		configEditCommandTemplate string
-		command                   func(string, ...string) *exec.Cmd
-		getenv                    func(string) string
-		gitConfigMockResponses    map[string]string
-		test                      func(string, error)
-	}
-
-	scenarios := []scenario{
-		{
-			"test",
-			"",
-			"{{editor}} {{filename}}",
-			func(name string, arg ...string) *exec.Cmd {
-				return secureexec.Command("exit", "1")
-			},
-			func(env string) string {
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.EqualError(t, err, "No editor defined in config file, $GIT_EDITOR, $VISUAL, $EDITOR, or git config")
-			},
-		},
-		{
-			"test",
-			"nano",
-			"{{editor}} {{filename}}",
-			func(name string, args ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("echo")
-			},
-			func(env string) string {
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "nano "+gitCmd.OSCommand.Quote("test"), cmdStr)
-			},
-		},
-		{
-			"test",
-			"",
-			"{{editor}} {{filename}}",
-			func(name string, arg ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("exit", "1")
-			},
-			func(env string) string {
-				return ""
-			},
-			map[string]string{"core.editor": "nano"},
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "nano "+gitCmd.OSCommand.Quote("test"), cmdStr)
-			},
-		},
-		{
-			"test",
-			"",
-			"{{editor}} {{filename}}",
-			func(name string, arg ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("exit", "1")
-			},
-			func(env string) string {
-				if env == "VISUAL" {
-					return "nano"
-				}
-
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"test",
-			"",
-			"{{editor}} {{filename}}",
-			func(name string, arg ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("exit", "1")
-			},
-			func(env string) string {
-				if env == "EDITOR" {
-					return "emacs"
-				}
-
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "emacs "+gitCmd.OSCommand.Quote("test"), cmdStr)
-			},
-		},
-		{
-			"test",
-			"",
-			"{{editor}} {{filename}}",
-			func(name string, arg ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("echo")
-			},
-			func(env string) string {
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "vi "+gitCmd.OSCommand.Quote("test"), cmdStr)
-			},
-		},
-		{
-			"file/with space",
-			"",
-			"{{editor}} {{filename}}",
-			func(name string, args ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("echo")
-			},
-			func(env string) string {
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "vi "+gitCmd.OSCommand.Quote("file/with space"), cmdStr)
-			},
-		},
-		{
-			"open file/at line",
-			"vim",
-			"{{editor}} +{{line}} {{filename}}",
-			func(name string, args ...string) *exec.Cmd {
-				assert.Equal(t, "which", name)
-				return secureexec.Command("echo")
-			},
-			func(env string) string {
-				return ""
-			},
-			nil,
-			func(cmdStr string, err error) {
-				assert.NoError(t, err)
-				assert.Equal(t, "vim +1 "+gitCmd.OSCommand.Quote("open file/at line"), cmdStr)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		gitCmd.Config.GetUserConfig().OS.EditCommand = s.configEditCommand
-		gitCmd.Config.GetUserConfig().OS.EditCommandTemplate = s.configEditCommandTemplate
-		gitCmd.OSCommand.Command = s.command
-		gitCmd.OSCommand.Getenv = s.getenv
-		gitCmd.GitConfig = git_config.NewFakeGitConfig(s.gitConfigMockResponses)
-		s.test(gitCmd.EditFileCmdStr(s.filename, 1))
-	}
-}

pkg/commands/git.go

@@ -1,115 +1,170 @@
 package commands
 
 import (
-	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/go-errors/errors"
+	"github.com/sasha-s/go-deadlock"
 
 	gogit "github.com/jesseduffield/go-git/v5"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
-	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/common"
 	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/sirupsen/logrus"
 )
 
-// this takes something like:
-// * (HEAD detached at 264fc6f5)
-//	remotes
-// and returns '264fc6f5' as the second match
-const CurrentBranchNameRegex = `(?m)^\*.*?([^ ]*?)\)?$`
-
 // GitCommand is our main git interface
 type GitCommand struct {
-	Log                  *logrus.Entry
-	OSCommand            *oscommands.OSCommand
-	Repo                 *gogit.Repository
-	Tr                   *i18n.TranslationSet
-	Config               config.AppConfigurer
-	DotGitDir            string
-	onSuccessfulContinue func() error
-	PatchManager         *patch.PatchManager
-	GitConfig            git_config.IGitConfig
+	Branch      *git_commands.BranchCommands
+	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
+	Rebase      *git_commands.RebaseCommands
+	Remote      *git_commands.RemoteCommands
+	Stash       *git_commands.StashCommands
+	Status      *git_commands.StatusCommands
+	Submodule   *git_commands.SubmoduleCommands
+	Sync        *git_commands.SyncCommands
+	Tag         *git_commands.TagCommands
+	WorkingTree *git_commands.WorkingTreeCommands
+	Bisect      *git_commands.BisectCommands
 
-	// Push to current determines whether the user has configured to push to the remote branch of the same name as the current or not
-	PushToCurrent bool
-
-	// this is just a view that we write to when running certain commands.
-	// Coincidentally at the moment it's the same view that OnRunCommand logs to
-	// but that need not always be the case.
-	GetCmdWriter func() io.Writer
+	Loaders Loaders
+}
+
+type Loaders struct {
+	BranchLoader       *git_commands.BranchLoader
+	CommitFileLoader   *git_commands.CommitFileLoader
+	CommitLoader       *git_commands.CommitLoader
+	FileLoader         *git_commands.FileLoader
+	ReflogCommitLoader *git_commands.ReflogCommitLoader
+	RemoteLoader       *git_commands.RemoteLoader
+	StashLoader        *git_commands.StashLoader
+	TagLoader          *git_commands.TagLoader
 }
 
-// NewGitCommand it runs git commands
 func NewGitCommand(
-	log *logrus.Entry,
+	cmn *common.Common,
+	version *git_commands.GitVersion,
 	osCommand *oscommands.OSCommand,
-	tr *i18n.TranslationSet,
-	config config.AppConfigurer,
 	gitConfig git_config.IGitConfig,
+	syncMutex *deadlock.Mutex,
 ) (*GitCommand, error) {
-	var repo *gogit.Repository
-
-	pushToCurrent := gitConfig.Get("push.default") == "current"
-
 	if err := navigateToRepoRootDirectory(os.Stat, os.Chdir); err != nil {
 		return nil, err
 	}
 
-	var err error
-	if repo, err = setupRepository(gogit.PlainOpen, tr.GitconfigParseErr); err != nil {
-		return nil, err
-	}
-
-	dotGitDir, err := findDotGitDir(os.Stat, ioutil.ReadFile)
+	repo, err := setupRepository(gogit.PlainOpenWithOptions, gogit.PlainOpenOptions{DetectDotGit: false, EnableDotGitCommonDir: true}, cmn.Tr.GitconfigParseErr)
 	if err != nil {
 		return nil, err
 	}
 
-	gitCommand := &GitCommand{
-		Log:           log,
-		OSCommand:     osCommand,
-		Tr:            tr,
-		Repo:          repo,
-		Config:        config,
-		DotGitDir:     dotGitDir,
-		PushToCurrent: pushToCurrent,
-		GitConfig:     gitConfig,
-		GetCmdWriter:  func() io.Writer { return ioutil.Discard },
+	dotGitDir, err := findDotGitDir(os.Stat, os.ReadFile)
+	if err != nil {
+		return nil, err
 	}
 
-	gitCommand.PatchManager = patch.NewPatchManager(log, gitCommand.ApplyPatch, gitCommand.ShowFileDiff)
-
-	return gitCommand, nil
+	return NewGitCommandAux(
+		cmn,
+		version,
+		osCommand,
+		gitConfig,
+		dotGitDir,
+		repo,
+		syncMutex,
+	), nil
 }
 
-func (c *GitCommand) WithSpan(span string) *GitCommand {
-	// sometimes .WithSpan(span) will be called where span actually is empty, in
-	// which case we don't need to log anything so we can just return early here
-	// with the original struct
-	if span == "" {
-		return c
+func NewGitCommandAux(
+	cmn *common.Common,
+	version *git_commands.GitVersion,
+	osCommand *oscommands.OSCommand,
+	gitConfig git_config.IGitConfig,
+	dotGitDir string,
+	repo *gogit.Repository,
+	syncMutex *deadlock.Mutex,
+) *GitCommand {
+	cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd)
+
+	// here we're doing a bunch of dependency injection for each of our commands structs.
+	// This is admittedly messy, but allows us to test each command struct in isolation,
+	// and allows for better namespacing when compared to having every method living
+	// on the one struct.
+	// common ones are: cmn, osCommand, dotGitDir, configCommands
+	configCommands := git_commands.NewConfigCommands(cmn, gitConfig, repo)
+
+	fileLoader := git_commands.NewFileLoader(cmn, 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)
+	branchCommands := git_commands.NewBranchCommands(gitCommon)
+	syncCommands := git_commands.NewSyncCommands(gitCommon)
+	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)
+	rebaseCommands := git_commands.NewRebaseCommands(gitCommon, commitCommands, workingTreeCommands)
+	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) {
+			// 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)
+
+	branchLoader := git_commands.NewBranchLoader(cmn, cmd, branchCommands.CurrentBranchInfo, configCommands)
+	commitFileLoader := git_commands.NewCommitFileLoader(cmn, cmd)
+	commitLoader := git_commands.NewCommitLoader(cmn, cmd, dotGitDir, statusCommands.RebaseMode, gitCommon)
+	reflogCommitLoader := git_commands.NewReflogCommitLoader(cmn, cmd)
+	remoteLoader := git_commands.NewRemoteLoader(cmn, cmd, repo.Remotes)
+	stashLoader := git_commands.NewStashLoader(cmn, cmd)
+	tagLoader := git_commands.NewTagLoader(cmn, cmd)
+
+	return &GitCommand{
+		Branch:      branchCommands,
+		Commit:      commitCommands,
+		Config:      configCommands,
+		Custom:      customCommands,
+		Diff:        diffCommands,
+		File:        fileCommands,
+		Flow:        flowCommands,
+		Patch:       patchCommands,
+		Rebase:      rebaseCommands,
+		Remote:      remoteCommands,
+		Stash:       stashCommands,
+		Status:      statusCommands,
+		Submodule:   submoduleCommands,
+		Sync:        syncCommands,
+		Tag:         tagCommands,
+		Bisect:      bisectCommands,
+		WorkingTree: workingTreeCommands,
+		Loaders: Loaders{
+			BranchLoader:       branchLoader,
+			CommitFileLoader:   commitFileLoader,
+			CommitLoader:       commitLoader,
+			FileLoader:         fileLoader,
+			ReflogCommitLoader: reflogCommitLoader,
+			RemoteLoader:       remoteLoader,
+			StashLoader:        stashLoader,
+			TagLoader:          tagLoader,
+		},
 	}
-
-	newGitCommand := &GitCommand{}
-	*newGitCommand = *c
-	newGitCommand.OSCommand = c.OSCommand.WithSpan(span)
-
-	// NOTE: unlike the other things here which create shallow clones, this will
-	// actually update the PatchManager on the original struct to have the new span.
-	// This means each time we call ApplyPatch in PatchManager, we need to ensure
-	// we've called .WithSpan() ahead of time with the new span value
-	newGitCommand.PatchManager.ApplyPatch = newGitCommand.ApplyPatch
-
-	return newGitCommand
 }
 
 func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
@@ -169,7 +224,7 @@ func resolvePath(path string) (string, error) {
 	return filepath.EvalSymlinks(path)
 }
 
-func setupRepository(openGitRepository func(string) (*gogit.Repository, error), gitConfigParseErrorStr string) (*gogit.Repository, error) {
+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
@@ -184,8 +239,7 @@ func setupRepository(openGitRepository func(string) (*gogit.Repository, error),
 		return nil, err
 	}
 
-	repository, err := openGitRepository(path)
-
+	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)
@@ -217,44 +271,11 @@ func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filenam
 	}
 	fileContent := string(fileBytes)
 	if !strings.HasPrefix(fileContent, "gitdir: ") {
-		return "", errors.New(".git is a file which suggests we are in a submodule but the file's contents do not contain a gitdir pointing to the actual .git directory")
+		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.RunCommand("git rev-parse --git-dir")
-}
-
-func (c *GitCommand) RunCommand(formatString string, formatArgs ...interface{}) error {
-	_, err := c.RunCommandWithOutput(formatString, formatArgs...)
-	return err
-}
-
-func (c *GitCommand) RunCommandWithOutput(formatString string, formatArgs ...interface{}) (string, error) {
-	// TODO: have this retry logic in other places we run the command
-	waitTime := 50 * time.Millisecond
-	retryCount := 5
-	attempt := 0
-
-	for {
-		output, err := c.OSCommand.RunCommandWithOutput(formatString, formatArgs...)
-		if err != nil {
-			// if we have an error based on the index lock, we should wait a bit and then retry
-			if strings.Contains(output, ".git/index.lock") {
-				c.Log.Error(output)
-				c.Log.Info("index.lock prevented command from running. Retrying command after a small wait")
-				attempt++
-				time.Sleep(waitTime)
-				if attempt < retryCount {
-					continue
-				}
-			}
-		}
-		return output, err
-	}
-}
-
-func (c *GitCommand) NewCmdObjFromStr(cmdStr string) oscommands.ICmdObj {
-	return c.OSCommand.NewCmdObjFromStr(cmdStr).AddEnvVars("GIT_OPTIONAL_LOCKS=0")
+	return osCommand.Cmd.New(git_commands.NewGitCmd("rev-parse").Arg("--git-dir").ToArgv()).DontLog().Run()
 }

pkg/commands/git_cmd_obj_builder.go

@@ -0,0 +1,43 @@
+package commands
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/sirupsen/logrus"
+)
+
+// all we're doing here is wrapping the default command object builder with
+// some git-specific stuff: e.g. adding a git-specific env var
+
+type gitCmdObjBuilder struct {
+	innerBuilder *oscommands.CmdObjBuilder
+}
+
+var _ oscommands.ICmdObjBuilder = &gitCmdObjBuilder{}
+
+func NewGitCmdObjBuilder(log *logrus.Entry, innerBuilder *oscommands.CmdObjBuilder) *gitCmdObjBuilder {
+	// the price of having a convenient interface where we can say .New(...).Run() is that our builder now depends on our runner, so when we want to wrap the default builder/runner in new functionality we need to jump through some hoops. We could avoid the use of a decorator function here by just exporting the runner field on the default builder but that would be misleading because we don't want anybody using that to run commands (i.e. we want there to be a single API used across the codebase)
+	updatedBuilder := innerBuilder.CloneWithNewRunner(func(runner oscommands.ICmdObjRunner) oscommands.ICmdObjRunner {
+		return &gitCmdObjRunner{
+			log:         log,
+			innerRunner: runner,
+		}
+	})
+
+	return &gitCmdObjBuilder{
+		innerBuilder: updatedBuilder,
+	}
+}
+
+var defaultEnvVar = "GIT_OPTIONAL_LOCKS=0"
+
+func (self *gitCmdObjBuilder) New(args []string) oscommands.ICmdObj {
+	return self.innerBuilder.New(args).AddEnvVars(defaultEnvVar)
+}
+
+func (self *gitCmdObjBuilder) NewShell(cmdStr string) oscommands.ICmdObj {
+	return self.innerBuilder.NewShell(cmdStr).AddEnvVars(defaultEnvVar)
+}
+
+func (self *gitCmdObjBuilder) Quote(str string) string {
+	return self.innerBuilder.Quote(str)
+}

pkg/commands/git_cmd_obj_runner.go

@@ -0,0 +1,69 @@
+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
+}
+
+func (self *gitCmdObjRunner) Run(cmdObj oscommands.ICmdObj) error {
+	_, err := self.RunWithOutput(cmdObj)
+	return err
+}
+
+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
+}
+
+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
+}
+
+// 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

@@ -0,0 +1,181 @@
+package git_commands
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+type BisectCommands struct {
+	*GitCommon
+}
+
+func NewBisectCommands(gitCommon *GitCommon) *BisectCommands {
+	return &BisectCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+// 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 {
+	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(self.dotGitDir, "BISECT_START")
+	exists, err := self.os.FileExists(bisectStartPath)
+	if err != nil {
+		self.Log.Infof("error getting git bisect info: %s", err.Error())
+		return info
+	}
+
+	if !exists {
+		return info
+	}
+
+	startContent, err := os.ReadFile(bisectStartPath)
+	if err != nil {
+		self.Log.Infof("error getting git bisect info: %s", err.Error())
+		return info
+	}
+
+	info.started = true
+	info.start = strings.TrimSpace(string(startContent))
+
+	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 {
+		splitContent := strings.Split(string(termsContent), "\n")
+		info.newTerm = splitContent[0]
+		info.oldTerm = splitContent[1]
+	}
+
+	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())
+		return info
+	}
+
+	info.statusMap = make(map[string]BisectStatus)
+	for _, file := range files {
+		status := BisectStatusSkipped
+		name := file.Name()
+		path := filepath.Join(bisectRefsDir, name)
+
+		fileContent, err := os.ReadFile(path)
+		if err != nil {
+			self.Log.Infof("error getting git bisect info: %s", err.Error())
+			return info
+		}
+
+		sha := strings.TrimSpace(string(fileContent))
+
+		if name == info.newTerm {
+			status = BisectStatusNew
+		} else if strings.HasPrefix(name, info.oldTerm+"-") {
+			status = BisectStatusOld
+		} else if strings.HasPrefix(name, "skipped-") {
+			status = BisectStatusSkipped
+		}
+
+		info.statusMap[sha] = status
+	}
+
+	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
+	}
+	currentSha := strings.TrimSpace(string(currentContent))
+	info.current = currentSha
+
+	return info
+}
+
+func (self *BisectCommands) Reset() error {
+	cmdArgs := NewGitCmd("bisect").Arg("reset").ToArgv()
+
+	return self.cmd.New(cmdArgs).StreamOutput().Run()
+}
+
+func (self *BisectCommands) Mark(ref string, term string) error {
+	cmdArgs := NewGitCmd("bisect").Arg(term, ref).ToArgv()
+
+	return self.cmd.New(cmdArgs).
+		IgnoreEmptyError().
+		StreamOutput().
+		Run()
+}
+
+func (self *BisectCommands) Skip(ref string) error {
+	return self.Mark(ref, "skip")
+}
+
+func (self *BisectCommands) Start() error {
+	cmdArgs := NewGitCmd("bisect").Arg("start").ToArgv()
+
+	return self.cmd.New(cmdArgs).StreamOutput().Run()
+}
+
+// tells us whether we've found our problem commit(s). We return a string slice of
+// commit sha's if we're done, and that slice may have more that one item if
+// skipped commits are involved.
+func (self *BisectCommands) IsDone() (bool, []string, error) {
+	info := self.GetInfo()
+	if !info.Bisecting() {
+		return false, nil, nil
+	}
+
+	newSha := info.GetNewSha()
+	if newSha == "" {
+		return false, nil, nil
+	}
+
+	// if we start from the new commit and reach the a good commit without
+	// coming across any unprocessed commits, then we're done
+	done := false
+	candidates := []string{}
+
+	cmdArgs := NewGitCmd("rev-list").Arg(newSha).ToArgv()
+	err := self.cmd.New(cmdArgs).RunAndProcessLines(func(line string) (bool, error) {
+		sha := strings.TrimSpace(line)
+
+		if status, ok := info.statusMap[sha]; ok {
+			switch status {
+			case BisectStatusSkipped, BisectStatusNew:
+				candidates = append(candidates, sha)
+				return false, nil
+			case BisectStatusOld:
+				done = true
+				return true, nil
+			}
+		} else {
+			return true, nil
+		}
+
+		// should never land here
+		return true, nil
+	})
+	if err != nil {
+		return false, nil, err
+	}
+
+	return done, candidates, nil
+}
+
+// tells us whether the 'start' ref that we'll be sent back to after we're done
+// 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").
+		Arg("--is-ancestor", bisectInfo.GetNewSha(), bisectInfo.GetStartSha()).
+		ToArgv()
+
+	err := self.cmd.New(cmdArgs).DontLog().Run()
+
+	return err == nil
+}

pkg/commands/git_commands/bisect_info.go

@@ -0,0 +1,101 @@
+package git_commands
+
+import (
+	"github.com/jesseduffield/generics/maps"
+	"github.com/jesseduffield/generics/slices"
+	"github.com/sirupsen/logrus"
+)
+
+// although the typical terms in a git bisect are 'bad' and 'good', they're more
+// generally known as 'new' and 'old'. Semi-recently git allowed the user to define
+// their own terms e.g. when you want to used 'fixed', 'unfixed' in the event
+// that you're looking for a commit that fixed a bug.
+
+// Git bisect only keeps track of a single 'bad' commit. Once you pick a commit
+// that's older than the current bad one, it forgets about the previous one. On
+// the other hand, it does keep track of all the good and skipped commits.
+
+type BisectInfo struct {
+	log *logrus.Entry
+
+	// tells us whether all our git bisect files are there meaning we're in bisect mode.
+	// Doesn't necessarily mean that we've actually picked a good/bad commit yet.
+	started bool
+
+	// this is the ref you started the commit from
+	start string // this will always be defined
+
+	// these will be defined if we've started
+	newTerm string // 'bad' by default
+	oldTerm string // 'good' by default
+
+	// map of commit sha's to their status
+	statusMap map[string]BisectStatus
+
+	// the sha of the commit that's under test
+	current string
+}
+
+type BisectStatus int
+
+const (
+	BisectStatusOld BisectStatus = iota
+	BisectStatusNew
+	BisectStatusSkipped
+)
+
+// null object pattern
+func NewNullBisectInfo() *BisectInfo {
+	return &BisectInfo{started: false}
+}
+
+func (self *BisectInfo) GetNewSha() string {
+	for sha, status := range self.statusMap {
+		if status == BisectStatusNew {
+			return sha
+		}
+	}
+
+	return ""
+}
+
+func (self *BisectInfo) GetCurrentSha() string {
+	return self.current
+}
+
+func (self *BisectInfo) GetStartSha() string {
+	return self.start
+}
+
+func (self *BisectInfo) Status(commitSha string) (BisectStatus, bool) {
+	status, ok := self.statusMap[commitSha]
+	return status, ok
+}
+
+func (self *BisectInfo) NewTerm() string {
+	return self.newTerm
+}
+
+func (self *BisectInfo) OldTerm() string {
+	return self.oldTerm
+}
+
+// this is for when we have called `git bisect start`. It does not
+// mean that we have actually started narrowing things down or selecting good/bad commits
+func (self *BisectInfo) Started() bool {
+	return self.started
+}
+
+// this is where we have both a good and bad revision and we're actually
+// starting to narrow things down
+func (self *BisectInfo) Bisecting() bool {
+	if !self.Started() {
+		return false
+	}
+
+	if self.GetNewSha() == "" {
+		return false
+	}
+
+	return slices.Contains(maps.Values(self.statusMap), BisectStatusOld)
+}

pkg/commands/git_commands/branch.go

@@ -0,0 +1,208 @@
+package git_commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/mgutz/str"
+)
+
+type BranchCommands struct {
+	*GitCommon
+}
+
+func NewBranchCommands(gitCommon *GitCommon) *BranchCommands {
+	return &BranchCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+// New creates a new branch
+func (self *BranchCommands) New(name string, base string) error {
+	cmdArgs := NewGitCmd("checkout").
+		Arg("-b", name, base).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+// CurrentBranchInfo get the current branch information.
+func (self *BranchCommands) CurrentBranchInfo() (BranchInfo, error) {
+	branchName, err := self.cmd.New(
+		NewGitCmd("symbolic-ref").
+			Arg("--short", "HEAD").
+			ToArgv(),
+	).DontLog().RunWithOutput()
+	if err == nil && branchName != "HEAD\n" {
+		trimmedBranchName := strings.TrimSpace(branchName)
+		return BranchInfo{
+			RefName:      trimmedBranchName,
+			DisplayName:  trimmedBranchName,
+			DetachedHead: false,
+		}, nil
+	}
+	output, err := self.cmd.New(
+		NewGitCmd("branch").
+			Arg("--points-at=HEAD", "--format=%(HEAD)%00%(objectname)%00%(refname)").
+			ToArgv(),
+	).DontLog().RunWithOutput()
+	if err != nil {
+		return BranchInfo{}, err
+	}
+	for _, line := range utils.SplitLines(output) {
+		split := strings.Split(strings.TrimRight(line, "\r\n"), "\x00")
+		if len(split) == 3 && split[0] == "*" {
+			sha := split[1]
+			displayName := split[2]
+			return BranchInfo{
+				RefName:      sha,
+				DisplayName:  displayName,
+				DetachedHead: true,
+			}, nil
+		}
+	}
+	return BranchInfo{
+		RefName:      "HEAD",
+		DisplayName:  "HEAD",
+		DetachedHead: true,
+	}, nil
+}
+
+// Delete delete branch
+func (self *BranchCommands) Delete(branch string, force bool) error {
+	cmdArgs := NewGitCmd("branch").
+		ArgIfElse(force, "-D", "-d").
+		Arg(branch).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+// Checkout checks out a branch (or commit), with --force if you set the force arg to true
+type CheckoutOptions struct {
+	Force   bool
+	EnvVars []string
+}
+
+func (self *BranchCommands) Checkout(branch string, options CheckoutOptions) error {
+	cmdArgs := NewGitCmd("checkout").
+		ArgIf(options.Force, "--force").
+		Arg(branch).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).
+		// 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").
+		AddEnvVars(options.EnvVars...).
+		Run()
+}
+
+// GetGraph gets the color-formatted graph of the log for the given branch
+// Currently it limits the result to 100 commits, but when we get async stuff
+// working we can do lazy loading
+func (self *BranchCommands) GetGraph(branchName string) (string, error) {
+	return self.GetGraphCmdObj(branchName).DontLog().RunWithOutput()
+}
+
+func (self *BranchCommands) GetGraphCmdObj(branchName string) oscommands.ICmdObj {
+	branchLogCmdTemplate := self.UserConfig.Git.BranchLogCmd
+	templateValues := map[string]string{
+		"branchName": self.cmd.Quote(branchName),
+	}
+
+	resolvedTemplate := utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)
+
+	return self.cmd.New(str.ToArgv(resolvedTemplate)).DontLog()
+}
+
+func (self *BranchCommands) SetCurrentBranchUpstream(remoteName string, remoteBranchName string) error {
+	cmdArgs := NewGitCmd("branch").
+		Arg(fmt.Sprintf("--set-upstream-to=%s/%s", remoteName, remoteBranchName)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).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()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *BranchCommands) UnsetUpstream(branchName string) error {
+	cmdArgs := NewGitCmd("branch").Arg("--unset-upstream", branchName).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *BranchCommands) GetCurrentBranchUpstreamDifferenceCount() (string, string) {
+	return self.GetCommitDifferences("HEAD", "HEAD@{u}")
+}
+
+func (self *BranchCommands) GetUpstreamDifferenceCount(branchName string) (string, string) {
+	return self.GetCommitDifferences(branchName, branchName+"@{u}")
+}
+
+// GetCommitDifferences checks how many pushables/pullables there are for the
+// current branch
+func (self *BranchCommands) GetCommitDifferences(from, to string) (string, string) {
+	pushableCount, err := self.countDifferences(to, from)
+	if err != nil {
+		return "?", "?"
+	}
+	pullableCount, err := self.countDifferences(from, to)
+	if err != nil {
+		return "?", "?"
+	}
+	return strings.TrimSpace(pushableCount), strings.TrimSpace(pullableCount)
+}
+
+func (self *BranchCommands) countDifferences(from, to string) (string, error) {
+	cmdArgs := NewGitCmd("rev-list").
+		Arg(fmt.Sprintf("%s..%s", from, to)).
+		Arg("--count").
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+}
+
+func (self *BranchCommands) IsHeadDetached() bool {
+	cmdArgs := NewGitCmd("symbolic-ref").Arg("-q", "HEAD").ToArgv()
+
+	err := self.cmd.New(cmdArgs).DontLog().Run()
+	return err != nil
+}
+
+func (self *BranchCommands) Rename(oldName string, newName string) error {
+	cmdArgs := NewGitCmd("branch").
+		Arg("--move", oldName, newName).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+type MergeOpts struct {
+	FastForwardOnly bool
+}
+
+func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
+	cmdArgs := NewGitCmd("merge").
+		Arg("--no-edit").
+		ArgIf(self.UserConfig.Git.Merging.Args != "", self.UserConfig.Git.Merging.Args).
+		ArgIf(opts.FastForwardOnly, "--ff-only").
+		Arg(branchName).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *BranchCommands) AllBranchesLogCmdObj() oscommands.ICmdObj {
+	return self.cmd.New(str.ToArgv(self.UserConfig.Git.AllBranchesLogCmd)).DontLog()
+}

pkg/commands/git_commands/branch_loader.go

@@ -0,0 +1,247 @@
+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"
+)
+
+// context:
+// we want to only show 'safe' branches (ones that haven't e.g. been deleted)
+// which `git branch -a` gives us, but we also want the recency data that
+// git reflog gives us.
+// So we get the HEAD, then append get the reflog branches that intersect with
+// our safe branches, then add the remaining safe branches, ensuring uniqueness
+// along the way
+
+// if we find out we need to use one of these functions in the git.go file, we
+// can just pull them out of here and put them there and then call them from in here
+
+type BranchLoaderConfigCommands interface {
+	Branches() (map[string]*config.Branch, error)
+}
+
+type BranchInfo struct {
+	RefName      string
+	DisplayName  string // e.g. '(HEAD detached at 123asdf)'
+	DetachedHead bool
+}
+
+// BranchLoader returns a list of Branch objects for the current repo
+type BranchLoader struct {
+	*common.Common
+	cmd                  oscommands.ICmdObjBuilder
+	getCurrentBranchInfo func() (BranchInfo, error)
+	config               BranchLoaderConfigCommands
+}
+
+func NewBranchLoader(
+	cmn *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+	getCurrentBranchInfo func() (BranchInfo, error),
+	config BranchLoaderConfigCommands,
+) *BranchLoader {
+	return &BranchLoader{
+		Common:               cmn,
+		cmd:                  cmd,
+		getCurrentBranchInfo: getCurrentBranchInfo,
+		config:               config,
+	}
+}
+
+// Load the list of branches for the current repo
+func (self *BranchLoader) Load(reflogCommits []*models.Commit) ([]*models.Branch, error) {
+	branches := self.obtainBranches()
+
+	reflogBranches := self.obtainReflogBranches(reflogCommits)
+
+	// loop through reflog branches. If there is a match, merge them, then remove it from the branches and keep it in the reflog branches
+	branchesWithRecency := make([]*models.Branch, 0)
+outer:
+	for _, reflogBranch := range reflogBranches {
+		for j, branch := range branches {
+			if branch.Head {
+				continue
+			}
+			if strings.EqualFold(reflogBranch.Name, branch.Name) {
+				branch.Recency = reflogBranch.Recency
+				branchesWithRecency = append(branchesWithRecency, branch)
+				branches = slices.Remove(branches, j)
+				continue outer
+			}
+		}
+	}
+
+	branches = slices.Prepend(branches, branchesWithRecency...)
+
+	foundHead := false
+	for i, branch := range branches {
+		if branch.Head {
+			foundHead = true
+			branch.Recency = "  *"
+			branches = slices.Move(branches, i, 0)
+			break
+		}
+	}
+	if !foundHead {
+		info, err := self.getCurrentBranchInfo()
+		if err != nil {
+			return nil, err
+		}
+		branches = slices.Prepend(branches, &models.Branch{Name: info.RefName, DisplayName: info.DisplayName, Head: true, DetachedHead: info.DetachedHead, Recency: "  *"})
+	}
+
+	configBranches, err := self.config.Branches()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, branch := range branches {
+		match := configBranches[branch.Name]
+		if match != nil {
+			branch.UpstreamRemote = match.Remote
+			branch.UpstreamBranch = match.Merge.Short()
+		}
+	}
+
+	return branches, nil
+}
+
+func (self *BranchLoader) obtainBranches() []*models.Branch {
+	output, err := self.getRawBranches()
+	if err != nil {
+		panic(err)
+	}
+
+	trimmedOutput := strings.TrimSpace(output)
+	outputLines := strings.Split(trimmedOutput, "\n")
+
+	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
+			// This is probably a warning message, for more info see:
+			// https://github.com/jesseduffield/lazygit/issues/1385#issuecomment-885580439
+			return nil, false
+		}
+
+		return obtainBranch(split), true
+	})
+}
+
+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",
+	fmt.Sprintf("objectname:short=%d", utils.COMMIT_HASH_SHORT_SIZE),
+}
+
+// Obtain branch information from parsed line output of getRawBranches()
+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,
+	}
+}
+
+func parseUpstreamInfo(upstreamName string, track string) (string, string, bool) {
+	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
+	}
+
+	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]
+	} else {
+		return "0"
+	}
+}
+
+// TODO: only look at the new reflog commits, and otherwise store the recencies in
+// int form against the branch to recalculate the time ago
+func (self *BranchLoader) obtainReflogBranches(reflogCommits []*models.Commit) []*models.Branch {
+	foundBranches := set.New[string]()
+	re := regexp.MustCompile(`checkout: moving from ([\S]+) to ([\S]+)`)
+	reflogBranches := make([]*models.Branch, 0, len(reflogCommits))
+
+	for _, commit := range reflogCommits {
+		match := re.FindStringSubmatch(commit.Name)
+		if len(match) != 3 {
+			continue
+		}
+
+		recency := utils.UnixToTimeAgo(commit.UnixTimestamp)
+		for _, branchName := range match[1:] {
+			if !foundBranches.Includes(branchName) {
+				foundBranches.Add(branchName)
+				reflogBranches = append(reflogBranches, &models.Branch{
+					Recency: recency,
+					Name:    branchName,
+				})
+			}
+		}
+	}
+	return reflogBranches
+}

pkg/commands/git_commands/branch_loader_test.go

@@ -0,0 +1,88 @@
+package git_commands
+
+// "*|feat/detect-purge|origin/feat/detect-purge|[ahead 1]"
+import (
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestObtainBranch(t *testing.T) {
+	type scenario struct {
+		testName       string
+		input          []string
+		expectedBranch *models.Branch
+	}
+
+	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: "NoUpstream",
+			input:    []string{"", "a_branch", "", "", "subject", "123"},
+			expectedBranch: &models.Branch{
+				Name:       "a_branch",
+				Pushables:  "?",
+				Pullables:  "?",
+				Head:       false,
+				Subject:    "subject",
+				CommitHash: "123",
+			},
+		},
+		{
+			testName: "IsHead",
+			input:    []string{"*", "a_branch", "", "", "subject", "123"},
+			expectedBranch: &models.Branch{
+				Name:       "a_branch",
+				Pushables:  "?",
+				Pullables:  "?",
+				Head:       true,
+				Subject:    "subject",
+				CommitHash: "123",
+			},
+		},
+		{
+			testName: "IsBehindAndAhead",
+			input:    []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "subject", "123"},
+			expectedBranch: &models.Branch{
+				Name:       "a_branch",
+				Pushables:  "3",
+				Pullables:  "2",
+				Head:       false,
+				Subject:    "subject",
+				CommitHash: "123",
+			},
+		},
+		{
+			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",
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			branch := obtainBranch(s.input)
+			assert.EqualValues(t, s.expectedBranch, branch)
+		})
+	}
+}

pkg/commands/git_commands/branch_test.go

@@ -0,0 +1,276 @@
+package git_commands
+
+import (
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBranchGetCommitDifferences(t *testing.T) {
+	type scenario struct {
+		testName          string
+		runner            *oscommands.FakeCmdObjRunner
+		expectedPushables string
+		expectedPullables string
+	}
+
+	scenarios := []scenario{
+		{
+			"Can't retrieve pushable count",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"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")),
+			"?", "?",
+		},
+		{
+			"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),
+			"1", "2",
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildBranchCommands(commonDeps{runner: s.runner})
+			pushables, pullables := instance.GetCommitDifferences("HEAD", "@{u}")
+			assert.EqualValues(t, s.expectedPushables, pushables)
+			assert.EqualValues(t, s.expectedPullables, pullables)
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestBranchNewBranch(t *testing.T) {
+	runner := oscommands.NewFakeRunner(t).
+		ExpectGitArgs([]string{"checkout", "-b", "test", "refs/heads/master"}, "", nil)
+	instance := buildBranchCommands(commonDeps{runner: runner})
+
+	assert.NoError(t, instance.New("test", "refs/heads/master"))
+	runner.CheckForMissingCalls()
+}
+
+func TestBranchDeleteBranch(t *testing.T) {
+	type scenario struct {
+		testName string
+		force    bool
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"Delete a branch",
+			false,
+			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"branch", "-d", "test"}, "", nil),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			"Force delete a branch",
+			true,
+			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"branch", "-D", "test"}, "", nil),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildBranchCommands(commonDeps{runner: s.runner})
+
+			s.test(instance.Delete("test", s.force))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestBranchMerge(t *testing.T) {
+	scenarios := []struct {
+		testName   string
+		userConfig *config.UserConfig
+		opts       MergeOpts
+		branchName string
+		expected   []string
+	}{
+		{
+			testName:   "basic",
+			userConfig: &config.UserConfig{},
+			opts:       MergeOpts{},
+			branchName: "mybranch",
+			expected:   []string{"merge", "--no-edit", "mybranch"},
+		},
+		{
+			testName: "merging args",
+			userConfig: &config.UserConfig{
+				Git: config.GitConfig{
+					Merging: config.MergingConfig{
+						Args: "--merging-args", // it's up to the user what they put here
+					},
+				},
+			},
+			opts:       MergeOpts{},
+			branchName: "mybranch",
+			expected:   []string{"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"},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			runner := oscommands.NewFakeRunner(t).
+				ExpectGitArgs(s.expected, "", nil)
+			instance := buildBranchCommands(commonDeps{runner: runner, userConfig: s.userConfig})
+
+			assert.NoError(t, instance.Merge(s.branchName, s.opts))
+			runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestBranchCheckout(t *testing.T) {
+	type scenario struct {
+		testName string
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(error)
+		force    bool
+	}
+
+	scenarios := []scenario{
+		{
+			"Checkout",
+			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"checkout", "test"}, "", nil),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+			false,
+		},
+		{
+			"Checkout forced",
+			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"checkout", "--force", "test"}, "", nil),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+			true,
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildBranchCommands(commonDeps{runner: s.runner})
+			s.test(instance.Checkout("test", CheckoutOptions{Force: s.force}))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestBranchGetBranchGraph(t *testing.T) {
+	runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
+		"log", "--graph", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test", "--",
+	}, "", nil)
+	instance := buildBranchCommands(commonDeps{runner: runner})
+	_, err := instance.GetGraph("test")
+	assert.NoError(t, err)
+}
+
+func TestBranchGetAllBranchGraph(t *testing.T) {
+	runner := oscommands.NewFakeRunner(t).ExpectGitArgs([]string{
+		"log", "--graph", "--all", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium",
+	}, "", nil)
+	instance := buildBranchCommands(commonDeps{runner: runner})
+	err := instance.AllBranchesLogCmdObj().Run()
+	assert.NoError(t, err)
+}
+
+func TestBranchCurrentBranchInfo(t *testing.T) {
+	type scenario struct {
+		testName string
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(BranchInfo, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"says we are on the master branch if we are",
+			oscommands.NewFakeRunner(t).ExpectGitArgs([]string{"symbolic-ref", "--short", "HEAD"}, "master", nil),
+			func(info BranchInfo, err error) {
+				assert.NoError(t, err)
+				assert.EqualValues(t, "master", info.RefName)
+				assert.EqualValues(t, "master", info.DisplayName)
+				assert.False(t, info.DetachedHead)
+			},
+		},
+		{
+			"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),
+			func(info BranchInfo, err error) {
+				assert.NoError(t, err)
+				assert.EqualValues(t, "6f71c57a8d4bd6c11399c3f55f42c815527a73a4", info.RefName)
+				assert.EqualValues(t, "(HEAD detached at 6f71c57a)", info.DisplayName)
+				assert.True(t, info.DetachedHead)
+			},
+		},
+		{
+			"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)"},
+					"*\x00679b0456f3db7c505b398def84e7d023e5b55a8d\x00（头指针在 679b0456 分离）\n"+
+						" \x00679b0456f3db7c505b398def84e7d023e5b55a8d\x00refs/heads/master\n",
+					nil),
+			func(info BranchInfo, err error) {
+				assert.NoError(t, err)
+				assert.EqualValues(t, "679b0456f3db7c505b398def84e7d023e5b55a8d", info.RefName)
+				assert.EqualValues(t, "（头指针在 679b0456 分离）", info.DisplayName)
+				assert.True(t, info.DetachedHead)
+			},
+		},
+		{
+			"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")),
+			func(info BranchInfo, err error) {
+				assert.Error(t, err)
+				assert.EqualValues(t, "", info.RefName)
+				assert.EqualValues(t, "", info.DisplayName)
+				assert.False(t, info.DetachedHead)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildBranchCommands(commonDeps{runner: s.runner})
+			s.test(instance.CurrentBranchInfo())
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}

pkg/commands/git_commands/commit.go

@@ -0,0 +1,257 @@
+package git_commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+)
+
+var ErrInvalidCommitIndex = errors.New("invalid commit index")
+
+type CommitCommands struct {
+	*GitCommon
+}
+
+func NewCommitCommands(gitCommon *GitCommon) *CommitCommands {
+	return &CommitCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+// ResetAuthor resets the author of the topmost commit
+func (self *CommitCommands) ResetAuthor() error {
+	cmdArgs := NewGitCmd("commit").
+		Arg("--allow-empty", "--only", "--no-edit", "--amend", "--reset-author").
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).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()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+// ResetToCommit reset to commit
+func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars []string) error {
+	cmdArgs := NewGitCmd("reset").Arg("--"+strength, sha).ToArgv()
+
+	return self.cmd.New(cmdArgs).
+		// 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").
+		AddEnvVars(envVars...).
+		Run()
+}
+
+func (self *CommitCommands) CommitCmdObj(message string) oscommands.ICmdObj {
+	messageArgs := self.commitMessageArgs(message)
+
+	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
+
+	cmdArgs := NewGitCmd("commit").
+		ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
+		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
+		Arg(messageArgs...).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs)
+}
+
+func (self *CommitCommands) RewordLastCommitInEditorCmdObj() oscommands.ICmdObj {
+	return self.cmd.New(NewGitCmd("commit").Arg("--allow-empty", "--amend", "--only").ToArgv())
+}
+
+// RewordLastCommit rewords the topmost commit with the given message
+func (self *CommitCommands) RewordLastCommit(message string) error {
+	messageArgs := self.commitMessageArgs(message)
+
+	cmdArgs := NewGitCmd("commit").
+		Arg("--allow-empty", "--amend", "--only").
+		Arg(messageArgs...).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *CommitCommands) commitMessageArgs(message string) []string {
+	msg, description, _ := strings.Cut(message, "\n")
+	args := []string{"-m", msg}
+
+	if description != "" {
+		args = append(args, "-m", description)
+	}
+
+	return args
+}
+
+// runs git commit without the -m argument meaning it will invoke the user's editor
+func (self *CommitCommands) CommitEditorCmdObj() oscommands.ICmdObj {
+	cmdArgs := NewGitCmd("commit").
+		ArgIf(self.signoffFlag() != "", self.signoffFlag()).
+		ArgIf(self.verboseFlag() != "", self.verboseFlag()).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs)
+}
+
+func (self *CommitCommands) signoffFlag() string {
+	if self.UserConfig.Git.Commit.SignOff {
+		return "--signoff"
+	} else {
+		return ""
+	}
+}
+
+func (self *CommitCommands) verboseFlag() string {
+	switch self.config.UserConfig.Git.Commit.Verbose {
+	case "always":
+		return "--verbose"
+	case "never":
+		return "--no-verbose"
+	default:
+		return ""
+	}
+}
+
+// Get the subject of the HEAD commit
+func (self *CommitCommands) GetHeadCommitMessage() (string, error) {
+	cmdArgs := NewGitCmd("log").Arg("-1", "--pretty=%s").ToArgv()
+
+	message, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return strings.TrimSpace(message), err
+}
+
+func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
+	cmdArgs := NewGitCmd("rev-list").
+		Arg("--format=%B", "--max-count=1", commitSha).
+		ToArgv()
+
+	messageWithHeader, err := self.cmd.New(cmdArgs).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()
+
+	diff, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return diff, err
+}
+
+type Author struct {
+	Name  string
+	Email string
+}
+
+func (self *CommitCommands) GetCommitAuthor(commitSha string) (Author, error) {
+	cmdArgs := NewGitCmd("show").
+		Arg("--no-patch", "--pretty=format:'%an%x00%ae'", commitSha).
+		ToArgv()
+
+	output, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	if err != nil {
+		return Author{}, err
+	}
+
+	split := strings.SplitN(strings.TrimSpace(output), "\x00", 2)
+	if len(split) < 2 {
+		return Author{}, errors.New("unexpected git output")
+	}
+
+	author := Author{Name: split[0], Email: split[1]}
+	return author, err
+}
+
+func (self *CommitCommands) GetCommitMessageFirstLine(sha string) (string, error) {
+	return self.GetCommitMessagesFirstLine([]string{sha})
+}
+
+func (self *CommitCommands) GetCommitMessagesFirstLine(shas []string) (string, error) {
+	cmdArgs := NewGitCmd("show").
+		Arg("--no-patch", "--pretty=format:%s").
+		Arg(shas...).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+}
+
+func (self *CommitCommands) GetCommitsOneline(shas []string) (string, error) {
+	cmdArgs := NewGitCmd("show").
+		Arg("--no-patch", "--oneline").
+		Arg(shas...).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+}
+
+// AmendHead amends HEAD with whatever is staged in your working tree
+func (self *CommitCommands) AmendHead() error {
+	return self.AmendHeadCmdObj().Run()
+}
+
+func (self *CommitCommands) AmendHeadCmdObj() oscommands.ICmdObj {
+	cmdArgs := NewGitCmd("commit").
+		Arg("--amend", "--no-edit", "--allow-empty").
+		ToArgv()
+
+	return self.cmd.New(cmdArgs)
+}
+
+func (self *CommitCommands) ShowCmdObj(sha string, filterPath string, ignoreWhitespace bool) oscommands.ICmdObj {
+	contextSize := self.UserConfig.Git.DiffContextSize
+
+	cmdArgs := 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(ignoreWhitespace, "--ignore-all-space").
+		ArgIf(filterPath != "", "--", filterPath).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).DontLog()
+}
+
+// Revert reverts the selected commit by sha
+func (self *CommitCommands) Revert(sha string) error {
+	cmdArgs := NewGitCmd("revert").Arg(sha).ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *CommitCommands) RevertMerge(sha string, parentNumber int) error {
+	cmdArgs := NewGitCmd("revert").Arg(sha, "-m", fmt.Sprintf("%d", parentNumber)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).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()
+
+	return self.cmd.New(cmdArgs).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()
+
+	hash, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	formattedHash := strings.TrimSpace(hash)
+	if len(formattedHash) == 0 {
+		return "", ErrInvalidCommitIndex
+	}
+	return self.GetCommitMessage(formattedHash)
+}

pkg/commands/git_commands/commit_file_loader.go

@@ -0,0 +1,61 @@
+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"
+	"github.com/samber/lo"
+)
+
+type CommitFileLoader struct {
+	*common.Common
+	cmd oscommands.ICmdObjBuilder
+}
+
+func NewCommitFileLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *CommitFileLoader {
+	return &CommitFileLoader{
+		Common: common,
+		cmd:    cmd,
+	}
+}
+
+// GetFilesInDiff get the specified commit files
+func (self *CommitFileLoader) GetFilesInDiff(from string, to string, reverse bool) ([]*models.CommitFile, error) {
+	cmdArgs := NewGitCmd("diff").
+		Arg("--submodule").
+		Arg("--no-ext-diff").
+		Arg("--name-status").
+		Arg("-z").
+		Arg("--no-renames").
+		ArgIf(reverse, "-R").
+		Arg(from).
+		Arg(to).
+		ToArgv()
+
+	filenames, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	if err != nil {
+		return nil, err
+	}
+
+	return getCommitFilesFromFilenames(filenames), nil
+}
+
+// filenames string is something like "MM\x00file1\x00MU\x00file2\x00AA\x00file3\x00"
+// so we need to split it by the null character and then map each status-name pair to a commit file
+func getCommitFilesFromFilenames(filenames string) []*models.CommitFile {
+	lines := strings.Split(strings.TrimRight(filenames, "\x00"), "\x00")
+	if len(lines) == 1 {
+		return []*models.CommitFile{}
+	}
+
+	// typical result looks like 'A my_file' meaning my_file was added
+	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_file_loader_test.go

@@ -0,0 +1,71 @@
+package git_commands
+
+import (
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetCommitFilesFromFilenames(t *testing.T) {
+	tests := []struct {
+		testName string
+		input    string
+		output   []*models.CommitFile
+	}{
+		{
+			testName: "no files",
+			input:    "",
+			output:   []*models.CommitFile{},
+		},
+		{
+			testName: "one file",
+			input:    "MM\x00Myfile\x00",
+			output: []*models.CommitFile{
+				{
+					Name:         "Myfile",
+					ChangeStatus: "MM",
+				},
+			},
+		},
+		{
+			testName: "two files",
+			input:    "MM\x00Myfile\x00M \x00MyOtherFile\x00",
+			output: []*models.CommitFile{
+				{
+					Name:         "Myfile",
+					ChangeStatus: "MM",
+				},
+				{
+					Name:         "MyOtherFile",
+					ChangeStatus: "M ",
+				},
+			},
+		},
+		{
+			testName: "three files",
+			input:    "MM\x00Myfile\x00M \x00MyOtherFile\x00 M\x00YetAnother\x00",
+			output: []*models.CommitFile{
+				{
+					Name:         "Myfile",
+					ChangeStatus: "MM",
+				},
+				{
+					Name:         "MyOtherFile",
+					ChangeStatus: "M ",
+				},
+				{
+					Name:         "YetAnother",
+					ChangeStatus: " M",
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.testName, func(t *testing.T) {
+			result := getCommitFilesFromFilenames(test.input)
+			assert.Equal(t, test.output, result)
+		})
+	}
+}

pkg/commands/git_commands/commit_loader.go

@@ -0,0 +1,588 @@
+package git_commands
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"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/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
+	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/samber/lo"
+)
+
+// context:
+// here we get the commits from git log but format them to show whether they're
+// unpushed/pushed/merged into the base branch or not, or if they're yet to
+// be processed as part of a rebase (these won't appear in git log but we
+// grab them from the rebase-related files in the .git directory to show them
+
+// CommitLoader returns a list of Commit objects for the current repo
+type CommitLoader struct {
+	*common.Common
+	cmd oscommands.ICmdObjBuilder
+
+	getRebaseMode func() (enums.RebaseMode, error)
+	readFile      func(filename string) ([]byte, error)
+	walkFiles     func(root string, fn filepath.WalkFunc) error
+	dotGitDir     string
+	// List of main branches that exist in the repo.
+	// We use these to obtain the merge base of the branch.
+	// When nil, we're yet to obtain the list of existing main branches.
+	// When an empty slice, we've obtained the list and it's empty.
+	mainBranches []string
+	*GitCommon
+}
+
+// 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,
+		dotGitDir:     dotGitDir,
+		mainBranches:  nil,
+		GitCommon:     gitCommon,
+	}
+}
+
+type GetCommitsOptions struct {
+	Limit                bool
+	FilterPath           string
+	IncludeRebaseCommits bool
+	RefName              string // e.g. "HEAD" or "my_branch"
+	// determines if we show the whole git graph i.e. pass the '--all' flag
+	All bool
+}
+
+// GetCommits obtains the commits of the current branch
+func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit, error) {
+	commits := []*models.Commit{}
+	var rebasingCommits []*models.Commit
+
+	if opts.IncludeRebaseCommits && opts.FilterPath == "" {
+		var err error
+		rebasingCommits, err = self.MergeRebasingCommits(commits)
+		if err != nil {
+			return nil, err
+		}
+		commits = append(commits, rebasingCommits...)
+	}
+
+	passedFirstPushedCommit := false
+	firstPushedCommit, err := self.getFirstPushedCommit(opts.RefName)
+	if err != nil {
+		// must have no upstream branch so we'll consider everything as pushed
+		passedFirstPushedCommit = true
+	}
+
+	err = self.getLogCmd(opts).RunAndProcessLines(func(line string) (bool, error) {
+		commit := self.extractCommitFromLine(line)
+		if commit.Sha == firstPushedCommit {
+			passedFirstPushedCommit = true
+		}
+		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
+	}
+
+	commits = self.setCommitMergedStatuses(opts.RefName, commits)
+
+	return commits, nil
+}
+
+func (self *CommitLoader) MergeRebasingCommits(commits []*models.Commit) ([]*models.Commit, error) {
+	// chances are we have as many commits as last time so we'll set the capacity to be the old length
+	result := make([]*models.Commit, 0, len(commits))
+	for i, commit := range commits {
+		if !commit.IsTODO() { // removing the existing rebase commits so we can add the refreshed ones
+			result = append(result, commits[i:]...)
+			break
+		}
+	}
+
+	rebaseMode, err := self.getRebaseMode()
+	if err != nil {
+		return nil, err
+	}
+
+	if rebaseMode == enums.REBASE_MODE_NONE {
+		// not in rebase mode so return original commits
+		return result, nil
+	}
+
+	rebasingCommits, err := self.getHydratedRebasingCommits(rebaseMode)
+	if err != nil {
+		return nil, err
+	}
+	if len(rebasingCommits) > 0 {
+		result = append(rebasingCommits, result...)
+	}
+
+	return result, nil
+}
+
+// extractCommitFromLine takes a line from a git log and extracts the sha, message, date, and tag if present
+// 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) *models.Commit {
+	split := strings.SplitN(line, "\x00", 7)
+
+	sha := split[0]
+	unixTimestamp := split[1]
+	authorName := split[2]
+	authorEmail := split[3]
+	extraInfo := strings.TrimSpace(split[4])
+	parentHashes := split[5]
+	message := split[6]
+
+	tags := []string{}
+
+	if extraInfo != "" {
+		re := regexp.MustCompile(`tag: ([^,\)]+)`)
+		tagMatch := re.FindStringSubmatch(extraInfo)
+		if len(tagMatch) > 1 {
+			tags = append(tags, tagMatch[1])
+		}
+	}
+
+	unitTimestampInt, _ := strconv.Atoi(unixTimestamp)
+
+	parents := []string{}
+	if len(parentHashes) > 0 {
+		parents = strings.Split(parentHashes, " ")
+	}
+
+	return &models.Commit{
+		Sha:           sha,
+		Name:          message,
+		Tags:          tags,
+		ExtraInfo:     extraInfo,
+		UnixTimestamp: int64(unitTimestampInt),
+		AuthorName:    authorName,
+		AuthorEmail:   authorEmail,
+		Parents:       parents,
+	}
+}
+
+func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode) ([]*models.Commit, error) {
+	commits, err := self.getRebasingCommits(rebaseMode)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(commits) == 0 {
+		return nil, nil
+	}
+
+	commitShas := slices.FilterMap(commits, func(commit *models.Commit) (string, bool) {
+		return commit.Sha, commit.Sha != ""
+	})
+
+	// note that we're not filtering these as we do non-rebasing commits just because
+	// I suspect that will cause some damage
+	cmdObj := self.cmd.New(
+		NewGitCmd("show").
+			Config("log.showSignature=false").
+			Arg("--no-patch", "--oneline", "--abbrev=20", prettyFormat).
+			Arg(commitShas...).
+			ToArgv(),
+	).DontLog()
+
+	fullCommits := map[string]*models.Commit{}
+	err = cmdObj.RunAndProcessLines(func(line string) (bool, error) {
+		commit := self.extractCommitFromLine(line)
+		fullCommits[commit.Sha] = commit
+		return false, nil
+	})
+	if err != nil {
+		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 {
+			commit.Action = rebasingCommit.Action
+			commit.Status = rebasingCommit.Status
+			hydratedCommits = append(hydratedCommits, commit)
+		}
+	}
+	return hydratedCommits, nil
+}
+
+// getRebasingCommits obtains the commits that we're in the process of rebasing
+func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) ([]*models.Commit, error) {
+	switch rebaseMode {
+	case enums.REBASE_MODE_MERGING:
+		return self.getNormalRebasingCommits()
+	case enums.REBASE_MODE_INTERACTIVE:
+		return self.getInteractiveRebasingCommits()
+	default:
+		return nil, nil
+	}
+}
+
+func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
+	rewrittenCount := 0
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "rebase-apply/rewritten"))
+	if err == nil {
+		content := string(bytesContent)
+		rewrittenCount = len(strings.Split(content, "\n"))
+	}
+
+	// we know we're rebasing, so lets get all the files whose names have numbers
+	commits := []*models.Commit{}
+	err = self.walkFiles(filepath.Join(self.dotGitDir, "rebase-apply"), func(path string, f os.FileInfo, err error) error {
+		if rewrittenCount > 0 {
+			rewrittenCount--
+			return nil
+		}
+		if err != nil {
+			return err
+		}
+		re := regexp.MustCompile(`^\d+$`)
+		if !re.MatchString(f.Name()) {
+			return nil
+		}
+		bytesContent, err := self.readFile(path)
+		if err != nil {
+			return err
+		}
+		content := string(bytesContent)
+		commit := self.commitFromPatch(content)
+		commits = append([]*models.Commit{commit}, commits...)
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return commits, nil
+}
+
+// git-rebase-todo example:
+// pick ac446ae94ee560bdb8d1d057278657b251aaef17 ac446ae
+// pick afb893148791a2fbd8091aeb81deba4930c73031 afb8931
+
+// git-rebase-todo.backup example:
+// pick 49cbba374296938ea86bbd4bf4fee2f6ba5cccf6 third commit on master
+// pick ac446ae94ee560bdb8d1d057278657b251aaef17 blah  commit on master
+// pick afb893148791a2fbd8091aeb81deba4930c73031 fourth commit on master
+
+// getInteractiveRebasingCommits takes our git-rebase-todo and our git-rebase-todo.backup files
+// 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.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
+		return nil, nil
+	}
+
+	commits := []*models.Commit{}
+
+	todos, err := todo.Parse(bytes.NewBuffer(bytesContent), self.config.GetCoreCommentChar())
+	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/")
+		} else if t.Commit == "" {
+			// Command does not have a commit associated, skip
+			continue
+		}
+		commits = slices.Prepend(commits, &models.Commit{
+			Sha:    t.Commit,
+			Name:   t.Msg,
+			Status: models.StatusRebasing,
+			Action: t.Command,
+		})
+	}
+
+	return commits, nil
+}
+
+func (self *CommitLoader) getConflictedCommit(todos []todo.Todo) string {
+	bytesContent, err := self.readFile(filepath.Join(self.dotGitDir, "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.dotGitDir, "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>
+// Date: Wed, 5 Dec 2018 21:03:23 +1100
+// Subject: second commit on master
+func (self *CommitLoader) commitFromPatch(content string) *models.Commit {
+	lines := strings.Split(content, "\n")
+	sha := strings.Split(lines[0], " ")[1]
+	name := strings.TrimPrefix(lines[3], "Subject: ")
+	return &models.Commit{
+		Sha:    sha,
+		Name:   name,
+		Status: models.StatusRebasing,
+	}
+}
+
+func (self *CommitLoader) setCommitMergedStatuses(refName string, commits []*models.Commit) []*models.Commit {
+	ancestor := self.getMergeBase(refName)
+	if ancestor == "" {
+		return commits
+	}
+	passedAncestor := false
+	for i, commit := range commits {
+		if strings.HasPrefix(ancestor, commit.Sha) {
+			passedAncestor = true
+		}
+		if commit.Status != models.StatusPushed && commit.Status != models.StatusUnpushed {
+			continue
+		}
+		if passedAncestor {
+			commits[i].Status = models.StatusMerged
+		}
+	}
+	return commits
+}
+
+func (self *CommitLoader) getMergeBase(refName string) string {
+	if self.mainBranches == nil {
+		self.mainBranches = self.getExistingMainBranches()
+	}
+
+	if len(self.mainBranches) == 0 {
+		return ""
+	}
+
+	// We pass all configured main branches to the merge-base call; git will
+	// return the base commit for the closest one.
+
+	output, err := self.cmd.New(
+		NewGitCmd("merge-base").Arg(refName).Arg(self.mainBranches...).
+			ToArgv(),
+	).DontLog().RunWithOutput()
+	if err != nil {
+		// If there's an error, it must be because one of the main branches that
+		// used to exist when we called getExistingMainBranches() was deleted
+		// meanwhile. To fix this for next time, throw away our cache.
+		self.mainBranches = nil
+	}
+	return ignoringWarnings(output)
+}
+
+func (self *CommitLoader) getExistingMainBranches() []string {
+	return lo.FilterMap(self.UserConfig.Git.MainBranches,
+		func(branchName string, _ int) (string, bool) {
+			// 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 {
+				return strings.TrimSpace(ref), true
+			}
+
+			// 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 {
+				return ref, true
+			}
+
+			// 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 {
+				return ref, true
+			}
+
+			return "", false
+		})
+}
+
+func ignoringWarnings(commandOutput string) string {
+	trimmedOutput := strings.TrimSpace(commandOutput)
+	split := strings.Split(trimmedOutput, "\n")
+	// need to get last line in case the first line is a warning about how the error is ambiguous.
+	// At some point we should find a way to make it unambiguous
+	lastLine := split[len(split)-1]
+
+	return lastLine
+}
+
+// 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(),
+	).
+		DontLog().
+		RunWithOutput()
+	if err != nil {
+		return "", err
+	}
+
+	return ignoringWarnings(output), nil
+}
+
+// getLog gets the git log.
+func (self *CommitLoader) getLogCmd(opts GetCommitsOptions) oscommands.ICmdObj {
+	config := self.UserConfig.Git.Log
+
+	cmdArgs := NewGitCmd("log").
+		Arg(opts.RefName).
+		ArgIf(config.Order != "default", "--"+config.Order).
+		ArgIf(opts.All, "--all").
+		Arg("--oneline").
+		Arg(prettyFormat).
+		Arg("--abbrev=40").
+		ArgIf(opts.Limit, "-300").
+		ArgIf(opts.FilterPath != "", "--follow").
+		Arg("--no-show-signature").
+		Arg("--").
+		ArgIf(opts.FilterPath != "", opts.FilterPath).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).DontLog()
+}
+
+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

@@ -0,0 +1,508 @@
+package git_commands
+
+import (
+	"errors"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/fsmiamoto/git-todo-parser/todo"
+	"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/utils"
+	"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||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)
+
+func TestGetCommits(t *testing.T) {
+	type scenario struct {
+		testName        string
+		runner          *oscommands.FakeCmdObjRunner
+		expectedCommits []*models.Commit
+		expectedError   error
+		logOrder        string
+		rebaseMode      enums.RebaseMode
+		opts            GetCommitsOptions
+		mainBranches    []string
+	}
+
+	scenarios := []scenario{
+		{
+			testName:   "should return no commits if there are none",
+			logOrder:   "topo-order",
+			rebaseMode: enums.REBASE_MODE_NONE,
+			opts:       GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--topo-order", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+
+			expectedCommits: []*models.Commit{},
+			expectedError:   nil,
+		},
+		{
+			testName:   "should use proper upstream name for branch",
+			logOrder:   "topo-order",
+			rebaseMode: enums.REBASE_MODE_NONE,
+			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", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+
+			expectedCommits: []*models.Commit{},
+			expectedError:   nil,
+		},
+		{
+			testName:     "should return commits if they are present",
+			logOrder:     "topo-order",
+			rebaseMode:   enums.REBASE_MODE_NONE,
+			opts:         GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
+			mainBranches: []string{"master", "main", "develop"},
+			runner: oscommands.NewFakeRunner(t).
+				// here it's seeing which commits are yet to be pushed
+				ExpectGitArgs([]string{"merge-base", "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", "--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
+				// 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),
+
+			expectedCommits: []*models.Commit{
+				{
+					Sha:           "0eea75e8c631fba6b58135697835d58ba4c18dbc",
+					Name:          "better typing for rebase mode",
+					Status:        models.StatusUnpushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "(HEAD -> better-tests)",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640826609,
+					Parents: []string{
+						"b21997d6b4cbdf84b149",
+					},
+				},
+				{
+					Sha:           "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164",
+					Name:          "fix logging",
+					Status:        models.StatusPushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "(origin/better-tests)",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640824515,
+					Parents: []string{
+						"e94e8fc5b6fab4cb755f",
+					},
+				},
+				{
+					Sha:           "e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c",
+					Name:          "refactor",
+					Status:        models.StatusPushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640823749,
+					Parents: []string{
+						"d8084cd558925eb7c9c3",
+					},
+				},
+				{
+					Sha:           "d8084cd558925eb7c9c38afeed5725c21653ab90",
+					Name:          "WIP",
+					Status:        models.StatusPushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640821426,
+					Parents: []string{
+						"65f910ebd85283b5cce9",
+					},
+				},
+				{
+					Sha:           "65f910ebd85283b5cce9bf67d03d3f1a9ea3813a",
+					Name:          "WIP",
+					Status:        models.StatusPushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640821275,
+					Parents: []string{
+						"26c07b1ab33860a1a759",
+					},
+				},
+				{
+					Sha:           "26c07b1ab33860a1a7591a0638f9925ccf497ffa",
+					Name:          "WIP",
+					Status:        models.StatusMerged,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640750752,
+					Parents: []string{
+						"3d4470a6c072208722e5",
+					},
+				},
+				{
+					Sha:           "3d4470a6c072208722e5ae9a54bcb9634959a1c5",
+					Name:          "WIP",
+					Status:        models.StatusMerged,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640748818,
+					Parents: []string{
+						"053a66a7be3da43aacdc",
+					},
+				},
+				{
+					Sha:           "053a66a7be3da43aacdc7aa78e1fe757b82c4dd2",
+					Name:          "refactoring the config struct",
+					Status:        models.StatusMerged,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640739815,
+					Parents: []string{
+						"985fe482e806b172aea4",
+					},
+				},
+			},
+			expectedError: nil,
+		},
+		{
+			testName:     "should not call merge-base for mainBranches if none exist",
+			logOrder:     "topo-order",
+			rebaseMode:   enums.REBASE_MODE_NONE,
+			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", "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", "--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")),
+
+			expectedCommits: []*models.Commit{
+				{
+					Sha:           "0eea75e8c631fba6b58135697835d58ba4c18dbc",
+					Name:          "better typing for rebase mode",
+					Status:        models.StatusUnpushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "(HEAD -> better-tests)",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640826609,
+					Parents: []string{
+						"b21997d6b4cbdf84b149",
+					},
+				},
+			},
+			expectedError: nil,
+		},
+		{
+			testName:     "should call merge-base for all main branches that exist",
+			logOrder:     "topo-order",
+			rebaseMode:   enums.REBASE_MODE_NONE,
+			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", "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", "--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).
+				// 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),
+
+			expectedCommits: []*models.Commit{
+				{
+					Sha:           "0eea75e8c631fba6b58135697835d58ba4c18dbc",
+					Name:          "better typing for rebase mode",
+					Status:        models.StatusUnpushed,
+					Action:        models.ActionNone,
+					Tags:          []string{},
+					ExtraInfo:     "(HEAD -> better-tests)",
+					AuthorName:    "Jesse Duffield",
+					AuthorEmail:   "jessedduffield@gmail.com",
+					UnixTimestamp: 1640826609,
+					Parents: []string{
+						"b21997d6b4cbdf84b149",
+					},
+				},
+			},
+			expectedError: nil,
+		},
+		{
+			testName:   "should not specify order if `log.order` is `default`",
+			logOrder:   "default",
+			rebaseMode: enums.REBASE_MODE_NONE,
+			opts:       GetCommitsOptions{RefName: "HEAD", IncludeRebaseCommits: false},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s", "--abbrev=40", "--no-show-signature", "--"}, "", nil),
+
+			expectedCommits: []*models.Commit{},
+			expectedError:   nil,
+		},
+		{
+			testName:   "should set filter path",
+			logOrder:   "default",
+			rebaseMode: enums.REBASE_MODE_NONE,
+			opts:       GetCommitsOptions{RefName: "HEAD", FilterPath: "src"},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"merge-base", "HEAD", "HEAD@{u}"}, "b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164", nil).
+				ExpectGitArgs([]string{"log", "HEAD", "--oneline", "--pretty=format:%H%x00%at%x00%aN%x00%ae%x00%d%x00%p%x00%s", "--abbrev=40", "--follow", "--no-show-signature", "--", "src"}, "", nil),
+
+			expectedCommits: []*models.Commit{},
+			expectedError:   nil,
+		},
+	}
+
+	for _, scenario := range scenarios {
+		scenario := scenario
+		t.Run(scenario.testName, func(t *testing.T) {
+			common := utils.NewDummyCommon()
+			common.UserConfig.Git.Log.Order = scenario.logOrder
+
+			builder := &CommitLoader{
+				Common:        common,
+				cmd:           oscommands.NewDummyCmdObjBuilder(scenario.runner),
+				getRebaseMode: func() (enums.RebaseMode, error) { return scenario.rebaseMode, nil },
+				dotGitDir:     ".git",
+				readFile: func(filename string) ([]byte, error) {
+					return []byte(""), nil
+				},
+				walkFiles: func(root string, fn filepath.WalkFunc) error {
+					return nil
+				},
+			}
+
+			common.UserConfig.Git.MainBranches = scenario.mainBranches
+			commits, err := builder.GetCommits(scenario.opts)
+
+			assert.Equal(t, scenario.expectedCommits, commits)
+			assert.Equal(t, scenario.expectedError, err)
+
+			scenario.runner.CheckForMissingCalls()
+		})
+	}
+}
+
+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)
+		})
+	}
+}

pkg/commands/git_commands/commit_test.go

@@ -0,0 +1,336 @@
+package git_commands
+
+import (
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCommitRewordCommit(t *testing.T) {
+	type scenario struct {
+		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\nline 2\nline 3",
+		},
+	}
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildCommitCommands(commonDeps{runner: s.runner})
+
+			assert.NoError(t, instance.RewordLastCommit(s.input))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestCommitResetToCommit(t *testing.T) {
+	runner := oscommands.NewFakeRunner(t).
+		ExpectGitArgs([]string{"reset", "--hard", "78976bc"}, "", nil)
+
+	instance := buildCommitCommands(commonDeps{runner: runner})
+
+	assert.NoError(t, instance.ResetToCommit("78976bc", "hard", []string{}))
+	runner.CheckForMissingCalls()
+}
+
+func TestCommitCommitCmdObj(t *testing.T) {
+	type scenario struct {
+		testName             string
+		message              string
+		configSignoff        bool
+		configSkipHookPrefix string
+		expectedArgs         []string
+	}
+
+	scenarios := []scenario{
+		{
+			testName:             "Commit",
+			message:              "test",
+			configSignoff:        false,
+			configSkipHookPrefix: "",
+			expectedArgs:         []string{"commit", "-m", "test"},
+		},
+		{
+			testName:             "Commit with --no-verify flag",
+			message:              "WIP: test",
+			configSignoff:        false,
+			configSkipHookPrefix: "WIP",
+			expectedArgs:         []string{"commit", "--no-verify", "-m", "WIP: test"},
+		},
+		{
+			testName:             "Commit with multiline message",
+			message:              "line1\nline2",
+			configSignoff:        false,
+			configSkipHookPrefix: "",
+			expectedArgs:         []string{"commit", "-m", "line1", "-m", "line2"},
+		},
+		{
+			testName:             "Commit with signoff",
+			message:              "test",
+			configSignoff:        true,
+			configSkipHookPrefix: "",
+			expectedArgs:         []string{"commit", "--signoff", "-m", "test"},
+		},
+		{
+			testName:             "Commit with signoff and no-verify",
+			message:              "WIP: test",
+			configSignoff:        true,
+			configSkipHookPrefix: "WIP",
+			expectedArgs:         []string{"commit", "--no-verify", "--signoff", "-m", "WIP: test"},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			userConfig := config.GetDefaultConfig()
+			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})
+
+			assert.NoError(t, instance.CommitCmdObj(s.message).Run())
+			runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestCommitCommitEditorCmdObj(t *testing.T) {
+	type scenario struct {
+		testName      string
+		configSignoff bool
+		configVerbose string
+		expected      []string
+	}
+
+	scenarios := []scenario{
+		{
+			testName:      "Commit using editor",
+			configSignoff: false,
+			configVerbose: "default",
+			expected:      []string{"commit"},
+		},
+		{
+			testName:      "Commit with --no-verbose flag",
+			configSignoff: false,
+			configVerbose: "never",
+			expected:      []string{"commit", "--no-verbose"},
+		},
+		{
+			testName:      "Commit with --verbose flag",
+			configSignoff: false,
+			configVerbose: "always",
+			expected:      []string{"commit", "--verbose"},
+		},
+		{
+			testName:      "Commit with --signoff",
+			configSignoff: true,
+			configVerbose: "default",
+			expected:      []string{"commit", "--signoff"},
+		},
+		{
+			testName:      "Commit with --signoff and --no-verbose",
+			configSignoff: true,
+			configVerbose: "never",
+			expected:      []string{"commit", "--signoff", "--no-verbose"},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		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})
+
+			assert.NoError(t, instance.CommitEditorCmdObj().Run())
+			runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestCommitCreateFixupCommit(t *testing.T) {
+	type scenario struct {
+		testName string
+		sha      string
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			testName: "valid case",
+			sha:      "12345",
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"commit", "--fixup=12345"}, "", nil),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildCommitCommands(commonDeps{runner: s.runner})
+			s.test(instance.CreateFixupCommit(s.sha))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestCommitShowCmdObj(t *testing.T) {
+	type scenario struct {
+		testName         string
+		filterPath       string
+		contextSize      int
+		ignoreWhitespace bool
+		expected         []string
+	}
+
+	scenarios := []scenario{
+		{
+			testName:         "Default case without filter path",
+			filterPath:       "",
+			contextSize:      3,
+			ignoreWhitespace: false,
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890"},
+		},
+		{
+			testName:         "Default case with filter path",
+			filterPath:       "file.txt",
+			contextSize:      3,
+			ignoreWhitespace: false,
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=3", "--stat", "--decorate", "-p", "1234567890", "--", "file.txt"},
+		},
+		{
+			testName:         "Show diff with custom context size",
+			filterPath:       "",
+			contextSize:      77,
+			ignoreWhitespace: false,
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890"},
+		},
+		{
+			testName:         "Show diff, ignoring whitespace",
+			filterPath:       "",
+			contextSize:      77,
+			ignoreWhitespace: true,
+			expected:         []string{"show", "--submodule", "--color=always", "--unified=77", "--stat", "--decorate", "-p", "1234567890", "--ignore-all-space"},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			userConfig := config.GetDefaultConfig()
+			userConfig.Git.DiffContextSize = s.contextSize
+
+			runner := oscommands.NewFakeRunner(t).ExpectGitArgs(s.expected, "", nil)
+			instance := buildCommitCommands(commonDeps{userConfig: userConfig, runner: runner})
+
+			assert.NoError(t, instance.ShowCmdObj("1234567890", s.filterPath, s.ignoreWhitespace).Run())
+			runner.CheckForMissingCalls()
+		})
+	}
+}
+
+func TestGetCommitMsg(t *testing.T) {
+	type scenario struct {
+		testName       string
+		input          string
+		expectedOutput string
+	}
+	scenarios := []scenario{
+		{
+			"empty",
+			` commit deadbeef`,
+			``,
+		},
+		{
+			"no line breaks (single line)",
+			`commit deadbeef
+use generics to DRY up context code`,
+			`use generics to DRY up context code`,
+		},
+		{
+			"with line breaks",
+			`commit deadbeef
+Merge pull request #1750 from mark2185/fix-issue-template
+
+'git-rev parse' should be 'git rev-parse'`,
+			`Merge pull request #1750 from mark2185/fix-issue-template
+
+'git-rev parse' should be 'git rev-parse'`,
+		},
+	}
+
+	for _, s := range scenarios {
+		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),
+			})
+
+			output, err := instance.GetCommitMessage("deadbeef")
+
+			assert.NoError(t, err)
+
+			assert.Equal(t, s.expectedOutput, output)
+		})
+	}
+}
+
+func TestGetCommitMessageFromHistory(t *testing.T) {
+	type scenario struct {
+		testName string
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(string, error)
+	}
+	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),
+			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
+				use generics to DRY up context code`, nil),
+			func(output string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "use generics to DRY up context code", output)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildCommitCommands(commonDeps{runner: s.runner})
+
+			output, err := instance.GetCommitMessageFromHistory(2)
+
+			s.test(output, err)
+		})
+	}
+}

pkg/commands/git_commands/common.go

@@ -0,0 +1,42 @@
+package git_commands
+
+import (
+	gogit "github.com/jesseduffield/go-git/v5"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/sasha-s/go-deadlock"
+)
+
+type GitCommon struct {
+	*common.Common
+	version   *GitVersion
+	cmd       oscommands.ICmdObjBuilder
+	os        *oscommands.OSCommand
+	dotGitDir string
+	repo      *gogit.Repository
+	config    *ConfigCommands
+	// mutex for doing things like push/pull/fetch
+	syncMutex *deadlock.Mutex
+}
+
+func NewGitCommon(
+	cmn *common.Common,
+	version *GitVersion,
+	cmd oscommands.ICmdObjBuilder,
+	osCommand *oscommands.OSCommand,
+	dotGitDir string,
+	repo *gogit.Repository,
+	config *ConfigCommands,
+	syncMutex *deadlock.Mutex,
+) *GitCommon {
+	return &GitCommon{
+		Common:    cmn,
+		version:   version,
+		cmd:       cmd,
+		os:        osCommand,
+		dotGitDir: dotGitDir,
+		repo:      repo,
+		config:    config,
+		syncMutex: syncMutex,
+	}
+}

pkg/commands/git_commands/config.go

@@ -0,0 +1,109 @@
+package git_commands
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	gogit "github.com/jesseduffield/go-git/v5"
+	"github.com/jesseduffield/go-git/v5/config"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+type ConfigCommands struct {
+	*common.Common
+
+	gitConfig git_config.IGitConfig
+	repo      *gogit.Repository
+}
+
+func NewConfigCommands(
+	common *common.Common,
+	gitConfig git_config.IGitConfig,
+	repo *gogit.Repository,
+) *ConfigCommands {
+	return &ConfigCommands{
+		Common:    common,
+		gitConfig: gitConfig,
+		repo:      repo,
+	}
+}
+
+func (self *ConfigCommands) ConfiguredPager() string {
+	if os.Getenv("GIT_PAGER") != "" {
+		return os.Getenv("GIT_PAGER")
+	}
+	if os.Getenv("PAGER") != "" {
+		return os.Getenv("PAGER")
+	}
+	output := self.gitConfig.Get("core.pager")
+	return strings.Split(output, "\n")[0]
+}
+
+func (self *ConfigCommands) GetPager(width int) string {
+	useConfig := self.UserConfig.Git.Paging.UseConfig
+	if useConfig {
+		pager := self.ConfiguredPager()
+		return strings.Split(pager, "| less")[0]
+	}
+
+	templateValues := map[string]string{
+		"columnWidth": strconv.Itoa(width/2 - 6),
+	}
+
+	pagerTemplate := self.UserConfig.Git.Paging.Pager
+	return utils.ResolvePlaceholderString(pagerTemplate, templateValues)
+}
+
+// UsingGpg tells us whether the user has gpg enabled so that we can know
+// whether we need to run a subprocess to allow them to enter their password
+func (self *ConfigCommands) UsingGpg() bool {
+	overrideGpg := self.UserConfig.Git.OverrideGpg
+	if overrideGpg {
+		return false
+	}
+
+	return self.gitConfig.GetBool("commit.gpgsign")
+}
+
+func (self *ConfigCommands) GetCoreEditor() string {
+	return self.gitConfig.Get("core.editor")
+}
+
+// GetRemoteURL returns current repo remote url
+func (self *ConfigCommands) GetRemoteURL() string {
+	return self.gitConfig.Get("remote.origin.url")
+}
+
+func (self *ConfigCommands) GetShowUntrackedFiles() string {
+	return self.gitConfig.Get("status.showUntrackedFiles")
+}
+
+// this determines whether the user has configured to push to the remote branch of the same name as the current or not
+func (self *ConfigCommands) GetPushToCurrent() bool {
+	return self.gitConfig.Get("push.default") == "current"
+}
+
+// returns the repo's branches as specified in the git config
+func (self *ConfigCommands) Branches() (map[string]*config.Branch, error) {
+	conf, err := self.repo.Config()
+	if err != nil {
+		return nil, err
+	}
+
+	return conf.Branches, nil
+}
+
+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 '#'
+}

pkg/commands/git_commands/custom.go

@@ -0,0 +1,20 @@
+package git_commands
+
+import "github.com/mgutz/str"
+
+type CustomCommands struct {
+	*GitCommon
+}
+
+func NewCustomCommands(gitCommon *GitCommon) *CustomCommands {
+	return &CustomCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+// Only to be used for the sake of running custom commands specified by the user.
+// 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()
+}

pkg/commands/git_commands/deps_test.go

@@ -0,0 +1,179 @@
+package git_commands
+
+import (
+	"os"
+
+	"github.com/go-errors/errors"
+	gogit "github.com/jesseduffield/go-git/v5"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+type commonDeps struct {
+	runner     *oscommands.FakeCmdObjRunner
+	userConfig *config.UserConfig
+	gitVersion *GitVersion
+	gitConfig  *git_config.FakeGitConfig
+	getenv     func(string) string
+	removeFile func(string) error
+	dotGitDir  string
+	common     *common.Common
+	cmd        *oscommands.CmdObjBuilder
+}
+
+func buildGitCommon(deps commonDeps) *GitCommon {
+	gitCommon := &GitCommon{}
+
+	gitCommon.Common = deps.common
+	if gitCommon.Common == nil {
+		gitCommon.Common = utils.NewDummyCommonWithUserConfig(deps.userConfig)
+	}
+
+	runner := deps.runner
+	if runner == nil {
+		runner = oscommands.NewFakeRunner(nil)
+	}
+
+	cmd := deps.cmd
+	// gotta check deps.cmd because it's not an interface type and an interface value of nil is not considered to be nil
+	if cmd == nil {
+		cmd = oscommands.NewDummyCmdObjBuilder(runner)
+	}
+	gitCommon.cmd = cmd
+
+	gitCommon.Common.UserConfig = deps.userConfig
+	if gitCommon.Common.UserConfig == nil {
+		gitCommon.Common.UserConfig = config.GetDefaultConfig()
+	}
+
+	gitCommon.version = deps.gitVersion
+	if gitCommon.version == nil {
+		gitCommon.version = &GitVersion{2, 0, 0, ""}
+	}
+
+	gitConfig := deps.gitConfig
+	if gitConfig == nil {
+		gitConfig = git_config.NewFakeGitConfig(nil)
+	}
+
+	gitCommon.repo = buildRepo()
+	gitCommon.config = NewConfigCommands(gitCommon.Common, gitConfig, gitCommon.repo)
+
+	getenv := deps.getenv
+	if getenv == nil {
+		getenv = func(string) string { return "" }
+	}
+
+	removeFile := deps.removeFile
+	if removeFile == nil {
+		removeFile = func(string) error { return errors.New("unexpected call to removeFile") }
+	}
+
+	gitCommon.os = oscommands.NewDummyOSCommandWithDeps(oscommands.OSCommandDeps{
+		Common:       gitCommon.Common,
+		GetenvFn:     getenv,
+		Cmd:          cmd,
+		RemoveFileFn: removeFile,
+		TempDir:      os.TempDir(),
+	})
+
+	gitCommon.dotGitDir = deps.dotGitDir
+	if gitCommon.dotGitDir == "" {
+		gitCommon.dotGitDir = ".git"
+	}
+
+	return gitCommon
+}
+
+func buildRepo() *gogit.Repository {
+	// TODO: think of a way to actually mock this out
+	var repo *gogit.Repository = nil
+	return repo
+}
+
+func buildFileLoader(gitCommon *GitCommon) *FileLoader {
+	return NewFileLoader(gitCommon.Common, gitCommon.cmd, gitCommon.config)
+}
+
+func buildSubmoduleCommands(deps commonDeps) *SubmoduleCommands {
+	gitCommon := buildGitCommon(deps)
+
+	return NewSubmoduleCommands(gitCommon)
+}
+
+func buildCommitCommands(deps commonDeps) *CommitCommands {
+	gitCommon := buildGitCommon(deps)
+	return NewCommitCommands(gitCommon)
+}
+
+func buildWorkingTreeCommands(deps commonDeps) *WorkingTreeCommands {
+	gitCommon := buildGitCommon(deps)
+	submoduleCommands := buildSubmoduleCommands(deps)
+	fileLoader := buildFileLoader(gitCommon)
+
+	return NewWorkingTreeCommands(gitCommon, submoduleCommands, fileLoader)
+}
+
+func buildPatchCommands(deps commonDeps) *PatchCommands {
+	gitCommon := buildGitCommon(deps)
+	rebaseCommands := buildRebaseCommands(deps)
+	commitCommands := buildCommitCommands(deps)
+	statusCommands := buildStatusCommands(deps)
+	stashCommands := buildStashCommands(deps)
+	loadFileFn := func(from string, to string, reverse bool, filename string, plain bool) (string, error) {
+		return "", nil
+	}
+	patchBuilder := patch.NewPatchBuilder(gitCommon.Log, loadFileFn)
+
+	return NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchBuilder)
+}
+
+func buildStatusCommands(deps commonDeps) *StatusCommands {
+	gitCommon := buildGitCommon(deps)
+
+	return NewStatusCommands(gitCommon)
+}
+
+func buildStashCommands(deps commonDeps) *StashCommands {
+	gitCommon := buildGitCommon(deps)
+	fileLoader := buildFileLoader(gitCommon)
+	workingTreeCommands := buildWorkingTreeCommands(deps)
+
+	return NewStashCommands(gitCommon, fileLoader, workingTreeCommands)
+}
+
+func buildRebaseCommands(deps commonDeps) *RebaseCommands {
+	gitCommon := buildGitCommon(deps)
+	workingTreeCommands := buildWorkingTreeCommands(deps)
+	commitCommands := buildCommitCommands(deps)
+
+	return NewRebaseCommands(gitCommon, commitCommands, workingTreeCommands)
+}
+
+func buildSyncCommands(deps commonDeps) *SyncCommands {
+	gitCommon := buildGitCommon(deps)
+
+	return NewSyncCommands(gitCommon)
+}
+
+func buildFileCommands(deps commonDeps) *FileCommands {
+	gitCommon := buildGitCommon(deps)
+
+	return NewFileCommands(gitCommon)
+}
+
+func buildBranchCommands(deps commonDeps) *BranchCommands {
+	gitCommon := buildGitCommon(deps)
+
+	return NewBranchCommands(gitCommon)
+}
+
+func buildFlowCommands(deps commonDeps) *FlowCommands {
+	gitCommon := buildGitCommon(deps)
+
+	return NewFlowCommands(gitCommon)
+}

pkg/commands/git_commands/diff.go

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,155 @@
+package git_commands
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+type FileCommands struct {
+	*GitCommon
+}
+
+func NewFileCommands(gitCommon *GitCommon) *FileCommands {
+	return &FileCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+// Cat obtains the content of a file
+func (self *FileCommands) Cat(fileName string) (string, error) {
+	buf, err := os.ReadFile(fileName)
+	if err != nil {
+		return "", nil
+	}
+	return string(buf), nil
+}
+
+func (self *FileCommands) GetEditCmdStrLegacy(filename string, lineNumber int) (string, error) {
+	editor := self.UserConfig.OS.EditCommand
+
+	if editor == "" {
+		editor = self.config.GetCoreEditor()
+	}
+	if editor == "" {
+		editor = self.os.Getenv("GIT_EDITOR")
+	}
+	if editor == "" {
+		editor = self.os.Getenv("VISUAL")
+	}
+	if editor == "" {
+		editor = self.os.Getenv("EDITOR")
+	}
+	if editor == "" {
+		if err := self.cmd.New([]string{"which", "vi"}).DontLog().Run(); err == nil {
+			editor = "vi"
+		}
+	}
+	if editor == "" {
+		return "", errors.New("No editor defined in config file, $GIT_EDITOR, $VISUAL, $EDITOR, or git config")
+	}
+
+	templateValues := map[string]string{
+		"editor":   editor,
+		"filename": self.cmd.Quote(filename),
+		"line":     strconv.Itoa(lineNumber),
+	}
+
+	editCmdTemplate := self.UserConfig.OS.EditCommandTemplate
+	if len(editCmdTemplate) == 0 {
+		switch editor {
+		case "emacs", "nano", "vi", "vim", "nvim":
+			editCmdTemplate = "{{editor}} +{{line}} -- {{filename}}"
+		case "subl":
+			editCmdTemplate = "{{editor}} -- {{filename}}:{{line}}"
+		case "code":
+			editCmdTemplate = "{{editor}} -r --goto -- {{filename}}:{{line}}"
+		default:
+			editCmdTemplate = "{{editor}} -- {{filename}}"
+		}
+	}
+	return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil
+}
+
+func (self *FileCommands) GetEditCmdStr(filename string) (string, bool) {
+	// Legacy support for old config; to be removed at some point
+	if self.UserConfig.OS.Edit == "" && self.UserConfig.OS.EditCommandTemplate != "" {
+		if cmdStr, err := self.GetEditCmdStrLegacy(filename, 1); err == nil {
+			return cmdStr, true
+		}
+	}
+
+	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, editInTerminal
+}
+
+func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (string, bool) {
+	// Legacy support for old config; to be removed at some point
+	if self.UserConfig.OS.EditAtLine == "" && self.UserConfig.OS.EditCommandTemplate != "" {
+		if cmdStr, err := self.GetEditCmdStrLegacy(filename, lineNumber); err == nil {
+			return cmdStr, true
+		}
+	}
+
+	template, editInTerminal := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
+
+	templateValues := map[string]string{
+		"filename": self.cmd.Quote(filename),
+		"line":     strconv.Itoa(lineNumber),
+	}
+
+	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
+	return cmdStr, editInTerminal
+}
+
+func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber int) string {
+	// Legacy support for old config; to be removed at some point
+	if self.UserConfig.OS.EditAtLineAndWait == "" && self.UserConfig.OS.EditCommandTemplate != "" {
+		if cmdStr, err := self.GetEditCmdStrLegacy(filename, lineNumber); err == nil {
+			return cmdStr
+		}
+	}
+
+	template := config.GetEditAtLineAndWaitTemplate(&self.UserConfig.OS, self.guessDefaultEditor)
+
+	templateValues := map[string]string{
+		"filename": self.cmd.Quote(filename),
+		"line":     strconv.Itoa(lineNumber),
+	}
+
+	cmdStr := utils.ResolvePlaceholderString(template, templateValues)
+	return cmdStr
+}
+
+func (self *FileCommands) guessDefaultEditor() string {
+	// Try to query a few places where editors get configured
+	editor := self.config.GetCoreEditor()
+	if editor == "" {
+		editor = self.os.Getenv("GIT_EDITOR")
+	}
+	if editor == "" {
+		editor = self.os.Getenv("VISUAL")
+	}
+	if editor == "" {
+		editor = self.os.Getenv("EDITOR")
+	}
+
+	if editor != "" {
+		// At this point, it might be more than just the name of the editor;
+		// e.g. it might be "code -w" or "vim -u myvim.rc". So assume that
+		// everything up to the first space is the editor name.
+		editor = strings.Split(editor, " ")[0]
+	}
+
+	return editor
+}

pkg/commands/git_commands/file_loader.go

@@ -0,0 +1,125 @@
+package git_commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
+)
+
+type FileLoaderConfig interface {
+	GetShowUntrackedFiles() string
+}
+
+type FileLoader struct {
+	*common.Common
+	cmd         oscommands.ICmdObjBuilder
+	config      FileLoaderConfig
+	getFileType func(string) string
+}
+
+func NewFileLoader(cmn *common.Common, cmd oscommands.ICmdObjBuilder, config FileLoaderConfig) *FileLoader {
+	return &FileLoader{
+		Common:      cmn,
+		cmd:         cmd,
+		getFileType: oscommands.FileType,
+		config:      config,
+	}
+}
+
+type GetStatusFileOptions struct {
+	NoRenames bool
+}
+
+func (self *FileLoader) GetStatusFiles(opts GetStatusFileOptions) []*models.File {
+	// check if config wants us ignoring untracked files
+	untrackedFilesSetting := self.config.GetShowUntrackedFiles()
+
+	if untrackedFilesSetting == "" {
+		untrackedFilesSetting = "all"
+	}
+	untrackedFilesArg := fmt.Sprintf("--untracked-files=%s", untrackedFilesSetting)
+
+	statuses, err := self.gitStatus(GitStatusOptions{NoRenames: opts.NoRenames, UntrackedFilesArg: untrackedFilesArg})
+	if err != nil {
+		self.Log.Error(err)
+	}
+	files := []*models.File{}
+
+	for _, status := range statuses {
+		if strings.HasPrefix(status.StatusString, "warning") {
+			self.Log.Warningf("warning when calling git status: %s", status.StatusString)
+			continue
+		}
+
+		file := &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)
+	}
+
+	return files
+}
+
+// GitStatus returns the file status of the repo
+type GitStatusOptions struct {
+	NoRenames         bool
+	UntrackedFilesArg string
+}
+
+type FileStatus struct {
+	StatusString string
+	Change       string // ??, MM, AM, ...
+	Name         string
+	PreviousName string
+}
+
+func (c *FileLoader) gitStatus(opts GitStatusOptions) ([]FileStatus, error) {
+	cmdArgs := NewGitCmd("status").
+		Arg(opts.UntrackedFilesArg).
+		Arg("--porcelain").
+		Arg("-z").
+		ArgIf(opts.NoRenames, "--no-renames").
+		ToArgv()
+
+	statusLines, _, err := c.cmd.New(cmdArgs).DontLog().RunWithOutputs()
+	if err != nil {
+		return []FileStatus{}, err
+	}
+
+	splitLines := strings.Split(statusLines, "\x00")
+	response := []FileStatus{}
+
+	for i := 0; i < len(splitLines); i++ {
+		original := splitLines[i]
+
+		if len(original) < 3 {
+			continue
+		}
+
+		status := FileStatus{
+			StatusString: original,
+			Change:       original[:2],
+			Name:         original[3:],
+			PreviousName: "",
+		}
+
+		if strings.HasPrefix(status.Change, "R") {
+			// if a line starts with 'R' then the next line is the original file.
+			status.PreviousName = splitLines[i+1]
+			status.StatusString = fmt.Sprintf("%s %s -> %s", status.Change, status.PreviousName, status.Name)
+			i++
+		}
+
+		response = append(response, status)
+	}
+
+	return response, nil
+}

pkg/commands/git_commands/file_loader_test.go

@@ -0,0 +1,207 @@
+package git_commands
+
+import (
+	"testing"
+
+	"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"
+)
+
+func TestFileGetStatusFiles(t *testing.T) {
+	type scenario struct {
+		testName      string
+		runner        oscommands.ICmdObjRunner
+		expectedFiles []*models.File
+	}
+
+	scenarios := []scenario{
+		{
+			"No files found",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"}, "", nil),
+			[]*models.File{},
+		},
+		{
+			"Several files found",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
+					"MM file1.txt\x00A  file3.txt\x00AM file2.txt\x00?? file4.txt\x00UU file5.txt",
+					nil,
+				),
+			[]*models.File{
+				{
+					Name:                    "file1.txt",
+					HasStagedChanges:        true,
+					HasUnstagedChanges:      true,
+					Tracked:                 true,
+					Added:                   false,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "MM file1.txt",
+					Type:                    "file",
+					ShortStatus:             "MM",
+				},
+				{
+					Name:                    "file3.txt",
+					HasStagedChanges:        true,
+					HasUnstagedChanges:      false,
+					Tracked:                 false,
+					Added:                   true,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "A  file3.txt",
+					Type:                    "file",
+					ShortStatus:             "A ",
+				},
+				{
+					Name:                    "file2.txt",
+					HasStagedChanges:        true,
+					HasUnstagedChanges:      true,
+					Tracked:                 false,
+					Added:                   true,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "AM file2.txt",
+					Type:                    "file",
+					ShortStatus:             "AM",
+				},
+				{
+					Name:                    "file4.txt",
+					HasStagedChanges:        false,
+					HasUnstagedChanges:      true,
+					Tracked:                 false,
+					Added:                   true,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "?? file4.txt",
+					Type:                    "file",
+					ShortStatus:             "??",
+				},
+				{
+					Name:                    "file5.txt",
+					HasStagedChanges:        false,
+					HasUnstagedChanges:      true,
+					Tracked:                 true,
+					Added:                   false,
+					Deleted:                 false,
+					HasMergeConflicts:       true,
+					HasInlineMergeConflicts: true,
+					DisplayString:           "UU file5.txt",
+					Type:                    "file",
+					ShortStatus:             "UU",
+				},
+			},
+		},
+		{
+			"File with new line char",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"}, "MM a\nb.txt", nil),
+			[]*models.File{
+				{
+					Name:                    "a\nb.txt",
+					HasStagedChanges:        true,
+					HasUnstagedChanges:      true,
+					Tracked:                 true,
+					Added:                   false,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "MM a\nb.txt",
+					Type:                    "file",
+					ShortStatus:             "MM",
+				},
+			},
+		},
+		{
+			"Renamed files",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
+					"R  after1.txt\x00before1.txt\x00RM after2.txt\x00before2.txt",
+					nil,
+				),
+			[]*models.File{
+				{
+					Name:                    "after1.txt",
+					PreviousName:            "before1.txt",
+					HasStagedChanges:        true,
+					HasUnstagedChanges:      false,
+					Tracked:                 true,
+					Added:                   false,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "R  before1.txt -> after1.txt",
+					Type:                    "file",
+					ShortStatus:             "R ",
+				},
+				{
+					Name:                    "after2.txt",
+					PreviousName:            "before2.txt",
+					HasStagedChanges:        true,
+					HasUnstagedChanges:      true,
+					Tracked:                 true,
+					Added:                   false,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "RM before2.txt -> after2.txt",
+					Type:                    "file",
+					ShortStatus:             "RM",
+				},
+			},
+		},
+		{
+			"File with arrow in name",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"status", "--untracked-files=yes", "--porcelain", "-z"},
+					`?? a -> b.txt`,
+					nil,
+				),
+			[]*models.File{
+				{
+					Name:                    "a -> b.txt",
+					HasStagedChanges:        false,
+					HasUnstagedChanges:      true,
+					Tracked:                 false,
+					Added:                   true,
+					Deleted:                 false,
+					HasMergeConflicts:       false,
+					HasInlineMergeConflicts: false,
+					DisplayString:           "?? a -> b.txt",
+					Type:                    "file",
+					ShortStatus:             "??",
+				},
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)
+
+			loader := &FileLoader{
+				Common:      utils.NewDummyCommon(),
+				cmd:         cmd,
+				config:      &FakeFileLoaderConfig{showUntrackedFiles: "yes"},
+				getFileType: func(string) string { return "file" },
+			}
+
+			assert.EqualValues(t, s.expectedFiles, loader.GetStatusFiles(GetStatusFileOptions{}))
+		})
+	}
+}
+
+type FakeFileLoaderConfig struct {
+	showUntrackedFiles string
+}
+
+func (self *FakeFileLoaderConfig) GetShowUntrackedFiles() string {
+	return self.showUntrackedFiles
+}

pkg/commands/git_commands/file_test.go

@@ -0,0 +1,377 @@
+package git_commands
+
+import (
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEditFileCmdStrLegacy(t *testing.T) {
+	type scenario struct {
+		filename                  string
+		configEditCommand         string
+		configEditCommandTemplate string
+		runner                    *oscommands.FakeCmdObjRunner
+		getenv                    func(string) string
+		gitConfigMockResponses    map[string]string
+		test                      func(string, error)
+	}
+
+	scenarios := []scenario{
+		{
+			filename:                  "test",
+			configEditCommand:         "",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner: oscommands.NewFakeRunner(t).
+				ExpectArgs([]string{"which", "vi"}, "", errors.New("error")),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.EqualError(t, err, "No editor defined in config file, $GIT_EDITOR, $VISUAL, $EDITOR, or git config")
+			},
+		},
+		{
+			filename:                  "test",
+			configEditCommand:         "nano",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner:                    oscommands.NewFakeRunner(t),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `nano "test"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "test",
+			configEditCommand:         "",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner:                    oscommands.NewFakeRunner(t),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: map[string]string{"core.editor": "nano"},
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `nano "test"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "test",
+			configEditCommand:         "",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner:                    oscommands.NewFakeRunner(t),
+			getenv: func(env string) string {
+				if env == "VISUAL" {
+					return "nano"
+				}
+
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `nano "test"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "test",
+			configEditCommand:         "",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner:                    oscommands.NewFakeRunner(t),
+			getenv: func(env string) string {
+				if env == "EDITOR" {
+					return "emacs"
+				}
+
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `emacs "test"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "test",
+			configEditCommand:         "",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner: oscommands.NewFakeRunner(t).
+				ExpectArgs([]string{"which", "vi"}, "/usr/bin/vi", nil),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `vi "test"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "file/with space",
+			configEditCommand:         "",
+			configEditCommandTemplate: "{{editor}} {{filename}}",
+			runner: oscommands.NewFakeRunner(t).
+				ExpectArgs([]string{"which", "vi"}, "/usr/bin/vi", nil),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `vi "file/with space"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "open file/at line",
+			configEditCommand:         "vim",
+			configEditCommandTemplate: "{{editor}} +{{line}} {{filename}}",
+			runner:                    oscommands.NewFakeRunner(t),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `vim +1 "open file/at line"`, cmdStr)
+			},
+		},
+		{
+			filename:                  "default edit command template",
+			configEditCommand:         "vim",
+			configEditCommandTemplate: "",
+			runner:                    oscommands.NewFakeRunner(t),
+			getenv: func(env string) string {
+				return ""
+			},
+			gitConfigMockResponses: nil,
+			test: func(cmdStr string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, `vim +1 -- "default edit command template"`, cmdStr)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		userConfig := config.GetDefaultConfig()
+		userConfig.OS.EditCommand = s.configEditCommand
+		userConfig.OS.EditCommandTemplate = s.configEditCommandTemplate
+
+		instance := buildFileCommands(commonDeps{
+			runner:     s.runner,
+			userConfig: userConfig,
+			gitConfig:  git_config.NewFakeGitConfig(s.gitConfigMockResponses),
+			getenv:     s.getenv,
+		})
+
+		s.test(instance.GetEditCmdStrLegacy(s.filename, 1))
+		s.runner.CheckForMissingCalls()
+	}
+}
+
+func TestEditFileCmd(t *testing.T) {
+	type scenario struct {
+		filename               string
+		osConfig               config.OSConfig
+		expectedCmdStr         string
+		expectedEditInTerminal bool
+	}
+
+	scenarios := []scenario{
+		{
+			filename:               "test",
+			osConfig:               config.OSConfig{},
+			expectedCmdStr:         `vim -- "test"`,
+			expectedEditInTerminal: true,
+		},
+		{
+			filename: "test",
+			osConfig: config.OSConfig{
+				Edit: "nano {{filename}}",
+			},
+			expectedCmdStr:         `nano "test"`,
+			expectedEditInTerminal: true,
+		},
+		{
+			filename: "file/with space",
+			osConfig: config.OSConfig{
+				EditPreset: "sublime",
+			},
+			expectedCmdStr:         `subl -- "file/with space"`,
+			expectedEditInTerminal: false,
+		},
+	}
+
+	for _, s := range scenarios {
+		userConfig := config.GetDefaultConfig()
+		userConfig.OS = s.osConfig
+
+		instance := buildFileCommands(commonDeps{
+			userConfig: userConfig,
+		})
+
+		cmdStr, editInTerminal := instance.GetEditCmdStr(s.filename)
+		assert.Equal(t, s.expectedCmdStr, cmdStr)
+		assert.Equal(t, s.expectedEditInTerminal, editInTerminal)
+	}
+}
+
+func TestEditFileAtLineCmd(t *testing.T) {
+	type scenario struct {
+		filename               string
+		lineNumber             int
+		osConfig               config.OSConfig
+		expectedCmdStr         string
+		expectedEditInTerminal bool
+	}
+
+	scenarios := []scenario{
+		{
+			filename:               "test",
+			lineNumber:             42,
+			osConfig:               config.OSConfig{},
+			expectedCmdStr:         `vim +42 -- "test"`,
+			expectedEditInTerminal: true,
+		},
+		{
+			filename:   "test",
+			lineNumber: 35,
+			osConfig: config.OSConfig{
+				EditAtLine: "nano +{{line}} {{filename}}",
+			},
+			expectedCmdStr:         `nano +35 "test"`,
+			expectedEditInTerminal: true,
+		},
+		{
+			filename:   "file/with space",
+			lineNumber: 12,
+			osConfig: config.OSConfig{
+				EditPreset: "sublime",
+			},
+			expectedCmdStr:         `subl -- "file/with space":12`,
+			expectedEditInTerminal: false,
+		},
+	}
+
+	for _, s := range scenarios {
+		userConfig := config.GetDefaultConfig()
+		userConfig.OS = s.osConfig
+
+		instance := buildFileCommands(commonDeps{
+			userConfig: userConfig,
+		})
+
+		cmdStr, editInTerminal := instance.GetEditAtLineCmdStr(s.filename, s.lineNumber)
+		assert.Equal(t, s.expectedCmdStr, cmdStr)
+		assert.Equal(t, s.expectedEditInTerminal, editInTerminal)
+	}
+}
+
+func TestEditFileAtLineAndWaitCmd(t *testing.T) {
+	type scenario struct {
+		filename       string
+		lineNumber     int
+		osConfig       config.OSConfig
+		expectedCmdStr string
+	}
+
+	scenarios := []scenario{
+		{
+			filename:       "test",
+			lineNumber:     42,
+			osConfig:       config.OSConfig{},
+			expectedCmdStr: `vim +42 -- "test"`,
+		},
+		{
+			filename:   "file/with space",
+			lineNumber: 12,
+			osConfig: config.OSConfig{
+				EditPreset: "sublime",
+			},
+			expectedCmdStr: `subl --wait -- "file/with space":12`,
+		},
+	}
+
+	for _, s := range scenarios {
+		userConfig := config.GetDefaultConfig()
+		userConfig.OS = s.osConfig
+
+		instance := buildFileCommands(commonDeps{
+			userConfig: userConfig,
+		})
+
+		cmdStr := instance.GetEditAtLineAndWaitCmdStr(s.filename, s.lineNumber)
+		assert.Equal(t, s.expectedCmdStr, cmdStr)
+	}
+}
+
+func TestGuessDefaultEditor(t *testing.T) {
+	type scenario struct {
+		gitConfigMockResponses map[string]string
+		getenv                 func(string) string
+		expectedResult         string
+	}
+
+	scenarios := []scenario{
+		{
+			gitConfigMockResponses: nil,
+			getenv: func(env string) string {
+				return ""
+			},
+			expectedResult: "",
+		},
+		{
+			gitConfigMockResponses: map[string]string{"core.editor": "nano"},
+			getenv: func(env string) string {
+				return ""
+			},
+			expectedResult: "nano",
+		},
+		{
+			gitConfigMockResponses: map[string]string{"core.editor": "code -w"},
+			getenv: func(env string) string {
+				return ""
+			},
+			expectedResult: "code",
+		},
+		{
+			gitConfigMockResponses: nil,
+			getenv: func(env string) string {
+				if env == "VISUAL" {
+					return "emacs"
+				}
+
+				return ""
+			},
+			expectedResult: "emacs",
+		},
+		{
+			gitConfigMockResponses: nil,
+			getenv: func(env string) string {
+				if env == "EDITOR" {
+					return "bbedit -w"
+				}
+
+				return ""
+			},
+			expectedResult: "bbedit",
+		},
+	}
+
+	for _, s := range scenarios {
+		instance := buildFileCommands(commonDeps{
+			gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),
+			getenv:    s.getenv,
+		})
+
+		assert.Equal(t, s.expectedResult, instance.guessDefaultEditor())
+	}
+}

pkg/commands/git_commands/flow.go

@@ -0,0 +1,61 @@
+package git_commands
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+)
+
+type FlowCommands struct {
+	*GitCommon
+}
+
+func NewFlowCommands(
+	gitCommon *GitCommon,
+) *FlowCommands {
+	return &FlowCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+func (self *FlowCommands) GitFlowEnabled() bool {
+	return self.config.GetGitFlowPrefixes() != ""
+}
+
+func (self *FlowCommands) FinishCmdObj(branchName string) (oscommands.ICmdObj, error) {
+	prefixes := self.config.GetGitFlowPrefixes()
+
+	// need to find out what kind of branch this is
+	prefix := strings.SplitAfterN(branchName, "/", 2)[0]
+	suffix := strings.Replace(branchName, prefix, "", 1)
+
+	branchType := ""
+	for _, line := range strings.Split(strings.TrimSpace(prefixes), "\n") {
+		if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) {
+
+			regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*")
+			matches := regex.FindAllStringSubmatch(line, 1)
+
+			if len(matches) > 0 && len(matches[0]) > 1 {
+				branchType = matches[0][1]
+				break
+			}
+		}
+	}
+
+	if branchType == "" {
+		return nil, errors.New(self.Tr.NotAGitFlowBranch)
+	}
+
+	cmdArgs := NewGitCmd("flow").Arg(branchType, "finish", suffix).ToArgv()
+
+	return self.cmd.New(cmdArgs), nil
+}
+
+func (self *FlowCommands) StartCmdObj(branchType string, name string) oscommands.ICmdObj {
+	cmdArgs := NewGitCmd("flow").Arg(branchType, "start", name).ToArgv()
+
+	return self.cmd.New(cmdArgs)
+}

pkg/commands/git_commands/flow_test.go

@@ -0,0 +1,92 @@
+package git_commands
+
+import (
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestStartCmdObj(t *testing.T) {
+	scenarios := []struct {
+		testName   string
+		branchType string
+		name       string
+		expected   []string
+	}{
+		{
+			testName:   "basic",
+			branchType: "feature",
+			name:       "test",
+			expected:   []string{"git", "flow", "feature", "start", "test"},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildFlowCommands(commonDeps{})
+
+			assert.Equal(t,
+				instance.StartCmdObj(s.branchType, s.name).Args(),
+				s.expected,
+			)
+		})
+	}
+}
+
+func TestFinishCmdObj(t *testing.T) {
+	scenarios := []struct {
+		testName               string
+		branchName             string
+		expected               []string
+		expectedError          string
+		gitConfigMockResponses map[string]string
+	}{
+		{
+			testName:               "not a git flow branch",
+			branchName:             "mybranch",
+			expected:               nil,
+			expectedError:          "This does not seem to be a git flow branch",
+			gitConfigMockResponses: nil,
+		},
+		{
+			testName:               "feature branch without config",
+			branchName:             "feature/mybranch",
+			expected:               nil,
+			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"},
+			expectedError: "",
+			gitConfigMockResponses: map[string]string{
+				"--local --get-regexp gitflow.prefix": "gitflow.prefix.feature feature/",
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildFlowCommands(commonDeps{
+				gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses),
+			})
+
+			cmd, err := instance.FinishCmdObj(s.branchName)
+
+			if s.expectedError != "" {
+				if err == nil {
+					t.Errorf("Expected error, got nil")
+				} else {
+					assert.Equal(t, err.Error(), s.expectedError)
+				}
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, cmd.Args(), s.expected)
+			}
+		})
+	}
+}

pkg/commands/git_commands/git_command_builder.go

@@ -0,0 +1,58 @@
+package git_commands
+
+import "strings"
+
+// convenience struct for building git commands. Especially useful when
+// including conditional args
+type GitCommandBuilder struct {
+	// command string
+	args []string
+}
+
+func NewGitCmd(command string) *GitCommandBuilder {
+	return &GitCommandBuilder{args: []string{command}}
+}
+
+func (self *GitCommandBuilder) Arg(args ...string) *GitCommandBuilder {
+	self.args = append(self.args, args...)
+
+	return self
+}
+
+func (self *GitCommandBuilder) ArgIf(condition bool, ifTrue ...string) *GitCommandBuilder {
+	if condition {
+		self.Arg(ifTrue...)
+	}
+
+	return self
+}
+
+func (self *GitCommandBuilder) ArgIfElse(condition bool, ifTrue string, ifFalse string) *GitCommandBuilder {
+	if condition {
+		return self.Arg(ifTrue)
+	} else {
+		return self.Arg(ifFalse)
+	}
+}
+
+func (self *GitCommandBuilder) Config(value string) *GitCommandBuilder {
+	// config settings come before the command
+	self.args = append([]string{"-c", value}, self.args...)
+
+	return self
+}
+
+func (self *GitCommandBuilder) RepoPath(value string) *GitCommandBuilder {
+	// repo path comes before the command
+	self.args = append([]string{"-C", value}, self.args...)
+
+	return self
+}
+
+func (self *GitCommandBuilder) ToArgv() []string {
+	return append([]string{"git"}, self.args...)
+}
+
+func (self *GitCommandBuilder) ToString() string {
+	return strings.Join(self.ToArgv(), " ")
+}

pkg/commands/git_commands/git_command_builder_test.go

@@ -0,0 +1,56 @@
+package git_commands
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGitCommandBuilder(t *testing.T) {
+	scenarios := []struct {
+		input    []string
+		expected []string
+	}{
+		{
+			input: NewGitCmd("push").
+				Arg("--force-with-lease").
+				Arg("--set-upstream").
+				Arg("origin").
+				Arg("master").
+				ToArgv(),
+			expected: []string{"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(false, "--test").ToArgv(),
+			expected: []string{"git", "push"},
+		},
+		{
+			input:    NewGitCmd("push").ArgIfElse(true, "-b", "-a").ToArgv(),
+			expected: []string{"git", "push", "-b"},
+		},
+		{
+			input:    NewGitCmd("push").ArgIfElse(false, "-a", "-b").ToArgv(),
+			expected: []string{"git", "push", "-b"},
+		},
+		{
+			input:    NewGitCmd("push").Arg("-a", "-b").ToArgv(),
+			expected: []string{"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").RepoPath("a/b/c").ToArgv(),
+			expected: []string{"git", "-C", "a/b/c", "push"},
+		},
+	}
+
+	for _, s := range scenarios {
+		assert.Equal(t, s.input, s.expected)
+	}
+}

pkg/commands/git_commands/patch.go

@@ -0,0 +1,326 @@
+package git_commands
+
+import (
+	"fmt"
+	"path/filepath"
+	"time"
+
+	"github.com/fsmiamoto/git-todo-parser/todo"
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/app/daemon"
+	"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 {
+	*GitCommon
+	rebase *RebaseCommands
+	commit *CommitCommands
+	status *StatusCommands
+	stash  *StashCommands
+
+	PatchBuilder *patch.PatchBuilder
+}
+
+func NewPatchCommands(
+	gitCommon *GitCommon,
+	rebase *RebaseCommands,
+	commit *CommitCommands,
+	status *StatusCommands,
+	stash *StashCommands,
+	patchBuilder *patch.PatchBuilder,
+) *PatchCommands {
+	return &PatchCommands{
+		GitCommon:    gitCommon,
+		rebase:       rebase,
+		commit:       commit,
+		status:       status,
+		stash:        stash,
+		PatchBuilder: patchBuilder,
+	}
+}
+
+type ApplyPatchOpts struct {
+	ThreeWay bool
+	Cached   bool
+	Index    bool
+	Reverse  bool
+}
+
+func (self *PatchCommands) ApplyCustomPatch(reverse bool) error {
+	patch := self.PatchBuilder.PatchToApply(reverse)
+
+	return self.ApplyPatch(patch, ApplyPatchOpts{
+		Index:    true,
+		ThreeWay: true,
+		Reverse:  reverse,
+	})
+}
+
+func (self *PatchCommands) ApplyPatch(patch string, opts ApplyPatchOpts) error {
+	filepath, err := self.SaveTemporaryPatch(patch)
+	if err != nil {
+		return err
+	}
+
+	return self.applyPatchFile(filepath, opts)
+}
+
+func (self *PatchCommands) applyPatchFile(filepath string, opts ApplyPatchOpts) error {
+	cmdArgs := NewGitCmd("apply").
+		ArgIf(opts.ThreeWay, "--3way").
+		ArgIf(opts.Cached, "--cached").
+		ArgIf(opts.Index, "--index").
+		ArgIf(opts.Reverse, "--reverse").
+		Arg(filepath).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *PatchCommands) SaveTemporaryPatch(patch string) (string, error) {
+	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
+	}
+	return filepath, nil
+}
+
+// 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 {
+		return err
+	}
+
+	// apply each patch in reverse
+	if err := self.ApplyCustomPatch(true); err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	// time to amend the selected commit
+	if err := self.commit.AmendHead(); err != nil {
+		return err
+	}
+
+	self.rebase.onSuccessfulContinue = func() error {
+		self.PatchBuilder.Reset()
+		return nil
+	}
+
+	// continue
+	return self.rebase.ContinueRebase()
+}
+
+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 {
+			return err
+		}
+
+		// apply each patch forward
+		if err := self.ApplyCustomPatch(false); err != nil {
+			// Don't abort the rebase here; this might cause conflicts, so give
+			// the user a chance to resolve them
+			return err
+		}
+
+		// amend the destination commit
+		if err := self.commit.AmendHead(); err != nil {
+			return err
+		}
+
+		self.rebase.onSuccessfulContinue = func() error {
+			self.PatchBuilder.Reset()
+			return nil
+		}
+
+		// continue
+		return self.rebase.ContinueRebase()
+	}
+
+	if len(commits)-1 < sourceCommitIdx {
+		return errors.New("index outside of range of commits")
+	}
+
+	// we can make this GPG thing possible it just means we need to do this in two parts:
+	// one where we handle the possibility of a credential request, and the other
+	// where we continue the rebase
+	if self.config.UsingGpg() {
+		return errors.New(self.Tr.DisabledForGPG)
+	}
+
+	baseIndex := sourceCommitIdx + 1
+
+	changes := []daemon.ChangeTodoAction{
+		{Sha: commits[sourceCommitIdx].Sha, NewAction: todo.Edit},
+		{Sha: commits[destinationCommitIdx].Sha, NewAction: todo.Edit},
+	}
+	self.os.LogCommand(logTodoChanges(changes), false)
+
+	err := self.rebase.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot:  commits[baseIndex].Sha,
+		overrideEditor: true,
+		instruction:    daemon.NewChangeTodoActionsInstruction(changes),
+	}).Run()
+	if err != nil {
+		return err
+	}
+
+	// apply each patch in reverse
+	if err := self.ApplyCustomPatch(true); err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	// amend the source commit
+	if err := self.commit.AmendHead(); err != nil {
+		return err
+	}
+
+	patch, err := self.diffHeadAgainstCommit(commits[sourceCommitIdx])
+	if err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	if self.rebase.onSuccessfulContinue != nil {
+		return errors.New("You are midway through another rebase operation. Please abort to start again")
+	}
+
+	self.rebase.onSuccessfulContinue = func() error {
+		// now we should be up to the destination, so let's apply forward these patches to that.
+		// ideally we would ensure we're on the right commit but I'm not sure if that check is necessary
+		if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
+			// Don't abort the rebase here; this might cause conflicts, so give
+			// the user a chance to resolve them
+			return err
+		}
+
+		// amend the destination commit
+		if err := self.commit.AmendHead(); err != nil {
+			return err
+		}
+
+		self.rebase.onSuccessfulContinue = func() error {
+			self.PatchBuilder.Reset()
+			return nil
+		}
+
+		return self.rebase.ContinueRebase()
+	}
+
+	return self.rebase.ContinueRebase()
+}
+
+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 {
+			return err
+		}
+	}
+
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
+		return err
+	}
+
+	if err := self.ApplyCustomPatch(true); err != nil {
+		if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
+			_ = self.rebase.AbortRebase()
+		}
+		return err
+	}
+
+	// amend the commit
+	if err := self.commit.AmendHead(); err != nil {
+		return err
+	}
+
+	patch, err := self.diffHeadAgainstCommit(commits[commitIdx])
+	if err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	if self.rebase.onSuccessfulContinue != nil {
+		return errors.New("You are midway through another rebase operation. Please abort to start again")
+	}
+
+	self.rebase.onSuccessfulContinue = func() error {
+		// add patches to index
+		if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
+			if self.status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
+				_ = self.rebase.AbortRebase()
+			}
+			return err
+		}
+
+		if stash {
+			if err := self.stash.Apply(0); err != nil {
+				return err
+			}
+		}
+
+		self.PatchBuilder.Reset()
+		return nil
+	}
+
+	return self.rebase.ContinueRebase()
+}
+
+func (self *PatchCommands) PullPatchIntoNewCommit(commits []*models.Commit, commitIdx int) error {
+	if err := self.rebase.BeginInteractiveRebaseForCommit(commits, commitIdx, false); err != nil {
+		return err
+	}
+
+	if err := self.ApplyCustomPatch(true); err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	// amend the commit
+	if err := self.commit.AmendHead(); err != nil {
+		return err
+	}
+
+	patch, err := self.diffHeadAgainstCommit(commits[commitIdx])
+	if err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	if err := self.ApplyPatch(patch, ApplyPatchOpts{Index: true, ThreeWay: true}); err != nil {
+		_ = self.rebase.AbortRebase()
+		return err
+	}
+
+	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
+	}
+
+	if self.rebase.onSuccessfulContinue != nil {
+		return errors.New("You are midway through another rebase operation. Please abort to start again")
+	}
+
+	self.PatchBuilder.Reset()
+	return self.rebase.ContinueRebase()
+}
+
+// We have just applied a patch in reverse to discard it from a commit; if we
+// now try to apply the patch again to move it to a later commit, or to the
+// index, then this would conflict "with itself" in case the patch contained
+// 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()
+
+	return self.cmd.New(cmdArgs).RunWithOutput()
+}

pkg/commands/git_commands/patch_test.go

@@ -0,0 +1,68 @@
+package git_commands
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPatchApplyPatch(t *testing.T) {
+	type scenario struct {
+		testName string
+		opts     ApplyPatchOpts
+		runner   *oscommands.FakeCmdObjRunner
+		test     func(error)
+	}
+
+	// expectedArgs excludes the last argument which is an indeterminate filename
+	expectFn := func(expectedArgs []string, errToReturn error) func(cmdObj oscommands.ICmdObj) (string, error) {
+		return func(cmdObj oscommands.ICmdObj) (string, error) {
+			args := cmdObj.Args()
+
+			assert.Equal(t, len(args), len(expectedArgs)+1, fmt.Sprintf("unexpected command: %s", cmdObj.ToString()))
+
+			filename := args[len(args)-1]
+
+			content, err := os.ReadFile(filename)
+			assert.NoError(t, err)
+
+			assert.Equal(t, "test", string(content))
+
+			return "", errToReturn
+		}
+	}
+
+	scenarios := []scenario{
+		{
+			testName: "valid case",
+			opts:     ApplyPatchOpts{Cached: true},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectFunc(expectFn([]string{"git", "apply", "--cached"}, nil)),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			testName: "command returns error",
+			opts:     ApplyPatchOpts{Cached: true},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectFunc(expectFn([]string{"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", s.opts))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}

pkg/commands/git_commands/rebase.go

@@ -0,0 +1,418 @@
+package git_commands
+
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"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"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/samber/lo"
+)
+
+type RebaseCommands struct {
+	*GitCommon
+	commit      *CommitCommands
+	workingTree *WorkingTreeCommands
+
+	onSuccessfulContinue func() error
+}
+
+func NewRebaseCommands(
+	gitCommon *GitCommon,
+	commitCommands *CommitCommands,
+	workingTreeCommands *WorkingTreeCommands,
+) *RebaseCommands {
+	return &RebaseCommands{
+		GitCommon:   gitCommon,
+		commit:      commitCommands,
+		workingTree: workingTreeCommands,
+	}
+}
+
+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(message)
+	}
+
+	err := self.BeginInteractiveRebaseForCommit(commits, index, false)
+	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(message)
+	if err != nil {
+		return err
+	}
+
+	return self.ContinueRebase()
+}
+
+func (self *RebaseCommands) RewordCommitInEditor(commits []*models.Commit, index int) (oscommands.ICmdObj, error) {
+	changes := []daemon.ChangeTodoAction{{
+		Sha:       commits[index].Sha,
+		NewAction: todo.Reword,
+	}}
+	self.os.LogCommand(logTodoChanges(changes), false)
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot: getBaseShaOrRoot(commits, index+1),
+		instruction:   daemon.NewChangeTodoActionsInstruction(changes),
+	}), nil
+}
+
+func (self *RebaseCommands) ResetCommitAuthor(commits []*models.Commit, index int) error {
+	return self.GenericAmend(commits, index, func() error {
+		return self.commit.ResetAuthor()
+	})
+}
+
+func (self *RebaseCommands) SetCommitAuthor(commits []*models.Commit, index int, value string) error {
+	return self.GenericAmend(commits, index, func() error {
+		return self.commit.SetAuthor(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)
+	if err != nil {
+		return err
+	}
+
+	// now the selected commit should be our head so we'll amend it
+	err = f()
+	if err != nil {
+		return err
+	}
+
+	return self.ContinueRebase()
+}
+
+func (self *RebaseCommands) MoveCommitDown(commits []*models.Commit, index int) error {
+	baseShaOrRoot := getBaseShaOrRoot(commits, index+2)
+
+	sha := commits[index].Sha
+
+	self.os.LogCommand(fmt.Sprintf("Moving TODO down: %s", utils.ShortSha(sha)), false)
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot:  baseShaOrRoot,
+		instruction:    daemon.NewMoveTodoDownInstruction(sha),
+		overrideEditor: true,
+	}).Run()
+}
+
+func (self *RebaseCommands) MoveCommitUp(commits []*models.Commit, index int) error {
+	baseShaOrRoot := getBaseShaOrRoot(commits, index+1)
+
+	sha := commits[index].Sha
+
+	self.os.LogCommand(fmt.Sprintf("Moving TODO up: %s", utils.ShortSha(sha)), false)
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot:  baseShaOrRoot,
+		instruction:    daemon.NewMoveTodoUpInstruction(sha),
+		overrideEditor: true,
+	}).Run()
+}
+
+func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, index int, action todo.TodoCommand) error {
+	baseIndex := index + 1
+	if action == todo.Squash || action == todo.Fixup {
+		baseIndex++
+	}
+
+	baseShaOrRoot := getBaseShaOrRoot(commits, baseIndex)
+
+	changes := []daemon.ChangeTodoAction{{
+		Sha:       commits[index].Sha,
+		NewAction: action,
+	}}
+	self.os.LogCommand(logTodoChanges(changes), false)
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot:  baseShaOrRoot,
+		overrideEditor: true,
+		instruction:    daemon.NewChangeTodoActionsInstruction(changes),
+	}).Run()
+}
+
+func (self *RebaseCommands) EditRebase(branchRef string) error {
+	self.os.LogCommand(fmt.Sprintf("Beginning interactive rebase at '%s'", branchRef), false)
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot: branchRef,
+		instruction:   daemon.NewInsertBreakInstruction(),
+	}).Run()
+}
+
+func logTodoChanges(changes []daemon.ChangeTodoAction) 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
+	instruction                daemon.Instruction
+	overrideEditor             bool
+	keepCommitsThatBecomeEmpty bool
+}
+
+// PrepareInteractiveRebaseCommand returns the cmd for an interactive rebase
+// we tell git to run lazygit to edit the todo list, and we pass the client
+// lazygit a todo string to write to the todo file
+func (self *RebaseCommands) PrepareInteractiveRebaseCommand(opts PrepareInteractiveRebaseCommandOpts) oscommands.ICmdObj {
+	ex := oscommands.GetLazygitPath()
+
+	cmdArgs := NewGitCmd("rebase").
+		Arg("--interactive").
+		Arg("--autostash").
+		Arg("--keep-empty").
+		ArgIf(opts.keepCommitsThatBecomeEmpty && !self.version.IsOlderThan(2, 26, 0), "--empty=keep").
+		Arg("--no-autosquash").
+		ArgIf(!self.version.IsOlderThan(2, 22, 0), "--rebase-merges").
+		Arg(opts.baseShaOrRoot).
+		ToArgv()
+
+	debug := "FALSE"
+	if self.Debug {
+		debug = "TRUE"
+	}
+
+	self.Log.WithField("command", cmdArgs).Debug("RunCommand")
+
+	cmdObj := self.cmd.New(cmdArgs)
+
+	gitSequenceEditor := ex
+
+	if opts.instruction != nil {
+		cmdObj.AddEnvVars(daemon.ToEnvVars(opts.instruction)...)
+	} else {
+		gitSequenceEditor = "true"
+	}
+
+	cmdObj.AddEnvVars(
+		"DEBUG="+debug,
+		"LANG=en_US.UTF-8",   // Force using EN as language
+		"LC_ALL=en_US.UTF-8", // Force using EN as language
+		"GIT_SEQUENCE_EDITOR="+gitSequenceEditor,
+	)
+
+	if opts.overrideEditor {
+		cmdObj.AddEnvVars("GIT_EDITOR=" + ex)
+	}
+
+	return cmdObj
+}
+
+// AmendTo amends the given commit with whatever files are staged
+func (self *RebaseCommands) AmendTo(commits []*models.Commit, commitIndex int) error {
+	commit := commits[commitIndex]
+
+	if err := self.commit.CreateFixupCommit(commit.Sha); err != nil {
+		return err
+	}
+
+	// Get the sha of the commit we just created
+	cmdArgs := NewGitCmd("rev-parse").Arg("--verify", "HEAD").ToArgv()
+	fixupSha, err := self.cmd.New(cmdArgs).RunWithOutput()
+	if err != nil {
+		return err
+	}
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot:  getBaseShaOrRoot(commits, commitIndex+1),
+		overrideEditor: true,
+		instruction:    daemon.NewMoveFixupCommitDownInstruction(commit.Sha, fixupSha),
+	}).Run()
+}
+
+// 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.dotGitDir, "rebase-merge/git-rebase-todo"), commit.Sha, commit.Action, action, self.config.GetCoreCommentChar())
+}
+
+// MoveTodoDown moves a rebase todo item down by one position
+func (self *RebaseCommands) MoveTodoDown(commit *models.Commit) error {
+	fileName := filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo")
+	return utils.MoveTodoDown(fileName, commit.Sha, commit.Action, self.config.GetCoreCommentChar())
+}
+
+// MoveTodoDown moves a rebase todo item down by one position
+func (self *RebaseCommands) MoveTodoUp(commit *models.Commit) error {
+	fileName := filepath.Join(self.dotGitDir, "rebase-merge/git-rebase-todo")
+	return utils.MoveTodoUp(fileName, commit.Sha, commit.Action, self.config.GetCoreCommentChar())
+}
+
+// SquashAllAboveFixupCommits squashes all fixup! commits above the given one
+func (self *RebaseCommands) SquashAllAboveFixupCommits(commit *models.Commit) error {
+	shaOrRoot := commit.Sha + "^"
+	if commit.IsFirstCommit() {
+		shaOrRoot = "--root"
+	}
+
+	cmdArgs := NewGitCmd("rebase").
+		Arg("--interactive", "--rebase-merges", "--autostash", "--autosquash", shaOrRoot).
+		ToArgv()
+
+	return self.runSkipEditorCommand(self.cmd.New(cmdArgs))
+}
+
+// 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 {
+	if len(commits)-1 < commitIndex {
+		return errors.New("index outside of range of commits")
+	}
+
+	// we can make this GPG thing possible it just means we need to do this in two parts:
+	// one where we handle the possibility of a credential request, and the other
+	// where we continue the rebase
+	if self.config.UsingGpg() {
+		return errors.New(self.Tr.DisabledForGPG)
+	}
+
+	changes := []daemon.ChangeTodoAction{{
+		Sha:       commits[commitIndex].Sha,
+		NewAction: todo.Edit,
+	}}
+	self.os.LogCommand(logTodoChanges(changes), false)
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot:              getBaseShaOrRoot(commits, commitIndex+1),
+		overrideEditor:             true,
+		keepCommitsThatBecomeEmpty: keepCommitsThatBecomeEmpty,
+		instruction:                daemon.NewChangeTodoActionsInstruction(changes),
+	}).Run()
+}
+
+// RebaseBranch interactive rebases onto a branch
+func (self *RebaseCommands) RebaseBranch(branchName string) error {
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{baseShaOrRoot: branchName}).Run()
+}
+
+func (self *RebaseCommands) GenericMergeOrRebaseActionCmdObj(commandType string, command string) oscommands.ICmdObj {
+	cmdArgs := NewGitCmd(commandType).Arg("--" + command).ToArgv()
+
+	return self.cmd.New(cmdArgs)
+}
+
+func (self *RebaseCommands) ContinueRebase() error {
+	return self.GenericMergeOrRebaseAction("rebase", "continue")
+}
+
+func (self *RebaseCommands) AbortRebase() error {
+	return self.GenericMergeOrRebaseAction("rebase", "abort")
+}
+
+// GenericMerge takes a commandType of "merge" or "rebase" and a command of "abort", "skip" or "continue"
+// By default we skip the editor in the case where a commit will be made
+func (self *RebaseCommands) GenericMergeOrRebaseAction(commandType string, command string) error {
+	err := self.runSkipEditorCommand(self.GenericMergeOrRebaseActionCmdObj(commandType, command))
+	if err != nil {
+		if !strings.Contains(err.Error(), "no rebase in progress") {
+			return err
+		}
+		self.Log.Warn(err)
+	}
+
+	// sometimes we need to do a sequence of things in a rebase but the user needs to
+	// fix merge conflicts along the way. When this happens we queue up the next step
+	// so that after the next successful rebase continue we can continue from where we left off
+	if commandType == "rebase" && command == "continue" && self.onSuccessfulContinue != nil {
+		f := self.onSuccessfulContinue
+		self.onSuccessfulContinue = nil
+		return f()
+	}
+	if command == "abort" {
+		self.onSuccessfulContinue = nil
+	}
+	return nil
+}
+
+func (self *RebaseCommands) runSkipEditorCommand(cmdObj oscommands.ICmdObj) error {
+	instruction := daemon.NewExitImmediatelyInstruction()
+	lazyGitPath := oscommands.GetLazygitPath()
+	return cmdObj.
+		AddEnvVars(
+			"GIT_EDITOR="+lazyGitPath,
+			"GIT_SEQUENCE_EDITOR="+lazyGitPath,
+			"EDITOR="+lazyGitPath,
+			"VISUAL="+lazyGitPath,
+		).
+		AddEnvVars(daemon.ToEnvVars(instruction)...).
+		Run()
+}
+
+// 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 {
+		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()
+
+	if err := self.cmd.New(cmdArgs).Run(); err != nil {
+		if err := self.os.Remove(fileName); err != nil {
+			return err
+		}
+		if err := self.workingTree.StageFile(fileName); err != nil {
+			return err
+		}
+	} else if err := self.workingTree.CheckoutFile("HEAD^", fileName); err != nil {
+		return err
+	}
+
+	// amend the commit
+	err := self.commit.AmendHead()
+	if err != nil {
+		return err
+	}
+
+	// continue
+	return self.ContinueRebase()
+}
+
+// CherryPickCommits begins an interactive rebase with the given shas being cherry picked onto HEAD
+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)
+	})
+	self.os.LogCommand(fmt.Sprintf("Cherry-picking commits:\n%s", strings.Join(commitLines, "\n")), false)
+
+	return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
+		baseShaOrRoot: "HEAD",
+		instruction:   daemon.NewCherryPickCommitsInstruction(commits),
+	}).Run()
+}
+
+// we can't start an interactive rebase from the first commit without passing the
+// '--root' arg
+func getBaseShaOrRoot(commits []*models.Commit, index int) string {
+	// We assume that the commits slice contains the initial commit of the repo.
+	// Technically this assumption could prove false, but it's unlikely you'll
+	// be starting a rebase from 300 commits ago (which is the original commit limit
+	// at time of writing)
+	if index < len(commits) {
+		return commits[index].Sha
+	} else {
+		return "--root"
+	}
+}

pkg/commands/git_commands/rebase_test.go

@@ -0,0 +1,178 @@
+package git_commands
+
+import (
+	"regexp"
+	"strconv"
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/lazygit/pkg/app/daemon"
+	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/samber/lo"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRebaseRebaseBranch(t *testing.T) {
+	type scenario struct {
+		testName   string
+		arg        string
+		gitVersion *GitVersion
+		runner     *oscommands.FakeCmdObjRunner
+		test       func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			testName:   "successful rebase",
+			arg:        "master",
+			gitVersion: &GitVersion{2, 26, 0, ""},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "--rebase-merges", "master"}, "", nil),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			testName:   "unsuccessful rebase",
+			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")),
+			test: func(err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			testName:   "successful rebase (< 2.26.0)",
+			arg:        "master",
+			gitVersion: &GitVersion{2, 25, 5, ""},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "--rebase-merges", "master"}, "", nil),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			testName:   "successful rebase (< 2.22.0)",
+			arg:        "master",
+			gitVersion: &GitVersion{2, 21, 9, ""},
+			runner: oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"rebase", "--interactive", "--autostash", "--keep-empty", "--no-autosquash", "master"}, "", nil),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildRebaseCommands(commonDeps{runner: s.runner, gitVersion: s.gitVersion})
+			s.test(instance.RebaseBranch(s.arg))
+		})
+	}
+}
+
+// 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(func(cmdObj oscommands.ICmdObj) (string, error) {
+		assert.EqualValues(t, cmdArgs, cmdObj.Args())
+		envVars := cmdObj.GetEnvVars()
+		for _, regexStr := range []string{
+			`^VISUAL=.*$`,
+			`^EDITOR=.*$`,
+			`^GIT_EDITOR=.*$`,
+			`^GIT_SEQUENCE_EDITOR=.*$`,
+			"^" + daemon.DaemonKindEnvKey + "=" + strconv.Itoa(int(daemon.DaemonKindExitImmediately)) + "$",
+		} {
+			regexStr := regexStr
+			foundMatch := lo.ContainsBy(envVars, func(envVar string) bool {
+				return regexp.MustCompile(regexStr).MatchString(envVar)
+			})
+			if !foundMatch {
+				t.Errorf("expected environment variable %s to be set", regexStr)
+			}
+		}
+		return "", nil
+	})
+	instance := buildRebaseCommands(commonDeps{runner: runner})
+	err := instance.runSkipEditorCommand(instance.cmd.New(cmdArgs))
+	assert.NoError(t, err)
+	runner.CheckForMissingCalls()
+}
+
+func TestRebaseDiscardOldFileChanges(t *testing.T) {
+	type scenario struct {
+		testName               string
+		gitConfigMockResponses map[string]string
+		commits                []*models.Commit
+		commitIndex            int
+		fileName               string
+		runner                 *oscommands.FakeCmdObjRunner
+		test                   func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			testName:               "returns error when index outside of range of commits",
+			gitConfigMockResponses: nil,
+			commits:                []*models.Commit{},
+			commitIndex:            0,
+			fileName:               "test999.txt",
+			runner:                 oscommands.NewFakeRunner(t),
+			test: func(err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			testName:               "returns error when using gpg",
+			gitConfigMockResponses: map[string]string{"commit.gpgsign": "true"},
+			commits:                []*models.Commit{{Name: "commit", Sha: "123456"}},
+			commitIndex:            0,
+			fileName:               "test999.txt",
+			runner:                 oscommands.NewFakeRunner(t),
+			test: func(err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			testName:               "checks out file if it already existed",
+			gitConfigMockResponses: nil,
+			commits: []*models.Commit{
+				{Name: "commit", Sha: "123456"},
+				{Name: "commit2", Sha: "abcdef"},
+			},
+			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),
+			test: func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		// test for when the file was created within the commit requires a refactor to support proper mocks
+		// currently we'd need to mock out the os.Remove function and that's gonna introduce tech debt
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			instance := buildRebaseCommands(commonDeps{
+				runner:     s.runner,
+				gitVersion: &GitVersion{2, 26, 0, ""},
+				gitConfig:  git_config.NewFakeGitConfig(s.gitConfigMockResponses),
+			})
+
+			s.test(instance.DiscardOldFileChanges(s.commits, s.commitIndex, s.fileName))
+			s.runner.CheckForMissingCalls()
+		})
+	}
+}

pkg/commands/git_commands/reflog_commit_loader.go

@@ -0,0 +1,79 @@
+package git_commands
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/common"
+)
+
+type ReflogCommitLoader struct {
+	*common.Common
+	cmd oscommands.ICmdObjBuilder
+}
+
+func NewReflogCommitLoader(common *common.Common, cmd oscommands.ICmdObjBuilder) *ReflogCommitLoader {
+	return &ReflogCommitLoader{
+		Common: common,
+		cmd:    cmd,
+	}
+}
+
+// GetReflogCommits only returns the new reflog commits since the given lastReflogCommit
+// if none is passed (i.e. it's value is nil) then we get all the reflog commits
+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()
+	onlyObtainedNewReflogCommits := false
+	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
+		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 && 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
+		}
+
+		commits = append(commits, commit)
+		return false, nil
+	})
+	if err != nil {
+		return nil, false, err
+	}
+
+	return commits, onlyObtainedNewReflogCommits, nil
+}

pkg/commands/git_commands/reflog_commit_loader_test.go

@@ -0,0 +1,169 @@
+package git_commands
+
+import (
+	"errors"
+	"strings"
+	"testing"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/models"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sanity-io/litter"
+	"github.com/stretchr/testify/assert"
+)
+
+var reflogOutput = strings.Replace(`c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1
+c3c4b66b64c97ffeecde|1643150483|checkout: moving from B to A|51baa8c1
+c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1
+c3c4b66b64c97ffeecde|1643150483|checkout: moving from master to A|51baa8c1
+f4ddf2f0d4be4ccc7efa|1643149435|checkout: moving from A to master|51baa8c1
+`, "|", "\x00", -1)
+
+func TestGetReflogCommits(t *testing.T) {
+	type scenario struct {
+		testName                string
+		runner                  *oscommands.FakeCmdObjRunner
+		lastReflogCommit        *models.Commit
+		filterPath              string
+		expectedCommits         []*models.Commit
+		expectedOnlyObtainedNew bool
+		expectedError           error
+	}
+
+	scenarios := []scenario{
+		{
+			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),
+
+			lastReflogCommit:        nil,
+			expectedCommits:         []*models.Commit{},
+			expectedOnlyObtainedNew: false,
+			expectedError:           nil,
+		},
+		{
+			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),
+
+			lastReflogCommit: nil,
+			expectedCommits: []*models.Commit{
+				{
+					Sha:           "c3c4b66b64c97ffeecde",
+					Name:          "checkout: moving from A to B",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643150483,
+					Parents:       []string{"51baa8c1"},
+				},
+				{
+					Sha:           "c3c4b66b64c97ffeecde",
+					Name:          "checkout: moving from B to A",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643150483,
+					Parents:       []string{"51baa8c1"},
+				},
+				{
+					Sha:           "c3c4b66b64c97ffeecde",
+					Name:          "checkout: moving from A to B",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643150483,
+					Parents:       []string{"51baa8c1"},
+				},
+				{
+					Sha:           "c3c4b66b64c97ffeecde",
+					Name:          "checkout: moving from master to A",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643150483,
+					Parents:       []string{"51baa8c1"},
+				},
+				{
+					Sha:           "f4ddf2f0d4be4ccc7efa",
+					Name:          "checkout: moving from A to master",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643149435,
+					Parents:       []string{"51baa8c1"},
+				},
+			},
+			expectedOnlyObtainedNew: false,
+			expectedError:           nil,
+		},
+		{
+			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),
+
+			lastReflogCommit: &models.Commit{
+				Sha:           "c3c4b66b64c97ffeecde",
+				Name:          "checkout: moving from B to A",
+				Status:        models.StatusReflog,
+				UnixTimestamp: 1643150483,
+				Parents:       []string{"51baa8c1"},
+			},
+			expectedCommits: []*models.Commit{
+				{
+					Sha:           "c3c4b66b64c97ffeecde",
+					Name:          "checkout: moving from A to B",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643150483,
+					Parents:       []string{"51baa8c1"},
+				},
+			},
+			expectedOnlyObtainedNew: true,
+			expectedError:           nil,
+		},
+		{
+			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),
+
+			lastReflogCommit: &models.Commit{
+				Sha:           "c3c4b66b64c97ffeecde",
+				Name:          "checkout: moving from B to A",
+				Status:        models.StatusReflog,
+				UnixTimestamp: 1643150483,
+				Parents:       []string{"51baa8c1"},
+			},
+			filterPath: "path",
+			expectedCommits: []*models.Commit{
+				{
+					Sha:           "c3c4b66b64c97ffeecde",
+					Name:          "checkout: moving from A to B",
+					Status:        models.StatusReflog,
+					UnixTimestamp: 1643150483,
+					Parents:       []string{"51baa8c1"},
+				},
+			},
+			expectedOnlyObtainedNew: true,
+			expectedError:           nil,
+		},
+		{
+			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")),
+
+			lastReflogCommit:        nil,
+			filterPath:              "",
+			expectedCommits:         nil,
+			expectedOnlyObtainedNew: false,
+			expectedError:           errors.New("haha"),
+		},
+	}
+
+	for _, scenario := range scenarios {
+		scenario := scenario
+		t.Run(scenario.testName, func(t *testing.T) {
+			builder := &ReflogCommitLoader{
+				Common: utils.NewDummyCommon(),
+				cmd:    oscommands.NewDummyCmdObjBuilder(scenario.runner),
+			}
+
+			commits, onlyObtainednew, err := builder.GetReflogCommits(scenario.lastReflogCommit, scenario.filterPath)
+			assert.Equal(t, scenario.expectedOnlyObtainedNew, onlyObtainednew)
+			assert.Equal(t, scenario.expectedError, err)
+			t.Logf("actual commits: \n%s", litter.Sdump(commits))
+			assert.Equal(t, scenario.expectedCommits, commits)
+
+			scenario.runner.CheckForMissingCalls()
+		})
+	}
+}

pkg/commands/git_commands/remote.go

@@ -0,0 +1,68 @@
+package git_commands
+
+import (
+	"fmt"
+
+	"github.com/jesseduffield/gocui"
+)
+
+type RemoteCommands struct {
+	*GitCommon
+}
+
+func NewRemoteCommands(gitCommon *GitCommon) *RemoteCommands {
+	return &RemoteCommands{
+		GitCommon: gitCommon,
+	}
+}
+
+func (self *RemoteCommands) AddRemote(name string, url string) error {
+	cmdArgs := NewGitCmd("remote").
+		Arg("add", name, url).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *RemoteCommands) RemoveRemote(name string) error {
+	cmdArgs := NewGitCmd("remote").
+		Arg("remove", name).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *RemoteCommands) RenameRemote(oldRemoteName string, newRemoteName string) error {
+	cmdArgs := NewGitCmd("remote").
+		Arg("rename", oldRemoteName, newRemoteName).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *RemoteCommands) UpdateRemoteUrl(remoteName string, updatedUrl string) error {
+	cmdArgs := NewGitCmd("remote").
+		Arg("set-url", remoteName, updatedUrl).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *RemoteCommands) DeleteRemoteBranch(task gocui.Task, remoteName string, branchName string) error {
+	cmdArgs := NewGitCmd("push").
+		Arg(remoteName, "--delete", branchName).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).PromptOnCredentialRequest(task).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()
+
+	_, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+
+	return err == nil
+}

pkg/commands/git_commands/remote_loader.go

@@ -0,0 +1,78 @@
+package git_commands
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"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"
+)
+
+type RemoteLoader struct {
+	*common.Common
+	cmd             oscommands.ICmdObjBuilder
+	getGoGitRemotes func() ([]*gogit.Remote, error)
+}
+
+func NewRemoteLoader(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+	getGoGitRemotes func() ([]*gogit.Remote, error),
+) *RemoteLoader {
+	return &RemoteLoader{
+		Common:          common,
+		cmd:             cmd,
+		getGoGitRemotes: getGoGitRemotes,
+	}
+}
+
+func (self *RemoteLoader) GetRemotes() ([]*models.Remote, error) {
+	cmdArgs := NewGitCmd("branch").Arg("-r").ToArgv()
+	remoteBranchesStr, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	if err != nil {
+		return nil, err
+	}
+
+	goGitRemotes, err := self.getGoGitRemotes()
+	if err != nil {
+		return nil, err
+	}
+
+	// first step is to get our remotes from go-git
+	remotes := slices.Map(goGitRemotes, func(goGitRemote *gogit.Remote) *models.Remote {
+		remoteName := goGitRemote.Config().Name
+
+		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,
+			Urls:     goGitRemote.Config().URLs,
+			Branches: branches,
+		}
+	})
+
+	// now lets sort our remotes by name alphabetically
+	slices.SortFunc(remotes, func(a, b *models.Remote) bool {
+		// we want origin at the top because we'll be most likely to want it
+		if a.Name == "origin" {
+			return true
+		}
+		if b.Name == "origin" {
+			return false
+		}
+		return strings.ToLower(a.Name) < strings.ToLower(b.Name)
+	})
+
+	return remotes, nil
+}

pkg/commands/git_commands/stash.go

@@ -0,0 +1,196 @@
+package git_commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+)
+
+type StashCommands struct {
+	*GitCommon
+	fileLoader  *FileLoader
+	workingTree *WorkingTreeCommands
+}
+
+func NewStashCommands(
+	gitCommon *GitCommon,
+	fileLoader *FileLoader,
+	workingTree *WorkingTreeCommands,
+) *StashCommands {
+	return &StashCommands{
+		GitCommon:   gitCommon,
+		fileLoader:  fileLoader,
+		workingTree: workingTree,
+	}
+}
+
+func (self *StashCommands) DropNewest() error {
+	cmdArgs := NewGitCmd("stash").Arg("drop").ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *StashCommands) Drop(index int) error {
+	cmdArgs := NewGitCmd("stash").Arg("drop", fmt.Sprintf("stash@{%d}", index)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *StashCommands) Pop(index int) error {
+	cmdArgs := NewGitCmd("stash").Arg("pop", fmt.Sprintf("stash@{%d}", index)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *StashCommands) Apply(index int) error {
+	cmdArgs := NewGitCmd("stash").Arg("apply", fmt.Sprintf("stash@{%d}", index)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+// Push push stash
+func (self *StashCommands) Push(message string) error {
+	cmdArgs := NewGitCmd("stash").Arg("push", "-m", message).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).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()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *StashCommands) Sha(index int) (string, error) {
+	cmdArgs := NewGitCmd("rev-parse").
+		Arg(fmt.Sprintf("refs/stash@{%d}", index)).
+		ToArgv()
+
+	sha, _, err := self.cmd.New(cmdArgs).DontLog().RunWithOutputs()
+	return strings.Trim(sha, "\r\n"), err
+}
+
+func (self *StashCommands) ShowStashEntryCmdObj(index int, ignoreWhitespace bool) oscommands.ICmdObj {
+	cmdArgs := NewGitCmd("stash").Arg("show").
+		Arg("-p").
+		Arg("--stat").
+		Arg(fmt.Sprintf("--color=%s", self.UserConfig.Git.Paging.ColorArg)).
+		Arg(fmt.Sprintf("--unified=%d", self.UserConfig.Git.DiffContextSize)).
+		ArgIf(ignoreWhitespace, "--ignore-all-space").
+		Arg(fmt.Sprintf("stash@{%d}", index)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).DontLog()
+}
+
+func (self *StashCommands) StashAndKeepIndex(message string) error {
+	cmdArgs := NewGitCmd("stash").Arg("push", "--keep-index", "-m", message).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).Run()
+}
+
+func (self *StashCommands) StashUnstagedChanges(message string) error {
+	if err := self.cmd.New(
+		NewGitCmd("commit").
+			Arg("--no-verify", "-m", "[lazygit] stashing unstaged changes").
+			ToArgv(),
+	).Run(); err != nil {
+		return err
+	}
+	if err := self.Push(message); err != nil {
+		return err
+	}
+
+	if err := self.cmd.New(
+		NewGitCmd("reset").Arg("--soft", "HEAD^").ToArgv(),
+	).Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
+// SaveStagedChanges stashes only the currently staged changes. This takes a few steps
+// shoutouts to Joe on https://stackoverflow.com/questions/14759748/stashing-only-staged-changes-in-git-is-it-possible
+func (self *StashCommands) SaveStagedChanges(message string) error {
+	// wrap in 'writing', which uses a mutex
+	if err := self.cmd.New(
+		NewGitCmd("stash").Arg("--keep-index").ToArgv(),
+	).Run(); err != nil {
+		return err
+	}
+
+	if err := self.Push(message); err != nil {
+		return err
+	}
+
+	if err := self.cmd.New(
+		NewGitCmd("stash").Arg("apply", "stash@{1}").ToArgv(),
+	).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()),
+	); err != nil {
+		return err
+	}
+
+	if err := self.cmd.New(
+		NewGitCmd("stash").Arg("drop", "stash@{1}").ToArgv(),
+	).Run(); err != nil {
+		return err
+	}
+
+	// if you had staged an untracked file, that will now appear as 'AD' in git status
+	// meaning it's deleted in your working tree but added in your index. Given that it's
+	// now safely stashed, we need to remove it.
+	files := self.fileLoader.
+		GetStatusFiles(GetStatusFileOptions{})
+
+	for _, file := range files {
+		if file.ShortStatus == "AD" {
+			if err := self.workingTree.UnStageFile(file.Names(), false); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func (self *StashCommands) StashIncludeUntrackedChanges(message string) error {
+	return self.cmd.New(
+		NewGitCmd("stash").Arg("push", "--include-untracked", "-m", message).
+			ToArgv(),
+	).Run()
+}
+
+func (self *StashCommands) Rename(index int, message string) error {
+	sha, err := self.Sha(index)
+	if err != nil {
+		return err
+	}
+
+	if err := self.Drop(index); err != nil {
+		return err
+	}
+
+	err = self.Store(sha, message)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/commands/git_commands/stash_loader.go

@@ -0,0 +1,82 @@
+package git_commands
+
+import (
+	"regexp"
+	"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"
+)
+
+type StashLoader struct {
+	*common.Common
+	cmd oscommands.ICmdObjBuilder
+}
+
+func NewStashLoader(
+	common *common.Common,
+	cmd oscommands.ICmdObjBuilder,
+) *StashLoader {
+	return &StashLoader{
+		Common: common,
+		cmd:    cmd,
+	}
+}
+
+func (self *StashLoader) GetStashEntries(filterPath string) []*models.StashEntry {
+	if filterPath == "" {
+		return self.getUnfilteredStashEntries()
+	}
+
+	cmdArgs := NewGitCmd("stash").Arg("list", "--name-only").ToArgv()
+	rawString, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	if err != nil {
+		return self.getUnfilteredStashEntries()
+	}
+	stashEntries := []*models.StashEntry{}
+	var currentStashEntry *models.StashEntry
+	lines := utils.SplitLines(rawString)
+	isAStash := func(line string) bool { return strings.HasPrefix(line, "stash@{") }
+	re := regexp.MustCompile(`stash@\{(\d+)\}`)
+
+outer:
+	for i := 0; i < len(lines); i++ {
+		if !isAStash(lines[i]) {
+			continue
+		}
+		match := re.FindStringSubmatch(lines[i])
+		idx, err := strconv.Atoi(match[1])
+		if err != nil {
+			return self.getUnfilteredStashEntries()
+		}
+		currentStashEntry = self.stashEntryFromLine(lines[i], idx)
+		for i+1 < len(lines) && !isAStash(lines[i+1]) {
+			i++
+			if lines[i] == filterPath {
+				stashEntries = append(stashEntries, currentStashEntry)
+				continue outer
+			}
+		}
+	}
+	return stashEntries
+}
+
+func (self *StashLoader) getUnfilteredStashEntries() []*models.StashEntry {
+	cmdArgs := NewGitCmd("stash").Arg("list", "-z", "--pretty=%gs").ToArgv()
+
+	rawString, _ := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
+	return slices.MapWithIndex(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
+		return self.stashEntryFromLine(line, index)
+	})
+}
+
+func (c *StashLoader) stashEntryFromLine(line string, index int) *models.StashEntry {
+	return &models.StashEntry{
+		Name:  line,
+		Index: index,
+	}
+}

pkg/commands/git_commands/stash_loader_test.go

@@ -0,0 +1,59 @@
+package git_commands
+
+import (
+	"testing"
+
+	"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"
+)
+
+func TestGetStashEntries(t *testing.T) {
+	type scenario struct {
+		testName             string
+		filterPath           string
+		runner               oscommands.ICmdObjRunner
+		expectedStashEntries []*models.StashEntry
+	}
+
+	scenarios := []scenario{
+		{
+			"No stash entries found",
+			"",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"stash", "list", "-z", "--pretty=%gs"}, "", nil),
+			[]*models.StashEntry{},
+		},
+		{
+			"Several stash entries found",
+			"",
+			oscommands.NewFakeRunner(t).
+				ExpectGitArgs([]string{"stash", "list", "-z", "--pretty=%gs"},
+					"WIP on add-pkg-commands-test: 55c6af2 increase parallel build\x00WIP on master: bb86a3f update github template\x00",
+					nil,
+				),
+			[]*models.StashEntry{
+				{
+					Index: 0,
+					Name:  "WIP on add-pkg-commands-test: 55c6af2 increase parallel build",
+				},
+				{
+					Index: 1,
+					Name:  "WIP on master: bb86a3f update github template",
+				},
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s := s
+		t.Run(s.testName, func(t *testing.T) {
+			cmd := oscommands.NewDummyCmdObjBuilder(s.runner)
+
+			loader := NewStashLoader(utils.NewDummyCommon(), cmd)
+
+			assert.EqualValues(t, s.expectedStashEntries, loader.GetStashEntries(s.filterPath))
+		})
+	}
+}