Add subble image

- **PR Description**

Fixes https://github.com/jesseduffield/lazygit/issues/4464.

I checked, and the README already has a width specified on the `img`
tag, so I don't think the increased size of this will matter at all. I
just grabbed this directly from discord's site
https://discord.com/branding


https://github.com/jesseduffield/lazygit/blob/f7787fc8190504a9461b37da4c3240d3488b6813/README.md#L510

I personally use github dark mode all the time, and can vouch that it
looks totally fine. Light mode users won't see a difference, since we
just removed some white


![Image](https://github.com/user-attachments/assets/f682a58b-eaff-44ed-89aa-69f19d797557)

.github/FUNDING.yml

@@ -1,4 +0,0 @@
-# These are supported funding model platforms
-
-github: [jesseduffield]
-custom: ['https://donorbox.org/lazygit']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-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 '....'
-4. See error
-
-**Expected behavior**
-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```)
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/discussion.md

@@ -1,14 +0,0 @@
----
-name: Discussion
-about: Begin a discussion
-title: ''
-labels: discussion
-assignees: ''
-
----
-
-**Topic**
-A clear and concise description of what you want to discuss
-
-**Your thoughts**
-What you have to say about the topic

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    allowed_updates:
-      - match:
-          update_type: "security"

.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

@@ -1,31 +0,0 @@
-name: Continuous Delivery
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Unshallow repo
-        run: git fetch --prune --unshallow
-      - name: Setup Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16.x
-      - name: Run goreleaser
-        uses: goreleaser/goreleaser-action@v1
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
-  homebrew:
-    runs-on: macos-latest
-    steps:
-      - name: Bump Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v3
-        with:
-          token: ${{secrets.GITHUB_API_TOKEN}}
-          formula: lazygit

.github/workflows/ci.yml

@@ -1,105 +0,0 @@
-name: Continuous Integration
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  ci:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-    name: ci - ${{matrix.os}}
-    runs-on: ${{matrix.os}}
-    env:
-      GOFLAGS: -mod=vendor
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16.x
-      - name: Cache build
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/go-build
-          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-test
-          restore-keys: |
-            ${{runner.os}}-go-
-      - name: Test code
-        run: |
-          bash ./test.sh
-  build:
-    runs-on: ubuntu-latest
-    env:
-      GOFLAGS: -mod=vendor
-      GOARCH: amd64
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16.x
-      - name: Cache build
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/go-build
-          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
-          restore-keys: |
-            ${{runner.os}}-go-
-      - name: Build linux binary
-        run: |
-          GOOS=linux go build
-      - name: Build windows binary
-        run: |
-          GOOS=windows go build
-      - name: Build darwin binary
-        run: |
-          GOOS=darwin go build
-  check-cheatsheet:
-    runs-on: ubuntu-latest
-    env:
-      GOFLAGS: -mod=vendor
-      GOARCH: amd64
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16.x
-      - name: Cache build
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/go-build
-          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}-build
-          restore-keys: |
-            ${{runner.os}}-go-
-      - name: Check Cheatsheet
-        run: |
-          go run scripts/cheatsheet/main.go check
-  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
-      - name: errors
-        run: golangci-lint run
-        if: ${{ failure() }}

.gitignore

@@ -1,38 +0,0 @@
-# Please do not add personal files
-
-# Logs
-*.log
-
-# Hidden
-.*
-
-# TODO
-TODO.*
-
-# Notes
-*.notes
-
-# Tests
-test/repos/repo
-coverage.txt
-
-# Binaries
-lazygit
-lazygit.exe
-
-# Exceptions
-!.gitignore
-!.goreleaser.yml
-!.circleci/
-!.github/
-# 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/**/hooks/
-test/integration/*/expected_remote/**/hooks/

.goreleaser.yml

@@ -1,63 +0,0 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
-builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm
-      - arm64
-      - 386
-    # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
-    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease
-
-archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: 32-bit
-      amd64: x86_64
-    format_overrides:
-      - goos: windows
-        format: zip
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: '{{ .Tag }}-next'
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
-      - '^bump'
-brews:
-  -
-    # Repository to push the tap to.
-    tap:
-      owner: jesseduffield
-      name: homebrew-lazygit
-
-    # Your app's homepage.
-    # Default is empty.
-    homepage: 'https://github.com/jesseduffield/lazygit/'
-
-    # Your app's description.
-    # Default is empty.
-    description: 'A simple terminal UI for git commands, written in Go'
-
-    # # Packages your package depends on.
-    # dependencies:
-    #   - git
-    #   - zsh
-    # # Packages that conflict with your package.
-    # conflicts:
-    #   - svn
-    #   - bash

CODE-OF-CONDUCT.md

@@ -1,3 +0,0 @@
-# Lazygit Code of Conduct
-
-Be nice, or face the wrath of the maintainer.

CONTRIBUTING.md

@@ -1,107 +0,0 @@
-# Contributing
-
-♥ We love pull requests from everyone !
-
-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.
-
-## 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:
-
-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. 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.
-
-## Code of conduct
-
-Please note by participating in this project, you agree to abide by the [code of conduct].
-
-[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CODE-OF-CONDUCT.md
-
-## Any contributions you make will be under the MIT Software License
-
-In short, when you submit code changes, your submissions are understood to be
-under the same [MIT License](http://choosealicense.com/licenses/mit/) that
-covers the project. Feel free to contact the maintainers if that's a concern.
-
-## Report bugs using Github's [issues](https://github.com/jesseduffield/lazygit/issues)
-
-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.
-
-## 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. Although it is appreciated if you translate the text into other languages, it's not expected of you (google translate will likely do a bad job anyway!).
-
-## Debugging
-
-The easiest way to debug lazygit is to have two terminal tabs open at once: one for running lazygit (via `go run main.go -debug` in the project root) and one for viewing lazygit's logs (which can be done via `go run main.go --logs` or just `lazygit --logs`).
-
-From most places in the codebase you have access to a logger e.g. `gui.Log.Warn("blah")`
-
-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 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!
-
-If you want to trigger a debug session from VSCode, you can use the following snippet. Note that the 'console' key is not, at the time of writing, in a stable release.
-
-```jsonc
-// .vscode/launch.json
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "debug lazygit",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "main.go",
-      "console": "externalTerminal" // <-- you need this to actually see the lazygit UI in a window while debugging
-    }
-  ]
-}
-```
-
-## 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. Lazygit has its own integration test system where you can build a sandbox repo with a shell script, record yourself doing something, and commit the resulting repo snapshot. It's pretty damn cool! To learn more see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Integration_Tests.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 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
-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
-./scripts/bump_gocui.sh
-```
-
-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

@@ -1,17 +0,0 @@
-# run with:
-# docker build -t lazygit .
-# docker run -it lazygit:latest /bin/sh
-
-FROM golang:1.14-alpine3.11
-WORKDIR /go/src/github.com/jesseduffield/lazygit/
-COPY ./ .
-RUN CGO_ENABLED=0 GOOS=linux go build
-
-FROM alpine:3.11
-RUN apk add -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/
-RUN echo "alias gg=lazygit" >> ~/.profile
-
-ENTRYPOINT [ "lazygit" ]

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Jesse Duffield
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,309 +0,0 @@
-<p align="center">
-  <img src="https://i.imgur.com/oYB7Cj8.png">
-</p>
-
-![CI](https://github.com/jesseduffield/lazygit/workflows/Continuous%20Integration/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![GolangCI](https://golangci.com/badges/github.com/jesseduffield/lazygit.svg)](https://golangci.com) [![GoDoc](https://godoc.org/github.com/jesseduffield/lazygit?status.svg)](http://godoc.org/github.com/jesseduffield/lazygit) [![GitHub tag](https://img.shields.io/github/tag/jesseduffield/lazygit.svg)]() [![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/jesseduffield/lazygit)](https://www.tickgit.com/browse?repo=github.com/jesseduffield/lazygit)
-
-
-
-
-A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui "gocui") library.
-
-Rant time: You've heard it before, git is _powerful_, but what good is that power when everything is so damn hard to do? Interactive rebasing requires you to edit a goddamn TODO file in your editor? *Are you kidding me?* To stage part of a file you need to use a command line program to step through each hunk and if a hunk can't be split down any further but contains code you don't want to stage, you have to edit an arcane patch file _by hand_? *Are you KIDDING me?!* Sometimes you get asked to stash your changes when switching branches only to realise that after you switch and unstash that there weren't even any conflicts and it would have been fine to just checkout the branch directly? *YOU HAVE GOT TO BE KIDDING ME!*
-
-If you're a mere mortal like me and you're tired of hearing how powerful git is when in your daily life it's a powerful pain in your ass, lazygit might be for you.
-
-![Gif](../assets/staging.gif)
-
-## Table of contents
-
-- [Installation](#installation)
-  - [Binary releases](#binary-releases)
-  - [Homebrew](#homebrew)
-  - [MacPorts](#macports)
-  - [Ubuntu](#ubuntu)
-  - [Void Linux](#void-linux)
-  - [Scoop (Windows)](#scoop-windows)
-  - [Arch Linux](#arch-linux)
-  - [Fedora and CentOS 7](#fedora-and-centos-7)
-  - [Solus Linux](#solus-linux)
-  - [Funtoo Linux](#funtoo-linux)
-  - [FreeBSD](#freebsd)
-  - [Conda](#conda)
-  - [Go](#go)
-  - [Chocolatey (Windows)](#chocolatey-windows)
-  - [Manual](#manual)
-- [Usage](#usage)
-  - [Keybindings](#keybindings)
-  - [Changing directory on exit](#changing-directory-on-exit)
-  - [Undo/Redo](#undoredo)
-- [Configuration](#configuration)
-  - [Custom pagers](#configuration)
-  - [Custom commands](#configuration)
-- [Tutorials](#tutorials)
-- [Cool Features](#cool-features)
-- [Contributing](#contributing)
-- [Donate](#donate)
-- [Alternatives](#alternatives)
-
-Github Sponsors is matching all donations dollar-for-dollar for 12 months so if you're feeling generous consider [sponsoring me](https://github.com/sponsors/jesseduffield)
-
-[<img src="https://i.imgur.com/sVEktDn.png">](https://youtu.be/CPLdltN7wgE)
-
-## Installation
-
-### Binary Releases
-
-For Windows, Mac OS(10.12+) or Linux, you can download a binary release [here](../../releases).
-
-### Homebrew
-
-Normally the lazygit formula can be found in the Homebrew core but we suggest you tap our formula to get the frequently updated one. It works with Linux, too.
-
-Tap:
-
-```
-brew install jesseduffield/lazygit/lazygit
-```
-
-Core:
-
-```
-brew install lazygit
-```
-
-### MacPorts
-
-Latest version built from github releases.
-Tap:
-
-```
-sudo port install lazygit
-```
-
-### Ubuntu
-
-**Deprecated**: will no longer receive updates.
-
-Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
-
-```sh
-sudo add-apt-repository ppa:lazygit-team/release
-sudo apt-get update
-sudo apt-get install lazygit
-```
-
-### Void Linux
-
-Packages for Void Linux are available in the distro repo
-
-They follow upstream latest releases
-
-```sh
-sudo xbps-install -S lazygit
-```
-
-### Scoop (Windows)
-
-You can install `lazygit` using [scoop](https://scoop.sh/). It's in the `extras` bucket:
-
-```sh
-# Add the extras bucket
-scoop bucket add extras
-
-# Install lazygit
-scoop install lazygit
-```
-
-### Arch Linux
-
-Packages for Arch Linux are available via pacman and AUR (Arch User Repository).
-
-There are two packages. The stable one which is built with the latest release
-and the git version which builds from the most recent commit.
-
-- Stable: `sudo pacman -S lazygit`
-- Development: <https://aur.archlinux.org/packages/lazygit-git/>
-
-Instruction of how to install AUR content can be found here:
-<https://wiki.archlinux.org/index.php/Arch_User_Repository>
-
-### Fedora and CentOS 7
-
-Packages for Fedora and CentOS 7 are available via [Copr](https://copr.fedorainfracloud.org/coprs/atim/lazygit/) (Cool Other Package Repo).
-
-```sh
-sudo dnf copr enable atim/lazygit -y
-sudo dnf install lazygit
-```
-
-### Solus Linux
-
-```sh
-sudo eopkg install lazygit
-```
-
-### Funtoo Linux
-
-Funtoo Linux has an autogenerated lazygit package in [dev-kit](https://github.com/funtoo/dev-kit/tree/1.4-release/dev-vcs/lazygit):
-
-```sh
-sudo emerge dev-vcs/lazygit
-```
-
-### FreeBSD
-
-```sh
-pkg install lazygit
-```
-
-
-### Conda
-
-Released versions are available for different platforms, see <https://anaconda.org/conda-forge/lazygit>
-
-```sh
-conda install -c conda-forge lazygit
-```
-
-### Go
-
-```sh
-go install github.com/jesseduffield/lazygit@latest
-```
-
-Please note:
-If you get an error claiming that lazygit cannot be found or is not defined, you
-may need to add `~/go/bin` to your \$PATH (MacOS/Linux), or `%HOME%\go\bin`
-(Windows). Not to be mistaked for `C:\Go\bin` (which is for Go's own binaries,
-not apps like Lazygit).
-
-### Chocolatey (Windows)
-
-You can install `lazygit` using [Chocolatey](https://chocolatey.org/):
-
-```sh
-choco install lazygit
-```
-
-### Manual
-
-You'll need to [install Go](https://golang.org/doc/install)
-
-```
-git clone https://github.com/jesseduffield/lazygit.git
-cd lazygit
-go install
-```
-
-You can also use `go run main.go` to compile and run in one go (pun definitely intended)
-
-## Usage
-
-Call `lazygit` in your terminal inside a git repository.
-
-```sh
-$ lazygit
-```
-
-If you want, you can
-also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or
-whichever rc file you're using).
-
-### Keybindings
-
-You can check out the list of keybindings [here](/docs/keybindings).
-
-### Changing Directory On Exit
-
-If you change repos in lazygit and want your shell to change directory into that repo on exiting lazygit, add this to your `~/.zshrc` (or other rc file):
-
-```
-lg()
-{
-    export LAZYGIT_NEW_DIR_FILE=~/.lazygit/newdir
-
-    lazygit "$@"
-
-    if [ -f $LAZYGIT_NEW_DIR_FILE ]; then
-            cd "$(cat $LAZYGIT_NEW_DIR_FILE)"
-            rm -f $LAZYGIT_NEW_DIR_FILE > /dev/null
-    fi
-}
-```
-
-Then `source ~/.zshrc` and from now on when you call `lg` and exit you'll switch directories to whatever you were in inside lazyigt. To override this behaviour you can exit using `shift+Q` rather than just `q`.
-
-### Undo/Redo
-
-See the [docs](/docs/Undoing.md)
-
-## Configuration
-
-Check out the [configuration docs](docs/Config.md).
-
-### Custom Pagers
-
-See the [docs](docs/Custom_Pagers.md)
-
-### Custom Commands
-
-If lazygit is missing a feature, there's a good chance you can implement it yourself with a custom command!
-
-See the [docs](docs/Custom_Command_Keybindings.md)
-
-## Tutorials
-
-- [Video Tutorial](https://youtu.be/VDXvbHZYeKY)
-- [Rebase Magic Video Tutorial](https://youtu.be/4XaToVut_hs)
-- [Twitch Stream](https://www.twitch.tv/jesseduffield)
-
-
-## Cool features
-
-- Adding files easily
-- Resolving merge conflicts
-- Easily check out recent branches
-- Scroll through logs/diffs of branches/commits/stash
-- Quick pushing/pulling
-- Squash down and reword commits
-
-### Resolving merge conflicts
-
-![Gif](../assets/resolving-merge-conflicts.gif)
-
-### Interactive Rebasing
-
-![Interactive Rebasing](../assets/rebase.gif)
-
-## Contributing
-
-We love your input! Please check out the [contributing guide](CONTRIBUTING.md).
-For contributor discussion about things not better discussed here in the repo, join the slack channel
-
-[![Slack](../assets/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/zt-5bo2clzo-hB8ZTVN5dWUCqj5QFiQVLA)
-
-### Debugging Locally
-Run `lazygit --debug` in one terminal tab and `lazygit --logs` in another to view the program and its log output side by side
-
-## Donate
-
-If you would like to support the development of lazygit, consider [sponsoring me](https://github.com/sponsors/jesseduffield) (github is matching all donations dollar-for-dollar for 12 months)
-
-## FAQ
-
-### I'm struggling to see the selected line
-see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#struggling-to-see-selected-line)
-
-## Social
-
-If you want to see what I (Jesse) am up to in terms of development, follow me on
-[twitter](https://twitter.com/DuffieldJesse) or watch me program on
-[twitch](https://www.twitch.tv/jesseduffield).
-
-## Alternatives
-
-If you find that lazygit doesn't quite satisfy your requirements, these may be a better fit:
-
-- [GitUI](https://github.com/Extrawurst/gitui)
-- [tig](https://github.com/jonas/tig)

docs/Config.md

@@ -1,520 +0,0 @@
-# User Config
-
-Default path for the config file:
-
-- Linux: `~/.config/lazygit/config.yml`
-- MacOS: `~/Library/Application Support/lazygit/config.yml`
-- Windows: `%APPDATA%\lazygit\config.yml`
-
-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`
-- Windows: `%APPDATA%\jesseduffield\lazygit\config.yml`
-
-## Default
-
-```yaml
-gui:
-  # stuff relating to the UI
-  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'
-  theme:
-    lightTheme: false # For terminals with a light background
-    activeBorderColor:
-      - white
-      - bold
-    inactiveBorderColor:
-      - green
-    optionsTextColor:
-      - blue
-    selectedLineBgColor:
-      - default
-    selectedRangeBgColor:
-      - blue
-    cherryPickedCommitBgColor:
-      - blue
-    cherryPickedCommitFgColor:
-      - cyan
-  commitLength:
-    show: true
-  mouseEvents: true
-  skipUnstageLineWarning: false
-  skipStashWarning: false
-  showFileTree: true # for rendering changes files in a tree format
-  showListFooter: true # for seeing the '5 of 20' message in list panels
-  showRandomTip: true
-  showCommandLog: true
-  commandLogSize: 8
-git:
-  paging:
-    colorArg: always
-    useConfig: false
-  commit:
-    signOff: false
-  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.
-    # 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'
-  skipHookPrefix: WIP
-  autoFetch: true
-  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: ''
-refresher:
-  refreshInterval: 10 # file/submodule refresh interval in seconds
-  fetchInterval: 60 # re-fetch interval in seconds
-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'
-keybinding:
-  universal:
-    quit: 'q'
-    quit-alt1: '<c-c>' # alternative/alias of quit
-    return: '<esc>' # return to previous menu, will quit if there's nowhere to return
-    quitWithoutChangingDirectory: 'Q'
-    togglePanel: '<tab>' # goto the next panel
-    prevItem: '<up>' # go one line up
-    nextItem: '<down>' # go one line down
-    prevItem-alt: 'k' # go one line up
-    nextItem-alt: 'j' # go one line down
-    prevPage: ',' # go to next page in list
-    nextPage: '.' # go to previous page in list
-    gotoTop: '<' # go to top of list
-    gotoBottom: '>' # go to bottom of list
-    scrollLeft: 'H' # scroll left within list view
-    scrollRight: 'L' # scroll right within list view
-    prevBlock: '<left>' # goto the previous block / panel
-    nextBlock: '<right>' # goto the next block / panel
-    prevBlock-alt: 'h' # goto the previous block / panel
-    nextBlock-alt: 'l' # goto the next block / panel
-    jumpToBlock: ['1', '2', '3', '4', '5'] # goto the Nth block / panel
-    nextMatch: 'n'
-    prevMatch: 'N'
-    optionMenu: 'x' # 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'
-    openFile: 'o'
-    scrollUpMain: '<pgup>' # main panel scroll up
-    scrollDownMain: '<pgdown>' # main panel scroll down
-    scrollUpMain-alt1: 'K' # main panel scroll up
-    scrollDownMain-alt1: 'J' # main panel scroll down
-    scrollUpMain-alt2: '<c-u>' # main panel scroll up
-    scrollDownMain-alt2: '<c-d>' # main panel scroll down
-    executeCustomCommand: ':'
-    createRebaseOptionsMenu: 'm'
-    pushFiles: 'P'
-    pullFiles: 'p'
-    refresh: 'R'
-    createPatchOptionsMenu: '<c-p>'
-    nextTab: ']'
-    prevTab: '['
-    nextScreenMode: '+'
-    prevScreenMode: '_'
-    undo: 'z'
-    redo: '<c-z>'
-    filteringMenu: '<c-s>'
-    diffingMenu: 'W'
-    diffingMenu-alt: '<c-e>' # deprecated
-    copyToClipboard: '<c-o>'
-    submitEditorText: '<enter>'
-    appendNewline: '<a-enter>'
-    extrasMenu: '@'
-    toggleWhitespaceInDiffView: '<c-w>'
-    increaseContextInDiffView: '}'
-    decreaseContextInDiffView: '{'
-  status:
-    checkForUpdate: 'u'
-    recentRepos: '<enter>'
-  files:
-    commitChanges: 'c'
-    commitChangesWithoutHook: 'w' # commit changes without pre-commit hook
-    amendLastCommit: 'A'
-    commitChangesWithEditor: 'C'
-    ignoreFile: 'i'
-    refreshFiles: 'r'
-    stashAllChanges: 's'
-    viewStashOptions: 'S'
-    toggleStagedAll: 'a' # stage/unstage all
-    viewResetOptions: 'D'
-    fetch: 'f'
-    toggleTreeView: '`'
-  branches:
-    createPullRequest: 'o'
-    viewPullRequestOptions: 'O'
-    checkoutBranchByName: 'c'
-    forceCheckoutBranch: 'F'
-    rebaseBranch: 'r'
-    mergeIntoCurrentBranch: 'M'
-    viewGitFlowOptions: 'i'
-    fastForward: 'f' # fast-forward this branch from its upstream
-    pushTag: 'P'
-    setUpstream: 'u' # set as upstream of checked-out branch
-    fetchRemote: 'f'
-  commits:
-    squashDown: 's'
-    renameCommit: 'r'
-    renameCommitWithEditor: 'R'
-    viewResetOptions: 'g'
-    markCommitAsFixup: 'f'
-    createFixupCommit: 'F' # create fixup commit for this commit
-    squashAboveCommits: 'S'
-    moveDownCommit: '<c-j>' # move commit down one
-    moveUpCommit: '<c-k>' # move commit up one
-    amendToCommit: 'A'
-    pickCommit: 'p' # pick commit (when mid-rebase)
-    revertCommit: 't'
-    cherryPickCopy: 'c'
-    cherryPickCopyRange: 'C'
-    pasteCommits: 'v'
-    tagCommit: 'T'
-    checkoutCommit: '<space>'
-    resetCherryPick: '<c-R>'
-    copyCommitMessageToClipboard: '<c-y>'
-    openLogMenu: '<c-l>'
-    viewBisectOptions: 'b'
-  stash:
-    popStash: 'g'
-  commitFiles:
-    checkoutCommitFile: 'c'
-  main:
-    toggleDragSelect: 'v'
-    toggleDragSelect-alt: 'V'
-    toggleSelectHunk: 'a'
-    pickBothHunks: 'b'
-  submodules:
-    init: 'i'
-    update: 'u'
-    bulkMenu: 'b'
-```
-
-## Platform Defaults
-
-### Windows
-
-```yaml
-os:
-  openCommand: 'start "" {{filename}}'
-```
-
-### Linux
-
-```yaml
-os:
-  openCommand: 'xdg-open {{filename}} >/dev/null'
-```
-
-### OSX
-
-```yaml
-os:
-  openCommand: 'open {{filename}}'
-```
-
-### Configuring File Editing
-
-Lazygit will edit a file with the first set editor in the following:
-
-1. config.yaml
-
-```yaml
-os:
-  editCommand: 'vim' # as an example
-```
-
-2. \$(git config core.editor)
-3. \$GIT_EDITOR
-4. \$VISUAL
-5. \$EDITOR
-6. \$(which vi)
-
-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.
-
-```yaml
-os:
-  editCommand: 'vim'
-  editCommandTemplate: '{{editor}} +{{line}} {{filename}}'
-```
-
-or
-
-```yaml
-os:
-  editCommand: 'code'
-  editCommandTemplate: '{{editor}} --goto {{filename}}:{{line}}'
-```
-
-`{{editor}}` in `editCommandTemplate` is replaced with the value of `editCommand`.
-
-### 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 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
-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}}'
-```
-
-## Color Attributes
-
-For color attributes you can choose an array of attributes (with max one color attribute)
-The available attributes are:
-
-**Colors**
-
-- black
-- red
-- green
-- yellow
-- blue
-- magenta
-- cyan
-- white
-- '#ff00ff'
-
-**Modifiers**
-
-- bold
-- default
-- reverse # useful for high-contrast
-- underline
-
-## Light terminal theme
-
-If you have issues with a light terminal theme where you can't read / see the text add these settings
-
-```yaml
-gui:
-  theme:
-    lightTheme: true
-    activeBorderColor:
-      - black
-      - bold
-    inactiveBorderColor:
-      - black
-    selectedLineBgColor:
-      - 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:
-
-```yaml
-gui:
-  theme:
-    selectedLineBgColor:
-      - reverse
-    selectedRangeBgColor:
-      - reverse
-```
-
-The following has also worked for a couple of people:
-
-```yaml
-gui:
-  theme:
-    activeBorderColor:
-      - white
-      - bold
-    inactiveBorderColor:
-      - white
-    selectedLineBgColor:
-      - reverse
-      - blue
-```
-
-Alternatively you may have bold fonts disabled in your terminal, in which case enabling bold fonts should solve the problem.
-
-If you're still having trouble please raise an issue.
-
-## 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:
-  authorColors:
-    'John Smith': '#ff0000' # use red for John Smith
-```
-
-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:
-
-```yaml
-gui:
-  authorColors:
-    # use red for John Smith
-    'John Smith': '#ff0000'
-    # 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)
-
-## Keybindings
-
-For all possible keybinding options, check [Custom_Keybindings.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md)
-
-### Example Keybindings For Colemak Users
-
-```yaml
-keybinding:
-  universal:
-    prevItem-alt: 'u'
-    nextItem-alt: 'e'
-    prevBlock-alt: 'n'
-    nextBlock-alt: 'i'
-    nextMatch: '='
-    prevMatch: '-'
-    new: 'k'
-    edit: 'o'
-    openFile: 'O'
-    scrollUpMain-alt1: 'U'
-    scrollDownMain-alt1: 'E'
-    scrollUpMain-alt2: '<c-u>'
-    scrollDownMain-alt2: '<c-e>'
-    undo: 'l'
-    redo: '<c-r>'
-    diffingMenu: 'M'
-    filteringMenu: '<c-f>'
-  files:
-    ignoreFile: 'I'
-  commits:
-    moveDownCommit: '<c-e>'
-    moveUpCommit: '<c-u>'
-  branches:
-    viewGitFlowOptions: 'I'
-    setUpstream: 'U'
-```
-
-## Custom pull request URLs
-
-Some git provider setups (e.g. on-premises GitLab) can have distinct URLs for git-related calls and
-the web interface/API itself. To work with those, Lazygit needs to know where it needs to create
-the pull request. You can do so on your `config.yml` file using the following syntax:
-
-```yaml
-services:
-  '<gitDomain>': '<provider>:<webDomain>'
-```
-
-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`
-- `webDomain` is the URL where your git service exposes a web interface and APIs, e.g. `gitservice.work.com`
-
-## Predefined commit message prefix
-
-In situations where certain naming pattern is used for branches and commits, pattern can be used to populate
-commit message with prefix that is parsed from the branch name.
-
-Example:
-
-- Branch name: feature/AB-123
-- Commit message: [AB-123] Adding feature
-
-```yaml
-git:
-  commitPrefixes:
-    my_project: # This is repository folder name
-      pattern: "^\\w+\\/(\\w+-\\w+).*"
-      replace: '[$1] '
-```
-
-## Custom git log command
-
-You can override the `git log` command that's used to render the log of the selected branch like so:
-
-```
-git:
-  branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium --oneline {{branchName}} --"
-```
-
-Result:
-
-![](https://i.imgur.com/Nibq35B.png)
-
-## Launching not in a repository behaviour
-
-By default, when launching lazygit from a directory that is not a repository,
-you will be prompted to choose if you would like to initialize a repo. You can
-override this behaviour in the config with one of the following:
-
-```yaml
-# for default prompting behaviour
-notARepository: 'prompt'
-```
-
-```yaml
-# to skip and initialize a new repo
-notARepository: 'create'
-```
-
-```yaml
-# to skip without creating a new repo
-notARepository: 'skip'
-```

docs/Custom_Command_Keybindings.md

@@ -1,169 +0,0 @@
-# Custom Command Keybindings
-
-You can add custom command keybindings in your config.yml (accessible by pressing 'o' on the status panel from within lazygit) like so:
-
-```yml
-customCommands:
-  - key: '<c-r>'
-    command: 'hub browse -- "commit/{{.SelectedLocalCommit.Sha}}"'
-    context: 'commits'
-  - key: 'a'
-    command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name}}"
-    context: 'files'
-    description: 'toggle file staged'
-  - key: 'C'
-    command: "git commit"
-    context: 'global'
-    subprocess: true
-  - key: 'n'
-    prompts:
-      - type: 'menu'
-        title: 'What kind of branch is it?'
-        options:
-          - name: 'feature'
-            description: 'a feature branch'
-            value: 'feature'
-          - name: 'hotfix'
-            description: 'a hotfix branch'
-            value: 'hotfix'
-          - name: 'release'
-            description: 'a release branch'
-            value: 'release'
-      - type: 'input'
-        title: 'What is the new branch name?'
-        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 }}'
-```
-
-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':
-
-![](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 |
-| stream | whether you want to stream the command's output to the Command Log panel | no |
-
-### 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                                                              |
-
-### Prompts
-
-The permitted prompt fields are:
-
-| _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                                           |            |
-
-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 |
-
-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
-    prompts:
-      - type: 'menu'
-        title: 'What kind of branch is it?'
-        options:
-          - value: 'feature'
-          - value: 'hotfix'
-          - value: 'release'
-```
-
-### Placeholder values
-
-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:
-
-```
-SelectedLocalCommit
-SelectedReflogCommit
-SelectedSubCommit
-SelectedFile
-SelectedLocalBranch
-SelectedRemoteBranch
-SelectedRemote
-SelectedTag
-SelectedStashEntry
-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.
-
-### 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
-
-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
-
-### More Examples
-
-See the [wiki](https://github.com/jesseduffield/lazygit/wiki/Custom-Commands-Compendium) page for more examples, and feel free to add your own custom commands to this page so others can benefit!

docs/Custom_Pagers.md

@@ -1,64 +0,0 @@
-# Custom Pagers
-
-Lazygit supports custom pagers, [configured](/docs/Config.md) in the config.yml file (which can be opened by pressing `o` in the Status panel).
-
-Support does not extend to Windows users, because we're making use of a package which doesn't have Windows support.
-
-## Default:
-
-```yaml
-git:
-  paging:
-    colorArg: always
-    useConfig: false
-```
-
-the `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`.
-
-## Delta:
-
-```yaml
-git:
-  paging:
-    colorArg: always
-    pager: delta --dark --paging=never
-```
-
-![](https://i.imgur.com/QJpQkF3.png)
-
-## Diff-so-fancy
-
-```yaml
-git:
-  paging:
-    colorArg: always
-    pager: diff-so-fancy
-```
-
-![](https://i.imgur.com/rjH1TpT.png)
-
-## ydiff
-
-```yaml
-gui:
-  sidePanelWidth: 0.2 # gives you more space to show things side-by-side
-git:
-  paging:
-    colorArg: never
-    pager: ydiff -p cat -s --wrap --width={{columnWidth}}
-```
-
-![](https://i.imgur.com/vaa8z0H.png)
-
-Be careful with this one, I think the homebrew and pip versions are behind master. I needed to directly download the ydiff script to get the no-pager functionality working.
-
-## Using git config
-
-```yaml
-git:
-  paging:
-    colorArg: always
-    useConfig: true
-```
-
-If you set `useConfig: true`, lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).

docs/Integration_Tests.md

@@ -1,119 +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
-
-### From a TUI
-
-You can run/record/sandbox tests via a TUI with the following command:
-
-```
-go run test/lazyintegration/main.go
-```
-
-This TUI makes much of the following documentation redundant, but feel free to read through anyway!
-
-### From command line
-
-To run all tests - assuming you're at the project root:
-
-```
-go test ./pkg/gui/
-```
-
-To run them in parallel
-
-```
-PARALLEL=true go test ./pkg/gui
-```
-
-To run a single test
-
-```
-go test ./pkg/gui -run /<test name>
-# For example, to run the `tags` test:
-go test ./pkg/gui -run /tags
-```
-
-To run a test at a certain speed
-
-```
-SPEED=2 go test ./pkg/gui -run /<test name>
-```
-
-To update a snapshot
-
-```
-MODE=updateSnapshot go test ./pkg/gui -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:
-
-```
-MODE=record go test ./pkg/gui -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.
-
-## Sandboxing
-
-The integration tests serve a secondary purpose of providing a setup for easy sandboxing. If you want to run a test in sandbox mode (meaning the session won't be recorded and we won't create/update snapshots), go:
-
-```
-MODE=sandbox go test ./pkg/gui -run /<test name>
-```
-
-## 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 +0,0 @@
-# Documentation Overview 
-
-* [Configuration](./Config.md).
-* [Custom Commands](./Custom_Command_Keybindings.md)
-* [Custom Pagers](./Custom_Pagers.md)
-* [Keybindings](./keybindings)
-* [Undo/Redo](./Undoing.md)

docs/Undoing.md

@@ -1,24 +0,0 @@
-# Undo/Redo in lazygit
-
-![Gif](../../assets/undo2.gif)
-
-## Keybindings:
-'z' to undo, 'ctrl+z' to redo
-
-## How it works
-
-If you're as clumsy as me you'll probably have felt the pain of botching an interactive rebase or doing a hard reset onto the wrong commit. Luckily, the reflog allows you to trace your steps and make things right again, but I personally can't stand trying to make sense of the reflog.
-
-Lazygit can read through your reflog for you and walk back action by action so that you don't even need to read the reflog. If lazygit finds a reflog entry where you checked out a branch, we'll checkout the original branch. If the entry is from a commit being applied, we'll go back to the commit before that. If we hit an interactive rebase, we'll go back to the commit you were on just before you started it.
-
-## You can even undo things you did outside of lazygit!
-
-Because lazygit just uses the reflog to keep track of things, it doesn't matter whether you're trying to undo something you did in lazygit or directly on the command line. You can open lazygit for the first time and start undoing thing in your repo! Likewise, lazygit marks its undos/redos in the reflog so if you quit the application and come back, lazygit still knows where you're up to.
-
-## Limitations
-
-There are limitations: firstly, lazygit can only undo things that are recorded in the reflog. That means changes to your working tree or stash aren't covered. Secondly, anything permanent you do like pushing to a remote can't be undone. Thirdly, actions like creating a branch won't be undone, because they're not stored in the reflog.
-
-If you are mid-rebase, undo/redo is not supported, because the reflog doesn't contain enough information about what specific things have happened inside that rebase. If you want to undo out of a rebase, it's best to abort the rebase (the default keybinding for bringing up rebase options is 'm').
-
-Undo/Redo is a new feature so if you find a bug let us know. The worst case scenario is that you'll just need to look at your reflog and manually put yourself back on track.

docs/keybindings/Custom_Keybindings.md

@@ -1,59 +0,0 @@
-## Possible keybindings
-| Put in        | You will get   |
-|---------------|----------------|
-| `<f1>`        | F1             |
-| `<f2>`        | F2             |
-| `<f3>`        | F3             |
-| `<f4>`        | F4             |
-| `<f5>`        | F5             |
-| `<f6>`        | F6             |
-| `<f7>`        | F7             |
-| `<f8>`        | F8             |
-| `<f9>`        | F9             |
-| `<f10>`       | F10            |
-| `<f11>`       | F11            |
-| `<f12>`       | F12            |
-| `<insert>`    | Insert         |
-| `<delete>`    | Delete         |
-| `<home>`      | Home           |
-| `<end>`       | End            |
-| `<pgup>`      | Pgup           |
-| `<pgdown>`    | Pgdn           |
-| `<up>`        | ArrowUp        |
-| `<down>`      | ArrowDown      |
-| `<left>`      | ArrowLeft      |
-| `<right>`     | ArrowRight     |
-| `<tab>`       | Tab            |
-| `<enter>`     | Enter          |
-| `<esc>`       | Esc            |
-| `<backspace>` | Backspace      |
-| `<c-space>`   | CtrlSpace      |
-| `<c-/>`       | CtrlSlash      |
-| `<space>`     | Space          |
-| `<c-a>`       | CtrlA          |
-| `<c-b>`       | CtrlB          |
-| `<c-c>`       | CtrlC          |
-| `<c-d>`       | CtrlD          |
-| `<c-e>`       | CtrlE          |
-| `<c-f>`       | CtrlF          |
-| `<c-g>`       | CtrlG          |
-| `<c-j>`       | CtrlJ          |
-| `<c-k>`       | CtrlK          |
-| `<c-l>`       | CtrlL          |
-| `<c-n>`       | CtrlN          |
-| `<c-o>`       | CtrlO          |
-| `<c-p>`       | CtrlP          |
-| `<c-q>`       | CtrlQ          |
-| `<c-r>`       | CtrlR          |
-| `<c-s>`       | CtrlS          |
-| `<c-t>`       | CtrlT          |
-| `<c-u>`       | CtrlU          |
-| `<c-v>`       | CtrlV          |
-| `<c-w>`       | CtrlW          |
-| `<c-x>`       | CtrlX          |
-| `<c-y>`       | CtrlY          |
-| `<c-z>`       | CtrlZ          |
-| `<c-4>`       | Ctrl4          |
-| `<c-5>`       | Ctrl5          |
-| `<c-6>`       | Ctrl6          |
-| `<c-8>`       | Ctrl8          |

docs/keybindings/Keybindings_en.md

@@ -1,308 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
-
-# Lazygit Keybindings
-
-## 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>}</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
-</pre>
-
-## 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
-</pre>
-
-## Branches Panel (Branches Tab)
-
-<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
-</pre>
-
-## Branches Panel (Remote Branches (in Remotes tab))
-
-<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
-</pre>
-
-## Branches Panel (Remotes Tab)
-
-<pre>
-  <kbd>f</kbd>: fetch remote
-  <kbd>n</kbd>: add new remote
-  <kbd>d</kbd>: remove remote
-  <kbd>e</kbd>: edit remote
-</pre>
-
-## Branches Panel (Sub-commits)
-
-<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
-</pre>
-
-## Branches Panel (Tags Tab)
-
-<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
-</pre>
-
-## Commit Files Panel
-
-<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
-</pre>
-
-## Commits Panel (Commits)
-
-<pre>
-  <kbd>ctrl+l</kbd>: open log menu
-  <kbd>s</kbd>: squash down
-  <kbd>r</kbd>: reword commit
-  <kbd>R</kbd>: reword 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>o</kbd>: open commit in browser
-  <kbd>b</kbd>: view bisect options
-</pre>
-
-## Commits Panel (Reflog Tab)
-
-<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
-</pre>
-
-## Extras Panel
-
-<pre>
-  <kbd>@</kbd>: open command log menu
-</pre>
-
-## Files Panel
-
-<pre>
-  <kbd>ctrl+b</kbd>: Filter commit files
-</pre>
-
-## Files Panel (Files)
-
-<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
-</pre>
-
-## Files Panel (Submodules)
-
-<pre>
-  <kbd>ctrl+o</kbd>: copy submodule name to clipboard
-  <kbd>enter</kbd>: enter submodule
-  <kbd>d</kbd>: remove submodule
-  <kbd>u</kbd>: update submodule
-  <kbd>n</kbd>: add new submodule
-  <kbd>e</kbd>: update submodule URL
-  <kbd>i</kbd>: initialize submodule
-  <kbd>b</kbd>: view bulk submodule options
-</pre>
-
-## Main Panel (Merging)
-
-<pre>
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <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
-</pre>
-
-## Main Panel (Normal)
-
-<pre>
-  <kbd>Ő</kbd>: scroll down (fn+up)
-  <kbd>ő</kbd>: scroll up (fn+down)
-</pre>
-
-## Main Panel (Patch Building)
-
-<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>ctrl+o</kbd>: copy the selected text to the clipboard
-  <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>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-</pre>
-
-## Main Panel (Staging)
-
-<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>ctrl+o</kbd>: copy the selected text to the clipboard
-  <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>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <kbd>c</kbd>: commit changes
-  <kbd>w</kbd>: commit changes without pre-commit hook
-  <kbd>C</kbd>: commit changes using git editor
-</pre>
-
-## Menu Panel
-
-<pre>
-  <kbd>esc</kbd>: close menu
-</pre>
-
-## Stash Panel
-
-<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
-</pre>
-
-## Status Panel
-
-<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
-</pre>

docs/keybindings/Keybindings_nl.md

@@ -1,308 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
-
-# Lazygit Sneltoetsen
-
-## 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>}</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
-</pre>
-
-## 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
-</pre>
-
-## Branches Paneel (Branches Tabblad)
-
-<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
-</pre>
-
-## Branches Paneel (Remote Branches (in Remotes tabblad))
-
-<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
-</pre>
-
-## Branches Paneel (Remotes Tabblad)
-
-<pre>
-  <kbd>f</kbd>: fetch remote
-  <kbd>n</kbd>: voeg een nieuwe remote toe
-  <kbd>d</kbd>: verwijder remote
-  <kbd>e</kbd>: wijzig remote
-</pre>
-
-## Branches Paneel (Sub-commits)
-
-<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
-</pre>
-
-## Branches Paneel (Tags Tabblad)
-
-<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
-</pre>
-
-## Commit bestanden Paneel
-
-<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>ctrl+l</kbd>: open log menu
-  <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>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>o</kbd>: open commit in browser
-  <kbd>b</kbd>: view bisect options
-</pre>
-
-## Commits Paneel (Reflog Tabblad)
-
-<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
-</pre>
-
-## Extras Paneel
-
-<pre>
-  <kbd>@</kbd>: open command log menu
-</pre>
-
-## Bestanden Paneel
-
-<pre>
-  <kbd>ctrl+b</kbd>: Commit dossiers filteren
-</pre>
-
-## Bestanden Paneel (Bestanden)
-
-<pre>
-  <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
-</pre>
-
-## Bestanden Paneel (Submodules)
-
-<pre>
-  <kbd>ctrl+o</kbd>: kopieer submodule naam naar klembord
-  <kbd>enter</kbd>: enter submodule
-  <kbd>d</kbd>: remove submodule
-  <kbd>u</kbd>: update submodule
-  <kbd>n</kbd>: voeg nieuwe submodule toe
-  <kbd>e</kbd>: update submodule URL
-  <kbd>i</kbd>: initialiseer submodule
-  <kbd>b</kbd>: bekijk bulk submodule opties
-</pre>
-
-## Hoofd Paneel (Mergen)
-
-<pre>
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <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
-</pre>
-
-## Hoofd Paneel (Normaal)
-
-<pre>
-  <kbd>Ő</kbd>: scroll omlaag (fn+up)
-  <kbd>ő</kbd>: scroll omhoog (fn+down)
-</pre>
-
-## Hoofd Paneel (Patch Bouwen)
-
-<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>ctrl+o</kbd>: copy the selected text to the clipboard
-  <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>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-</pre>
-
-## Hoofd Paneel (Staging)
-
-<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>ctrl+o</kbd>: copy the selected text to the clipboard
-  <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>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <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
-</pre>

docs/keybindings/Keybindings_pl.md

@@ -1,308 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
-
-# Lazygit Keybindings
-
-## 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>: widok scalenia/opcje zmiany bazy
-  <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>: wykonaj własną komendę
-  <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>}</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
-</pre>
-
-## 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
-</pre>
-
-## Gałęzie Panel (Branches Tab)
-
-<pre>
-  <kbd>space</kbd>: przełącz
-  <kbd>o</kbd>: utwórz żądanie pobrania
-  <kbd>O</kbd>: utwórz opcje żądania ściągnięcia
-  <kbd>ctrl+y</kbd>: skopiuj adres URL żądania pobrania 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>: zmiana bazy gałęzi
-  <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>: wyświetl opcje resetu
-  <kbd>R</kbd>: rename branch
-  <kbd>ctrl+o</kbd>: copy branch name to clipboard
-  <kbd>enter</kbd>: view commits
-</pre>
-
-## Gałęzie Panel (Remote Branches (in Remotes tab))
-
-<pre>
-  <kbd>esc</kbd>: wróć do listy repozytoriów zdalnych
-  <kbd>g</kbd>: wyświetl opcje resetu
-  <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>: zmiana bazy gałęzi
-  <kbd>u</kbd>: set as upstream of checked-out branch
-</pre>
-
-## Gałęzie Panel (Remotes Tab)
-
-<pre>
-  <kbd>f</kbd>: fetch remote
-  <kbd>n</kbd>: add new remote
-  <kbd>d</kbd>: remove remote
-  <kbd>e</kbd>: edit remote
-</pre>
-
-## Gałęzie Panel (Sub-commits)
-
-<pre>
-  <kbd>enter</kbd>: przeglądaj pliki commita
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: wyświetl opcje resetu
-  <kbd>n</kbd>: nowa gałąź
-  <kbd>c</kbd>: kopiuj commit (przebieranie)
-  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
-</pre>
-
-## Gałęzie Panel (Tags Tab)
-
-<pre>
-  <kbd>space</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>enter</kbd>: view commits
-</pre>
-
-## Pliki commita Panel
-
-<pre>
-  <kbd>ctrl+o</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>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
-</pre>
-
-## Commity Panel (Commity)
-
-<pre>
-  <kbd>ctrl+l</kbd>: open log menu
-  <kbd>s</kbd>: ściśnij
-  <kbd>r</kbd>: zmień nazwę commita
-  <kbd>R</kbd>: zmień nazwę commita w edytorze
-  <kbd>g</kbd>: zresetuj do tego commita
-  <kbd>f</kbd>: napraw commit
-  <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>d</kbd>: usuń commit
-  <kbd>ctrl+j</kbd>: przenieś commit 1 w dół
-  <kbd>ctrl+k</kbd>: przenieś commit 1 w górę
-  <kbd>e</kbd>: edytuj commit
-  <kbd>A</kbd>: popraw commit zmianami z poczekalni
-  <kbd>p</kbd>: wybierz commit (podczas zmiany bazy)
-  <kbd>t</kbd>: odwróć commit
-  <kbd>c</kbd>: kopiuj commit (przebieranie)
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
-  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
-  <kbd>v</kbd>: wklej commity (przebieranie)
-  <kbd>enter</kbd>: przeglądaj pliki commita
-  <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>o</kbd>: open commit in browser
-  <kbd>b</kbd>: view bisect options
-</pre>
-
-## Commity Panel (Reflog Tab)
-
-<pre>
-  <kbd>enter</kbd>: przeglądaj pliki commita
-  <kbd>space</kbd>: checkout commit
-  <kbd>g</kbd>: wyświetl opcje resetu
-  <kbd>c</kbd>: kopiuj commit (przebieranie)
-  <kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
-</pre>
-
-## Extras Panel
-
-<pre>
-  <kbd>@</kbd>: open command log menu
-</pre>
-
-## Pliki Panel
-
-<pre>
-  <kbd>ctrl+b</kbd>: Filtrowanie commitów
-</pre>
-
-## Pliki Panel (Pliki)
-
-<pre>
-  <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>space</kbd>: przełącz stan poczekalni
-  <kbd>d</kbd>: pokaż opcje porzucania zmian
-  <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 zmiany
-  <kbd>S</kbd>: wyświetl opcje schowka
-  <kbd>a</kbd>: przełącz stan poczekalni wszystkich
-  <kbd>D</kbd>: wyświetl opcje resetu
-  <kbd>enter</kbd>: zatwierdź pojedyncze linie
-  <kbd>f</kbd>: pobierz
-  <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
-</pre>
-
-## Pliki Panel (Submodules)
-
-<pre>
-  <kbd>ctrl+o</kbd>: copy submodule name to clipboard
-  <kbd>enter</kbd>: enter submodule
-  <kbd>d</kbd>: remove submodule
-  <kbd>u</kbd>: update submodule
-  <kbd>n</kbd>: add new submodule
-  <kbd>e</kbd>: update submodule URL
-  <kbd>i</kbd>: initialize submodule
-  <kbd>b</kbd>: view bulk submodule options
-</pre>
-
-## Główne Panel (Scalanie)
-
-<pre>
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <kbd>esc</kbd>: wróć do panelu plików
-  <kbd>M</kbd>: open external merge tool (git mergetool)
-  <kbd>space</kbd>: wybierz kawałek
-  <kbd>b</kbd>: wybierz wszystkie kawałki
-  <kbd>◄</kbd>: poprzedni konflikt
-  <kbd>►</kbd>: następny konflikt
-  <kbd>▲</kbd>: wybierz poprzedni kawałek
-  <kbd>▼</kbd>: wybierz następny kawałek
-  <kbd>z</kbd>: cofnij
-</pre>
-
-## Główne Panel (Zwykłe)
-
-<pre>
-  <kbd>Ő</kbd>: przewiń w dół (fn+up)
-  <kbd>ő</kbd>: przewiń w górę (fn+down)
-</pre>
-
-## Główne Panel (Patch Building)
-
-<pre>
-  <kbd>esc</kbd>: wyście z trybu "linia po linii"
-  <kbd>o</kbd>: otwórz plik
-  <kbd>▲</kbd>: poprzednia linia
-  <kbd>▼</kbd>: następna linia
-  <kbd>◄</kbd>: poprzedni kawałek
-  <kbd>►</kbd>: następny kawałek
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <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>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-</pre>
-
-## Główne Panel (Poczekalnia)
-
-<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>: poprzednia linia
-  <kbd>▼</kbd>: następna linia
-  <kbd>◄</kbd>: poprzedni kawałek
-  <kbd>►</kbd>: następny kawałek
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <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>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <kbd>c</kbd>: Zatwierdź zmiany
-  <kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
-  <kbd>C</kbd>: Zatwierdź zmiany używając edytora
-</pre>
-
-## Menu Panel
-
-<pre>
-  <kbd>esc</kbd>: close menu
-</pre>
-
-## Schowek Panel
-
-<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łąź
-</pre>
-
-## Status Panel
-
-<pre>
-  <kbd>e</kbd>: edytuj konfigurację
-  <kbd>o</kbd>: otwórz konfigurację
-  <kbd>u</kbd>: sprawdź aktualizacje
-  <kbd>enter</kbd>: switch to a recent repo
-  <kbd>a</kbd>: pokaż wszystkie logi gałęzi
-</pre>

docs/keybindings/Keybindings_zh.md

@@ -1,308 +0,0 @@
-_This file is auto-generated. To update, make the changes in the pkg/i18n directory and then run `go run scripts/cheatsheet/main.go generate` from the project root._
-
-# Lazygit 按键绑定
-
-## 全局键绑定
-
-<pre>
-  <kbd>ctrl+r</kbd>: 切换到最近的仓库 (<c-r>)
-  <kbd>pgup</kbd>: 向上滚动主面板 (fn+up)
-  <kbd>pgdown</kbd>: 向下滚动主面板 (fn+down)
-  <kbd>m</kbd>: 查看 合并/变基 选项
-  <kbd>ctrl+p</kbd>: 查看自定义补丁选项
-  <kbd>P</kbd>: 推送
-  <kbd>p</kbd>: 拉取
-  <kbd>R</kbd>: 刷新
-  <kbd>x</kbd>: 打开菜单
-  <kbd>z</kbd>: （通过 reflog）撤销「实验功能」
-  <kbd>ctrl+z</kbd>: （通过 reflog）重做「实验功能」
-  <kbd>+</kbd>: 下一屏模式（正常/半屏/全屏）
-  <kbd>_</kbd>: 上一屏模式
-  <kbd>:</kbd>: 执行自定义命令
-  <kbd>ctrl+s</kbd>: 查看按路径过滤选项
-  <kbd>W</kbd>: 打开 diff 菜单
-  <kbd>ctrl+e</kbd>: 打开 diff 菜单
-  <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
-</pre>
-
-## 列表面板导航
-
-<pre>
-  <kbd>.</kbd>: 下一页
-  <kbd>,</kbd>: 上一页
-  <kbd><</kbd>: 滚动到顶部
-  <kbd>></kbd>: 滚动到底部
-  <kbd>/</kbd>: 开始搜索
-  <kbd>]</kbd>: 下一个标签
-  <kbd>[</kbd>: 上一个标签
-</pre>
-
-## 分支 面板 (分支标签)
-
-<pre>
-  <kbd>space</kbd>: 检出
-  <kbd>o</kbd>: 创建抓取请求
-  <kbd>O</kbd>: 创建抓取请求选项
-  <kbd>ctrl+y</kbd>: 将抓取请求 URL 复制到剪贴板
-  <kbd>c</kbd>: 按名称检出
-  <kbd>F</kbd>: 强制检出
-  <kbd>n</kbd>: 新分支
-  <kbd>d</kbd>: 删除分支
-  <kbd>r</kbd>: 将已检出的分支变基到该分支
-  <kbd>M</kbd>: 合并到当前检出的分支
-  <kbd>i</kbd>: 显示 git-flow 选项
-  <kbd>f</kbd>: 从上游快进此分支
-  <kbd>g</kbd>: 查看重置选项
-  <kbd>R</kbd>: 重命名分支
-  <kbd>ctrl+o</kbd>: 将分支名称复制到剪贴板
-  <kbd>enter</kbd>: 查看提交
-</pre>
-
-## 分支 面板 (远程分支（在远程页面中）)
-
-<pre>
-  <kbd>esc</kbd>: 返回远程仓库列表
-  <kbd>g</kbd>: 查看重置选项
-  <kbd>enter</kbd>: 查看提交
-  <kbd>space</kbd>: 检出
-  <kbd>n</kbd>: 新分支
-  <kbd>M</kbd>: 合并到当前检出的分支
-  <kbd>d</kbd>: 删除分支
-  <kbd>r</kbd>: 将已检出的分支变基到该分支
-  <kbd>u</kbd>: 设置为检出分支的上游
-</pre>
-
-## 分支 面板 (远程页面)
-
-<pre>
-  <kbd>f</kbd>: 抓取远程仓库
-  <kbd>n</kbd>: 添加新的远程仓库
-  <kbd>d</kbd>: 删除远程
-  <kbd>e</kbd>: 编辑远程仓库
-</pre>
-
-## 分支 面板 (子提交)
-
-<pre>
-  <kbd>enter</kbd>: 查看提交的文件
-  <kbd>space</kbd>: 检出提交
-  <kbd>g</kbd>: 查看重置选项
-  <kbd>n</kbd>: 新分支
-  <kbd>c</kbd>: 复制提交（拣选）
-  <kbd>C</kbd>: 复制提交范围（拣选）
-  <kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
-  <kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
-</pre>
-
-## 分支 面板 (标签页面)
-
-<pre>
-  <kbd>space</kbd>: 检出
-  <kbd>d</kbd>: 删除标签
-  <kbd>P</kbd>: 推送标签
-  <kbd>n</kbd>: 创建标签
-  <kbd>g</kbd>: 查看重置选项
-  <kbd>enter</kbd>: 查看提交
-</pre>
-
-## 提交文件 面板
-
-<pre>
-  <kbd>ctrl+o</kbd>: 将提交的文件名复制到剪贴板
-  <kbd>c</kbd>: 检出文件
-  <kbd>d</kbd>: 放弃对此文件的提交更改
-  <kbd>o</kbd>: 打开文件
-  <kbd>e</kbd>: 编辑文件
-  <kbd>space</kbd>: 补丁中包含的切换文件
-  <kbd>enter</kbd>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
-  <kbd>`</kbd>: 切换文件树视图
-</pre>
-
-## 提交 面板 (提交)
-
-<pre>
-  <kbd>ctrl+l</kbd>: open log menu
-  <kbd>s</kbd>: 向下压缩
-  <kbd>r</kbd>: 改写提交
-  <kbd>R</kbd>: 使用编辑器重命名提交
-  <kbd>g</kbd>: 重置为此提交
-  <kbd>f</kbd>: 修正提交（fixup）
-  <kbd>F</kbd>: 为此提交创建修正
-  <kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
-  <kbd>d</kbd>: 删除提交
-  <kbd>ctrl+j</kbd>: 下移提交
-  <kbd>ctrl+k</kbd>: 上移提交
-  <kbd>e</kbd>: 编辑提交
-  <kbd>A</kbd>: 用已暂存的更改来修补提交
-  <kbd>p</kbd>: 选择提交（变基过程中）
-  <kbd>t</kbd>: 还原提交
-  <kbd>c</kbd>: 复制提交（拣选）
-  <kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
-  <kbd>C</kbd>: 复制提交范围（拣选）
-  <kbd>v</kbd>: 粘贴提交（拣选）
-  <kbd>enter</kbd>: 查看提交的文件
-  <kbd>space</kbd>: 检出提交
-  <kbd>n</kbd>: 从提交创建新分支
-  <kbd>T</kbd>: 标签提交
-  <kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
-  <kbd>ctrl+y</kbd>: 将提交消息复制到剪贴板
-  <kbd>o</kbd>: open commit in browser
-  <kbd>b</kbd>: view bisect options
-</pre>
-
-## 提交 面板 (Reflog)
-
-<pre>
-  <kbd>enter</kbd>: 查看提交的文件
-  <kbd>space</kbd>: 检出提交
-  <kbd>g</kbd>: 查看重置选项
-  <kbd>c</kbd>: 复制提交（拣选）
-  <kbd>C</kbd>: 复制提交范围（拣选）
-  <kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
-  <kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
-</pre>
-
-## Extras 面板
-
-<pre>
-  <kbd>@</kbd>: 打开命令日志菜单
-</pre>
-
-## 文件 面板
-
-<pre>
-  <kbd>ctrl+b</kbd>: 过滤提交文件
-</pre>
-
-## 文件 面板 (文件)
-
-<pre>
-  <kbd>c</kbd>: 提交更改
-  <kbd>w</kbd>: 提交更改而无需预先提交钩子
-  <kbd>A</kbd>: 修补最后一次提交
-  <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
-  <kbd>space</kbd>: 切换暂存状态
-  <kbd>d</kbd>: 查看'放弃更改‘选项
-  <kbd>e</kbd>: 编辑文件
-  <kbd>o</kbd>: 打开文件
-  <kbd>i</kbd>: 添加到 .gitignore
-  <kbd>r</kbd>: 刷新文件
-  <kbd>s</kbd>: 将所有更改加入贮藏
-  <kbd>S</kbd>: 查看隐藏选项
-  <kbd>a</kbd>: 切换所有文件的暂存状态
-  <kbd>D</kbd>: 查看重置选项
-  <kbd>enter</kbd>: 暂存单个 块/行 用于文件, 或 折叠/展开 目录
-  <kbd>f</kbd>: 抓取
-  <kbd>ctrl+o</kbd>: 将文件名复制到剪贴板
-  <kbd>g</kbd>: 查看上游重置选项
-  <kbd>`</kbd>: 切换文件树视图
-  <kbd>M</kbd>: 打开合并工具
-  <kbd>ctrl+w</kbd>: 切换是否在差异视图中显示空白更改
-</pre>
-
-## 文件 面板 (子模块)
-
-<pre>
-  <kbd>ctrl+o</kbd>: 将子模块名称复制到剪贴板
-  <kbd>enter</kbd>: 输入子模块
-  <kbd>d</kbd>: 删除子模块
-  <kbd>u</kbd>: 更新子模块
-  <kbd>n</kbd>: 添加新的子模块
-  <kbd>e</kbd>: 更新子模块 URL
-  <kbd>i</kbd>: 初始化子模块
-  <kbd>b</kbd>: 查看批量子模块选项
-</pre>
-
-## 主要 面板 (合并中)
-
-<pre>
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <kbd>esc</kbd>: 返回文件面板
-  <kbd>M</kbd>: 打开合并工具
-  <kbd>space</kbd>: 选中区块
-  <kbd>b</kbd>: 选中所有区块
-  <kbd>◄</kbd>: 选择上一个冲突
-  <kbd>►</kbd>: 选择下一个冲突
-  <kbd>▲</kbd>: 选择顶部块
-  <kbd>▼</kbd>: 选择底部块
-  <kbd>z</kbd>: 撤销
-</pre>
-
-## 主要 面板 (正常)
-
-<pre>
-  <kbd>Ő</kbd>: 向下滚动 (fn+up)
-  <kbd>ő</kbd>: 向上滚动 (fn+down)
-</pre>
-
-## 主要 面板 (构建补丁中)
-
-<pre>
-  <kbd>esc</kbd>: 退出逐行模式
-  <kbd>o</kbd>: 打开文件
-  <kbd>▲</kbd>: 选择上一行
-  <kbd>▼</kbd>: 选择下一行
-  <kbd>◄</kbd>: 选择上一个区块
-  <kbd>►</kbd>: 选择下一个区块
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>space</kbd>: 添加/移除 行到补丁
-  <kbd>v</kbd>: 切换拖动选择
-  <kbd>V</kbd>: 切换拖动选择
-  <kbd>a</kbd>: 切换选择区块
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-</pre>
-
-## 主要 面板 (正在暂存)
-
-<pre>
-  <kbd>esc</kbd>: 返回文件面板
-  <kbd>space</kbd>: 切换行暂存状态
-  <kbd>d</kbd>: 取消变更 (git reset)
-  <kbd>tab</kbd>: 切换到其他面板
-  <kbd>o</kbd>: 打开文件
-  <kbd>▲</kbd>: 选择上一行
-  <kbd>▼</kbd>: 选择下一行
-  <kbd>◄</kbd>: 选择上一个区块
-  <kbd>►</kbd>: 选择下一个区块
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>e</kbd>: 编辑文件
-  <kbd>o</kbd>: 打开文件
-  <kbd>v</kbd>: 切换拖动选择
-  <kbd>V</kbd>: 切换拖动选择
-  <kbd>a</kbd>: 切换选择区块
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
-  <kbd>c</kbd>: 提交更改
-  <kbd>w</kbd>: 提交更改而无需预先提交钩子
-  <kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
-</pre>
-
-## 菜单 面板
-
-<pre>
-  <kbd>esc</kbd>: 关闭菜单
-</pre>
-
-## 贮藏 面板
-
-<pre>
-  <kbd>enter</kbd>: 查看贮藏条目中的文件
-  <kbd>space</kbd>: 应用
-  <kbd>g</kbd>: 应用并删除
-  <kbd>d</kbd>: 删除
-  <kbd>n</kbd>: 新分支
-</pre>
-
-## 状态 面板
-
-<pre>
-  <kbd>e</kbd>: 编辑配置文件
-  <kbd>o</kbd>: 打开配置文件
-  <kbd>u</kbd>: 检查更新
-  <kbd>enter</kbd>: 切换到最近的仓库
-  <kbd>a</kbd>: 显示所有分支的日志
-</pre>

go.mod

@@ -1,50 +0,0 @@
-module github.com/jesseduffield/lazygit
-
-go 1.14
-
-require (
-	github.com/OpenPeeDeeP/xdg v1.0.0
-	github.com/atotto/clipboard v0.1.2
-	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/fsnotify/fsnotify v1.4.7
-	github.com/gdamore/tcell/v2 v2.4.1-0.20210926162909-66f061b1fc9b // indirect
-	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/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.20220108045521-1945d7b9ed8b
-	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/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/sanity-io/litter v1.5.2
-	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/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-20211216021012-1d35b9e2eb4e // 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
-)

go.sum

@@ -1,216 +0,0 @@
-github.com/OpenPeeDeeP/xdg v1.0.0 h1:UDLmNjCGFZZCaVMB74DqYEtXkHxnTxcr4FeJVF9uCn8=
-github.com/OpenPeeDeeP/xdg v1.0.0/go.mod h1:tMoSueLQlMf0TCldjrJLNIjAc5qAOIcHt5REi88/Ygo=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
-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/aybabtme/humanlog v0.4.1 h1:D8d9um55rrthJsP8IGSHBcti9lTb/XknmDAX6Zy8tek=
-github.com/aybabtme/humanlog v0.4.1/go.mod h1:B0bnQX4FTSU3oftPMTTPvENCy8LqixLDvYJA9TUCAGo=
-github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
-github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
-github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
-github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
-github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
-github.com/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=
-github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
-github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/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/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.4.1-0.20210926162909-66f061b1fc9b h1:eoaSI4eEwM5eTx/HvmRSwmicxuMhL73AyoEfM1oCJLc=
-github.com/gdamore/tcell/v2 v2.4.1-0.20210926162909-66f061b1fc9b/go.mod h1:ZPwXnysybtQqdqKcWMWXux9aGdtMHe+kr+cwEZEe+A4=
-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-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
-github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
-github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM=
-github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
-github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M=
-github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/golang-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=
-github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
-github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-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.20220108045521-1945d7b9ed8b h1:AUK5nDiPiaahBtGIsf8rITgZ9SC+uddvnNKs0/mrYA8=
-github.com/jesseduffield/gocui v0.3.1-0.20220108045521-1945d7b9ed8b/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU=
-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=
-github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
-github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/kyokomi/emoji/v2 v2.2.8 h1:jcofPxjHWEkJtkIbcLHvZhxKgCPl6C7MyjTrD4KDqUE=
-github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
-github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.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/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
-github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-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/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/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
-github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
-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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/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/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/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/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=
-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/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-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/sync v0.0.0-20180314180146-1d60e4601c6f/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=
-golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-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-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-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/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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-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/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=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0 h1:KzcWKJ0nMAmGoBhYVMnkWc1rXjB42lKy5aIys4TdLOA=
-gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0/go.mod h1:XoytMOotjRRJVkIsQdxsPIioRLYFISEaY9a4tftOXAo=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-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=

main.go

@@ -1,151 +0,0 @@
-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"
-)
-
-var (
-	commit      string
-	version     = "unversioned"
-	date        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")
-		}
-
-		absRepoPath, err := filepath.Abs(repoPath)
-		if err != nil {
-			log.Fatal(err)
-		}
-		workTree = absRepoPath
-		gitDir = filepath.Join(absRepoPath, ".git")
-	}
-
-	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))
-	}
-}

pkg/app/app.go

@@ -1,339 +0,0 @@
-package app
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/aybabtme/humanlog"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/common"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/env"
-	"github.com/jesseduffield/lazygit/pkg/gui"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/updates"
-	"github.com/sirupsen/logrus"
-)
-
-// App struct
-type App struct {
-	*common.Common
-	closers       []io.Closer
-	Config        config.AppConfigurer
-	OSCommand     *oscommands.OSCommand
-	Gui           *gui.Gui
-	Updater       *updates.Updater // may only need this on the Gui
-	ClientContext string
-}
-
-type errorMapping struct {
-	originalError string
-	newError      string
-}
-
-func newProductionLogger() *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
-	}
-	return level
-}
-
-func newDevelopmentLogger() *logrus.Logger {
-	logger := logrus.New()
-	logger.SetLevel(getLogLevel())
-	logPath, err := config.LogPath()
-	if err != nil {
-		log.Fatal(err)
-	}
-	file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		log.Fatalf("Unable to log to log file: %v", err)
-	}
-	logger.SetOutput(file)
-	return logger
-}
-
-func newLogger(config config.AppConfigurer) *logrus.Entry {
-	var log *logrus.Logger
-	if config.GetDebug() || os.Getenv("DEBUG") == "TRUE" {
-		log = newDevelopmentLogger()
-	} else {
-		log = newProductionLogger()
-	}
-
-	// highly recommended: tail -f development.log | humanlog
-	// https://github.com/aybabtme/humanlog
-	log.Formatter = &logrus.JSONFormatter{}
-
-	return log.WithFields(logrus.Fields{
-		"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) {
-	userConfig := config.GetUserConfig()
-
-	app := &App{
-		closers: []io.Closer{},
-		Config:  config,
-	}
-	var err error
-	log := newLogger(config)
-	tr, err := i18n.NewTranslationSetFromConfig(log, userConfig.Gui.Language)
-	if err != nil {
-		return app, err
-	}
-
-	app.Common = &common.Common{
-		Log:        log,
-		Tr:         tr,
-		UserConfig: userConfig,
-		Debug:      config.GetDebug(),
-	}
-
-	// 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
-	}
-
-	app.OSCommand = oscommands.NewOSCommand(app.Common, oscommands.GetPlatform(), oscommands.NewNullGuiIO(log))
-
-	app.Updater, err = updates.NewUpdater(app.Common, config, app.OSCommand)
-	if err != nil {
-		return app, err
-	}
-
-	showRecentRepos, err := app.setupRepo()
-	if err != nil {
-		return app, err
-	}
-
-	gitConfig := git_config.NewStdCachedGitConfig(app.Log)
-
-	app.Gui, err = gui.NewGui(app.Common, config, gitConfig, app.Updater, filterPath, showRecentRepos)
-	if err != nil {
-		return app, err
-	}
-	return app, nil
-}
-
-func (app *App) validateGitVersion() error {
-	output, err := app.OSCommand.Cmd.New("git --version").RunWithOutput()
-	// if we get an error anywhere here we'll show the same status
-	minVersionError := errors.New(app.Tr.MinGitVersionError)
-	if err != nil {
-		return minVersionError
-	}
-
-	if isGitVersionValid(output) {
-		return nil
-	}
-
-	return minVersionError
-}
-
-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)
-
-	if len(matches) == 0 {
-		return false
-	}
-
-	gitVersion := matches[1]
-	majorVersion, err := strconv.Atoi(gitVersion[0:1])
-	if err != nil {
-		return false
-	}
-	if majorVersion < 2 {
-		return false
-	}
-
-	return true
-}
-
-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 Git object
-		return false, nil
-	}
-
-	// if we are not in a git repo, we ask if we want to `git init`
-	if err := commands.VerifyInGitRepo(app.OSCommand); err != nil {
-		cwd, err := os.Getwd()
-		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.
-		}
-
-		shouldInitRepo := true
-		notARepository := app.UserConfig.NotARepository
-		if notARepository == "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
-					}
-				}
-				return false, err
-			}
-
-			os.Exit(1)
-		}
-		if err := app.OSCommand.Cmd.New("git init").Run(); err != nil {
-			return false, err
-		}
-	}
-
-	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()
-	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)
-}

pkg/app/app_test.go

@@ -1,45 +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 {
-		s := s
-		t.Run(s.versionStr, func(t *testing.T) {
-			result := isGitVersionValid(s.versionStr)
-			assert.Equal(t, result, s.expectedResult)
-		})
-	}
-}

pkg/app/logging.go

@@ -1,31 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package app
-
-import (
-	"log"
-	"os"
-
-	"github.com/aybabtme/humanlog"
-	"github.com/jesseduffield/lazygit/pkg/secureexec"
-)
-
-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/cheatsheet/check.go

@@ -1,79 +0,0 @@
-package cheatsheet
-
-import (
-	"fmt"
-	"io/fs"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-
-	"github.com/pmezard/go-difflib/difflib"
-)
-
-func Check() {
-	dir := GetDir()
-	tmpDir := filepath.Join(os.TempDir(), "lazygit_cheatsheet")
-	err := os.RemoveAll(tmpDir)
-	if err != nil {
-		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
-	}
-	err = os.Mkdir(tmpDir, 0700)
-	if err != nil {
-		log.Fatalf("Error occured 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 occured 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\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 := ioutil.ReadFile(path)
-			if err != nil {
-				log.Fatalf("Error occured 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 occured while checking if cheatsheets are up to date: %v", err)
-	}
-
-	return content
-}

pkg/cheatsheet/generate.go

@@ -1,265 +0,0 @@
-// 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"
-	"sort"
-
-	"github.com/jesseduffield/lazygit/pkg/app"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/gui"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/integration"
-)
-
-type bindingSection struct {
-	title    string
-	bindings []*gui.Binding
-}
-
-func CommandToRun() string {
-	return "go run scripts/cheatsheet/main.go generate"
-}
-
-func GetDir() string {
-	return integration.GetRootDirectory() + "/docs/keybindings"
-}
-
-func generateAtDir(cheatsheetDir string) {
-	os.Setenv("LANG", "en")
-
-	translationSetsByLang := i18n.GetTranslationSets()
-	mConfig := config.NewDummyAppConfig()
-
-	for lang := range translationSetsByLang {
-		os.Setenv("LC_ALL", lang)
-		mApp, _ := app.NewApp(mConfig, "")
-		path := cheatsheetDir + "/Keybindings_" + lang + ".md"
-		file, err := os.Create(path)
-		if err != nil {
-			panic(err)
-		}
-
-		bindingSections := getBindingSections(mApp)
-		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(GetDir())
-}
-
-func writeString(file *os.File, str string) {
-	_, err := file.WriteString(str)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func localisedTitle(mApp *app.App, str string) string {
-	tr := mApp.Tr
-
-	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,
-		"commits":        tr.CommitsTitle,
-		"confirmation":   tr.ConfirmationTitle,
-		"credentials":    tr.CredentialsTitle,
-		"information":    tr.InformationTitle,
-		"main":           tr.MainTitle,
-		"patchBuilding":  tr.PatchBuildingTitle,
-		"merging":        tr.MergingTitle,
-		"normal":         tr.NormalTitle,
-		"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 formatTitle(title string) string {
-	return fmt.Sprintf("\n## %s\n\n", title)
-}
-
-func formatBinding(binding *gui.Binding) string {
-	if binding.Alternative != "" {
-		return fmt.Sprintf("  <kbd>%s</kbd>: %s (%s)\n", gui.GetKeyDisplay(binding.Key), binding.Description, binding.Alternative)
-	}
-	return fmt.Sprintf("  <kbd>%s</kbd>: %s\n", gui.GetKeyDisplay(binding.Key), binding.Description)
-}
-
-func getBindingSections(mApp *app.App) []*bindingSection {
-	bindingSections := []*bindingSection{}
-
-	bindings := mApp.Gui.GetInitialKeybindings()
-
-	type contextAndViewType struct {
-		subtitle string
-		title    string
-	}
-
-	contextAndViewBindingMap := map[contextAndViewType][]*gui.Binding{}
-
-outer:
-	for _, binding := range bindings {
-		if binding.Tag == "navigation" {
-			key := contextAndViewType{subtitle: "", title: "navigation"}
-			existing := contextAndViewBindingMap[key]
-			if existing == nil {
-				contextAndViewBindingMap[key] = []*gui.Binding{binding}
-			} else {
-				for _, navBinding := range contextAndViewBindingMap[key] {
-					if navBinding.Description == binding.Description {
-						continue outer
-					}
-				}
-				contextAndViewBindingMap[key] = append(contextAndViewBindingMap[key], binding)
-			}
-
-			continue outer
-		}
-
-		contexts := []string{}
-		if len(binding.Contexts) == 0 {
-			contexts = append(contexts, "")
-		} else {
-			contexts = append(contexts, binding.Contexts...)
-		}
-
-		for _, context := range contexts {
-			key := contextAndViewType{subtitle: context, title: binding.ViewName}
-			existing := contextAndViewBindingMap[key]
-			if existing == nil {
-				contextAndViewBindingMap[key] = []*gui.Binding{binding}
-			} else {
-				contextAndViewBindingMap[key] = append(contextAndViewBindingMap[key], binding)
-			}
-		}
-	}
-
-	type groupedBindingsType struct {
-		contextAndView contextAndViewType
-		bindings       []*gui.Binding
-	}
-
-	groupedBindings := make([]groupedBindingsType, len(contextAndViewBindingMap))
-
-	for contextAndView, contextBindings := range contextAndViewBindingMap {
-		groupedBindings = append(groupedBindings, groupedBindingsType{contextAndView: contextAndView, bindings: contextBindings})
-	}
-
-	sort.Slice(groupedBindings, func(i, j int) bool {
-		first := groupedBindings[i].contextAndView
-		second := groupedBindings[j].contextAndView
-		if first.title == "" {
-			return true
-		}
-		if second.title == "" {
-			return false
-		}
-		if first.title == "navigation" {
-			return true
-		}
-		if second.title == "navigation" {
-			return false
-		}
-		return first.title < second.title || (first.title == second.title && first.subtitle < second.subtitle)
-	})
-
-	for _, group := range groupedBindings {
-		contextAndView := group.contextAndView
-		contextBindings := group.bindings
-		mApp.Log.Info("viewname: " + contextAndView.title + ", context: " + contextAndView.subtitle)
-		viewName := contextAndView.title
-		if viewName == "" {
-			viewName = "global"
-		}
-		translatedView := localisedTitle(mApp, viewName)
-		var title string
-		if contextAndView.subtitle == "" {
-			addendum := " " + mApp.Tr.Panel
-			if viewName == "global" || viewName == "navigation" {
-				addendum = ""
-			}
-			title = fmt.Sprintf("%s%s", translatedView, addendum)
-		} else {
-			translatedContextName := localisedTitle(mApp, contextAndView.subtitle)
-			title = fmt.Sprintf("%s %s (%s)", translatedView, mApp.Tr.Panel, translatedContextName)
-		}
-
-		for _, binding := range contextBindings {
-			bindingSections = addBinding(title, bindingSections, binding)
-		}
-	}
-
-	return bindingSections
-}
-
-func addBinding(title string, bindingSections []*bindingSection, binding *gui.Binding) []*bindingSection {
-	if binding.Description == "" && binding.Alternative == "" {
-		return bindingSections
-	}
-
-	for _, section := range bindingSections {
-		if title == section.title {
-			section.bindings = append(section.bindings, binding)
-			return bindingSections
-		}
-	}
-
-	section := &bindingSection{
-		title:    title,
-		bindings: []*gui.Binding{binding},
-	}
-
-	return append(bindingSections, section)
-}
-
-func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) string {
-	content := fmt.Sprintf("# Lazygit %s\n", tr.Keybindings)
-
-	for _, section := range bindingSections {
-		content += formatTitle(section.title)
-		content += "<pre>\n"
-		for _, binding := range section.bindings {
-			content += formatBinding(binding)
-		}
-		content += "</pre>\n"
-	}
-
-	return content
-}

pkg/commands/git.go

@@ -1,261 +0,0 @@
-package commands
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/go-errors/errors"
-
-	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/loaders"
-	"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/env"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// GitCommand is our main git interface
-type GitCommand struct {
-	Branch      *git_commands.BranchCommands
-	Commit      *git_commands.CommitCommands
-	Config      *git_commands.ConfigCommands
-	Custom      *git_commands.CustomCommands
-	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
-
-	Loaders Loaders
-}
-
-type Loaders struct {
-	Branches      *loaders.BranchLoader
-	CommitFiles   *loaders.CommitFileLoader
-	Commits       *loaders.CommitLoader
-	Files         *loaders.FileLoader
-	ReflogCommits *loaders.ReflogCommitLoader
-	Remotes       *loaders.RemoteLoader
-	Stash         *loaders.StashLoader
-	Tags          *loaders.TagLoader
-}
-
-func NewGitCommand(
-	cmn *common.Common,
-	osCommand *oscommands.OSCommand,
-	gitConfig git_config.IGitConfig,
-) (*GitCommand, error) {
-	if err := navigateToRepoRootDirectory(os.Stat, os.Chdir); err != nil {
-		return nil, err
-	}
-
-	repo, err := setupRepository(gogit.PlainOpen, cmn.Tr.GitconfigParseErr)
-	if err != nil {
-		return nil, err
-	}
-
-	dotGitDir, err := findDotGitDir(os.Stat, ioutil.ReadFile)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewGitCommandAux(
-		cmn,
-		osCommand,
-		gitConfig,
-		dotGitDir,
-		repo,
-	), nil
-}
-
-func NewGitCommandAux(
-	cmn *common.Common,
-	osCommand *oscommands.OSCommand,
-	gitConfig git_config.IGitConfig,
-	dotGitDir string,
-	repo *gogit.Repository,
-) *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)
-	gitCommon := git_commands.NewGitCommon(cmn, cmd, osCommand, dotGitDir, repo, configCommands)
-
-	statusCommands := git_commands.NewStatusCommands(gitCommon)
-	fileLoader := loaders.NewFileLoader(cmn, cmd, configCommands)
-	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)
-	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)
-	// TODO: have patch manager take workingTreeCommands in its entirety
-	patchManager := patch.NewPatchManager(cmn.Log, workingTreeCommands.ApplyPatch, workingTreeCommands.ShowFileDiff)
-	patchCommands := git_commands.NewPatchCommands(gitCommon, rebaseCommands, commitCommands, statusCommands, stashCommands, patchManager)
-	bisectCommands := git_commands.NewBisectCommands(gitCommon)
-
-	return &GitCommand{
-		Branch:      branchCommands,
-		Commit:      commitCommands,
-		Config:      configCommands,
-		Custom:      customCommands,
-		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{
-			Branches:      loaders.NewBranchLoader(cmn, branchCommands.GetRawBranches, branchCommands.CurrentBranchName, configCommands),
-			CommitFiles:   loaders.NewCommitFileLoader(cmn, cmd),
-			Commits:       loaders.NewCommitLoader(cmn, cmd, dotGitDir, branchCommands.CurrentBranchName, statusCommands.RebaseMode),
-			Files:         fileLoader,
-			ReflogCommits: loaders.NewReflogCommitLoader(cmn, cmd),
-			Remotes:       loaders.NewRemoteLoader(cmn, cmd, repo.Remotes),
-			Stash:         loaders.NewStashLoader(cmn, cmd),
-			Tags:          loaders.NewTagLoader(cmn, cmd),
-		},
-	}
-}
-
-func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
-	gitDir := env.GetGitDirEnv()
-	if gitDir != "" {
-		// we've been given the git directory explicitly so no need to navigate to it
-		_, err := stat(gitDir)
-		if err != nil {
-			return utils.WrapError(err)
-		}
-
-		return nil
-	}
-
-	// we haven't been given the git dir explicitly so we assume it's in the current working directory as `.git/` (or an ancestor directory)
-
-	for {
-		_, err := stat(".git")
-
-		if err == nil {
-			return nil
-		}
-
-		if !os.IsNotExist(err) {
-			return utils.WrapError(err)
-		}
-
-		if err = chdir(".."); err != nil {
-			return utils.WrapError(err)
-		}
-
-		currentPath, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		atRoot := currentPath == filepath.Dir(currentPath)
-		if atRoot {
-			// we should never really land here: the code that creates GitCommand should
-			// verify we're in a git directory
-			return errors.New("Must open lazygit in a git repository")
-		}
-	}
-}
-
-// resolvePath takes a path containing a symlink and returns the true path
-func resolvePath(path string) (string, error) {
-	l, err := os.Lstat(path)
-	if err != nil {
-		return "", err
-	}
-
-	if l.Mode()&os.ModeSymlink == 0 {
-		return path, nil
-	}
-
-	return filepath.EvalSymlinks(path)
-}
-
-func setupRepository(openGitRepository func(string) (*gogit.Repository, error), gitConfigParseErrorStr string) (*gogit.Repository, error) {
-	unresolvedPath := env.GetGitDirEnv()
-	if unresolvedPath == "" {
-		var err error
-		unresolvedPath, err = os.Getwd()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	path, err := resolvePath(unresolvedPath)
-	if err != nil {
-		return nil, err
-	}
-
-	repository, err := openGitRepository(path)
-
-	if err != nil {
-		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
-			return nil, errors.New(gitConfigParseErrorStr)
-		}
-
-		return nil, err
-	}
-
-	return repository, err
-}
-
-func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filename string) ([]byte, error)) (string, error) {
-	if env.GetGitDirEnv() != "" {
-		return env.GetGitDirEnv(), nil
-	}
-
-	f, err := stat(".git")
-	if err != nil {
-		return "", err
-	}
-
-	if f.IsDir() {
-		return ".git", nil
-	}
-
-	fileBytes, err := readFile(".git")
-	if err != nil {
-		return "", err
-	}
-	fileContent := string(fileBytes)
-	if !strings.HasPrefix(fileContent, "gitdir: ") {
-		return "", errors.New(".git is a file which suggests we are in a submodule but the file's contents do not contain a gitdir pointing to the actual .git directory")
-	}
-	return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
-}
-
-func VerifyInGitRepo(osCommand *oscommands.OSCommand) error {
-	return osCommand.Cmd.New("git rev-parse --git-dir").DontLog().Run()
-}

pkg/commands/git_cmd_obj_builder.go

@@ -1,47 +0,0 @@
-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(cmdStr string) oscommands.ICmdObj {
-	return self.innerBuilder.New(cmdStr).AddEnvVars(defaultEnvVar)
-}
-
-func (self *gitCmdObjBuilder) NewFromArgs(args []string) oscommands.ICmdObj {
-	return self.innerBuilder.NewFromArgs(args).AddEnvVars(defaultEnvVar)
-}
-
-func (self *gitCmdObjBuilder) NewShell(cmdStr string) oscommands.ICmdObj {
-	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

@@ -1,26 +0,0 @@
-package commands
-
-import (
-	"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
-
-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) {
-	return self.innerRunner.RunWithOutput(cmdObj)
-}
-
-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

@@ -1,175 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	"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 {
-	return self.cmd.New("git bisect reset").StreamOutput().Run()
-}
-
-func (self *BisectCommands) Mark(ref string, term string) error {
-	return self.cmd.New(
-		fmt.Sprintf("git bisect %s %s", term, ref),
-	).
-		IgnoreEmptyError().
-		StreamOutput().
-		Run()
-}
-
-func (self *BisectCommands) Skip(ref string) error {
-	return self.Mark(ref, "skip")
-}
-
-func (self *BisectCommands) Start() error {
-	return self.cmd.New("git bisect start").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{}
-
-	err := self.cmd.New(fmt.Sprintf("git rev-list %s", newSha)).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 {
-	err := self.cmd.New(
-		fmt.Sprintf("git merge-base --is-ancestor %s %s", bisectInfo.GetNewSha(), bisectInfo.GetStartSha()),
-	).DontLog().Run()
-
-	return err == nil
-}

pkg/commands/git_commands/bisect_info.go

@@ -1,103 +0,0 @@
-package git_commands
-
-import "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
-	}
-
-	for _, status := range self.statusMap {
-		if status == BisectStatusOld {
-			return true
-		}
-	}
-
-	return false
-}

pkg/commands/git_commands/branch.go

@@ -1,168 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// this takes something like:
-// * (HEAD detached at 264fc6f5)
-//	remotes
-// and returns '264fc6f5' as the second match
-const CurrentBranchNameRegex = `(?m)^\*.*?([^ ]*?)\)?$`
-
-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 {
-	return self.cmd.New(fmt.Sprintf("git checkout -b %s %s", self.cmd.Quote(name), self.cmd.Quote(base))).Run()
-}
-
-// 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 (self *BranchCommands) CurrentBranchName() (string, string, error) {
-	branchName, err := self.cmd.New("git symbolic-ref --short HEAD").DontLog().RunWithOutput()
-	if err == nil && branchName != "HEAD\n" {
-		trimmedBranchName := strings.TrimSpace(branchName)
-		return trimmedBranchName, trimmedBranchName, nil
-	}
-	output, err := self.cmd.New("git branch --contains").DontLog().RunWithOutput()
-	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
-}
-
-// Delete delete branch
-func (self *BranchCommands) Delete(branch string, force bool) error {
-	command := "git branch -d"
-
-	if force {
-		command = "git branch -D"
-	}
-
-	return self.cmd.New(fmt.Sprintf("%s %s", command, self.cmd.Quote(branch))).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 {
-	forceArg := ""
-	if options.Force {
-		forceArg = " --force"
-	}
-
-	return self.cmd.New(fmt.Sprintf("git checkout%s %s", forceArg, self.cmd.Quote(branch))).
-		// 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),
-	}
-	return self.cmd.New(utils.ResolvePlaceholderString(branchLogCmdTemplate, templateValues)).DontLog()
-}
-
-func (self *BranchCommands) SetCurrentBranchUpstream(remoteName string, remoteBranchName string) error {
-	return self.cmd.New(fmt.Sprintf("git branch --set-upstream-to=%s/%s", self.cmd.Quote(remoteName), self.cmd.Quote(remoteBranchName))).Run()
-}
-
-func (self *BranchCommands) SetUpstream(remoteName string, remoteBranchName string, branchName string) error {
-	return self.cmd.New(fmt.Sprintf("git branch --set-upstream-to=%s/%s %s", self.cmd.Quote(remoteName), self.cmd.Quote(remoteBranchName), self.cmd.Quote(branchName))).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) {
-	command := "git rev-list %s..%s --count"
-	pushableCount, err := self.cmd.New(fmt.Sprintf(command, to, from)).DontLog().RunWithOutput()
-	if err != nil {
-		return "?", "?"
-	}
-	pullableCount, err := self.cmd.New(fmt.Sprintf(command, from, to)).DontLog().RunWithOutput()
-	if err != nil {
-		return "?", "?"
-	}
-	return strings.TrimSpace(pushableCount), strings.TrimSpace(pullableCount)
-}
-
-func (self *BranchCommands) IsHeadDetached() bool {
-	err := self.cmd.New("git symbolic-ref -q HEAD").DontLog().Run()
-	return err != nil
-}
-
-func (self *BranchCommands) Rename(oldName string, newName string) error {
-	return self.cmd.New(fmt.Sprintf("git branch --move %s %s", self.cmd.Quote(oldName), self.cmd.Quote(newName))).Run()
-}
-
-func (self *BranchCommands) GetRawBranches() (string, error) {
-	return self.cmd.New(`git for-each-ref --sort=-committerdate --format="%(HEAD)|%(refname:short)|%(upstream:short)|%(upstream:track)" refs/heads`).DontLog().RunWithOutput()
-}
-
-type MergeOpts struct {
-	FastForwardOnly bool
-}
-
-func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
-	mergeArg := ""
-	if self.UserConfig.Git.Merging.Args != "" {
-		mergeArg = " " + self.UserConfig.Git.Merging.Args
-	}
-
-	command := fmt.Sprintf("git merge --no-edit%s %s", mergeArg, self.cmd.Quote(branchName))
-	if opts.FastForwardOnly {
-		command = fmt.Sprintf("%s --ff-only", command)
-	}
-
-	return self.cmd.New(command).Run()
-}
-
-func (self *BranchCommands) AllBranchesLogCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(self.UserConfig.Git.AllBranchesLogCmd).DontLog()
-}

pkg/commands/git_commands/branch_test.go

@@ -1,225 +0,0 @@
-package git_commands
-
-import (
-	"testing"
-
-	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"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).
-				Expect("git rev-list @{u}..HEAD --count", "", errors.New("error")),
-			"?", "?",
-		},
-		{
-			"Can't retrieve pullable count",
-			oscommands.NewFakeRunner(t).
-				Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
-				Expect("git rev-list HEAD..@{u} --count", "", errors.New("error")),
-			"?", "?",
-		},
-		{
-			"Retrieve pullable and pushable count",
-			oscommands.NewFakeRunner(t).
-				Expect("git rev-list @{u}..HEAD --count", "1\n", nil).
-				Expect("git 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).
-		Expect(`git checkout -b "test" "master"`, "", nil)
-	instance := buildBranchCommands(commonDeps{runner: runner})
-
-	assert.NoError(t, instance.New("test", "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).Expect(`git branch -d "test"`, "", nil),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"Force delete a branch",
-			true,
-			oscommands.NewFakeRunner(t).Expect(`git 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) {
-	runner := oscommands.NewFakeRunner(t).
-		Expect(`git merge --no-edit "test"`, "", nil)
-	instance := buildBranchCommands(commonDeps{runner: runner})
-
-	assert.NoError(t, instance.Merge("test", MergeOpts{}))
-	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).Expect(`git checkout "test"`, "", nil),
-			func(err error) {
-				assert.NoError(t, err)
-			},
-			false,
-		},
-		{
-			"Checkout forced",
-			oscommands.NewFakeRunner(t).Expect(`git 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 TestBranchCurrentBranchName(t *testing.T) {
-	type scenario struct {
-		testName string
-		runner   *oscommands.FakeCmdObjRunner
-		test     func(string, string, error)
-	}
-
-	scenarios := []scenario{
-		{
-			"says we are on the master branch if we are",
-			oscommands.NewFakeRunner(t).Expect(`git symbolic-ref --short HEAD`, "master", nil),
-			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",
-			oscommands.NewFakeRunner(t).
-				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
-				Expect(`git branch --contains`, "* master", 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",
-			oscommands.NewFakeRunner(t).
-				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
-				Expect(`git branch --contains`, "* (HEAD detached at 123abcd)", 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",
-			oscommands.NewFakeRunner(t).
-				Expect(`git symbolic-ref --short HEAD`, "", errors.New("error")).
-				Expect(`git branch --contains`, "", errors.New("error")),
-			func(name string, displayname string, err error) {
-				assert.Error(t, err)
-				assert.EqualValues(t, "", name)
-				assert.EqualValues(t, "", displayname)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s := s
-		t.Run(s.testName, func(t *testing.T) {
-			instance := buildBranchCommands(commonDeps{runner: s.runner})
-			s.test(instance.CurrentBranchName())
-			s.runner.CheckForMissingCalls()
-		})
-	}
-}

pkg/commands/git_commands/commit.go

@@ -1,125 +0,0 @@
-package git_commands
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-)
-
-type CommitCommands struct {
-	*GitCommon
-}
-
-func NewCommitCommands(gitCommon *GitCommon) *CommitCommands {
-	return &CommitCommands{
-		GitCommon: gitCommon,
-	}
-}
-
-// RewordLastCommit rewords the topmost commit with the given message
-func (self *CommitCommands) RewordLastCommit(message string) error {
-	return self.cmd.New("git commit --allow-empty --amend --only -m " + self.cmd.Quote(message)).Run()
-}
-
-// ResetToCommit reset to commit
-func (self *CommitCommands) ResetToCommit(sha string, strength string, envVars []string) error {
-	return self.cmd.New(fmt.Sprintf("git reset --%s %s", strength, sha)).
-		// 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 {
-	splitMessage := strings.Split(message, "\n")
-	lineArgs := ""
-	for _, line := range splitMessage {
-		lineArgs += fmt.Sprintf(" -m %s", self.cmd.Quote(line))
-	}
-
-	skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
-	noVerifyFlag := ""
-	if skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix) {
-		noVerifyFlag = " --no-verify"
-	}
-
-	return self.cmd.New(fmt.Sprintf("git commit%s%s%s", noVerifyFlag, self.signoffFlag(), lineArgs))
-}
-
-// runs git commit without the -m argument meaning it will invoke the user's editor
-func (self *CommitCommands) CommitEditorCmdObj() oscommands.ICmdObj {
-	return self.cmd.New(fmt.Sprintf("git commit%s", self.signoffFlag()))
-}
-
-func (self *CommitCommands) signoffFlag() string {
-	if self.UserConfig.Git.Commit.SignOff {
-		return " --signoff"
-	} else {
-		return ""
-	}
-}
-
-// Get the subject of the HEAD commit
-func (self *CommitCommands) GetHeadCommitMessage() (string, error) {
-	message, err := self.cmd.New("git log -1 --pretty=%s").DontLog().RunWithOutput()
-	return strings.TrimSpace(message), err
-}
-
-func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
-	cmdStr := "git rev-list --format=%B --max-count=1 " + commitSha
-	messageWithHeader, err := self.cmd.New(cmdStr).DontLog().RunWithOutput()
-	message := strings.Join(strings.SplitAfter(messageWithHeader, "\n")[1:], "\n")
-	return strings.TrimSpace(message), err
-}
-
-func (self *CommitCommands) GetCommitMessageFirstLine(sha string) (string, error) {
-	return self.GetCommitMessagesFirstLine([]string{sha})
-}
-
-func (self *CommitCommands) GetCommitMessagesFirstLine(shas []string) (string, error) {
-	return self.cmd.New(
-		fmt.Sprintf("git show --no-patch --pretty=format:%%s %s", strings.Join(shas, " ")),
-	).DontLog().RunWithOutput()
-}
-
-func (self *CommitCommands) GetCommitsOneline(shas []string) (string, error) {
-	return self.cmd.New(
-		fmt.Sprintf("git show --no-patch --oneline %s", strings.Join(shas, " ")),
-	).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 {
-	return self.cmd.New("git commit --amend --no-edit --allow-empty")
-}
-
-func (self *CommitCommands) ShowCmdObj(sha string, filterPath string) oscommands.ICmdObj {
-	contextSize := self.UserConfig.Git.DiffContextSize
-	filterPathArg := ""
-	if filterPath != "" {
-		filterPathArg = fmt.Sprintf(" -- %s", self.cmd.Quote(filterPath))
-	}
-
-	cmdStr := fmt.Sprintf("git show --submodule --color=%s --unified=%d --no-renames --stat -p %s %s", self.UserConfig.Git.Paging.ColorArg, contextSize, sha, filterPathArg)
-	return self.cmd.New(cmdStr).DontLog()
-}
-
-// Revert reverts the selected commit by sha
-func (self *CommitCommands) Revert(sha string) error {
-	return self.cmd.New(fmt.Sprintf("git revert %s", sha)).Run()
-}
-
-func (self *CommitCommands) RevertMerge(sha string, parentNumber int) error {
-	return self.cmd.New(fmt.Sprintf("git revert %s -m %d", sha, parentNumber)).Run()
-}
-
-// CreateFixupCommit creates a commit that fixes up a previous commit
-func (self *CommitCommands) CreateFixupCommit(sha string) error {
-	return self.cmd.New(fmt.Sprintf("git commit --fixup=%s", sha)).Run()
-}

pkg/commands/git_commands/commit_test.go

@@ -1,163 +0,0 @@
-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) {
-	runner := oscommands.NewFakeRunner(t).
-		ExpectGitArgs([]string{"commit", "--allow-empty", "--amend", "--only", "-m", "test"}, "", nil)
-	instance := buildCommitCommands(commonDeps{runner: runner})
-
-	assert.NoError(t, instance.RewordLastCommit("test"))
-	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 TestCommitCommitObj(t *testing.T) {
-	type scenario struct {
-		testName             string
-		message              string
-		configSignoff        bool
-		configSkipHookPrefix string
-		expected             string
-	}
-
-	scenarios := []scenario{
-		{
-			testName:             "Commit",
-			message:              "test",
-			configSignoff:        false,
-			configSkipHookPrefix: "",
-			expected:             `git commit -m "test"`,
-		},
-		{
-			testName:             "Commit with --no-verify flag",
-			message:              "WIP: test",
-			configSignoff:        false,
-			configSkipHookPrefix: "WIP",
-			expected:             `git commit --no-verify -m "WIP: test"`,
-		},
-		{
-			testName:             "Commit with multiline message",
-			message:              "line1\nline2",
-			configSignoff:        false,
-			configSkipHookPrefix: "",
-			expected:             `git commit -m "line1" -m "line2"`,
-		},
-		{
-			testName:             "Commit with signoff",
-			message:              "test",
-			configSignoff:        true,
-			configSkipHookPrefix: "",
-			expected:             `git commit --signoff -m "test"`,
-		},
-		{
-			testName:             "Commit with signoff and no-verify",
-			message:              "WIP: test",
-			configSignoff:        true,
-			configSkipHookPrefix: "WIP",
-			expected:             `git 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
-
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig})
-
-			cmdStr := instance.CommitCmdObj(s.message).ToString()
-			assert.Equal(t, s.expected, cmdStr)
-		})
-	}
-}
-
-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).
-				Expect(`git 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
-		expected    string
-	}
-
-	scenarios := []scenario{
-		{
-			testName:    "Default case without filter path",
-			filterPath:  "",
-			contextSize: 3,
-			expected:    "git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890 ",
-		},
-		{
-			testName:    "Default case with filter path",
-			filterPath:  "file.txt",
-			contextSize: 3,
-			expected:    `git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890  -- "file.txt"`,
-		},
-		{
-			testName:    "Show diff with custom context size",
-			filterPath:  "",
-			contextSize: 77,
-			expected:    "git show --submodule --color=always --unified=77 --no-renames --stat -p 1234567890 ",
-		},
-	}
-
-	for _, s := range scenarios {
-		s := s
-		t.Run(s.testName, func(t *testing.T) {
-			userConfig := config.GetDefaultConfig()
-			userConfig.Git.DiffContextSize = s.contextSize
-
-			instance := buildCommitCommands(commonDeps{userConfig: userConfig})
-
-			cmdStr := instance.ShowCmdObj("1234567890", s.filterPath).ToString()
-			assert.Equal(t, s.expected, cmdStr)
-		})
-	}
-}

pkg/commands/git_commands/common.go

@@ -1,34 +0,0 @@
-package git_commands
-
-import (
-	gogit "github.com/jesseduffield/go-git/v5"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"github.com/jesseduffield/lazygit/pkg/common"
-)
-
-type GitCommon struct {
-	*common.Common
-	cmd       oscommands.ICmdObjBuilder
-	os        *oscommands.OSCommand
-	dotGitDir string
-	repo      *gogit.Repository
-	config    *ConfigCommands
-}
-
-func NewGitCommon(
-	cmn *common.Common,
-	cmd oscommands.ICmdObjBuilder,
-	osCommand *oscommands.OSCommand,
-	dotGitDir string,
-	repo *gogit.Repository,
-	config *ConfigCommands,
-) *GitCommon {
-	return &GitCommon{
-		Common:    cmn,
-		cmd:       cmd,
-		os:        osCommand,
-		dotGitDir: dotGitDir,
-		repo:      repo,
-		config:    config,
-	}
-}

pkg/commands/git_commands/config.go

@@ -1,101 +0,0 @@
-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")
-}

pkg/commands/git_commands/custom.go

@@ -1,18 +0,0 @@
-package git_commands
-
-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(cmdStr).RunWithOutput()
-}

pkg/commands/git_commands/deps_test.go

@@ -1,144 +0,0 @@
-package git_commands
-
-import (
-	"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/loaders"
-	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
-	"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
-	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()
-	}
-
-	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,
-	})
-
-	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) *loaders.FileLoader {
-	return loaders.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 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)
-}

pkg/commands/git_commands/file.go

@@ -1,62 +0,0 @@
-package git_commands
-
-import (
-	"io/ioutil"
-	"strconv"
-
-	"github.com/go-errors/errors"
-	"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 := ioutil.ReadFile(fileName)
-	if err != nil {
-		return "", nil
-	}
-	return string(buf), nil
-}
-
-func (self *FileCommands) GetEditCmdStr(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("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
-	return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil
-}

pkg/commands/git_commands/file_test.go

@@ -1,163 +0,0 @@
-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 TestEditFileCmdStr(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).
-				Expect(`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)
-			},
-		},
-		{
-			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).
-				Expect(`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).
-				Expect(`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)
-			},
-		},
-	}
-
-	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.GetEditCmdStr(s.filename, 1))
-		s.runner.CheckForMissingCalls()
-	}
-}