fix cheatsheet script to support different contexts

2020-02-29 17:41:16 +11:00
492 changed files with 93065 additions and 20252 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,62 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:1.13
+    environment:
+      GO111MODULE: "on"
+    working_directory: /go/src/github.com/jesseduffield/lazygit
+    steps:
+      - checkout
+      - run:
+          name: Run gofmt -s
+          command: |
+            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
+      - restore_cache:
+          keys:
+            - pkg-cache-{{ checksum "go.sum" }}-v5
+      - run:
+          name: Run tests
+          command: |
+            ./test.sh
+      - run:
+          name: Push on codecov result
+          command: |
+            bash <(curl -s https://codecov.io/bash)
+      - run:
+          name: Compile project on every platform
+          command: |
+            go get github.com/mitchellh/gox
+            GOFLAGS=-mod=vendor gox -parallel 10 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"
+      - save_cache:
+          key: pkg-cache-{{ checksum "go.sum" }}-v5
+          paths:
+            - ~/.cache/go-build
+
+  release:
+    docker:
+      - image: circleci/golang:1.13
+    working_directory: /go/src/github.com/jesseduffield/lazygit
+    steps:
+      - checkout
+      - run:
+          name: Run gorelease
+          command: |
+            curl -sL https://git.io/goreleaser | bash
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build
+  release:
+    jobs:
+      - release:
+          filters:
+            tags:
+              only: /v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
--- a/.github/workflows/automerge.yml
+++ b/.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
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,28 +0,0 @@
-name: Continuous Delivery
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  cd:
-    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.14.x
-      - name: Run goreleaser
-        uses: goreleaser/goreleaser-action@v1
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
-      - name: Bump Homebrew
-        uses: dawidd6/action-homebrew-bump-formula@v2
-        with:
-          token: ${{secrets.GITHUB_API_TOKEN}}
-          formula: lazygit
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,36 +0,0 @@
-name: Continuous Integration
-
-on: push
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    env:
-      GOFLAGS: -mod=vendor
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.14.x
-      - name: Cache build
-        uses: actions/cache@v1
-        with:
-          path: ~/.cache/go-build
-          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}
-          restore-keys: |
-            ${{runner.os}}-go-
-      - 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: Test code
-        run: |
-          ./test.sh
-      - name: Build binaries
-        uses: goreleaser/goreleaser-action@v1
-        with:
-          args: --skip-publish --snapshot
--- a/4
+++ b/4
@@ -2,12 +2,12 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh -l

-FROM golang:1.14-alpine3.11
+FROM golang:1.13-alpine3.10
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY ./ .
 RUN CGO_ENABLED=0 GOOS=linux go build

-FROM alpine:3.11
+FROM alpine:3.10
 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
--- a/README.md
+++ b/README.md
@@ -1,56 +1,32 @@
-# lazygit
+# lazygit [![CircleCI](https://circleci.com/gh/jesseduffield/lazygit.svg?style=svg)](https://circleci.com/gh/jesseduffield/lazygit) [![codecov](https://codecov.io/gh/jesseduffield/lazygit/branch/master/graph/badge.svg)](https://codecov.io/gh/jesseduffield/lazygit) [![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)]()

-![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.

-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!*
+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 stepping through each hunk and if a hunk can't be split down any further but contains code you don't want to stage, bad luck? *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](/docs/resources/staging.gif)
+![Gif](/docs/resources/lazygit-example.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)
-  - [Conda](#conda)
-  - [Go](#go)
- [Usage](#usage)
-  - [Keybindings](#keybindings)
-  - [Changing directory on exit](#changing-directory-on-exit)
-  - [Undo/Redo](#undoredo)
- [Configuration](#configuration)
-  - [Custom pagers](#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)
+- [Installation](https://github.com/jesseduffield/lazygit#installation)
+- [Usage](https://github.com/jesseduffield/lazygit#usage),
+  [Keybindings](/docs/keybindings)
+- [Cool Features](https://github.com/jesseduffield/lazygit#cool-features)
+- [Contributing](https://github.com/jesseduffield/lazygit#contributing)
+- [Video Tutorial](https://youtu.be/VDXvbHZYeKY)
+- [Rebase Magic Video Tutorial](https://youtu.be/4XaToVut_hs)
+- [Twitch Stream](https://www.twitch.tv/jesseduffield)

 [<img src="https://i.imgur.com/sVEktDn.png">](https://youtu.be/CPLdltN7wgE)

+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)
+
 ## Installation

-### Binary Releases
-
-For Windows, Mac OS 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
 ```
@@ -62,10 +38,8 @@ brew install lazygit
 ```

 ### MacPorts
-
 Latest version built from github releases.
 Tap:
-
 ```
 sudo port install lazygit
 ```
@@ -89,7 +63,6 @@ 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:
@@ -109,11 +82,11 @@ Packages for Arch Linux are available via 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: <https://aur.archlinux.org/packages/lazygit/>
- Development: <https://aur.archlinux.org/packages/lazygit-git/>
+- Stable: https://aur.archlinux.org/packages/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>
+https://wiki.archlinux.org/index.php/Arch_User_Repository

 ### Fedora and CentOS 7

@@ -126,12 +99,16 @@ sudo dnf install lazygit

 ### Conda

-Released versions are available for different platforms, see <https://anaconda.org/conda-forge/lazygit>
+Released versions are available for different platforms, see https://anaconda.org/conda-forge/lazygit

 ```sh
 conda install -c conda-forge lazygit
 ```

+### Binary Release (Windows/Linux/OSX)
+
+You can download a binary release [here](https://github.com/jesseduffield/lazygit/releases).
+
 ### Go

 ```sh
@@ -144,27 +121,20 @@ 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).

-
 ## Usage

-Call `lazygit` in your terminal inside a git repository.
-
-```sh
-$ lazygit
-```
-
-If you want, you can
+Call `lazygit` in your terminal inside a git repository. 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
+- Basic video tutorial [here](https://youtu.be/VDXvbHZYeKY).
+- Rebase Magic tutorial [here](https://youtu.be/4XaToVut_hs)
+- 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()
 {
@@ -178,28 +148,8 @@ lg()
    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)
-
-## 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
@@ -215,14 +165,14 @@ See the [docs](docs/Custom_Pagers.md)

 ### Interactive Rebasing

-![Interactive Rebasing](/docs/resources/rebase.gif)
+![Interactive Rebasing](/docs/resources/interactive-rebase.png)

 ## 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](/docs/resources/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/zt-5bo2clzo-hB8ZTVN5dWUCqj5QFiQVLA)
+[![Slack](/docs/resources/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/enQtNDE3MjIwNTYyMDA0LTM3Yjk3NzdiYzhhNTA1YjM4Y2M4MWNmNDBkOTI0YTE4YjQ1ZmI2YWRhZTgwNjg2YzhhYjg3NDBlMmQyMTI5N2M)

 ## Donate

--- a/docs/Config.md
+++ b/docs/Config.md
@@ -1,18 +1,17 @@
-# User Config
+# User Config:

 Default path for the config file:

 * Linux: `~/.config/jesseduffield/lazygit/config.yml`
 * MacOS: `~/Library/Application Support/jesseduffield/lazygit/config.yml`

-## Default
+## 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
    theme:
      lightTheme: false # For terminals with a light background
      activeBorderColor:
@@ -28,16 +27,10 @@ Default path for the config file:
      show: true
    mouseEvents: true
    skipUnstageLineWarning: false
-    skipStashWarning: true
  git:
-    paging:
-      colorArg: always
-      useConfig: false
    merging:
      # only applicable to unix users
      manualCommit: false
-      # extra args passed to `git merge`, e.g. --no-ff
-      args: ""
    skipHookPrefix: WIP
    autoFetch: true
  update:
@@ -56,10 +49,6 @@ Default path for the config file:
      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
      prevBlock: '<left>' # goto the previous block / panel
      nextBlock: '<right>' # goto the next block / panel
      prevBlock-alt: 'h' # goto the previous block / panel
@@ -90,11 +79,6 @@ Default path for the config file:
      prevTab: '['
      nextScreenMode: '+'
      prevScreenMode: '_'
-      undo: 'z'
-      redo: '<c-z>'
-      filteringMenu: <c-s>
-      diffingMenu: '<c-e>'
-      copyToClipboard: '<c-o>'
    status:
      checkForUpdate: 'u'
      recentRepos: '<enter>'
@@ -138,8 +122,8 @@ Default path for the config file:
      cherryPickCopyRange: 'C'
      pasteCommits: 'v'
      tagCommit: 'T'
+      toggleDiffCommit: 'i'
      checkoutCommit: '<space>'
-      resetCherryPick: '<c-R>'
    stash:
      popStash: 'g'
    commitFiles:
@@ -149,32 +133,33 @@ Default path for the config file:
      toggleDragSelect-alt: 'V'
      toggleSelectHunk: 'a'
      pickBothHunks: 'b'
+      undo: 'z'
 ```

-## Platform Defaults
+## Platform Defaults:

-### Windows
+### Windows:

 ```yaml
  os:
    openCommand: 'cmd /c "start "" {{filename}}"'
 ```

-### Linux
+### Linux:

 ```yaml
  os:
    openCommand: 'sh -c "xdg-open {{filename}} >/dev/null"'
 ```

-### OSX
+### OSX:

 ```yaml
  os:
    openCommand: 'open {{filename}}'
 ```

-### Recommended Config Values
+### Recommended Config Values:

 for users of VSCode

@@ -183,7 +168,7 @@ for users of VSCode
    openCommand: 'code -r {{filename}}'
 ```

-## Color Attributes
+## Color Attributes:

 For color attributes you can choose an array of attributes (with max one color attribute)
 The available attributes are:
@@ -201,7 +186,7 @@ The available attributes are:
 - reverse # useful for high-contrast
 - underline

-## Light terminal theme
+## Light terminal theme:

 If you have issues with a light terminal theme where you can't read / see the text add these settings

@@ -218,16 +203,15 @@ If you have issues with a light terminal theme where you can't read / see the te
        - blue
 ```

-## Example Coloring
+## Example Coloring:

 ![border example](/docs/resources/colored-border-example.png)

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

-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

+#### Example Keybindings For Colemak Users:
 ```yaml
  keybinding:
    universal:
@@ -254,35 +238,3 @@ For all possible keybinding options, check [Custom_Keybindings.md](https://githu
      viewGitFlowOptions: 'I'
 ```

-## 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] "
-```
--- a/docs/Custom_Pagers.md
+++ b/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 --24-bit-color=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).
--- a/docs/Undoing.md
+++ b/docs/Undoing.md
@@ -1,24 +0,0 @@
-# Undo/Redo in lazygit
-
-![Gif](/docs/resources/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 enough contain 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.
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -10,21 +10,11 @@
  <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
 </pre>

-## Branches Panel
-
-<pre>
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
-</pre>
-
 ## Branches Panel (Branches Tab)

 <pre>
@@ -39,12 +29,6 @@
  <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>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Branches Panel (Remote Branches (in Remotes tab))
@@ -57,11 +41,6 @@
  <kbd>d</kbd>: delete branch
  <kbd>r</kbd>: rebase checked-out branch onto this branch
  <kbd>u</kbd>: set as upstream of checked-out branch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Branches Panel (Remotes Tab)
@@ -71,11 +50,6 @@
  <kbd>n</kbd>: add new remote
  <kbd>d</kbd>: remove remote
  <kbd>e</kbd>: edit remote
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Branches Panel (Tags Tab)
@@ -86,11 +60,6 @@
  <kbd>P</kbd>: push tag
  <kbd>n</kbd>: create tag
  <kbd>g</kbd>: view reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Commit Files Panel
@@ -102,18 +71,6 @@
  <kbd>o</kbd>: open file
  <kbd>space</kbd>: toggle file included in patch
  <kbd>enter</kbd>: enter file to add selected lines to the patch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
-</pre>
-
-## Commits Panel
-
-<pre>
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
 </pre>

 ## Commits Panel (Commits Tab)
@@ -140,12 +97,6 @@
  <kbd>space</kbd>: checkout commit
  <kbd>i</kbd>: select commit to diff with another commit
  <kbd>T</kbd>: tag commit
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Commits Panel (Reflog Tab)
@@ -153,11 +104,6 @@
 <pre>
  <kbd>space</kbd>: checkout commit
  <kbd>g</kbd>: view reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Files Panel
@@ -180,11 +126,6 @@
  <kbd>enter</kbd>: stage individual hunks/lines
  <kbd>f</kbd>: fetch
  <kbd>g</kbd>: view upstream reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Main Panel (Merging)
@@ -215,7 +156,8 @@
  <kbd>▼</kbd>: select next line
  <kbd>◄</kbd>: select previous hunk
  <kbd>►</kbd>: select next hunk
-  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>space</kbd>: stage selection
+  <kbd>d</kbd>: reset selection
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
@@ -225,8 +167,8 @@

 <pre>
  <kbd>esc</kbd>: return to files panel
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
+  <kbd>space</kbd>: stage selection
+  <kbd>d</kbd>: reset selection
  <kbd>tab</kbd>: switch to other panel
  <kbd>▲</kbd>: select previous line
  <kbd>▼</kbd>: select next line
@@ -242,29 +184,12 @@
  <kbd>C</kbd>: commit changes using git editor
 </pre>

-## Menu Panel
-
-<pre>
-  <kbd>esc</kbd>: close menu
-  <kbd>q</kbd>: close menu
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
-</pre>
-
 ## Stash Panel

 <pre>
  <kbd>space</kbd>: apply
  <kbd>g</kbd>: pop
  <kbd>d</kbd>: drop
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Status Panel
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -10,21 +10,11 @@
  <kbd>P</kbd>: push
  <kbd>p</kbd>: pull
  <kbd>R</kbd>: verversen
-  <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>: voor aangepast commando uit
 </pre>

-## Branches Panel
-
-<pre>
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
-</pre>
-
 ## Branches Panel (Branches Tab)

 <pre>
@@ -39,12 +29,6 @@
  <kbd>i</kbd>: show git-flow options
  <kbd>f</kbd>: fast-forward this branch from its upstream
  <kbd>g</kbd>: bekijk reset opties
-  <kbd>R</kbd>: rename branch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Branches Panel (Remote Branches (in Remotes tab))
@@ -57,11 +41,6 @@
  <kbd>d</kbd>: verwijder branch
  <kbd>r</kbd>: rebase branch
  <kbd>u</kbd>: set as upstream of checked-out branch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Branches Panel (Remotes Tab)
@@ -71,11 +50,6 @@
  <kbd>n</kbd>: add new remote
  <kbd>d</kbd>: remove remote
  <kbd>e</kbd>: edit remote
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Branches Panel (Tags Tab)
@@ -86,11 +60,6 @@
  <kbd>P</kbd>: push tag
  <kbd>n</kbd>: create tag
  <kbd>g</kbd>: bekijk reset opties
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Commit bestanden Panel
@@ -102,18 +71,6 @@
  <kbd>o</kbd>: open bestand
  <kbd>space</kbd>: toggle file included in patch
  <kbd>enter</kbd>: enter file to add selected lines to the patch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
-</pre>
-
-## Commits Panel
-
-<pre>
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
 </pre>

 ## Commits Panel (Commits Tab)
@@ -140,12 +97,6 @@
  <kbd>space</kbd>: checkout commit
  <kbd>i</kbd>: select commit to diff with another commit
  <kbd>T</kbd>: tag commit
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Commits Panel (Reflog Tab)
@@ -153,11 +104,6 @@
 <pre>
  <kbd>space</kbd>: checkout commit
  <kbd>g</kbd>: bekijk reset opties
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Bestanden Panel
@@ -180,11 +126,6 @@
  <kbd>enter</kbd>: stage individuele hunks/lijnen
  <kbd>f</kbd>: fetch
  <kbd>g</kbd>: view upstream reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Hoofd Panel (Merging)
@@ -215,7 +156,8 @@
  <kbd>▼</kbd>: selecteer de volgende lijn
  <kbd>◄</kbd>: selecteer de vorige hunk
  <kbd>►</kbd>: selecteer de volgende hunk
-  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>space</kbd>: stage selection
+  <kbd>d</kbd>: reset selection
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
@@ -225,8 +167,8 @@

 <pre>
  <kbd>esc</kbd>: ga terug naar het bestanden paneel
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
+  <kbd>space</kbd>: stage selection
+  <kbd>d</kbd>: reset selection
  <kbd>tab</kbd>: switch to other panel
  <kbd>▲</kbd>: selecteer de vorige lijn
  <kbd>▼</kbd>: selecteer de volgende lijn
@@ -242,29 +184,12 @@
  <kbd>C</kbd>: commit veranderingen met de git editor
 </pre>

-## Menu Panel
-
-<pre>
-  <kbd>esc</kbd>: close menu
-  <kbd>q</kbd>: close menu
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
-</pre>
-
 ## Stash Panel

 <pre>
  <kbd>space</kbd>: toepassen
  <kbd>g</kbd>: pop
  <kbd>d</kbd>: drop
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Status Panel
--- a/docs/keybindings/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md
@@ -10,21 +10,11 @@
  <kbd>P</kbd>: push
  <kbd>p</kbd>: pull
  <kbd>R</kbd>: odśwież
-  <kbd>x</kbd>: open menu
-  <kbd>z</kbd>: undo (via reflog) (experimental)
-  <kbd>ctrl+z</kbd>: redo (via reflog) (experimental)
  <kbd>+</kbd>: next screen mode (normal/half/fullscreen)
  <kbd>_</kbd>: prev screen mode
  <kbd>:</kbd>: execute custom command
 </pre>

-## Gałęzie Panel
-
-<pre>
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
-</pre>
-
 ## Gałęzie Panel (Branches Tab)

 <pre>
@@ -39,12 +29,6 @@
  <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>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Gałęzie Panel (Remote Branches (in Remotes tab))
@@ -57,11 +41,6 @@
  <kbd>d</kbd>: usuń gałąź
  <kbd>r</kbd>: rebase branch
  <kbd>u</kbd>: set as upstream of checked-out branch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Gałęzie Panel (Remotes Tab)
@@ -71,11 +50,6 @@
  <kbd>n</kbd>: add new remote
  <kbd>d</kbd>: remove remote
  <kbd>e</kbd>: edit remote
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Gałęzie Panel (Tags Tab)
@@ -86,11 +60,6 @@
  <kbd>P</kbd>: push tag
  <kbd>n</kbd>: create tag
  <kbd>g</kbd>: view reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Commit files Panel
@@ -102,18 +71,6 @@
  <kbd>o</kbd>: otwórz plik
  <kbd>space</kbd>: toggle file included in patch
  <kbd>enter</kbd>: enter file to add selected lines to the patch
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
-</pre>
-
-## Commity Panel
-
-<pre>
-  <kbd>]</kbd>: next tab
-  <kbd>[</kbd>: previous tab
 </pre>

 ## Commity Panel (Commits Tab)
@@ -140,12 +97,6 @@
  <kbd>space</kbd>: checkout commit
  <kbd>i</kbd>: select commit to diff with another commit
  <kbd>T</kbd>: tag commit
-  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Commity Panel (Reflog Tab)
@@ -153,11 +104,6 @@
 <pre>
  <kbd>space</kbd>: checkout commit
  <kbd>g</kbd>: view reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Pliki Panel
@@ -180,11 +126,6 @@
  <kbd>enter</kbd>: zatwierdź pojedyncze linie
  <kbd>f</kbd>: fetch
  <kbd>g</kbd>: view upstream reset options
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Main Panel (Merging)
@@ -197,7 +138,7 @@
  <kbd>►</kbd>: select next conflict
  <kbd>▲</kbd>: select top hunk
  <kbd>▼</kbd>: select bottom hunk
-  <kbd>z</kbd>: cofnij
+  <kbd>z</kbd>: undo
 </pre>

 ## Main Panel (Normal)
@@ -215,7 +156,8 @@
  <kbd>▼</kbd>: select next line
  <kbd>◄</kbd>: select previous hunk
  <kbd>►</kbd>: select next hunk
-  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>space</kbd>: stage selection
+  <kbd>d</kbd>: reset selection
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
@@ -225,8 +167,8 @@

 <pre>
  <kbd>esc</kbd>: wróć do panelu plików
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
+  <kbd>space</kbd>: stage selection
+  <kbd>d</kbd>: reset selection
  <kbd>tab</kbd>: switch to other panel
  <kbd>▲</kbd>: select previous line
  <kbd>▼</kbd>: select next line
@@ -242,29 +184,12 @@
  <kbd>C</kbd>: commituj zmiany używając edytora z gita
 </pre>

-## Menu Panel
-
-<pre>
-  <kbd>esc</kbd>: close menu
-  <kbd>q</kbd>: close menu
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
-</pre>
-
 ## Schowek Panel

 <pre>
  <kbd>space</kbd>: zastosuj
  <kbd>g</kbd>: wyciągnij
  <kbd>d</kbd>: porzuć
-  <kbd>,</kbd>: previous page
-  <kbd>.</kbd>: next page
-  <kbd><</kbd>: scroll to top
-  <kbd>/</kbd>: start search
-  <kbd>></kbd>: scroll to bottom
 </pre>

 ## Status Panel
--- a/docs/resources/interactive-rebase.png
+++ b/docs/resources/interactive-rebase.png
--- a/docs/resources/rebase.gif
+++ b/docs/resources/rebase.gif
--- a/docs/resources/staging.gif
+++ b/docs/resources/staging.gif
--- a/docs/resources/undo2.gif
+++ b/docs/resources/undo2.gif
--- a/go.mod
+++ b/go.mod
@@ -1,19 +1,19 @@
 module github.com/jesseduffield/lazygit

-go 1.14
+go 1.13

 require (
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
-	github.com/creack/pty v1.1.10-0.20191209115840-8ab47f72e854
 	github.com/fatih/color v1.7.0
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/go-errors/errors v1.0.1
-	github.com/go-git/go-git/v5 v5.0.0
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/integrii/flaggy v1.4.0
-	github.com/jesseduffield/gocui v0.3.1-0.20200309001002-7765949e1c8a
+	github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed
+	github.com/jesseduffield/pty v1.2.1
+	github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 // indirect
 	github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9 // indirect
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
@@ -34,6 +34,11 @@ require (
 	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
 	github.com/stretchr/testify v1.4.0
 	github.com/tcnksm/go-gitconfig v0.1.2
+	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
+	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
 	golang.org/x/text v0.3.2
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v2 v2.2.7
 )
--- a/go.sum
+++ b/go.sum
@@ -23,9 +23,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.10-0.20191209115840-8ab47f72e854 h1:NB4neYMzyBsw52kUdkTrQm4Q05ErObCdwLvJptpfJSc=
-github.com/creack/pty v1.1.10-0.20191209115840-8ab47f72e854/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 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=
@@ -44,14 +42,6 @@ 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.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-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.1 h1:q+IFMfLx200Q3scvt2hN79JsEzy4AmBTp/pqnefH+Bc=
-github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
-github.com/go-git/go-git/v5 v5.0.0 h1:k5RWPm4iJwYtfWoxIJy4wJX9ON7ihPeZZYC1fLYDnpg=
-github.com/go-git/go-git/v5 v5.0.0/go.mod h1:oYD8y9kWsGINPFJoLdaScGCN6dlKg23blmClfZwtUVA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -64,6 +54,7 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/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=
@@ -86,8 +77,28 @@ 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/gocui v0.3.1-0.20200309001002-7765949e1c8a h1:JSORQue6V4bMppr22dtUuYX+w79cgupo66PcGZ9ijlU=
-github.com/jesseduffield/gocui v0.3.1-0.20200309001002-7765949e1c8a/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532 h1:V1Lk2rm5/p27NjnlF2ezzkxDaisHNcveMNueSD7RYgs=
+github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200112025325-6c933915c351 h1:+sSqd2YotacWt+1MNRN8ZmXnYoiJeblZeptzKiHIyv0=
+github.com/jesseduffield/gocui v0.3.1-0.20200112025325-6c933915c351/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200131125953-f679540a7039 h1:CVhilJ8ZdN7GmAI+fbH9829Cp/8hbK7Lijbd4VaNgo0=
+github.com/jesseduffield/gocui v0.3.1-0.20200131125953-f679540a7039/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200131131454-a319843434ac h1:vp7I0RpFq4L46nFA9QQokzhFgr68LRGtwDO9xfq4F+A=
+github.com/jesseduffield/gocui v0.3.1-0.20200131131454-a319843434ac/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200201013258-57fdcf23edc5 h1:tE0w3tuL/bj1o5VMhjjE0ep6i7Fva+RYjKcMFcniJEY=
+github.com/jesseduffield/gocui v0.3.1-0.20200201013258-57fdcf23edc5/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200223105115-3e1f0f7c3efe h1:UQyebauOcBzbGq32kTXwEyuJaqp3BkI8JoCrGs2jijU=
+github.com/jesseduffield/gocui v0.3.1-0.20200223105115-3e1f0f7c3efe/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed h1:glGs+mzPZOl1iHiUsBW3918WeFwqsbQQ/jtLkkQXDi4=
+github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/pty v1.2.1 h1:7xYBiwNH0PpWqC8JmvrPq1a/ksNqyCavzWu9pbBGYWI=
+github.com/jesseduffield/pty v1.2.1/go.mod h1:7jlS40+UhOqkZJDIG1B/H21xnuET/+fvbbnHCa8wSIo=
+github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 h1:+JaOkfBNYQYlGD7dgru8mCwYNEc5tRRI8mThlVANhSM=
+github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00/go.mod h1:cWNQljQAWYBp4wchyGfql4q2jRNZXxiE1KhVQgz+JaM=
+github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 h1:CRD7bVjlGIiV+M0jlsa+XWpneW0KY0e7Y4z3GWb5S4o=
+github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7/go.mod h1:VspA3aTkEo0Q7TPCLmX1uHNP+Wb4iSDX09hmTRo1QYc=
+github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e h1:tth7wr6+sfSbdpRWWrwvLYyS56HyIRVfq0Qcl2h28wM=
+github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e/go.mod h1:anMibpZtqNxjDbxrcDEAwSdaJ37vyUeM1f/M4uekib4=
 github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9 h1:iBBk1lhFwjwJw//J2m1yyz9S368GeXQTpMVACTyQMh0=
 github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9/go.mod h1:anMibpZtqNxjDbxrcDEAwSdaJ37vyUeM1f/M4uekib4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -101,6 +112,7 @@ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 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=
@@ -108,10 +120,9 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 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/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 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/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
@@ -119,6 +130,8 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
 github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -131,14 +144,14 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nicksnyder/go-i18n/v2 v2.0.3 h1:ks/JkQiOEhhuF6jpNvx+Wih1NIiXzUnZeZVnJuI8R8M=
 github.com/nicksnyder/go-i18n/v2 v2.0.3/go.mod h1:oDab7q8XCYMRlcrBnaY/7B1eOectbvj6B1UPBT+p5jo=
-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/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 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/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
+github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4=
 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
@@ -157,11 +170,12 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-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/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 h1:Xuk8ma/ibJ1fOy4Ee11vHhUFHQNpHhrBneOCNHVXS5w=
 github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0/go.mod h1:7AwjWCpdPhkSmNAgUv5C7EJ4AbmjEB3r047r3DXWu3Y=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
@@ -170,14 +184,17 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -185,9 +202,13 @@ github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
 github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 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/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
@@ -208,8 +229,10 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 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-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -220,8 +243,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -238,9 +264,11 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 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-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/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 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 h1:gSbV7h1NRL2G1xTg/owz62CST1oJBmxy4QpMMregXVQ=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -251,22 +279,28 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 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/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
+gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
+gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
+gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
 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=
--- a/main.go
+++ b/main.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path/filepath"
 	"runtime"

 	"github.com/go-errors/errors"
@@ -19,15 +20,17 @@ var (
 	buildSource = "unknown"
 )

+func projectPath(path string) string {
+	gopath := os.Getenv("GOPATH")
+	return filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/" + path)
+}
+
 func main() {
 	flaggy.DefaultParser.ShowVersionWithVersionFlag = false

 	repoPath := "."
 	flaggy.String(&repoPath, "p", "path", "Path of git repo")

-	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
@@ -64,7 +67,7 @@ func main() {
 		log.Fatal(err.Error())
 	}

-	app, err := app.NewApp(appConfig, filterPath)
+	app, err := app.NewApp(appConfig)

 	if err == nil {
 		err = app.Run()
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -91,7 +91,7 @@ func newLogger(config config.AppConfigurer) *logrus.Entry {
 }

 // NewApp bootstrap a new application
-func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
+func NewApp(config config.AppConfigurer) (*App, error) {
 	app := &App{
 		closers: []io.Closer{},
 		Config:  config,
@@ -121,7 +121,7 @@ func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
 	if err != nil {
 		return app, err
 	}
-	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater, filterPath)
+	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater)
 	if err != nil {
 		return app, err
 	}
--- a/pkg/commands/branch.go
+++ b/pkg/commands/branch.go
@@ -3,12 +3,8 @@ package commands
 // Branch : A git branch
 // duplicating this for now
 type Branch struct {
-	Name string
-	// the displayname is something like '(HEAD detached at 123asdf)', whereas in that case the name would be '123asdf'
-	DisplayName  string
-	Recency      string
-	Pushables    string
-	Pullables    string
-	UpstreamName string
-	Head         bool
+	Name      string
+	Recency   string
+	Pushables string
+	Pullables string
 }
--- a/pkg/commands/branch_list_builder.go
+++ b/pkg/commands/branch_list_builder.go
@@ -5,7 +5,10 @@ import (
 	"strings"

 	"github.com/jesseduffield/lazygit/pkg/utils"
+
 	"github.com/sirupsen/logrus"
+
+	"gopkg.in/src-d/go-git.v4/plumbing"
 )

 // context:
@@ -21,140 +24,151 @@ import (

 // BranchListBuilder returns a list of Branch objects for the current repo
 type BranchListBuilder struct {
-	Log           *logrus.Entry
-	GitCommand    *GitCommand
-	ReflogCommits []*Commit
+	Log        *logrus.Entry
+	GitCommand *GitCommand
 }

 // NewBranchListBuilder builds a new branch list builder
-func NewBranchListBuilder(log *logrus.Entry, gitCommand *GitCommand, reflogCommits []*Commit) (*BranchListBuilder, error) {
+func NewBranchListBuilder(log *logrus.Entry, gitCommand *GitCommand) (*BranchListBuilder, error) {
 	return &BranchListBuilder{
-		Log:           log,
-		GitCommand:    gitCommand,
-		ReflogCommits: reflogCommits,
+		Log:        log,
+		GitCommand: gitCommand,
 	}, nil
 }

-func (b *BranchListBuilder) obtainBranches() []*Branch {
-	cmdStr := `git for-each-ref --sort=-committerdate --format="%(HEAD)|%(refname:short)|%(upstream:short)|%(upstream:track)" refs/heads`
-	output, err := b.GitCommand.OSCommand.RunCommandWithOutput(cmdStr)
+func (b *BranchListBuilder) obtainCurrentBranch() *Branch {
+	branchName, err := b.GitCommand.CurrentBranchName()
+	if err != nil {
+		panic(err.Error())
+	}
+
+	return &Branch{Name: strings.TrimSpace(branchName)}
+}
+
+func (b *BranchListBuilder) obtainReflogBranches() []*Branch {
+	branches := make([]*Branch, 0)
+	// if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string
+	unescaped := "git reflog --date=relative --pretty='%gd|%gs' --grep-reflog='checkout: moving' HEAD"
+	rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput(unescaped)
+	if err != nil {
+		return branches
+	}
+
+	branchLines := utils.SplitLines(rawString)
+	for _, line := range branchLines {
+		recency, branchName := branchInfoFromLine(line)
+		if branchName == "" {
+			continue
+		}
+		branch := &Branch{Name: branchName, Recency: recency}
+		branches = append(branches, branch)
+	}
+	return uniqueByName(branches)
+}
+
+func (b *BranchListBuilder) obtainSafeBranches() []*Branch {
+	branches := make([]*Branch, 0)
+
+	bIter, err := b.GitCommand.Repo.Branches()
 	if err != nil {
 		panic(err)
 	}
-
-	trimmedOutput := strings.TrimSpace(output)
-	outputLines := strings.Split(trimmedOutput, "\n")
-	branches := make([]*Branch, 0, len(outputLines))
-	for _, line := range outputLines {
-		if line == "" {
-			continue
-		}
-
-		split := strings.Split(line, SEPARATION_CHAR)
-
-		name := split[1]
-		branch := &Branch{
-			Name:      name,
-			Pullables: "?",
-			Pushables: "?",
-			Head:      split[0] == "*",
-		}
-
-		upstreamName := split[2]
-		if upstreamName == "" {
-			branches = append(branches, branch)
-			continue
-		}
-
-		branch.UpstreamName = upstreamName
-
-		track := split[3]
-		re := regexp.MustCompile(`ahead (\d+)`)
-		match := re.FindStringSubmatch(track)
-		if len(match) > 1 {
-			branch.Pushables = match[1]
-		} else {
-			branch.Pushables = "0"
-		}
-
-		re = regexp.MustCompile(`behind (\d+)`)
-		match = re.FindStringSubmatch(track)
-		if len(match) > 1 {
-			branch.Pullables = match[1]
-		} else {
-			branch.Pullables = "0"
-		}
-
-		branches = append(branches, branch)
-	}
+	bIter.ForEach(func(b *plumbing.Reference) error {
+		name := b.Name().Short()
+		branches = append(branches, &Branch{Name: name})
+		return nil
+	})

 	return branches
 }

+func (b *BranchListBuilder) appendNewBranches(finalBranches, newBranches, existingBranches []*Branch, included bool) []*Branch {
+	for _, newBranch := range newBranches {
+		if included == branchIncluded(newBranch.Name, existingBranches) {
+			finalBranches = append(finalBranches, newBranch)
+		}
+	}
+	return finalBranches
+}
+
+func sanitisedReflogName(reflogBranch *Branch, safeBranches []*Branch) string {
+	for _, safeBranch := range safeBranches {
+		if strings.ToLower(safeBranch.Name) == strings.ToLower(reflogBranch.Name) {
+			return safeBranch.Name
+		}
+	}
+	return reflogBranch.Name
+}
+
 // Build the list of branches for the current repo
 func (b *BranchListBuilder) Build() []*Branch {
-	branches := b.obtainBranches()
+	branches := make([]*Branch, 0)
+	head := b.obtainCurrentBranch()
+	safeBranches := b.obtainSafeBranches()

 	reflogBranches := b.obtainReflogBranches()
-
-	// loop through reflog branches. If there is a match, merge them, then remove it from the branches and keep it in the reflog branches
-	branchesWithRecency := make([]*Branch, 0)
-outer:
-	for _, reflogBranch := range reflogBranches {
-		for j, branch := range branches {
-			if branch.Head {
-				continue
-			}
-			if strings.EqualFold(reflogBranch.Name, branch.Name) {
-				branch.Recency = reflogBranch.Recency
-				branchesWithRecency = append(branchesWithRecency, branch)
-				branches = append(branches[0:j], branches[j+1:]...)
-				continue outer
-			}
-		}
+	for i, reflogBranch := range reflogBranches {
+		reflogBranches[i].Name = sanitisedReflogName(reflogBranch, safeBranches)
 	}

-	branches = append(branchesWithRecency, branches...)
+	branches = b.appendNewBranches(branches, reflogBranches, safeBranches, true)
+	branches = b.appendNewBranches(branches, safeBranches, branches, false)

-	foundHead := false
-	for i, branch := range branches {
-		if branch.Head {
-			foundHead = true
-			branch.Recency = "  *"
-			branches = append(branches[0:i], branches[i+1:]...)
-			branches = append([]*Branch{branch}, branches...)
-			break
-		}
-	}
-	if !foundHead {
-		currentBranchName, currentBranchDisplayName, err := b.GitCommand.CurrentBranchName()
-		if err != nil {
-			panic(err)
-		}
-		branches = append([]*Branch{{Name: currentBranchName, DisplayName: currentBranchDisplayName, Head: true, Recency: "  *"}}, branches...)
+	if len(branches) == 0 || branches[0].Name != head.Name {
+		branches = append([]*Branch{head}, branches...)
 	}
+
+	branches[0].Recency = "  *"
+
 	return branches
 }

-// TODO: only look at the new reflog commits, and otherwise store the recencies in
-// int form against the branch to recalculate the time ago
-func (b *BranchListBuilder) obtainReflogBranches() []*Branch {
-	foundBranchesMap := map[string]bool{}
-	re := regexp.MustCompile(`checkout: moving from ([\S]+) to ([\S]+)`)
-	reflogBranches := make([]*Branch, 0, len(b.ReflogCommits))
-	for _, commit := range b.ReflogCommits {
-		if match := re.FindStringSubmatch(commit.Name); len(match) == 3 {
-			recency := utils.UnixToTimeAgo(commit.UnixTimestamp)
-			for _, branchName := range match[1:] {
-				if !foundBranchesMap[branchName] {
-					foundBranchesMap[branchName] = true
-					reflogBranches = append(reflogBranches, &Branch{
-						Recency: recency,
-						Name:    branchName,
-					})
-				}
-			}
+func branchIncluded(branchName string, branches []*Branch) bool {
+	for _, existingBranch := range branches {
+		if strings.ToLower(existingBranch.Name) == strings.ToLower(branchName) {
+			return true
 		}
 	}
-	return reflogBranches
+	return false
+}
+
+func uniqueByName(branches []*Branch) []*Branch {
+	finalBranches := make([]*Branch, 0)
+	for _, branch := range branches {
+		if branchIncluded(branch.Name, finalBranches) {
+			continue
+		}
+		finalBranches = append(finalBranches, branch)
+	}
+	return finalBranches
+}
+
+// A line will have the form '10 days ago master' so we need to strip out the
+// useful information from that into timeNumber, timeUnit, and branchName
+func branchInfoFromLine(line string) (string, string) {
+	// example line: HEAD@{12 minutes ago}|checkout: moving from pulling-from-forks to tim77-patch-1
+	r := regexp.MustCompile(`HEAD\@\{([^\s]+) ([^\s]+) ago\}\|.*?([^\s]*)$`)
+	matches := r.FindStringSubmatch(strings.TrimSpace(line))
+	if len(matches) == 0 {
+		return "", ""
+	}
+	since := matches[1]
+	unit := matches[2]
+	branchName := matches[3]
+	return since + abbreviatedTimeUnit(unit), branchName
+}
+
+func abbreviatedTimeUnit(timeUnit string) string {
+	r := regexp.MustCompile("s$")
+	timeUnit = r.ReplaceAllString(timeUnit, "")
+	timeUnitMap := map[string]string{
+		"hour":   "h",
+		"minute": "m",
+		"second": "s",
+		"week":   "w",
+		"year":   "y",
+		"day":    "d",
+		"month":  "m",
+	}
+	return timeUnitMap[timeUnit]
 }
--- a/pkg/commands/commit.go
+++ b/pkg/commands/commit.go
@@ -5,16 +5,11 @@ type Commit struct {
 	Sha           string
 	Name          string
 	Status        string // one of "unpushed", "pushed", "merged", "rebasing" or "selected"
+	DisplayString string
 	Action        string // one of "", "pick", "edit", "squash", "reword", "drop", "fixup"
+	Copied        bool   // to know if this commit is ready to be cherry-picked somewhere
 	Tags          []string
 	ExtraInfo     string // something like 'HEAD -> master, tag: v0.15.2'
 	Author        string
-	UnixTimestamp int64
-}
-
-func (c *Commit) ShortSha() string {
-	if len(c.Sha) < 8 {
-		return c.Sha
-	}
-	return c.Sha[:8]
+	Date          string
 }
--- a/pkg/commands/commit_list_builder.go
+++ b/pkg/commands/commit_list_builder.go
@@ -4,10 +4,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"

 	"github.com/fatih/color"
@@ -34,16 +32,18 @@ type CommitListBuilder struct {
 	OSCommand           *OSCommand
 	Tr                  *i18n.Localizer
 	CherryPickedCommits []*Commit
+	DiffEntries         []*Commit
 }

 // NewCommitListBuilder builds a new commit list builder
-func NewCommitListBuilder(log *logrus.Entry, gitCommand *GitCommand, osCommand *OSCommand, tr *i18n.Localizer, cherryPickedCommits []*Commit) (*CommitListBuilder, error) {
+func NewCommitListBuilder(log *logrus.Entry, gitCommand *GitCommand, osCommand *OSCommand, tr *i18n.Localizer, cherryPickedCommits []*Commit, diffEntries []*Commit) (*CommitListBuilder, error) {
 	return &CommitListBuilder{
 		Log:                 log,
 		GitCommand:          gitCommand,
 		OSCommand:           osCommand,
 		Tr:                  tr,
 		CherryPickedCommits: cherryPickedCommits,
+		DiffEntries:         diffEntries,
 	}, nil
 }

@@ -55,7 +55,7 @@ func (c *CommitListBuilder) extractCommitFromLine(line string) *Commit {
 	split := strings.Split(line, SEPARATION_CHAR)

 	sha := split[0]
-	unixTimestamp := split[1]
+	date := split[1]
 	author := split[2]
 	extraInfo := strings.TrimSpace(split[3])
 	message := strings.Join(split[4:], SEPARATION_CHAR)
@@ -69,32 +69,26 @@ func (c *CommitListBuilder) extractCommitFromLine(line string) *Commit {
 		}
 	}

-	unitTimestampInt, _ := strconv.Atoi(unixTimestamp)
-
 	return &Commit{
 		Sha:           sha,
 		Name:          message,
+		DisplayString: line,
 		Tags:          tags,
 		ExtraInfo:     extraInfo,
-		UnixTimestamp: int64(unitTimestampInt),
+		Date:          date,
 		Author:        author,
 	}
 }

-type GetCommitsOptions struct {
-	Limit      bool
-	FilterPath string
-}
-
 // GetCommits obtains the commits of the current branch
-func (c *CommitListBuilder) GetCommits(options GetCommitsOptions) ([]*Commit, error) {
+func (c *CommitListBuilder) GetCommits(limit bool) ([]*Commit, error) {
 	commits := []*Commit{}
 	var rebasingCommits []*Commit
 	rebaseMode, err := c.GitCommand.RebaseMode()
 	if err != nil {
 		return nil, err
 	}
-	if rebaseMode != "" && options.FilterPath == "" {
+	if rebaseMode != "" {
 		// here we want to also prepend the commits that we're in the process of rebasing
 		rebasingCommits, err = c.getRebasingCommits(rebaseMode)
 		if err != nil {
@@ -106,21 +100,15 @@ func (c *CommitListBuilder) GetCommits(options GetCommitsOptions) ([]*Commit, er
 	}

 	unpushedCommits := c.getUnpushedCommits()
-	cmd := c.getLogCmd(options)
+	log := c.getLog(limit)

-	err = RunLineOutputCmd(cmd, func(line string) (bool, error) {
-		if strings.Split(line, " ")[0] != "gpg:" {
-			commit := c.extractCommitFromLine(line)
-			_, unpushed := unpushedCommits[commit.ShortSha()]
-			commit.Status = map[bool]string{true: "unpushed", false: "pushed"}[unpushed]
-			commits = append(commits, commit)
-		}
-		return false, nil
-	})
-	if err != nil {
-		return nil, err
+	// now we can split it up and turn it into commits
+	for _, line := range utils.SplitLines(log) {
+		commit := c.extractCommitFromLine(line)
+		_, unpushed := unpushedCommits[commit.Sha[:8]]
+		commit.Status = map[bool]string{true: "unpushed", false: "pushed"}[unpushed]
+		commits = append(commits, commit)
 	}
-
 	if rebaseMode != "" {
 		currentCommit := commits[len(rebasingCommits)]
 		blue := color.New(color.FgYellow)
@@ -133,6 +121,19 @@ func (c *CommitListBuilder) GetCommits(options GetCommitsOptions) ([]*Commit, er
 		return nil, err
 	}

+	commits, err = c.setCommitCherryPickStatuses(commits)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, commit := range commits {
+		for _, entry := range c.DiffEntries {
+			if entry.Sha == commit.Sha {
+				commit.Status = "selected"
+			}
+		}
+	}
+
 	return commits, nil
 }

@@ -266,8 +267,19 @@ func (c *CommitListBuilder) setCommitMergedStatuses(commits []*Commit) ([]*Commi
 	return commits, nil
 }

+func (c *CommitListBuilder) setCommitCherryPickStatuses(commits []*Commit) ([]*Commit, error) {
+	for _, commit := range commits {
+		for _, cherryPickedCommit := range c.CherryPickedCommits {
+			if commit.Sha == cherryPickedCommit.Sha {
+				commit.Copied = true
+			}
+		}
+	}
+	return commits, nil
+}
+
 func (c *CommitListBuilder) getMergeBase() (string, error) {
-	currentBranch, _, err := c.GitCommand.CurrentBranchName()
+	currentBranch, err := c.GitCommand.CurrentBranchName()
 	if err != nil {
 		return "", err
 	}
@@ -298,16 +310,18 @@ func (c *CommitListBuilder) getUnpushedCommits() map[string]bool {
 }

 // getLog gets the git log.
-func (c *CommitListBuilder) getLogCmd(options GetCommitsOptions) *exec.Cmd {
+func (c *CommitListBuilder) getLog(limit bool) string {
 	limitFlag := ""
-	if options.Limit {
-		limitFlag = "-300"
+	if limit {
+		limitFlag = "-30"
 	}

-	filterFlag := ""
-	if options.FilterPath != "" {
-		filterFlag = fmt.Sprintf(" --follow -- %s", c.OSCommand.Quote(options.FilterPath))
+	result, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git log --oneline --pretty=format:\"%%H%s%%ar%s%%aN%s%%d%s%%s\" %s --abbrev=%d", SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, limitFlag, 20))
+
+	if err != nil {
+		// assume if there is an error there are no commits yet for this branch
+		return ""
 	}

-	return c.OSCommand.ExecutableFromString(fmt.Sprintf("git log --oneline --pretty=format:\"%%H%s%%at%s%%aN%s%%d%s%%s\" %s --abbrev=%d --date=unix %s", SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, limitFlag, 20, filterFlag))
+	return result
 }
--- a/pkg/commands/exec_live_default.go
+++ b/pkg/commands/exec_live_default.go
@@ -10,7 +10,7 @@ import (

 	"github.com/go-errors/errors"

-	"github.com/creack/pty"
+	"github.com/jesseduffield/pty"
 )

 // RunCommandWithOutputLiveWrapper runs a command and return every word that gets written in stdout
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
 	"time"

@@ -15,12 +14,12 @@ import (

 	"github.com/go-errors/errors"

-	gogit "github.com/go-git/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/sirupsen/logrus"
 	gitconfig "github.com/tcnksm/go-gitconfig"
+	gogit "gopkg.in/src-d/go-git.v4"
 )

 // this takes something like:
@@ -156,7 +155,9 @@ func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filenam
 	return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
 }

-func (c *GitCommand) getUnfilteredStashEntries() []*StashEntry {
+// GetStashEntries stash entries
+func (c *GitCommand) GetStashEntries() []*StashEntry {
+	// if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string
 	unescaped := "git stash list --pretty='%gs'"
 	rawString, _ := c.OSCommand.RunCommandWithOutput(unescaped)
 	stashEntries := []*StashEntry{}
@@ -166,55 +167,17 @@ func (c *GitCommand) getUnfilteredStashEntries() []*StashEntry {
 	return stashEntries
 }

-// GetStashEntries stash entries
-func (c *GitCommand) GetStashEntries(filterPath string) []*StashEntry {
-	if filterPath == "" {
-		return c.getUnfilteredStashEntries()
-	}
-
-	unescaped := fmt.Sprintf("git stash list --name-only")
-	rawString, err := c.OSCommand.RunCommandWithOutput(unescaped)
-	if err != nil {
-		return c.getUnfilteredStashEntries()
-	}
-	stashEntries := []*StashEntry{}
-	var currentStashEntry *StashEntry
-	lines := utils.SplitLines(rawString)
-	isAStash := func(line string) bool { return strings.HasPrefix(line, "stash@{") }
-	re := regexp.MustCompile(`stash@\{(\d+)\}`)
-
-outer:
-	for i := 0; i < len(lines); i++ {
-		if !isAStash(lines[i]) {
-			continue
-		}
-		match := re.FindStringSubmatch(lines[i])
-		idx, err := strconv.Atoi(match[1])
-		if err != nil {
-			return c.getUnfilteredStashEntries()
-		}
-		currentStashEntry = stashEntryFromLine(lines[i], idx)
-		for i+1 < len(lines) && !isAStash(lines[i+1]) {
-			i++
-			if lines[i] == filterPath {
-				stashEntries = append(stashEntries, currentStashEntry)
-				continue outer
-			}
-		}
-	}
-	return stashEntries
-}
-
 func stashEntryFromLine(line string, index int) *StashEntry {
 	return &StashEntry{
-		Name:  line,
-		Index: index,
+		Name:          line,
+		Index:         index,
+		DisplayString: line,
 	}
 }

 // GetStashEntryDiff stash diff
 func (c *GitCommand) ShowStashEntryCmdStr(index int) string {
-	return fmt.Sprintf("git stash show -p --color=%s stash@{%d}", c.colorArg(), index)
+	return fmt.Sprintf("git stash show -p --color stash@{%d}", index)
 }

 // GetStatusFiles git status files
@@ -358,38 +321,28 @@ func (c *GitCommand) Fetch(unamePassQuestion func(string) string, canAskForCrede
 }

 // ResetToCommit reset to commit
-func (c *GitCommand) ResetToCommit(sha string, strength string, options RunCommandOptions) error {
-	return c.OSCommand.RunCommandWithOptions(fmt.Sprintf("git reset --%s %s", strength, sha), options)
+func (c *GitCommand) ResetToCommit(sha string, strength string) error {
+	return c.OSCommand.RunCommand("git reset --%s %s", strength, sha)
 }

 // NewBranch create new branch
-func (c *GitCommand) NewBranch(name string, baseBranch string) error {
-	return c.OSCommand.RunCommand("git checkout -b %s %s", name, baseBranch)
+func (c *GitCommand) NewBranch(name string) error {
+	return c.OSCommand.RunCommand("git checkout -b %s", name)
 }

-// CurrentBranchName get the current branch name and displayname.
-// the first returned string is the name and the second is the displayname
-// e.g. name is 123asdf and displayname is '(HEAD detached at 123asdf)'
-func (c *GitCommand) CurrentBranchName() (string, string, error) {
+// CurrentBranchName is a function.
+func (c *GitCommand) CurrentBranchName() (string, error) {
 	branchName, err := c.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
-	if err == nil && branchName != "HEAD\n" {
-		trimmedBranchName := strings.TrimSpace(branchName)
-		return trimmedBranchName, trimmedBranchName, nil
-	}
-	output, err := c.OSCommand.RunCommandWithOutput("git branch --contains")
-	if err != nil {
-		return "", "", err
-	}
-	for _, line := range utils.SplitLines(output) {
-		re := regexp.MustCompile(CurrentBranchNameRegex)
-		match := re.FindStringSubmatch(line)
-		if len(match) > 0 {
-			branchName = match[1]
-			displayBranchName := match[0][2:]
-			return branchName, displayBranchName, nil
+	if err != nil || branchName == "HEAD\n" {
+		output, err := c.OSCommand.RunCommandWithOutput("git branch --contains")
+		if err != nil {
+			return "", err
 		}
+		re := regexp.MustCompile(CurrentBranchNameRegex)
+		match := re.FindStringSubmatch(output)
+		branchName = match[1]
 	}
-	return "HEAD", "HEAD", nil
+	return utils.TrimTrailingNewline(branchName), nil
 }

 // DeleteBranch delete branch
@@ -410,8 +363,7 @@ func (c *GitCommand) ListStash() (string, error) {

 // Merge merge
 func (c *GitCommand) Merge(branchName string) error {
-	mergeArgs := c.Config.GetUserConfig().GetString("git.merging.args")
-	return c.OSCommand.RunCommand("git merge --no-edit %s %s", mergeArgs, branchName)
+	return c.OSCommand.RunCommand("git merge --no-edit %s", branchName)
 }

 // AbortMerge abort merge
@@ -521,7 +473,11 @@ func (c *GitCommand) GitStatus() (string, error) {

 // IsInMergeState states whether we are still mid-merge
 func (c *GitCommand) IsInMergeState() (bool, error) {
-	return c.OSCommand.FileExists(fmt.Sprintf("%s/MERGE_HEAD", c.DotGitDir))
+	output, err := c.OSCommand.RunCommandWithOutput("git status --untracked-files=all")
+	if err != nil {
+		return false, err
+	}
+	return strings.Contains(output, "conclude merge") || strings.Contains(output, "unmerged paths"), nil
 }

 // RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
@@ -565,17 +521,12 @@ func (c *GitCommand) DiscardUnstagedFileChanges(file *File) error {
 }

 // Checkout checks out a branch (or commit), with --force if you set the force arg to true
-type CheckoutOptions struct {
-	Force   bool
-	EnvVars []string
-}
-
-func (c *GitCommand) Checkout(branch string, options CheckoutOptions) error {
+func (c *GitCommand) Checkout(branch string, force bool) error {
 	forceArg := ""
-	if options.Force {
+	if force {
 		forceArg = "--force "
 	}
-	return c.OSCommand.RunCommandWithOptions(fmt.Sprintf("git checkout %s %s", forceArg, branch), RunCommandOptions{EnvVars: options.EnvVars})
+	return c.OSCommand.RunCommand("git checkout %s %s", forceArg, branch)
 }

 // PrepareCommitSubProcess prepares a subprocess for `git commit`
@@ -606,16 +557,12 @@ func (c *GitCommand) Ignore(filename string) error {
 	return c.OSCommand.AppendLineToFile(".gitignore", filename)
 }

-func (c *GitCommand) ShowCmdStr(sha string, filterPath string) string {
-	filterPathArg := ""
-	if filterPath != "" {
-		filterPathArg = fmt.Sprintf(" -- %s", c.OSCommand.Quote(filterPath))
-	}
-	return fmt.Sprintf("git show --color=%s --no-renames --stat -p %s %s", c.colorArg(), sha, filterPathArg)
+func (c *GitCommand) ShowCmdStr(sha string) string {
+	return fmt.Sprintf("git show --color --no-renames --stat -p %s", sha)
 }

 func (c *GitCommand) GetBranchGraphCmdStr(branchName string) string {
-	return fmt.Sprintf("git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium %s --", branchName)
+	return fmt.Sprintf("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium %s", branchName)
 }

 // GetRemoteURL returns current repo remote url
@@ -644,7 +591,7 @@ func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
 func (c *GitCommand) DiffCmdStr(file *File, plain bool, cached bool) string {
 	cachedArg := ""
 	trackedArg := "--"
-	colorArg := c.colorArg()
+	colorArg := "--color"
 	split := strings.Split(file.Name, " -> ") // in case of a renamed file we get the new filename
 	fileName := c.OSCommand.Quote(split[len(split)-1])
 	if cached {
@@ -654,10 +601,10 @@ func (c *GitCommand) DiffCmdStr(file *File, plain bool, cached bool) string {
 		trackedArg = "--no-index /dev/null"
 	}
 	if plain {
-		colorArg = "never"
+		colorArg = ""
 	}

-	return fmt.Sprintf("git diff --color=%s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
+	return fmt.Sprintf("git diff --stat -p %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
 }

 func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
@@ -685,7 +632,6 @@ func (c *GitCommand) RunSkipEditorCommand(command string) error {
 	cmd.Env = append(
 		cmd.Env,
 		"LAZYGIT_CLIENT_COMMAND=EXIT_IMMEDIATELY",
-		"GIT_EDITOR="+lazyGitPath,
 		"EDITOR="+lazyGitPath,
 		"VISUAL="+lazyGitPath,
 	)
@@ -703,10 +649,7 @@ func (c *GitCommand) GenericMerge(commandType string, command string) error {
 		),
 	)
 	if err != nil {
-		if !strings.Contains(err.Error(), "no rebase in progress") {
-			return err
-		}
-		c.Log.Warn(err)
+		return err
 	}

 	// sometimes we need to do a sequence of things in a rebase but the user needs to
@@ -799,7 +742,7 @@ func (c *GitCommand) PrepareInteractiveRebaseCommand(baseSha string, todo string
 	)

 	if overrideEditor {
-		cmd.Env = append(cmd.Env, "GIT_EDITOR="+ex)
+		cmd.Env = append(cmd.Env, "EDITOR="+ex)
 	}

 	return cmd, nil
@@ -922,7 +865,7 @@ func (c *GitCommand) CherryPickCommits(commits []*Commit) error {

 // GetCommitFiles get the specified commit files
 func (c *GitCommand) GetCommitFiles(commitSha string, patchManager *PatchManager) ([]*CommitFile, error) {
-	files, err := c.OSCommand.RunCommandWithOutput("git diff-tree --no-commit-id --name-only -r --no-renames %s", commitSha)
+	files, err := c.OSCommand.RunCommandWithOutput("git show --pretty= --name-only --no-renames %s", commitSha)
 	if err != nil {
 		return nil, err
 	}
@@ -953,12 +896,12 @@ func (c *GitCommand) ShowCommitFile(commitSha, fileName string, plain bool) (str
 }

 func (c *GitCommand) ShowCommitFileCmdStr(commitSha, fileName string, plain bool) string {
-	colorArg := c.colorArg()
+	colorArg := "--color"
 	if plain {
-		colorArg = "never"
+		colorArg = ""
 	}

-	return fmt.Sprintf("git show --no-renames --color=%s %s -- %s", colorArg, commitSha, fileName)
+	return fmt.Sprintf("git show --no-renames %s %s -- %s", colorArg, commitSha, fileName)
 }

 // CheckoutFile checks out the file for the given commit
@@ -1022,6 +965,11 @@ func (c *GitCommand) ResetSoft(ref string) error {
 	return c.OSCommand.RunCommand("git reset --soft " + ref)
 }

+// DiffCommits show diff between commits
+func (c *GitCommand) DiffCommits(sha1, sha2 string) (string, error) {
+	return c.OSCommand.RunCommandWithOutput("git diff --color --stat -p %s %s", sha1, sha2)
+}
+
 // CreateFixupCommit creates a commit that fixes up a previous commit
 func (c *GitCommand) CreateFixupCommit(sha string) error {
 	return c.OSCommand.RunCommand("git commit --fixup=%s", sha)
@@ -1156,97 +1104,27 @@ func (c *GitCommand) FetchRemote(remoteName string) error {
 	return c.OSCommand.RunCommand("git fetch %s", remoteName)
 }

-// GetReflogCommits only returns the new reflog commits since the given lastReflogCommit
-// if none is passed (i.e. it's value is nil) then we get all the reflog commits
-
-func (c *GitCommand) GetReflogCommits(lastReflogCommit *Commit, filterPath string) ([]*Commit, bool, error) {
-	commits := make([]*Commit, 0)
-	re := regexp.MustCompile(`(\w+).*HEAD@\{([^\}]+)\}: (.*)`)
-
-	filterPathArg := ""
-	if filterPath != "" {
-		filterPathArg = fmt.Sprintf(" --follow -- %s", c.OSCommand.Quote(filterPath))
+func (c *GitCommand) GetReflogCommits() ([]*Commit, error) {
+	output, err := c.OSCommand.RunCommandWithOutput("git reflog --abbrev=20")
+	if err != nil {
+		return nil, err
 	}

-	cmd := c.OSCommand.ExecutableFromString(fmt.Sprintf("git reflog --abbrev=20 --date=unix %s", filterPathArg))
-	onlyObtainedNewReflogCommits := false
-	err := RunLineOutputCmd(cmd, func(line string) (bool, error) {
+	lines := strings.Split(strings.TrimSpace(output), "\n")
+	commits := make([]*Commit, len(lines))
+	re := regexp.MustCompile(`(\w+).*HEAD@\{\d+\}: (.*)`)
+	for i, line := range lines {
 		match := re.FindStringSubmatch(line)
 		if len(match) <= 1 {
-			return false, nil
+			continue
 		}

-		unixTimestamp, _ := strconv.Atoi(match[2])
-
-		commit := &Commit{
-			Sha:           match[1],
-			Name:          match[3],
-			UnixTimestamp: int64(unixTimestamp),
-			Status:        "reflog",
+		commits[i] = &Commit{
+			Sha:    match[1],
+			Name:   match[2],
+			Status: "reflog",
 		}
-
-		if lastReflogCommit != nil && commit.Sha == lastReflogCommit.Sha && commit.UnixTimestamp == lastReflogCommit.UnixTimestamp {
-			onlyObtainedNewReflogCommits = true
-			// after this point we already have these reflogs loaded so we'll simply return the new ones
-			return true, nil
-		}
-
-		commits = append(commits, commit)
-		return false, nil
-	})
-	if err != nil {
-		return nil, false, err
 	}

-	return commits, onlyObtainedNewReflogCommits, nil
-}
-
-func (c *GitCommand) ConfiguredPager() string {
-	if os.Getenv("GIT_PAGER") != "" {
-		return os.Getenv("GIT_PAGER")
-	}
-	if os.Getenv("PAGER") != "" {
-		return os.Getenv("PAGER")
-	}
-	output, err := c.OSCommand.RunCommandWithOutput("git config --get-all core.pager")
-	if err != nil {
-		return ""
-	}
-	trimmedOutput := strings.TrimSpace(output)
-	return strings.Split(trimmedOutput, "\n")[0]
-}
-
-func (c *GitCommand) GetPager(width int) string {
-	useConfig := c.Config.GetUserConfig().GetBool("git.paging.useConfig")
-	if useConfig {
-		pager := c.ConfiguredPager()
-		return strings.Split(pager, "| less")[0]
-	}
-
-	templateValues := map[string]string{
-		"columnWidth": strconv.Itoa(width/2 - 6),
-	}
-
-	pagerTemplate := c.Config.GetUserConfig().GetString("git.paging.pager")
-	return utils.ResolvePlaceholderString(pagerTemplate, templateValues)
-}
-
-func (c *GitCommand) colorArg() string {
-	return c.Config.GetUserConfig().GetString("git.paging.colorArg")
-}
-
-func (c *GitCommand) RenameBranch(oldName string, newName string) error {
-	return c.OSCommand.RunCommand("git branch --move %s %s", oldName, newName)
-}
-
-func (c *GitCommand) WorkingTreeState() string {
-	rebaseMode, _ := c.RebaseMode()
-	if rebaseMode != "" {
-		return "rebasing"
-	}
-	merging, _ := c.IsInMergeState()
-	if merging {
-		return "merging"
-	}
-	return "normal"
+	return commits, nil
 }
--- a/pkg/commands/git_test.go
+++ b/pkg/commands/git_test.go
@@ -10,10 +10,10 @@ import (
 	"time"

 	"github.com/go-errors/errors"
-	gogit "github.com/go-git/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/test"
 	"github.com/stretchr/testify/assert"
+	gogit "gopkg.in/src-d/go-git.v4"
 )

 type fileInfoMock struct {
@@ -294,10 +294,12 @@ func TestGitCommandGetStashEntries(t *testing.T) {
 					{
 						0,
 						"WIP on add-pkg-commands-test: 55c6af2 increase parallel build",
+						"WIP on add-pkg-commands-test: 55c6af2 increase parallel build",
 					},
 					{
 						1,
 						"WIP on master: bb86a3f update github template",
+						"WIP on master: bb86a3f update github template",
 					},
 				}

@@ -312,7 +314,7 @@ func TestGitCommandGetStashEntries(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command

-			s.test(gitCmd.GetStashEntries(""))
+			s.test(gitCmd.GetStashEntries())
 		})
 	}
 }
@@ -626,7 +628,7 @@ func TestGitCommandResetToCommit(t *testing.T) {
 		return exec.Command("echo")
 	}

-	assert.NoError(t, gitCmd.ResetToCommit("78976bc", "hard", RunCommandOptions{}))
+	assert.NoError(t, gitCmd.ResetToCommit("78976bc", "hard"))
 }

 // TestGitCommandNewBranch is a function.
@@ -634,12 +636,12 @@ func TestGitCommandNewBranch(t *testing.T) {
 	gitCmd := NewDummyGitCommand()
 	gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
 		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"checkout", "-b", "test", "master"}, args)
+		assert.EqualValues(t, []string{"checkout", "-b", "test"}, args)

 		return exec.Command("echo")
 	}

-	assert.NoError(t, gitCmd.NewBranch("test", "master"))
+	assert.NoError(t, gitCmd.NewBranch("test"))
 }

 // TestGitCommandDeleteBranch is a function.
@@ -1097,6 +1099,75 @@ func TestGitCommandUnstageFile(t *testing.T) {
 	}
 }

+// TestGitCommandIsInMergeState is a function.
+func TestGitCommandIsInMergeState(t *testing.T) {
+	type scenario struct {
+		testName string
+		command  func(string, ...string) *exec.Cmd
+		test     func(bool, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"An error occurred when running status command",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"status", "--untracked-files=all"}, args)
+
+				return exec.Command("test")
+			},
+			func(isInMergeState bool, err error) {
+				assert.Error(t, err)
+				assert.False(t, isInMergeState)
+			},
+		},
+		{
+			"Is not in merge state",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"status", "--untracked-files=all"}, args)
+				return exec.Command("echo")
+			},
+			func(isInMergeState bool, err error) {
+				assert.False(t, isInMergeState)
+				assert.NoError(t, err)
+			},
+		},
+		{
+			"Command output contains conclude merge",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"status", "--untracked-files=all"}, args)
+				return exec.Command("echo", "'conclude merge'")
+			},
+			func(isInMergeState bool, err error) {
+				assert.True(t, isInMergeState)
+				assert.NoError(t, err)
+			},
+		},
+		{
+			"Command output contains unmerged paths",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"status", "--untracked-files=all"}, args)
+				return exec.Command("echo", "'unmerged paths'")
+			},
+			func(isInMergeState bool, err error) {
+				assert.True(t, isInMergeState)
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd := NewDummyGitCommand()
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.IsInMergeState())
+		})
+	}
+}
+
 // TestGitCommandDiscardAllFileChanges is a function.
 func TestGitCommandDiscardAllFileChanges(t *testing.T) {
 	type scenario struct {
@@ -1368,7 +1439,7 @@ func TestGitCommandCheckout(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command
-			s.test(gitCmd.Checkout("test", CheckoutOptions{Force: s.force}))
+			s.test(gitCmd.Checkout("test", s.force))
 		})
 	}
 }
@@ -1378,7 +1449,7 @@ func TestGitCommandGetBranchGraph(t *testing.T) {
 	gitCmd := NewDummyGitCommand()
 	gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
 		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"log", "--graph", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test", "--"}, args)
+		assert.EqualValues(t, []string{"log", "--graph", "--color", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test"}, args)

 		return exec.Command("echo")
 	}
@@ -1402,7 +1473,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"Default case",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color=", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--color", "--", "test.txt"}, args)

 				return exec.Command("echo")
 			},
@@ -1418,7 +1489,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"cached",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color=", "--cached", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--color", "--cached", "--", "test.txt"}, args)

 				return exec.Command("echo")
 			},
@@ -1434,7 +1505,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"plain",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color=never", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--", "test.txt"}, args)

 				return exec.Command("echo")
 			},
@@ -1450,7 +1521,7 @@ func TestGitCommandDiff(t *testing.T) {
 			"File not tracked and file has no staged changes",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color=", "--no-index", "/dev/null", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--stat", "-p", "--color", "--no-index", "/dev/null", "test.txt"}, args)

 				return exec.Command("echo")
 			},
@@ -1478,7 +1549,7 @@ func TestGitCommandCurrentBranchName(t *testing.T) {
 	type scenario struct {
 		testName string
 		command  func(string, ...string) *exec.Cmd
-		test     func(string, string, error)
+		test     func(string, error)
 	}

 	scenarios := []scenario{
@@ -1488,10 +1559,9 @@ func TestGitCommandCurrentBranchName(t *testing.T) {
 				assert.Equal(t, "git", cmd)
 				return exec.Command("echo", "master")
 			},
-			func(name string, displayname string, err error) {
+			func(output string, err error) {
 				assert.NoError(t, err)
-				assert.EqualValues(t, "master", name)
-				assert.EqualValues(t, "master", displayname)
+				assert.EqualValues(t, "master", output)
 			},
 		},
 		{
@@ -1510,32 +1580,9 @@ func TestGitCommandCurrentBranchName(t *testing.T) {

 				return nil
 			},
-			func(name string, displayname string, err error) {
+			func(output string, err error) {
 				assert.NoError(t, err)
-				assert.EqualValues(t, "master", name)
-				assert.EqualValues(t, "master", displayname)
-			},
-		},
-		{
-			"handles a detached head",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-
-				switch args[0] {
-				case "symbolic-ref":
-					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
-					return exec.Command("test")
-				case "branch":
-					assert.EqualValues(t, []string{"branch", "--contains"}, args)
-					return exec.Command("echo", "* (HEAD detached at 123abcd)")
-				}
-
-				return nil
-			},
-			func(name string, displayname string, err error) {
-				assert.NoError(t, err)
-				assert.EqualValues(t, "123abcd", name)
-				assert.EqualValues(t, "(HEAD detached at 123abcd)", displayname)
+				assert.EqualValues(t, "master", output)
 			},
 		},
 		{
@@ -1544,10 +1591,9 @@ func TestGitCommandCurrentBranchName(t *testing.T) {
 				assert.Equal(t, "git", cmd)
 				return exec.Command("test")
 			},
-			func(name string, displayname string, err error) {
+			func(output string, err error) {
 				assert.Error(t, err)
-				assert.EqualValues(t, "", name)
-				assert.EqualValues(t, "", displayname)
+				assert.EqualValues(t, "", output)
 			},
 		},
 	}
@@ -1825,7 +1871,7 @@ func TestGitCommandShowCommitFile(t *testing.T) {
 			"hello.txt",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git show --no-renames --color=never 123456 -- hello.txt",
+					Expect:  "git show --no-renames 123456 -- hello.txt",
 					Replace: "echo -n hello",
 				},
 			}),
@@ -1861,7 +1907,7 @@ func TestGitCommandGetCommitFiles(t *testing.T) {
 			"123456",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git diff-tree --no-commit-id --name-only -r --no-renames 123456",
+					Expect:  "git show --pretty= --name-only --no-renames 123456",
 					Replace: "echo 'hello\nworld'",
 				},
 			}),
@@ -2076,13 +2122,6 @@ func TestGitCommandSkipEditorCommand(t *testing.T) {
 			"expected EDITOR to be set for a non-interactive external command",
 		)

-		test.AssertContainsMatch(
-			t,
-			cmd.Env,
-			regexp.MustCompile("^GIT_EDITOR="),
-			"expected GIT_EDITOR to be set for a non-interactive external command",
-		)
-
 		test.AssertContainsMatch(
 			t,
 			cmd.Env,
@@ -2091,7 +2130,7 @@ func TestGitCommandSkipEditorCommand(t *testing.T) {
 		)
 	})

-	_ = cmd.RunSkipEditorCommand("true")
+	cmd.RunSkipEditorCommand("true")
 }

 func TestFindDotGitDir(t *testing.T) {
--- a/pkg/commands/os.go
+++ b/pkg/commands/os.go
@@ -1,7 +1,6 @@
 package commands

 import (
-	"bufio"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -65,22 +64,6 @@ func (c *OSCommand) SetBeforeExecuteCmd(cmd func(*exec.Cmd)) {
 	c.beforeExecuteCmd = cmd
 }

-type RunCommandOptions struct {
-	EnvVars []string
-}
-
-func (c *OSCommand) RunCommandWithOutputWithOptions(command string, options RunCommandOptions) (string, error) {
-	c.Log.WithField("command", command).Info("RunCommand")
-	cmd := c.ExecutableFromString(command)
-	cmd.Env = append(cmd.Env, options.EnvVars...)
-	return sanitisedCommandOutput(cmd.CombinedOutput())
-}
-
-func (c *OSCommand) RunCommandWithOptions(command string, options RunCommandOptions) error {
-	_, err := c.RunCommandWithOutputWithOptions(command, options)
-	return err
-}
-
 // RunCommandWithOutput wrapper around commands returning their output and error
 // NOTE: If you don't pass any formatArgs we'll just use the command directly,
 // however there's a bizarre compiler error/warning when you pass in a formatString
@@ -418,50 +401,3 @@ func (c *OSCommand) PipeCommands(commandStrings ...string) error {
 	}
 	return nil
 }
-
-func Kill(cmd *exec.Cmd) error {
-	if cmd.Process == nil {
-		// somebody got to it before we were able to, poor bastard
-		return nil
-	}
-	return cmd.Process.Kill()
-}
-
-func RunLineOutputCmd(cmd *exec.Cmd, onLine func(line string) (bool, error)) error {
-	stdoutPipe, err := cmd.StdoutPipe()
-	if err != nil {
-		return err
-	}
-
-	scanner := bufio.NewScanner(stdoutPipe)
-	scanner.Split(bufio.ScanLines)
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		stop, err := onLine(line)
-		if err != nil {
-			return err
-		}
-		if stop {
-			cmd.Process.Kill()
-			break
-		}
-	}
-
-	cmd.Wait()
-	return nil
-}
-
-func (c *OSCommand) CopyToClipboard(str string) error {
-	commandTemplate := c.Config.GetUserConfig().GetString("os.copyToClipboardCommand")
-	templateValues := map[string]string{
-		"str": c.Quote(str),
-	}
-
-	command := utils.ResolvePlaceholderString(commandTemplate, templateValues)
-
-	return c.RunCommand(command)
-}
--- a/pkg/commands/patch_rebases.go
+++ b/pkg/commands/patch_rebases.go
@@ -131,22 +131,14 @@ func (c *GitCommand) MovePatchToSelectedCommit(commits []*Commit, sourceCommitId
 	return c.GenericMerge("rebase", "continue")
 }

-func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *PatchManager, stash bool) error {
-	if stash {
-		if err := c.StashSave(c.Tr.SLocalize("StashPrefix") + commits[commitIdx].Sha); err != nil {
-			return err
-		}
-	}
-
+func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *PatchManager) error {
 	if err := c.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
 		return err
 	}

 	if err := p.ApplyPatches(true); err != nil {
-		if c.WorkingTreeState() == "rebasing" {
-			if err := c.GenericMerge("rebase", "abort"); err != nil {
-				return err
-			}
+		if err := c.GenericMerge("rebase", "abort"); err != nil {
+			return err
 		}
 		return err
 	}
@@ -163,18 +155,10 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *Pat
 	c.onSuccessfulContinue = func() error {
 		// add patches to index
 		if err := p.ApplyPatches(false); err != nil {
-			if c.WorkingTreeState() == "rebasing" {
-				if err := c.GenericMerge("rebase", "abort"); err != nil {
-					return err
-				}
-			}
-			return err
-		}
-
-		if stash {
-			if err := c.StashDo(0, "apply"); err != nil {
+			if err := c.GenericMerge("rebase", "abort"); err != nil {
 				return err
 			}
+			return err
 		}

 		c.PatchManager.Reset()
--- a/pkg/commands/pull_request.go
+++ b/pkg/commands/pull_request.go
@@ -5,7 +5,6 @@ import (
 	"strings"

 	"github.com/go-errors/errors"
-	"github.com/jesseduffield/lazygit/pkg/config"
 )

 // Service is a service that repository is on (Github, Bitbucket, ...)
@@ -27,63 +26,27 @@ type RepoInformation struct {
 	Repository string
 }

-// NewService builds a Service based on the host type
-func NewService(typeName string, repositoryDomain string, siteDomain string) *Service {
-	var service *Service
-
-	switch typeName {
-	case "github":
-		service = &Service{
-			Name:           repositoryDomain,
-			PullRequestURL: fmt.Sprintf("https://%s%s", siteDomain, "/%s/%s/compare/%s?expand=1"),
-		}
-	case "bitbucket":
-		service = &Service{
-			Name:           repositoryDomain,
-			PullRequestURL: fmt.Sprintf("https://%s%s", siteDomain, "/%s/%s/pull-requests/new?source=%s&t=1"),
-		}
-	case "gitlab":
-		service = &Service{
-			Name:           repositoryDomain,
-			PullRequestURL: fmt.Sprintf("https://%s%s", siteDomain, "/%s/%s/merge_requests/new?merge_request[source_branch]=%s"),
-		}
+func getServices() []*Service {
+	return []*Service{
+		{
+			Name:           "github.com",
+			PullRequestURL: "https://github.com/%s/%s/compare/%s?expand=1",
+		},
+		{
+			Name:           "bitbucket.org",
+			PullRequestURL: "https://bitbucket.org/%s/%s/pull-requests/new?source=%s&t=1",
+		},
+		{
+			Name:           "gitlab.com",
+			PullRequestURL: "https://gitlab.com/%s/%s/merge_requests/new?merge_request[source_branch]=%s",
+		},
 	}
-
-	return service
-}
-
-func getServices(config config.AppConfigurer) []*Service {
-	services := []*Service{
-		NewService("github", "github.com", "github.com"),
-		NewService("bitbucket", "bitbucket.org", "bitbucket.org"),
-		NewService("gitlab", "gitlab.com", "gitlab.com"),
-	}
-
-	configServices := config.GetUserConfig().GetStringMapString("services")
-
-	for repoDomain, typeAndDomain := range configServices {
-		splitData := strings.Split(typeAndDomain, ":")
-		if len(splitData) != 2 {
-			// TODO log this misconfiguration
-			continue
-		}
-
-		service := NewService(splitData[0], repoDomain, splitData[1])
-		if service == nil {
-			// TODO log this unsupported service
-			continue
-		}
-
-		services = append(services, service)
-	}
-
-	return services
 }

 // NewPullRequest creates new instance of PullRequest
 func NewPullRequest(gitCommand *GitCommand) *PullRequest {
 	return &PullRequest{
-		GitServices: getServices(gitCommand.Config),
+		GitServices: getServices(),
 		GitCommand:  gitCommand,
 	}
 }
@@ -122,7 +85,7 @@ func getRepoInfoFromURL(url string) *RepoInformation {

 	if isHTTP {
 		splits := strings.Split(url, "/")
-		owner := strings.Join(splits[3:len(splits)-1], "/")
+		owner := splits[len(splits)-2]
 		repo := strings.TrimSuffix(splits[len(splits)-1], ".git")

 		return &RepoInformation{
@@ -133,8 +96,8 @@ func getRepoInfoFromURL(url string) *RepoInformation {

 	tmpSplit := strings.Split(url, ":")
 	splits := strings.Split(tmpSplit[1], "/")
-	owner := strings.Join(splits[0:len(splits)-1], "/")
-	repo := strings.TrimSuffix(splits[len(splits)-1], ".git")
+	owner := splits[0]
+	repo := strings.TrimSuffix(splits[1], ".git")

 	return &RepoInformation{
 		Owner:      owner,
--- a/pkg/commands/pull_request_test.go
+++ b/pkg/commands/pull_request_test.go
@@ -147,13 +147,6 @@ func TestCreatePullRequest(t *testing.T) {
 			gitCommand := NewDummyGitCommand()
 			gitCommand.OSCommand.command = s.command
 			gitCommand.OSCommand.Config.GetUserConfig().Set("os.openLinkCommand", "open {{link}}")
-			gitCommand.Config.GetUserConfig().Set("services", map[string]string{
-				// valid configuration for a custom service URL
-				"git.work.com": "gitlab:code.work.com",
-				// invalid configurations for a custom service URL
-				"invalid.work.com":   "noservice:invalid.work.com",
-				"noservice.work.com": "noservice.work.com",
-			})
 			dummyPullRequest := NewPullRequest(gitCommand)
 			s.test(dummyPullRequest.Create(s.branch))
 		})
--- a/pkg/commands/remote.go
+++ b/pkg/commands/remote.go
@@ -1,8 +1,24 @@
 package commands

+import (
+	"fmt"
+
+	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
 // Remote : A git remote
 type Remote struct {
 	Name     string
 	Urls     []string
+	Selected bool
 	Branches []*RemoteBranch
 }
+
+// GetDisplayStrings returns the display string of a remote
+func (r *Remote) GetDisplayStrings(isFocused bool) []string {
+
+	branchCount := len(r.Branches)
+
+	return []string{r.Name, utils.ColoredString(fmt.Sprintf("%d branches", branchCount), color.FgBlue)}
+}
--- a/pkg/commands/remote_branch.go
+++ b/pkg/commands/remote_branch.go
@@ -5,7 +5,3 @@ type RemoteBranch struct {
 	Name       string
 	RemoteName string
 }
-
-func (r *RemoteBranch) FullName() string {
-	return r.RemoteName + "/" + r.Name
-}
--- a/pkg/commands/stash_entry.go
+++ b/pkg/commands/stash_entry.go
@@ -1,13 +1,13 @@
 package commands

-import "fmt"
-
 // StashEntry : A git stash entry
 type StashEntry struct {
-	Index int
-	Name  string
+	Index         int
+	Name          string
+	DisplayString string
 }

-func (s *StashEntry) RefName() string {
-	return fmt.Sprintf("stash@{%d}", s.Index)
+// GetDisplayStrings returns the display string of branch
+func (s *StashEntry) GetDisplayStrings(isFocused bool) []string {
+	return []string{s.DisplayString}
 }
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -244,8 +244,6 @@ func GetDefaultConfig() []byte {
  scrollPastBottom: true
  mouseEvents: true
  skipUnstageLineWarning: false
-  skipStashWarning: true
-  sidePanelWidth: 0.3333
  theme:
    lightTheme: false
    activeBorderColor:
@@ -260,12 +258,8 @@ func GetDefaultConfig() []byte {
  commitLength:
    show: true
 git:
-  paging:
-    colorArg: always
-    useConfig: false
  merging:
    manualCommit: false
-    args: ""
  skipHookPrefix: 'WIP'
  autoFetch: true
 update:
@@ -285,10 +279,6 @@ keybinding:
    nextItem: '<down>'
    prevItem-alt: 'k'
    nextItem-alt: 'j'
-    prevPage: ','
-    nextPage: '.'
-    gotoTop: '<'
-    gotoBottom: '>'
    prevBlock: '<left>'
    nextBlock: '<right>'
    prevBlock-alt: 'h'
@@ -320,11 +310,6 @@ keybinding:
    prevTab: '['
    nextScreenMode: '+'
    prevScreenMode: '_'
-    undo: 'z'
-    redo: '<c-z>'
-    filteringMenu: <c-s>
-    diffingMenu: '<c-e>'
-    copyToClipboard: '<c-o>'
  status:
    checkForUpdate: 'u'
    recentRepos: '<enter>'
@@ -345,7 +330,6 @@ keybinding:
    checkoutBranchByName: 'c'
    forceCheckoutBranch: 'F'
    rebaseBranch: 'r'
-    renameBranch: 'R'
    mergeIntoCurrentBranch: 'M'
    viewGitFlowOptions: 'i'
    fastForward: 'f'
@@ -369,8 +353,8 @@ keybinding:
    cherryPickCopyRange: 'C'
    pasteCommits: 'v'
    tagCommit: 'T'
+    toggleDiffCommit: 'i'
    checkoutCommit: '<space>'
-    resetCherryPick: '<c-R>'
  stash:
    popStash: 'g'
  commitFiles:
@@ -380,6 +364,7 @@ keybinding:
    toggleDragSelect-alt: 'V'
    toggleSelectHunk: 'a'
    pickBothHunks: 'b'
+    undo: 'z'
 `)
 }

--- a/pkg/config/config_default_platform.go
+++ b/pkg/config/config_default_platform.go
@@ -7,6 +7,5 @@ func GetPlatformDefaultConfig() []byte {
 	return []byte(
 		`os:
  openCommand: 'open {{filename}}'
-  openLinkCommand: 'open {{link}}'
-  copyToClipboardCommand: 'bash -c "echo -n {{str}} | pbcopy"'`)
+  openLinkCommand: 'open {{link}}'`)
 }
--- a/pkg/config/config_linux.go
+++ b/pkg/config/config_linux.go
@@ -5,6 +5,5 @@ func GetPlatformDefaultConfig() []byte {
 	return []byte(
 		`os:
  openCommand: 'sh -c "xdg-open {{filename}} >/dev/null"'
-  openLinkCommand: 'sh -c "xdg-open {{link}} >/dev/null"'
-  copyToClipboardCommand: 'bash -c "echo -n {{str}} | xclip -selection clipboard"'`)
+  openLinkCommand: 'sh -c "xdg-open {{link}} >/dev/null"'`)
 }
--- a/pkg/config/config_windows.go
+++ b/pkg/config/config_windows.go
@@ -5,6 +5,5 @@ func GetPlatformDefaultConfig() []byte {
 	return []byte(
 		`os:
  openCommand: 'cmd /c "start "" {{filename}}"'
-  openLinkCommand: 'cmd /c "start "" {{link}}"'
-  copyToClipboardCommand: 'cmd \c "echo -n {{str}} > /dev/clipboard"`)
+  openLinkCommand: 'cmd /c "start "" {{link}}"'`)
 }
--- a/pkg/gui/app_status_manager.go
+++ b/pkg/gui/app_status_manager.go
@@ -66,13 +66,15 @@ func (gui *Gui) WithWaitingStatus(name string, f func() error) error {
 				if appStatus == "" {
 					return
 				}
-				gui.renderString(gui.g, "appStatus", appStatus)
+				if err := gui.renderString(gui.g, "appStatus", appStatus); err != nil {
+					gui.Log.Warn(err)
+				}
 			}
 		}()

 		if err := f(); err != nil {
 			gui.g.Update(func(g *gocui.Gui) error {
-				return gui.surfaceError(err)
+				return gui.createErrorPanel(gui.g, err.Error())
 			})
 		}
 	}()
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -40,10 +40,11 @@ func (gui *Gui) handleBranchSelect(g *gocui.Gui, v *gocui.View) error {
 		return gui.newStringTask("main", gui.Tr.SLocalize("NoBranchesThisRepo"))
 	}
 	branch := gui.getSelectedBranch()
-	v.FocusPoint(0, gui.State.Panels.Branches.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	if err := gui.focusPoint(0, gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches), v); err != nil {
+		return err
+	}
+	if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
+		return err
 	}

 	cmd := gui.OSCommand.ExecutableFromString(
@@ -55,45 +56,64 @@ func (gui *Gui) handleBranchSelect(g *gocui.Gui, v *gocui.View) error {
 	return nil
 }

+func (gui *Gui) RenderSelectedBranchUpstreamDifferences() error {
+	return gui.newTask("branches", func(stop chan struct{}) error {
+		branch := gui.getSelectedBranch()
+		branch.Pushables, branch.Pullables = gui.GitCommand.GetBranchUpstreamDifferenceCount(branch.Name)
+
+		select {
+		case <-stop:
+			return nil
+		default:
+		}
+
+		branchesView := gui.getBranchesView()
+		displayStrings := presentation.GetBranchListDisplayStrings(gui.State.Branches, gui.currentViewName() == "branches", gui.State.Panels.Branches.SelectedLine)
+		gui.renderDisplayStrings(branchesView, displayStrings)
+		return nil
+	})
+}
+
 // gui.refreshStatus is called at the end of this because that's when we can
 // be sure there is a state.Branches array to pick the current branch from
-func (gui *Gui) refreshBranches() {
-	reflogCommits := gui.State.FilteredReflogCommits
-	if gui.inFilterMode() {
-		// in filter mode we filter our reflog commits to just those containing the path
-		// however we need all the reflog entries to populate the recencies of our branches
-		// which allows us to order them correctly. So if we're filtering we'll just
-		// manually load all the reflog commits here
-		var err error
-		reflogCommits, _, err = gui.GitCommand.GetReflogCommits(nil, "")
+func (gui *Gui) refreshBranches(g *gocui.Gui) error {
+	if err := gui.refreshRemotes(); err != nil {
+		return err
+	}
+
+	if err := gui.refreshTags(); err != nil {
+		return err
+	}
+
+	g.Update(func(g *gocui.Gui) error {
+		builder, err := commands.NewBranchListBuilder(gui.Log, gui.GitCommand)
 		if err != nil {
-			gui.Log.Error(err)
+			return err
 		}
-	}
+		gui.State.Branches = builder.Build()

-	builder, err := commands.NewBranchListBuilder(gui.Log, gui.GitCommand, reflogCommits)
-	if err != nil {
-		_ = gui.surfaceError(err)
-	}
-	gui.State.Branches = builder.Build()
+		// TODO: if we're in the remotes view and we've just deleted a remote we need to refresh accordingly
+		if gui.getBranchesView().Context == "local-branches" {
+			if err := gui.renderLocalBranchesWithSelection(); err != nil {
+				return err
+			}
+		}

-	// TODO: if we're in the remotes view and we've just deleted a remote we need to refresh accordingly
-	if gui.getBranchesView().Context == "local-branches" {
-		_ = gui.renderLocalBranchesWithSelection()
-	}
-
-	gui.refreshStatus()
+		return gui.refreshStatus(g)
+	})
+	return nil
 }

 func (gui *Gui) renderLocalBranchesWithSelection() error {
 	branchesView := gui.getBranchesView()

 	gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
-	displayStrings := presentation.GetBranchListDisplayStrings(gui.State.Branches, gui.State.ScreenMode != SCREEN_NORMAL, gui.State.Diff.Ref)
-	gui.renderDisplayStrings(branchesView, displayStrings)
+	if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
+		return err
+	}
 	if gui.g.CurrentView() == branchesView {
 		if err := gui.handleBranchSelect(gui.g, branchesView); err != nil {
-			return gui.surfaceError(err)
+			return err
 		}
 	}

@@ -107,10 +127,10 @@ func (gui *Gui) handleBranchPress(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 	if gui.State.Panels.Branches.SelectedLine == 0 {
-		return gui.createErrorPanel(gui.Tr.SLocalize("AlreadyCheckedOutBranch"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("AlreadyCheckedOutBranch"))
 	}
 	branch := gui.getSelectedBranch()
-	return gui.handleCheckoutRef(branch.Name, handleCheckoutRefOptions{})
+	return gui.handleCheckoutRef(branch.Name)
 }

 func (gui *Gui) handleCreatePullRequestPress(g *gocui.Gui, v *gocui.View) error {
@@ -118,7 +138,7 @@ func (gui *Gui) handleCreatePullRequestPress(g *gocui.Gui, v *gocui.View) error

 	branch := gui.getSelectedBranch()
 	if err := pullRequest.Create(branch); err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(g, err.Error())
 	}

 	return nil
@@ -140,73 +160,55 @@ func (gui *Gui) handleForceCheckout(g *gocui.Gui, v *gocui.View) error {
 	message := gui.Tr.SLocalize("SureForceCheckout")
 	title := gui.Tr.SLocalize("ForceCheckoutBranch")
 	return gui.createConfirmationPanel(g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.Checkout(branch.Name, commands.CheckoutOptions{Force: true}); err != nil {
-			_ = gui.surfaceError(err)
+		if err := gui.GitCommand.Checkout(branch.Name, true); err != nil {
+			gui.createErrorPanel(g, err.Error())
 		}
-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+		return gui.refreshSidePanels(g)
 	}, nil)
 }

-type handleCheckoutRefOptions struct {
-	WaitingStatus string
-	EnvVars       []string
-}
+func (gui *Gui) handleCheckoutRef(ref string) error {
+	if err := gui.GitCommand.Checkout(ref, false); err != nil {
+		// note, this will only work for english-language git commands. If we force git to use english, and the error isn't this one, then the user will receive an english command they may not understand. I'm not sure what the best solution to this is. Running the command once in english and a second time in the native language is one option

-func (gui *Gui) handleCheckoutRef(ref string, options handleCheckoutRefOptions) error {
-	waitingStatus := options.WaitingStatus
-	if waitingStatus == "" {
-		waitingStatus = gui.Tr.SLocalize("CheckingOutStatus")
-	}
+		if strings.Contains(err.Error(), "Please commit your changes or stash them before you switch branch") {
+			// offer to autostash changes
+			return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("AutoStashTitle"), gui.Tr.SLocalize("AutoStashPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+				if err := gui.GitCommand.StashSave(gui.Tr.SLocalize("StashPrefix") + ref); err != nil {
+					return gui.createErrorPanel(g, err.Error())
+				}
+				if err := gui.GitCommand.Checkout(ref, false); err != nil {
+					return gui.createErrorPanel(g, err.Error())
+				}

-	cmdOptions := commands.CheckoutOptions{Force: false, EnvVars: options.EnvVars}
+				// checkout successful so we select the new branch
+				gui.State.Panels.Branches.SelectedLine = 0

-	onSuccess := func() {
-		gui.State.Panels.Branches.SelectedLine = 0
-		gui.State.Panels.Commits.SelectedLine = 0
-		// loading a heap of commits is slow so we limit them whenever doing a reset
-		gui.State.Panels.Commits.LimitCommits = true
-	}
-
-	return gui.WithWaitingStatus(waitingStatus, func() error {
-		if err := gui.GitCommand.Checkout(ref, cmdOptions); err != nil {
-			// note, this will only work for english-language git commands. If we force git to use english, and the error isn't this one, then the user will receive an english command they may not understand. I'm not sure what the best solution to this is. Running the command once in english and a second time in the native language is one option
-
-			if strings.Contains(err.Error(), "Please commit your changes or stash them before you switch branch") {
-				// offer to autostash changes
-				return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("AutoStashTitle"), gui.Tr.SLocalize("AutoStashPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-
-					if err := gui.GitCommand.StashSave(gui.Tr.SLocalize("StashPrefix") + ref); err != nil {
-						return gui.surfaceError(err)
+				if err := gui.GitCommand.StashDo(0, "pop"); err != nil {
+					if err := gui.refreshSidePanels(g); err != nil {
+						return err
 					}
-					if err := gui.GitCommand.Checkout(ref, cmdOptions); err != nil {
-						return gui.surfaceError(err)
-					}
-
-					onSuccess()
-					if err := gui.GitCommand.StashDo(0, "pop"); err != nil {
-						if err := gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI}); err != nil {
-							return err
-						}
-						return gui.surfaceError(err)
-					}
-					return gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI})
-				}, nil)
-			}
-
-			if err := gui.surfaceError(err); err != nil {
-				return err
-			}
+					return gui.createErrorPanel(g, err.Error())
+				}
+				return gui.refreshSidePanels(g)
+			}, nil)
 		}
-		onSuccess()

-		return gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI})
-	})
+		if err := gui.createErrorPanel(gui.g, err.Error()); err != nil {
+			return err
+		}
+	}
+
+	gui.State.Panels.Branches.SelectedLine = 0
+	gui.State.Panels.Commits.SelectedLine = 0
+	return gui.refreshSidePanels(gui.g)
 }

 func (gui *Gui) handleCheckoutByName(g *gocui.Gui, v *gocui.View) error {
-	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("BranchName")+":", "", func(g *gocui.Gui, v *gocui.View) error {
-		return gui.handleCheckoutRef(gui.trimmedContent(v), handleCheckoutRefOptions{})
+	gui.createPromptPanel(g, v, gui.Tr.SLocalize("BranchName")+":", "", func(g *gocui.Gui, v *gocui.View) error {
+		return gui.handleCheckoutRef(gui.trimmedContent(v))
 	})
+	return nil
 }

 func (gui *Gui) getCheckedOutBranch() *commands.Branch {
@@ -218,29 +220,31 @@ func (gui *Gui) getCheckedOutBranch() *commands.Branch {
 }

 func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error {
-	branch := gui.getSelectedBranch()
-	if branch == nil {
-		return nil
-	}
+	branch := gui.getCheckedOutBranch()
 	message := gui.Tr.TemplateLocalize(
 		"NewBranchNameBranchOff",
 		Teml{
 			"branchName": branch.Name,
 		},
 	)
-	return gui.createPromptPanel(g, v, message, "", func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.NewBranch(gui.trimmedContent(v), branch.Name); err != nil {
-			return gui.surfaceError(err)
+	gui.createPromptPanel(g, v, message, "", func(g *gocui.Gui, v *gocui.View) error {
+		if err := gui.GitCommand.NewBranch(gui.trimmedContent(v)); err != nil {
+			return gui.createErrorPanel(g, err.Error())
 		}
-		gui.State.Panels.Branches.SelectedLine = 0
-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+		gui.refreshSidePanels(g)
+		return gui.handleBranchSelect(g, v)
 	})
+	return nil
 }

 func (gui *Gui) handleDeleteBranch(g *gocui.Gui, v *gocui.View) error {
 	return gui.deleteBranch(g, v, false)
 }

+func (gui *Gui) handleForceDeleteBranch(g *gocui.Gui, v *gocui.View) error {
+	return gui.deleteBranch(g, v, true)
+}
+
 func (gui *Gui) deleteBranch(g *gocui.Gui, v *gocui.View, force bool) error {
 	selectedBranch := gui.getSelectedBranch()
 	if selectedBranch == nil {
@@ -248,7 +252,7 @@ func (gui *Gui) deleteBranch(g *gocui.Gui, v *gocui.View, force bool) error {
 	}
 	checkedOutBranch := gui.getCheckedOutBranch()
 	if checkedOutBranch.Name == selectedBranch.Name {
-		return gui.createErrorPanel(gui.Tr.SLocalize("CantDeleteCheckOutBranch"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantDeleteCheckOutBranch"))
 	}
 	return gui.deleteNamedBranch(g, v, selectedBranch, force)
 }
@@ -273,23 +277,19 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
 			if !force && strings.Contains(errMessage, "is not fully merged") {
 				return gui.deleteNamedBranch(g, v, selectedBranch, true)
 			}
-			return gui.createErrorPanel(errMessage)
+			return gui.createErrorPanel(g, errMessage)
 		}
-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{BRANCHES}})
+		return gui.refreshSidePanels(g)
 	}, nil)
 }

 func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	if gui.GitCommand.IsHeadDetached() {
-		return gui.createErrorPanel("Cannot merge branch in detached head state. You might have checked out a commit directly or a remote branch, in which case you should checkout the local branch you want to be on")
+		return gui.createErrorPanel(gui.g, "Cannot merge branch in detached head state. You might have checked out a commit directly or a remote branch, in which case you should checkout the local branch you want to be on")
 	}
 	checkedOutBranchName := gui.getCheckedOutBranch().Name
 	if checkedOutBranchName == branchName {
-		return gui.createErrorPanel(gui.Tr.SLocalize("CantMergeBranchIntoItself"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantMergeBranchIntoItself"))
 	}
 	prompt := gui.Tr.TemplateLocalize(
 		"ConfirmMerge",
@@ -307,10 +307,6 @@ func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
 }

 func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	selectedBranchName := gui.getSelectedBranch().Name
 	return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName)
 }
@@ -321,13 +317,9 @@ func (gui *Gui) handleRebaseOntoLocalBranch(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	checkedOutBranch := gui.getCheckedOutBranch().Name
 	if selectedBranchName == checkedOutBranch {
-		return gui.createErrorPanel(gui.Tr.SLocalize("CantRebaseOntoSelf"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantRebaseOntoSelf"))
 	}
 	prompt := gui.Tr.TemplateLocalize(
 		"ConfirmRebase",
@@ -352,15 +344,15 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 	if branch.Pushables == "?" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("FwdNoUpstream"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FwdNoUpstream"))
 	}
 	if branch.Pushables != "0" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("FwdCommitsToPush"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FwdCommitsToPush"))
 	}

 	upstream, err := gui.GitCommand.GetUpstreamForBranch(branch.Name)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

 	split := strings.Split(upstream, "/")
@@ -379,16 +371,14 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {

 		if gui.State.Panels.Branches.SelectedLine == 0 {
 			if err := gui.GitCommand.PullWithoutPasswordCheck("--ff-only"); err != nil {
-				_ = gui.surfaceError(err)
-				return
+				_ = gui.createErrorPanel(gui.g, err.Error())
 			}
-			_ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+			_ = gui.refreshSidePanels(gui.g)
 		} else {
 			if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
-				_ = gui.surfaceError(err)
-				return
+				_ = gui.createErrorPanel(gui.g, err.Error())
 			}
-			_ = gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{BRANCHES}})
+			_ = gui.RenderSelectedBranchUpstreamDifferences()
 		}

 		_ = gui.closeConfirmationPrompt(gui.g, true)
@@ -407,9 +397,7 @@ func (gui *Gui) onBranchesTabClick(tabIndex int) error {
 func (gui *Gui) switchBranchesPanelContext(context string) error {
 	branchesView := gui.getBranchesView()
 	branchesView.Context = context
-	if err := gui.onSearchEscape(); err != nil {
-		return err
-	}
+	gui.onSearchEscape()

 	contextTabIndexMap := map[string]int{
 		"local-branches":  0,
@@ -420,13 +408,7 @@ func (gui *Gui) switchBranchesPanelContext(context string) error {

 	branchesView.TabIndex = contextTabIndexMap[context]

-	return gui.refreshBranchesViewWithSelection()
-}
-
-func (gui *Gui) refreshBranchesViewWithSelection() error {
-	branchesView := gui.getBranchesView()
-
-	switch branchesView.Context {
+	switch context {
 	case "local-branches":
 		return gui.renderLocalBranchesWithSelection()
 	case "remotes":
@@ -476,56 +458,3 @@ func (gui *Gui) onBranchesPanelSearchSelect(selectedLine int) error {
 	}
 	return nil
 }
-
-func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error {
-	branch := gui.getSelectedBranch()
-	if branch == nil {
-		return nil
-	}
-
-	// TODO: find a way to not checkout the branch here if it's not the current branch (i.e. find some
-	// way to get it to show up in the reflog)
-
-	promptForNewName := func() error {
-		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("NewBranchNamePrompt")+" "+branch.Name+":", "", func(g *gocui.Gui, v *gocui.View) error {
-			newName := gui.trimmedContent(v)
-			if err := gui.GitCommand.RenameBranch(branch.Name, newName); err != nil {
-				return gui.surfaceError(err)
-			}
-			// need to checkout so that the branch shows up in our reflog and therefore
-			// doesn't get lost among all the other branches when we switch to something else
-			if err := gui.GitCommand.Checkout(newName, commands.CheckoutOptions{Force: false}); err != nil {
-				return gui.surfaceError(err)
-			}
-
-			return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-		})
-	}
-
-	// I could do an explicit check here for whether the branch is tracking a remote branch
-	// but if we've selected it we'll already know that via Pullables and Pullables.
-	// Bit of a hack but I'm lazy.
-	notTrackingRemote := branch.Pullables == "?"
-	if notTrackingRemote {
-		return promptForNewName()
-	}
-	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("renameBranch"), gui.Tr.SLocalize("RenameBranchWarning"), func(_g *gocui.Gui, _v *gocui.View) error {
-		return promptForNewName()
-	}, nil)
-}
-
-func (gui *Gui) currentBranch() *commands.Branch {
-	if len(gui.State.Branches) == 0 {
-		return nil
-	}
-	return gui.State.Branches[0]
-}
-
-func (gui *Gui) handleClipboardCopyBranch(g *gocui.Gui, v *gocui.View) error {
-	branch := gui.getSelectedBranch()
-	if branch == nil {
-		return nil
-	}
-
-	return gui.OSCommand.CopyToClipboard(branch.Name)
-}
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 )

-func (gui *Gui) getSelectedCommitFile() *commands.CommitFile {
+func (gui *Gui) getSelectedCommitFile(g *gocui.Gui) *commands.CommitFile {
 	selectedLine := gui.State.Panels.CommitFiles.SelectedLine
 	if selectedLine == -1 {
 		return nil
@@ -34,22 +34,23 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
 		gui.handleEscapeLineByLinePanel()
 	}

-	commitFile := gui.getSelectedCommitFile()
+	commitFile := gui.getSelectedCommitFile(g)
 	if commitFile == nil {
-		gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
-		return nil
+		return gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
 	}

 	if err := gui.refreshSecondaryPatchPanel(); err != nil {
 		return err
 	}

-	v.FocusPoint(0, gui.State.Panels.CommitFiles.SelectedLine)
+	if err := gui.focusPoint(0, gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles), v); err != nil {
+		return err
+	}

 	cmd := gui.OSCommand.ExecutableFromString(
 		gui.GitCommand.ShowCommitFileCmdStr(commitFile.Sha, commitFile.Name, false),
 	)
-	if err := gui.newPtyTask("main", cmd); err != nil {
+	if err := gui.newCmdTask("main", cmd); err != nil {
 		gui.Log.Error(err)
 	}

@@ -64,10 +65,10 @@ func (gui *Gui) handleCheckoutCommitFile(g *gocui.Gui, v *gocui.View) error {
 	file := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine]

 	if err := gui.GitCommand.CheckoutFile(file.Sha, file.Name); err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

-	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+	return gui.refreshFiles()
 }

 func (gui *Gui) handleDiscardOldFileChange(g *gocui.Gui, v *gocui.View) error {
@@ -85,7 +86,7 @@ func (gui *Gui) handleDiscardOldFileChange(g *gocui.Gui, v *gocui.View) error {
 				}
 			}

-			return gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI})
+			return gui.refreshSidePanels(gui.g)
 		})
 	}, nil)
 }
@@ -99,28 +100,28 @@ func (gui *Gui) refreshCommitFilesView() error {
 		return err
 	}

-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(gui.g)
 	if commit == nil {
 		return nil
 	}

 	files, err := gui.GitCommand.GetCommitFiles(commit.Sha, gui.GitCommand.PatchManager)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	gui.State.CommitFiles = files

 	gui.refreshSelectedLine(&gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles))

 	commitsFileView := gui.getCommitFilesView()
-	displayStrings := presentation.GetCommitFileListDisplayStrings(gui.State.CommitFiles, gui.State.Diff.Ref)
+	displayStrings := presentation.GetCommitFileListDisplayStrings(gui.State.CommitFiles)
 	gui.renderDisplayStrings(commitsFileView, displayStrings)

 	return gui.handleCommitFileSelect(gui.g, commitsFileView)
 }

 func (gui *Gui) handleOpenOldCommitFile(g *gocui.Gui, v *gocui.View) error {
-	file := gui.getSelectedCommitFile()
+	file := gui.getSelectedCommitFile(g)
 	return gui.openFile(file.Name)
 }

@@ -129,10 +130,9 @@ func (gui *Gui) handleToggleFileForPatch(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}

-	commitFile := gui.getSelectedCommitFile()
+	commitFile := gui.getSelectedCommitFile(g)
 	if commitFile == nil {
-		gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
-		return nil
+		return gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
 	}

 	toggleTheFile := func() error {
@@ -167,7 +167,7 @@ func (gui *Gui) startPatchManager() error {
 		diffMap[commitFile.Name] = commitText
 	}

-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(gui.g)
 	if commit == nil {
 		return errors.New("No commit selected")
 	}
@@ -185,10 +185,9 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
 		return err
 	}

-	commitFile := gui.getSelectedCommitFile()
+	commitFile := gui.getSelectedCommitFile(gui.g)
 	if commitFile == nil {
-		gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
-		return nil
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
 	}

 	enterTheFile := func(selectedLineIdx int) error {
@@ -209,9 +208,7 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
 		return gui.createConfirmationPanel(gui.g, gui.getCommitFilesView(), false, gui.Tr.SLocalize("DiscardPatch"), gui.Tr.SLocalize("DiscardPatchConfirm"), func(g *gocui.Gui, v *gocui.View) error {
 			gui.GitCommand.PatchManager.Reset()
 			return enterTheFile(selectedLineIdx)
-		}, func(g *gocui.Gui, v *gocui.View) error {
-			return gui.switchFocus(gui.g, nil, gui.getCommitFilesView())
-		})
+		}, nil)
 	}

 	return enterTheFile(selectedLineIdx)
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -15,7 +15,7 @@ import (
 func (gui *Gui) runSyncOrAsyncCommand(sub *exec.Cmd, err error) (bool, error) {
 	if err != nil {
 		if err != gui.Errors.ErrSubProcess {
-			return false, gui.surfaceError(err)
+			return false, gui.createErrorPanel(gui.g, err.Error())
 		}
 	}
 	if sub != nil {
@@ -28,7 +28,7 @@ func (gui *Gui) runSyncOrAsyncCommand(sub *exec.Cmd, err error) (bool, error) {
 func (gui *Gui) handleCommitConfirm(g *gocui.Gui, v *gocui.View) error {
 	message := gui.trimmedContent(v)
 	if message == "" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("CommitWithoutMessageErr"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("CommitWithoutMessageErr"))
 	}
 	flags := ""
 	skipHookPrefix := gui.Config.GetUserConfig().GetString("git.skipHookPrefix")
@@ -48,11 +48,11 @@ func (gui *Gui) handleCommitConfirm(g *gocui.Gui, v *gocui.View) error {
 	_ = v.SetOrigin(0, 0)
 	_, _ = g.SetViewOnBottom("commitMessage")
 	_ = gui.switchFocus(g, v, gui.getFilesView())
-	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+	return gui.refreshSidePanels(g)
 }

 func (gui *Gui) handleCommitClose(g *gocui.Gui, v *gocui.View) error {
-	_, _ = g.SetViewOnBottom("commitMessage")
+	g.SetViewOnBottom("commitMessage")
 	return gui.switchFocus(g, v, gui.getFilesView())
 }

@@ -68,8 +68,7 @@ func (gui *Gui) handleCommitFocused(g *gocui.Gui, v *gocui.View) error {
 			"keyBindConfirm": "enter",
 		},
 	)
-	gui.renderString(g, "options", message)
-	return nil
+	return gui.renderString(g, "options", message)
 }

 func (gui *Gui) getBufferLength(view *gocui.View) string {
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -2,7 +2,8 @@ package gui

 import (
 	"strconv"
-	"sync"
+
+	"github.com/go-errors/errors"

 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
@@ -12,7 +13,7 @@ import (

 // list panel functions

-func (gui *Gui) getSelectedCommit() *commands.Commit {
+func (gui *Gui) getSelectedCommit(g *gocui.Gui) *commands.Commit {
 	selectedLine := gui.State.Panels.Commits.SelectedLine
 	if selectedLine == -1 {
 		return nil
@@ -36,11 +37,11 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 	}

 	state := gui.State.Panels.Commits
-	if state.SelectedLine > 290 && state.LimitCommits {
+	if state.SelectedLine > 20 && state.LimitCommits {
 		state.LimitCommits = false
 		go func() {
 			if err := gui.refreshCommitsWithLimit(); err != nil {
-				_ = gui.surfaceError(err)
+				_ = gui.createErrorPanel(gui.g, err.Error())
 			}
 		}()
 	}
@@ -49,79 +50,61 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 	gui.getSecondaryView().Title = "Custom Patch"
 	gui.handleEscapeLineByLinePanel()

-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(g)
 	if commit == nil {
 		return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}

-	v.FocusPoint(0, gui.State.Panels.Commits.SelectedLine)
+	if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits), v); err != nil {
+		return err
+	}

-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	// if specific diff mode is on, don't show diff
+	if gui.State.Panels.Commits.SpecificDiffMode {
+		return nil
 	}

 	cmd := gui.OSCommand.ExecutableFromString(
-		gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.FilterPath),
+		gui.GitCommand.ShowCmdStr(commit.Sha),
 	)
-	if err := gui.newPtyTask("main", cmd); err != nil {
+	if err := gui.newCmdTask("main", cmd); err != nil {
 		gui.Log.Error(err)
 	}

 	return nil
 }

-// during startup, the bottleneck is fetching the reflog entries. We need these
-// on startup to sort the branches by recency. So we have two phases: INITIAL, and COMPLETE.
-// In the initial phase we don't get any reflog commits, but we asynchronously get them
-// and refresh the branches after that
-func (gui *Gui) refreshReflogCommitsConsideringStartup() {
-	switch gui.State.StartupStage {
-	case INITIAL:
+func (gui *Gui) refreshCommits(g *gocui.Gui) error {
+	g.Update(func(*gocui.Gui) error {
+		// I think this is here for the sake of some kind of rebasing thing
+		gui.refreshStatus(g)
+
+		if err := gui.refreshCommitsWithLimit(); err != nil {
+			return err
+		}
+
+		// doing this async because it shouldn't hold anything up
 		go func() {
-			_ = gui.refreshReflogCommits()
-			gui.refreshBranches()
-			gui.State.StartupStage = COMPLETE
+			if err := gui.refreshReflogCommits(); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
 		}()

-	case COMPLETE:
-		_ = gui.refreshReflogCommits()
-	}
-}
-
-// whenever we change commits, we should update branches because the upstream/downstream
-// counts can change. Whenever we change branches we should probably also change commits
-// e.g. in the case of switching branches.
-func (gui *Gui) refreshCommits() error {
-	wg := sync.WaitGroup{}
-	wg.Add(2)
-
-	go func() {
-		gui.refreshReflogCommitsConsideringStartup()
-
-		gui.refreshBranches()
-		wg.Done()
-	}()
-
-	go func() {
-		_ = gui.refreshCommitsWithLimit()
-		if gui.g.CurrentView() == gui.getCommitFilesView() || (gui.g.CurrentView() == gui.getMainView() && gui.State.MainContext == "patch-building") {
-			_ = gui.refreshCommitFilesView()
+		if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
+			return gui.refreshCommitFilesView()
 		}
-		wg.Done()
-	}()
-
-	wg.Wait()
-
+		return nil
+	})
 	return nil
 }

 func (gui *Gui) refreshCommitsWithLimit() error {
-	builder, err := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits)
+	builder, err := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits, gui.State.DiffEntries)
 	if err != nil {
 		return err
 	}

-	commits, err := builder.GetCommits(commands.GetCommitsOptions{Limit: gui.State.Panels.Commits.LimitCommits, FilterPath: gui.State.FilterPath})
+	commits, err := builder.GetCommits(gui.State.Panels.Commits.LimitCommits)
 	if err != nil {
 		return err
 	}
@@ -138,13 +121,31 @@ func (gui *Gui) refreshCommitsWithLimit() error {

 // specific functions

-func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
+func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error {
+	return gui.createConfirmationPanel(g, commitView, true, gui.Tr.SLocalize("ResetToCommit"), gui.Tr.SLocalize("SureResetThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+		commit := gui.getSelectedCommit(g)
+		if commit == nil {
+			panic(errors.New(gui.Tr.SLocalize("NoCommitsThisBranch")))
+		}

+		if err := gui.GitCommand.ResetToCommit(commit.Sha, "mixed"); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		if err := gui.refreshCommits(g); err != nil {
+			panic(err)
+		}
+		if err := gui.refreshFiles(); err != nil {
+			panic(err)
+		}
+		gui.resetOrigin(commitView)
+		gui.State.Panels.Commits.SelectedLine = 0
+		return gui.handleCommitSelect(g, commitView)
+	}, nil)
+}
+
+func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
 	if len(gui.State.Commits) <= 1 {
-		return gui.createErrorPanel(gui.Tr.SLocalize("YouNoCommitsToSquash"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("YouNoCommitsToSquash"))
 	}

 	applied, err := gui.handleMidRebaseCommand("squash")
@@ -155,21 +156,28 @@ func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}

-	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Squash"), gui.Tr.SLocalize("SureSquashThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+	gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Squash"), gui.Tr.SLocalize("SureSquashThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("SquashingStatus"), func() error {
 			err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "squash")
 			return gui.handleGenericMergeCommandResult(err)
 		})
 	}, nil)
+	return nil
+}
+
+// TODO: move to files panel
+func (gui *Gui) anyUnStagedChanges(files []*commands.File) bool {
+	for _, file := range files {
+		if file.Tracked && file.HasUnstagedChanges {
+			return true
+		}
+	}
+	return false
 }

 func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	if len(gui.State.Commits) <= 1 {
-		return gui.createErrorPanel(gui.Tr.SLocalize("YouNoCommitsToSquash"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("YouNoCommitsToSquash"))
 	}

 	applied, err := gui.handleMidRebaseCommand("fixup")
@@ -180,19 +188,16 @@ func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}

-	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Fixup"), gui.Tr.SLocalize("SureFixupThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+	gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Fixup"), gui.Tr.SLocalize("SureFixupThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("FixingStatus"), func() error {
 			err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "fixup")
 			return gui.handleGenericMergeCommandResult(err)
 		})
 	}, nil)
+	return nil
 }

 func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	applied, err := gui.handleMidRebaseCommand("reword")
 	if err != nil {
 		return err
@@ -202,22 +207,20 @@ func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
 	}

 	if gui.State.Panels.Commits.SelectedLine != 0 {
-		return gui.createErrorPanel(gui.Tr.SLocalize("OnlyRenameTopCommit"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("OnlyRenameTopCommit"))
 	}
 	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("renameCommit"), "", func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.RenameCommit(v.Buffer()); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(g, err.Error())
 		}
-
-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+		if err := gui.refreshCommits(g); err != nil {
+			panic(err)
+		}
+		return gui.handleCommitSelect(g, v)
 	})
 }

 func (gui *Gui) handleRenameCommitEditor(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	applied, err := gui.handleMidRebaseCommand("reword")
 	if err != nil {
 		return err
@@ -228,7 +231,7 @@ func (gui *Gui) handleRenameCommitEditor(g *gocui.Gui, v *gocui.View) error {

 	subProcess, err := gui.GitCommand.RewordCommit(gui.State.Commits, gui.State.Panels.Commits.SelectedLine)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	if subProcess != nil {
 		gui.SubProcess = subProcess
@@ -252,22 +255,31 @@ func (gui *Gui) handleMidRebaseCommand(action string) (bool, error) {
 	// our input or we set a lazygit client as the EDITOR env variable and have it
 	// request us to edit the commit message when prompted.
 	if action == "reword" {
-		return true, gui.createErrorPanel(gui.Tr.SLocalize("rewordNotSupported"))
+		return true, gui.createErrorPanel(gui.g, gui.Tr.SLocalize("rewordNotSupported"))
 	}

 	if err := gui.GitCommand.EditRebaseTodo(gui.State.Panels.Commits.SelectedLine, action); err != nil {
-		return false, gui.surfaceError(err)
+		return false, gui.createErrorPanel(gui.g, err.Error())
 	}
-	// TODO: consider doing this in a way that is less expensive. We don't actually
-	// need to reload all the commits, just the TODO commits.
-	return true, gui.refreshSidePanels(refreshOptions{scope: []int{COMMITS}})
+	return true, gui.refreshCommits(gui.g)
+}
+
+// handleMoveTodoDown like handleMidRebaseCommand but for moving an item up in the todo list
+func (gui *Gui) handleMoveTodoDown(index int) (bool, error) {
+	selectedCommit := gui.State.Commits[index]
+	if selectedCommit.Status != "rebasing" {
+		return false, nil
+	}
+	if gui.State.Commits[index+1].Status != "rebasing" {
+		return true, nil
+	}
+	if err := gui.GitCommand.MoveTodoDown(index); err != nil {
+		return true, gui.createErrorPanel(gui.g, err.Error())
+	}
+	return true, gui.refreshCommits(gui.g)
 }

 func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	applied, err := gui.handleMidRebaseCommand("drop")
 	if err != nil {
 		return err
@@ -285,10 +297,6 @@ func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	index := gui.State.Panels.Commits.SelectedLine
 	selectedCommit := gui.State.Commits[index]
 	if selectedCommit.Status == "rebasing" {
@@ -296,10 +304,10 @@ func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
 			return nil
 		}
 		if err := gui.GitCommand.MoveTodoDown(index); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 		gui.State.Panels.Commits.SelectedLine++
-		return gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI, scope: []int{COMMITS, BRANCHES}})
+		return gui.refreshCommits(gui.g)
 	}

 	return gui.WithWaitingStatus(gui.Tr.SLocalize("MovingStatus"), func() error {
@@ -312,10 +320,6 @@ func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	index := gui.State.Panels.Commits.SelectedLine
 	if index == 0 {
 		return nil
@@ -323,10 +327,10 @@ func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
 	selectedCommit := gui.State.Commits[index]
 	if selectedCommit.Status == "rebasing" {
 		if err := gui.GitCommand.MoveTodoDown(index - 1); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 		gui.State.Panels.Commits.SelectedLine--
-		return gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI, scope: []int{COMMITS, BRANCHES}})
+		return gui.refreshCommits(gui.g)
 	}

 	return gui.WithWaitingStatus(gui.Tr.SLocalize("MovingStatus"), func() error {
@@ -339,10 +343,6 @@ func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	applied, err := gui.handleMidRebaseCommand("edit")
 	if err != nil {
 		return err
@@ -358,10 +358,6 @@ func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("AmendCommitTitle"), gui.Tr.SLocalize("AmendCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("AmendingStatus"), func() error {
 			err := gui.GitCommand.AmendTo(gui.State.Commits[gui.State.Panels.Commits.SelectedLine].Sha)
@@ -371,10 +367,6 @@ func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCommitPick(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	applied, err := gui.handleMidRebaseCommand("pick")
 	if err != nil {
 		return err
@@ -389,22 +381,14 @@ func (gui *Gui) handleCommitPick(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCommitRevert(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	if err := gui.GitCommand.Revert(gui.State.Commits[gui.State.Panels.Commits.SelectedLine].Sha); err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	gui.State.Panels.Commits.SelectedLine++
-	return gui.refreshSidePanels(refreshOptions{mode: BLOCK_UI, scope: []int{COMMITS, BRANCHES}})
+	return gui.refreshCommits(gui.g)
 }

 func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	// get currently selected commit, add the sha to state.
 	commit := gui.State.Commits[gui.State.Panels.Commits.SelectedLine]

@@ -412,29 +396,22 @@ func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
 	for index, cherryPickedCommit := range gui.State.CherryPickedCommits {
 		if commit.Sha == cherryPickedCommit.Sha {
 			gui.State.CherryPickedCommits = append(gui.State.CherryPickedCommits[0:index], gui.State.CherryPickedCommits[index+1:]...)
-			return gui.renderBranchCommitsWithSelection()
+			return gui.refreshCommits(gui.g)
 		}
 	}

 	gui.addCommitToCherryPickedCommits(gui.State.Panels.Commits.SelectedLine)
-	return gui.renderBranchCommitsWithSelection()
-}
-
-func (gui *Gui) cherryPickedCommitShaMap() map[string]bool {
-	commitShaMap := map[string]bool{}
-	for _, commit := range gui.State.CherryPickedCommits {
-		commitShaMap[commit.Sha] = true
-	}
-	return commitShaMap
+	return gui.refreshCommits(gui.g)
 }

 func (gui *Gui) addCommitToCherryPickedCommits(index int) {
-	commitShaMap := gui.cherryPickedCommitShaMap()
-	commitShaMap[gui.State.Commits[index].Sha] = true
+	// not super happy with modifying the state of the Commits array here
+	// but the alternative would be very tricky
+	gui.State.Commits[index].Copied = true

 	newCommits := []*commands.Commit{}
 	for _, commit := range gui.State.Commits {
-		if commitShaMap[commit.Sha] {
+		if commit.Copied {
 			// duplicating just the things we need to put in the rebase TODO list
 			newCommits = append(newCommits, &commands.Commit{Name: commit.Name, Sha: commit.Sha})
 		}
@@ -444,17 +421,13 @@ func (gui *Gui) addCommitToCherryPickedCommits(index int) {
 }

 func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
-	commitShaMap := gui.cherryPickedCommitShaMap()
+	// whenever I add a commit, I need to make sure I retain its order

 	// find the last commit that is copied that's above our position
 	// if there are none, startIndex = 0
 	startIndex := 0
 	for index, commit := range gui.State.Commits[0:gui.State.Panels.Commits.SelectedLine] {
-		if commitShaMap[commit.Sha] {
+		if commit.Copied {
 			startIndex = index
 		}
 	}
@@ -465,15 +438,11 @@ func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
 		gui.addCommitToCherryPickedCommits(index)
 	}

-	return gui.renderBranchCommitsWithSelection()
+	return gui.refreshCommits(gui.g)
 }

 // HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied
 func (gui *Gui) HandlePasteCommits(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
 	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("CherryPick"), gui.Tr.SLocalize("SureCherryPick"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("CherryPickingStatus"), func() error {
 			err := gui.GitCommand.CherryPickCommits(gui.State.CherryPickedCommits)
@@ -490,6 +459,54 @@ func (gui *Gui) handleSwitchToCommitFilesPanel(g *gocui.Gui, v *gocui.View) erro
 	return gui.switchFocus(g, gui.getCommitsView(), gui.getCommitFilesView())
 }

+func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
+	selectLimit := 2
+
+	// get selected commit
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	// if already selected commit delete
+	if idx, has := gui.hasCommit(gui.State.DiffEntries, commit.Sha); has {
+		gui.State.DiffEntries = gui.unchooseCommit(gui.State.DiffEntries, idx)
+	} else {
+		if len(gui.State.DiffEntries) == selectLimit {
+			gui.State.DiffEntries = gui.unchooseCommit(gui.State.DiffEntries, 0)
+		}
+		gui.State.DiffEntries = append(gui.State.DiffEntries, commit)
+	}
+
+	gui.setDiffMode()
+
+	// if selected two commits, display diff between
+	if len(gui.State.DiffEntries) == selectLimit {
+		commitText, err := gui.GitCommand.DiffCommits(gui.State.DiffEntries[0].Sha, gui.State.DiffEntries[1].Sha)
+
+		if err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+
+		return gui.newStringTask("main", commitText)
+	}
+
+	return nil
+}
+
+func (gui *Gui) setDiffMode() {
+	v := gui.getCommitsView()
+	if len(gui.State.DiffEntries) != 0 {
+		gui.State.Panels.Commits.SpecificDiffMode = true
+		v.Title = gui.Tr.SLocalize("CommitsDiffTitle")
+	} else {
+		gui.State.Panels.Commits.SpecificDiffMode = false
+		v.Title = gui.Tr.SLocalize("CommitsTitle")
+	}
+
+	gui.refreshCommits(gui.g)
+}
+
 func (gui *Gui) hasCommit(commits []*commands.Commit, target string) (int, bool) {
 	for idx, commit := range commits {
 		if commit.Sha == target {
@@ -504,11 +521,7 @@ func (gui *Gui) unchooseCommit(commits []*commands.Commit, i int) []*commands.Co
 }

 func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(g)
 	if commit == nil {
 		return nil
 	}
@@ -520,19 +533,15 @@ func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
 		},
 	), func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.CreateFixupCommit(commit.Sha); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(g, err.Error())
 		}

-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+		return gui.refreshSidePanels(gui.g)
 	}, nil)
 }

 func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) error {
-	if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
-		return err
-	}
-
-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(g)
 	if commit == nil {
 		return nil
 	}
@@ -554,7 +563,7 @@ func (gui *Gui) handleTagCommit(g *gocui.Gui, v *gocui.View) error {
 	// TODO: bring up menu asking if you want to make a lightweight or annotated tag
 	// if annotated, switch to a subprocess to create the message

-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(g)
 	if commit == nil {
 		return nil
 	}
@@ -565,20 +574,26 @@ func (gui *Gui) handleTagCommit(g *gocui.Gui, v *gocui.View) error {
 func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
 	return gui.createPromptPanel(gui.g, gui.getCommitsView(), gui.Tr.SLocalize("TagNameTitle"), "", func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), commitSha); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(g, err.Error())
 		}
-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{COMMITS, TAGS}})
+		if err := gui.refreshCommits(g); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		if err := gui.refreshTags(); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		return gui.handleCommitSelect(g, v)
 	})
 }

 func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(g)
 	if commit == nil {
 		return nil
 	}

 	return gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
-		return gui.handleCheckoutRef(commit.Sha, handleCheckoutRefOptions{})
+		return gui.handleCheckoutRef(commit.Sha)
 	}, nil)
 }

@@ -586,7 +601,7 @@ func (gui *Gui) renderBranchCommitsWithSelection() error {
 	commitsView := gui.getCommitsView()

 	gui.refreshSelectedLine(&gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits))
-	displayStrings := presentation.GetCommitListDisplayStrings(gui.State.Commits, gui.State.ScreenMode != SCREEN_NORMAL, gui.cherryPickedCommitShaMap(), gui.State.Diff.Ref)
+	displayStrings := presentation.GetCommitListDisplayStrings(gui.State.Commits, gui.State.ScreenMode != SCREEN_NORMAL)
 	gui.renderDisplayStrings(commitsView, displayStrings)
 	if gui.g.CurrentView() == commitsView && commitsView.Context == "branch-commits" {
 		if err := gui.handleCommitSelect(gui.g, commitsView); err != nil {
@@ -608,9 +623,7 @@ func (gui *Gui) onCommitsTabClick(tabIndex int) error {
 func (gui *Gui) switchCommitsPanelContext(context string) error {
 	commitsView := gui.getCommitsView()
 	commitsView.Context = context
-	if err := gui.onSearchEscape(); err != nil {
-		return err
-	}
+	gui.onSearchEscape()

 	contextTabIndexMap := map[string]int{
 		"branch-commits": 0,
@@ -648,9 +661,9 @@ func (gui *Gui) handlePrevCommitsTab(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedCommit()
+	commit := gui.getSelectedCommit(g)
 	if commit == nil {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoCommitsThisBranch"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}

 	return gui.createResetMenu(commit.Sha)
@@ -673,42 +686,10 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err
 	// we usually lazyload these commits but now that we're searching we need to load them now
 	if gui.State.Panels.Commits.LimitCommits {
 		gui.State.Panels.Commits.LimitCommits = false
-		if err := gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{COMMITS}}); err != nil {
+		if err := gui.refreshCommits(gui.g); err != nil {
 			return err
 		}
 	}

 	return gui.handleOpenSearch(gui.g, v)
 }
-
-func (gui *Gui) handleResetCherryPick(g *gocui.Gui, v *gocui.View) error {
-	gui.State.CherryPickedCommits = []*commands.Commit{}
-	return gui.renderBranchCommitsWithSelection()
-}
-
-func (gui *Gui) handleGotoBottomForCommitsPanel(g *gocui.Gui, v *gocui.View) error {
-	// we usually lazyload these commits but now that we're searching we need to load them now
-	if gui.State.Panels.Commits.LimitCommits {
-		gui.State.Panels.Commits.LimitCommits = false
-		if err := gui.refreshSidePanels(refreshOptions{mode: SYNC, scope: []int{COMMITS}}); err != nil {
-			return err
-		}
-	}
-
-	for _, view := range gui.getListViews() {
-		if view.viewName == "commits" {
-			return view.handleGotoBottom(g, v)
-		}
-	}
-
-	return nil
-}
-
-func (gui *Gui) handleClipboardCopyCommit(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedCommit()
-	if commit == nil {
-		return nil
-	}
-
-	return gui.OSCommand.CopyToClipboard(commit.Sha)
-}
--- a/pkg/gui/confirmation_panel.go
+++ b/pkg/gui/confirmation_panel.go
@@ -39,8 +39,7 @@ func (gui *Gui) closeConfirmationPrompt(g *gocui.Gui, returnFocusOnClose bool) e
 			panic(err)
 		}
 	}
-	g.DeleteKeybinding("confirmation", gocui.KeyEnter, gocui.ModNone)
-	g.DeleteKeybinding("confirmation", gocui.KeyEsc, gocui.ModNone)
+	g.DeleteKeybindings("confirmation")
 	return g.DeleteView("confirmation")
 }

@@ -62,9 +61,6 @@ func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, wrap bool, prompt s
 	width, height := g.Size()
 	panelWidth := 4 * width / 7
 	panelHeight := gui.getMessageHeight(wrap, prompt, panelWidth)
-	if panelHeight > height*3/4 {
-		panelHeight = height * 3 / 4
-	}
 	return width/2 - panelWidth/2,
 		height/2 - panelHeight/2 - panelHeight%2 - 1,
 		width/2 + panelWidth/2,
@@ -126,7 +122,9 @@ func (gui *Gui) createPopupPanel(g *gocui.Gui, currentView *gocui.View, title, p
 			}()
 		}

-		gui.renderString(g, "confirmation", prompt)
+		if err := gui.renderString(g, "confirmation", prompt); err != nil {
+			return err
+		}
 		return gui.setKeyBindings(g, handleConfirm, handleClose, returnFocusOnClose)
 	})
 	return nil
@@ -153,14 +151,19 @@ func (gui *Gui) setKeyBindings(g *gocui.Gui, handleConfirm, handleClose func(*go
 			"keyBindConfirm": "enter",
 		},
 	)
-
-	gui.renderString(g, "options", actions)
+	if err := gui.renderString(g, "options", actions); err != nil {
+		return err
+	}
 	if err := g.SetKeybinding("confirmation", nil, gocui.KeyEnter, gocui.ModNone, gui.wrappedConfirmationFunction(handleConfirm, returnFocusOnClose)); err != nil {
 		return err
 	}
 	return g.SetKeybinding("confirmation", nil, gocui.KeyEsc, gocui.ModNone, gui.wrappedConfirmationFunction(handleClose, returnFocusOnClose))
 }

+func (gui *Gui) createMessagePanel(g *gocui.Gui, currentView *gocui.View, title, prompt string) error {
+	return gui.createPopupPanel(g, currentView, title, prompt, false, true, false, nil, nil)
+}
+
 // createSpecificErrorPanel allows you to create an error popup, specifying the
 //  view to be focused when the user closes the popup, and a boolean specifying
 // whether we will log the error. If the message may include a user password,
@@ -179,17 +182,9 @@ func (gui *Gui) createSpecificErrorPanel(message string, nextView *gocui.View, w

 	colorFunction := color.New(color.FgRed).SprintFunc()
 	coloredMessage := colorFunction(strings.TrimSpace(message))
-	if err := gui.refreshSidePanels(refreshOptions{mode: ASYNC}); err != nil {
-		return err
-	}
-
 	return gui.createConfirmationPanel(gui.g, nextView, true, gui.Tr.SLocalize("Error"), coloredMessage, nil, nil)
 }

-func (gui *Gui) createErrorPanel(message string) error {
-	return gui.createSpecificErrorPanel(message, gui.g.CurrentView(), true)
-}
-
-func (gui *Gui) surfaceError(err error) error {
-	return gui.createErrorPanel(err.Error())
+func (gui *Gui) createErrorPanel(g *gocui.Gui, message string) error {
+	return gui.createSpecificErrorPanel(message, g.CurrentView(), true)
 }
--- a/pkg/gui/context.go
+++ b/pkg/gui/context.go
@@ -16,4 +16,5 @@ func (gui *Gui) changeMainViewsContext(context string) {
 	}

 	gui.State.MainContext = context
+	return
 }
--- a/pkg/gui/credentials_panel.go
+++ b/pkg/gui/credentials_panel.go
@@ -36,9 +36,19 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
 func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error {
 	message := gui.trimmedContent(v)
 	gui.credentials <- message
+	err := gui.refreshFiles()
+	if err != nil {
+		return err
+	}
 	v.Clear()
-	_ = v.SetCursor(0, 0)
-	_, _ = g.SetViewOnBottom("credentials")
+	err = v.SetCursor(0, 0)
+	if err != nil {
+		return err
+	}
+	_, err = g.SetViewOnBottom("credentials")
+	if err != nil {
+		return err
+	}
 	nextView, err := gui.g.View("confirmation")
 	if err != nil {
 		nextView = gui.getFilesView()
@@ -47,7 +57,7 @@ func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error {
 	if err != nil {
 		return err
 	}
-	return gui.refreshSidePanels(refreshOptions{})
+	return gui.refreshCommits(g)
 }

 func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error {
@@ -72,8 +82,7 @@ func (gui *Gui) handleCredentialsViewFocused(g *gocui.Gui, v *gocui.View) error
 			"keyBindConfirm": "enter",
 		},
 	)
-	gui.renderString(g, "options", message)
-	return nil
+	return gui.renderString(g, "options", message)
 }

 // HandleCredentialsPopup handles the views after executing a command that might ask for credentials
@@ -90,6 +99,6 @@ func (gui *Gui) HandleCredentialsPopup(g *gocui.Gui, popupOpened bool, cmdErr er
 		_ = gui.createSpecificErrorPanel(errMessage, gui.getFilesView(), false)
 	} else {
 		_ = gui.closeConfirmationPrompt(g, true)
-		_ = gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+		_ = gui.refreshSidePanels(g)
 	}
 }
--- a/pkg/gui/diffing.go
+++ b/pkg/gui/diffing.go
@@ -1,181 +0,0 @@
-package gui
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-)
-
-func (gui *Gui) inDiffMode() bool {
-	return gui.State.Diff.Ref != ""
-}
-
-func (gui *Gui) exitDiffMode() error {
-	gui.State.Diff = DiffState{}
-	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-}
-
-func (gui *Gui) renderDiff() error {
-	gui.getMainView().Title = "Diff"
-	gui.State.SplitMainPanel = false
-	filterArg := ""
-	if gui.inFilterMode() {
-		filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath)
-	}
-
-	cmd := gui.OSCommand.ExecutableFromString(
-		fmt.Sprintf("git diff --color %s %s", gui.diffStr(), filterArg),
-	)
-	if err := gui.newPtyTask("main", cmd); err != nil {
-		gui.Log.Error(err)
-	}
-	return nil
-}
-
-// currentDiffTerminals returns the current diff terminals of the currently selected item.
-// in the case of a branch it returns both the branch and it's upstream name,
-// which becomes an option when you bring up the diff menu, but when you're just
-// flicking through branches it will be using the local branch name.
-func (gui *Gui) currentDiffTerminals() []string {
-	currentView := gui.g.CurrentView()
-	if currentView == nil {
-		return nil
-	}
-	names := []string{}
-	switch currentView.Name() {
-	case "files":
-	// not supporting files for now
-	// file, err := gui.getSelectedFile()
-	// if err == nil {
-	// 	names = append(names, file.Name)
-	// }
-	case "commitFiles":
-		// not supporting commit files for now
-		// file := gui.getSelectedCommitFile()
-		// if file != nil {
-		// 	names = append(names, file.Name)
-		// }
-	case "commits":
-		var commit *commands.Commit
-		switch gui.getCommitsView().Context {
-		case "reflog-commits":
-			commit = gui.getSelectedReflogCommit()
-		case "branch-commits":
-			commit = gui.getSelectedCommit()
-		}
-		if commit != nil {
-			names = append(names, commit.Sha)
-		}
-	case "stash":
-		entry := gui.getSelectedStashEntry()
-		if entry != nil {
-			names = append(names, entry.RefName())
-		}
-	case "branches":
-		switch gui.getBranchesView().Context {
-		case "local-branches":
-			branch := gui.getSelectedBranch()
-			if branch != nil {
-				names = append(names, branch.Name)
-				if branch.UpstreamName != "" {
-					names = append(names, branch.UpstreamName)
-				}
-			}
-		case "remotes":
-			remote := gui.getSelectedRemote()
-			if remote != nil {
-				names = append(names, remote.Name)
-			}
-		case "remote-branches":
-			remoteBranch := gui.getSelectedRemoteBranch()
-			if remoteBranch != nil {
-				names = append(names, remoteBranch.FullName())
-			}
-		case "tags":
-			tag := gui.getSelectedTag()
-			if tag != nil {
-				names = append(names, tag.Name)
-			}
-		}
-	}
-	return names
-}
-
-func (gui *Gui) currentDiffTerminal() string {
-	names := gui.currentDiffTerminals()
-	if len(names) == 0 {
-		return ""
-	}
-	return names[0]
-}
-
-func (gui *Gui) diffStr() string {
-	output := gui.State.Diff.Ref
-
-	right := gui.currentDiffTerminal()
-	if right != "" {
-		output += " " + right
-	}
-	if gui.State.Diff.Reverse {
-		output += " -R"
-	}
-	return output
-}
-
-func (gui *Gui) handleCreateDiffingMenuPanel(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	names := gui.currentDiffTerminals()
-
-	menuItems := []*menuItem{}
-	for _, name := range names {
-		name := name
-		menuItems = append(menuItems, []*menuItem{
-			{
-				displayString: fmt.Sprintf("%s %s", gui.Tr.SLocalize("diff"), name),
-				onPress: func() error {
-					gui.State.Diff.Ref = name
-					// can scope this down based on current view but too lazy right now
-					return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-				},
-			},
-		}...)
-	}
-
-	menuItems = append(menuItems, []*menuItem{
-		{
-			displayString: gui.Tr.SLocalize("enterRefToDiff"),
-			onPress: func() error {
-				return gui.createPromptPanel(gui.g, v, gui.Tr.SLocalize("enteRefName"), "", func(g *gocui.Gui, promptView *gocui.View) error {
-					gui.State.Diff.Ref = strings.TrimSpace(promptView.Buffer())
-					return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-				})
-			},
-		},
-	}...)
-
-	if gui.inDiffMode() {
-		menuItems = append(menuItems, []*menuItem{
-			{
-				displayString: gui.Tr.SLocalize("swapDiff"),
-				onPress: func() error {
-					gui.State.Diff.Reverse = !gui.State.Diff.Reverse
-					return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-				},
-			},
-			{
-				displayString: gui.Tr.SLocalize("exitDiffMode"),
-				onPress: func() error {
-					gui.State.Diff = DiffState{}
-					return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-				},
-			},
-		}...)
-	}
-
-	return gui.createMenu(gui.Tr.SLocalize("DiffingMenuTitle"), menuItems, createMenuOptions{showCancel: true})
-}
--- a/pkg/gui/discard_changes_menu_panel.go
+++ b/pkg/gui/discard_changes_menu_panel.go
@@ -5,7 +5,7 @@ import (
 )

 func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
@@ -18,9 +18,9 @@ func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
 			displayString: gui.Tr.SLocalize("discardAllChanges"),
 			onPress: func() error {
 				if err := gui.GitCommand.DiscardAllFileChanges(file); err != nil {
-					return gui.surfaceError(err)
+					return err
 				}
-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 	}
@@ -30,10 +30,10 @@ func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
 			displayString: gui.Tr.SLocalize("discardUnstagedChanges"),
 			onPress: func() error {
 				if err := gui.GitCommand.DiscardUnstagedFileChanges(file); err != nil {
-					return gui.surfaceError(err)
+					return err
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		})
 	}
--- a/pkg/gui/file_watching.go
+++ b/pkg/gui/file_watching.go
@@ -23,13 +23,11 @@ type fileWatcher struct {
 }

 func NewFileWatcher(log *logrus.Entry) *fileWatcher {
-	// TODO: get this going again, and ensure we don't see any crashes from it
+	watcher, err := fsnotify.NewWatcher()
+	log.Error(err)
 	return &fileWatcher{
 		Disabled: true,
 	}
-
-	watcher, err := fsnotify.NewWatcher()
-
 	if err != nil {
 		log.Error(err)
 		return &fileWatcher{
@@ -132,7 +130,12 @@ func (gui *Gui) watchFilesForChanges() {
 				}
 				// only refresh if we're not already
 				if !gui.State.IsRefreshingFiles {
-					gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+					if err := gui.refreshFiles(); err != nil {
+						err = gui.createErrorPanel(gui.g, err.Error())
+						if err != nil {
+							gui.Log.Error(err)
+						}
+					}
 				}

 			// watch for errors
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -8,18 +8,16 @@ import (
 	// "strings"

 	"fmt"
-	"regexp"
 	"strings"

 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 // list panel functions

-func (gui *Gui) getSelectedFile() (*commands.File, error) {
+func (gui *Gui) getSelectedFile(g *gocui.Gui) (*commands.File, error) {
 	selectedLine := gui.State.Panels.Files.SelectedLine
 	if selectedLine == -1 {
 		return &commands.File{}, gui.Errors.ErrNoFiles
@@ -29,13 +27,7 @@ func (gui *Gui) getSelectedFile() (*commands.File, error) {
 }

 func (gui *Gui) selectFile(alreadySelected bool) error {
-	gui.getFilesView().FocusPoint(0, gui.State.Panels.Files.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
-	}
-
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
@@ -45,6 +37,16 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles"))
 	}

+	if err := gui.focusPoint(0, gui.State.Panels.Files.SelectedLine, len(gui.State.Files), gui.getFilesView()); err != nil {
+		return err
+	}
+
+	if file.HasInlineMergeConflicts {
+		gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle")
+		gui.State.SplitMainPanel = false
+		return gui.refreshMergePanel()
+	}
+
 	if !alreadySelected {
 		if err := gui.resetOrigin(gui.getMainView()); err != nil {
 			return err
@@ -54,19 +56,13 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		}
 	}

-	if file.HasInlineMergeConflicts {
-		gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle")
-		gui.State.SplitMainPanel = false
-		return gui.refreshMergePanel()
-	}
-
 	if file.HasStagedChanges && file.HasUnstagedChanges {
 		gui.State.SplitMainPanel = true
 		gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
 		gui.getSecondaryView().Title = gui.Tr.SLocalize("StagedChanges")
 		cmdStr := gui.GitCommand.DiffCmdStr(file, false, true)
 		cmd := gui.OSCommand.ExecutableFromString(cmdStr)
-		if err := gui.newPtyTask("secondary", cmd); err != nil {
+		if err := gui.newCmdTask("secondary", cmd); err != nil {
 			return err
 		}
 	} else {
@@ -80,7 +76,7 @@ func (gui *Gui) selectFile(alreadySelected bool) error {

 	cmdStr := gui.GitCommand.DiffCmdStr(file, false, !file.HasUnstagedChanges && file.HasStagedChanges)
 	cmd := gui.OSCommand.ExecutableFromString(cmdStr)
-	if err := gui.newPtyTask("main", cmd); err != nil {
+	if err := gui.newCmdTask("main", cmd); err != nil {
 		return err
 	}

@@ -95,7 +91,7 @@ func (gui *Gui) refreshFiles() error {
 		gui.State.RefreshingFilesMutex.Unlock()
 	}()

-	selectedFile, _ := gui.getSelectedFile()
+	selectedFile, _ := gui.getSelectedFile(gui.g)

 	filesView := gui.getFilesView()
 	if filesView == nil {
@@ -107,11 +103,11 @@ func (gui *Gui) refreshFiles() error {
 	}

 	gui.g.Update(func(g *gocui.Gui) error {
-		displayStrings := presentation.GetFileListDisplayStrings(gui.State.Files, gui.State.Diff.Ref)
+		displayStrings := presentation.GetFileListDisplayStrings(gui.State.Files)
 		gui.renderDisplayStrings(filesView, displayStrings)

 		if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == "merging") {
-			newSelectedFile, _ := gui.getSelectedFile()
+			newSelectedFile, _ := gui.getSelectedFile(gui.g)
 			alreadySelected := newSelectedFile.Name == selectedFile.Name
 			return gui.selectFile(alreadySelected)
 		}
@@ -136,7 +132,7 @@ func (gui *Gui) stagedFiles() []*commands.File {

 func (gui *Gui) trackedFiles() []*commands.File {
 	files := gui.State.Files
-	result := make([]*commands.File, 0, len(files))
+	result := make([]*commands.File, 0)
 	for _, file := range files {
 		if file.Tracked {
 			result = append(result, file)
@@ -146,7 +142,7 @@ func (gui *Gui) trackedFiles() []*commands.File {
 }

 func (gui *Gui) stageSelectedFile(g *gocui.Gui) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
 		return err
 	}
@@ -158,7 +154,7 @@ func (gui *Gui) handleEnterFile(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
@@ -169,7 +165,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error
 		return gui.handleSwitchToMerge(gui.g, gui.getFilesView())
 	}
 	if file.HasMergeConflicts {
-		return gui.createErrorPanel(gui.Tr.SLocalize("FileStagingRequirements"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FileStagingRequirements"))
 	}
 	gui.changeMainViewsContext("staging")
 	if err := gui.switchFocus(gui.g, gui.getFilesView(), gui.getMainView()); err != nil {
@@ -179,7 +175,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error
 }

 func (gui *Gui) handleFilePress(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
 		if err == gui.Errors.ErrNoFiles {
 			return nil
@@ -192,15 +188,12 @@ func (gui *Gui) handleFilePress(g *gocui.Gui, v *gocui.View) error {
 	}

 	if file.HasUnstagedChanges {
-		err = gui.GitCommand.StageFile(file.Name)
+		gui.GitCommand.StageFile(file.Name)
 	} else {
-		err = gui.GitCommand.UnStageFile(file.Name, file.Tracked)
-	}
-	if err != nil {
-		return gui.surfaceError(err)
+		gui.GitCommand.UnStageFile(file.Name, file.Tracked)
 	}

-	if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil {
+	if err := gui.refreshFiles(); err != nil {
 		return err
 	}

@@ -232,10 +225,10 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
 		err = gui.GitCommand.StageAll()
 	}
 	if err != nil {
-		_ = gui.surfaceError(err)
+		_ = gui.createErrorPanel(g, err.Error())
 	}

-	if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil {
+	if err := gui.refreshFiles(); err != nil {
 		return err
 	}

@@ -243,9 +236,9 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

 	if file.Tracked {
@@ -258,24 +251,26 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
 				if err := gui.GitCommand.RemoveTrackedFiles(file.Name); err != nil {
 					return err
 				}
-				return gui.refreshSidePanels(refreshOptions{scope: []int{FILES}})
+				return gui.refreshFiles()
 			}, nil)
 	}

 	if err := gui.GitCommand.Ignore(file.Name); err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

-	return gui.refreshSidePanels(refreshOptions{scope: []int{FILES}})
+	return gui.refreshFiles()
 }

 func (gui *Gui) handleWIPCommitPress(g *gocui.Gui, filesView *gocui.View) error {
 	skipHookPreifx := gui.Config.GetUserConfig().GetString("git.skipHookPrefix")
 	if skipHookPreifx == "" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("SkipHookPrefixNotConfigured"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("SkipHookPrefixNotConfigured"))
 	}

-	gui.renderString(g, "commitMessage", skipHookPreifx)
+	if err := gui.renderString(g, "commitMessage", skipHookPreifx); err != nil {
+		return err
+	}
 	if err := gui.getCommitMessageView().SetCursor(len(skipHookPreifx), 0); err != nil {
 		return err
 	}
@@ -284,33 +279,13 @@ func (gui *Gui) handleWIPCommitPress(g *gocui.Gui, filesView *gocui.View) error
 }

 func (gui *Gui) handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
-	if len(gui.stagedFiles()) == 0 && gui.GitCommand.WorkingTreeState() == "normal" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoStagedFilesToCommit"))
+	if len(gui.stagedFiles()) == 0 && gui.State.WorkingTreeState == "normal" {
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoStagedFilesToCommit"))
 	}
 	commitMessageView := gui.getCommitMessageView()
-	prefixPattern := gui.Config.GetUserConfig().GetString("git.commitPrefixes." + utils.GetCurrentRepoName() + ".pattern")
-	prefixReplace := gui.Config.GetUserConfig().GetString("git.commitPrefixes." + utils.GetCurrentRepoName() + ".replace")
-	if len(prefixPattern) > 0 && len(prefixReplace) > 0 {
-		rgx, err := regexp.Compile(prefixPattern)
-		if err != nil {
-			return gui.createErrorPanel(fmt.Sprintf("%s: %s", gui.Tr.SLocalize("commitPrefixPatternError"), err.Error()))
-		}
-		prefix := rgx.ReplaceAllString(gui.getCheckedOutBranch().Name, prefixReplace)
-		gui.renderString(g, "commitMessage", prefix)
-		if err := commitMessageView.SetCursor(len(prefix), 0); err != nil {
-			return err
-		}
-	}
-
 	g.Update(func(g *gocui.Gui) error {
-		if _, err := g.SetViewOnTop("commitMessage"); err != nil {
-			return err
-		}
-
-		if err := gui.switchFocus(g, filesView, commitMessageView); err != nil {
-			return err
-		}
-
+		g.SetViewOnTop("commitMessage")
+		gui.switchFocus(g, filesView, commitMessageView)
 		gui.RenderCommitLength()
 		return nil
 	})
@@ -318,11 +293,11 @@ func (gui *Gui) handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
 }

 func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) error {
-	if len(gui.stagedFiles()) == 0 && gui.GitCommand.WorkingTreeState() == "normal" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoStagedFilesToCommit"))
+	if len(gui.stagedFiles()) == 0 && gui.State.WorkingTreeState == "normal" {
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoStagedFilesToCommit"))
 	}
 	if len(gui.State.Commits) == 0 {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoCommitToAmend"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoCommitToAmend"))
 	}

 	title := strings.Title(gui.Tr.SLocalize("AmendLastCommit"))
@@ -337,15 +312,15 @@ func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) erro
 			return nil
 		}

-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+		return gui.refreshSidePanels(g)
 	}, nil)
 }

 // handleCommitEditorPress - handle when the user wants to commit changes via
 // their editor rather than via the popup panel
 func (gui *Gui) handleCommitEditorPress(g *gocui.Gui, filesView *gocui.View) error {
-	if len(gui.stagedFiles()) == 0 && gui.GitCommand.WorkingTreeState() == "normal" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoStagedFilesToCommit"))
+	if len(gui.stagedFiles()) == 0 && gui.State.WorkingTreeState == "normal" {
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoStagedFilesToCommit"))
 	}
 	gui.PrepareSubProcess(g, "git", "commit")
 	return nil
@@ -365,24 +340,24 @@ func (gui *Gui) editFile(filename string) error {
 }

 func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

 	return gui.editFile(file.Name)
 }

 func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	return gui.openFile(file.Name)
 }

 func (gui *Gui) handleRefreshFiles(g *gocui.Gui, v *gocui.View) error {
-	return gui.refreshSidePanels(refreshOptions{scope: []int{FILES}})
+	return gui.refreshFiles()
 }

 func (gui *Gui) refreshStateFiles() error {
@@ -395,11 +370,11 @@ func (gui *Gui) refreshStateFiles() error {
 	}

 	gui.refreshSelectedLine(&gui.State.Panels.Files.SelectedLine, len(gui.State.Files))
-	return nil
+	return gui.updateWorkTreeState()
 }

 func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {
-	item, err := gui.getSelectedFile()
+	item, err := gui.getSelectedFile(g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return "", err
@@ -419,27 +394,31 @@ func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {

 func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
 	// if we have no upstream branch we need to set that first
-	currentBranch := gui.currentBranch()
-	if currentBranch.Pullables == "?" {
+	_, pullables := gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount()
+	currentBranchName, err := gui.GitCommand.CurrentBranchName()
+	if err != nil {
+		return err
+	}
+	if pullables == "?" {
 		// see if we have this branch in our config with an upstream
 		conf, err := gui.GitCommand.Repo.Config()
 		if err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 		for branchName, branch := range conf.Branches {
-			if branchName == currentBranch.Name {
+			if branchName == currentBranchName {
 				return gui.pullFiles(v, fmt.Sprintf("%s %s", branch.Remote, branchName))
 			}
 		}

-		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin/"+currentBranch.Name, func(g *gocui.Gui, v *gocui.View) error {
+		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin/"+currentBranchName, func(g *gocui.Gui, v *gocui.View) error {
 			upstream := gui.trimmedContent(v)
 			if err := gui.GitCommand.SetUpstreamBranch(upstream); err != nil {
 				errorMessage := err.Error()
 				if strings.Contains(errorMessage, "does not exist") {
 					errorMessage = fmt.Sprintf("upstream branch %s not found.\nIf you expect it to exist, you should fetch (with 'f').\nOtherwise, you should push (with 'shift+P')", upstream)
 				}
-				return gui.createErrorPanel(errorMessage)
+				return gui.createErrorPanel(gui.g, errorMessage)
 			}
 			return gui.pullFiles(v, "")
 		})
@@ -483,24 +462,28 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstr

 func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
 	// if we have pullables we'll ask if the user wants to force push
-	currentBranch := gui.currentBranch()
+	_, pullables := gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount()
+	currentBranchName, err := gui.GitCommand.CurrentBranchName()
+	if err != nil {
+		return err
+	}

-	if currentBranch.Pullables == "?" {
+	if pullables == "?" {
 		// see if we have this branch in our config with an upstream
 		conf, err := gui.GitCommand.Repo.Config()
 		if err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 		for branchName, branch := range conf.Branches {
-			if branchName == currentBranch.Name {
+			if branchName == currentBranchName {
 				return gui.pushWithForceFlag(g, v, false, "", fmt.Sprintf("%s %s", branch.Remote, branchName))
 			}
 		}

-		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranch.Name, func(g *gocui.Gui, v *gocui.View) error {
+		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranchName, func(g *gocui.Gui, v *gocui.View) error {
 			return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v), "")
 		})
-	} else if currentBranch.Pullables == "0" {
+	} else if pullables == "0" {
 		return gui.pushWithForceFlag(g, v, false, "", "")
 	}
 	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
@@ -509,15 +492,15 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 		return nil
 	}
 	if !file.HasInlineMergeConflicts {
-		return gui.createErrorPanel(gui.Tr.SLocalize("FileNoMergeCons"))
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons"))
 	}
 	gui.changeMainViewsContext("merging")
 	if err := gui.switchFocus(g, v, gui.getMainView()); err != nil {
@@ -526,9 +509,18 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
 	return gui.refreshMergePanel()
 }

+func (gui *Gui) handleAbortMerge(g *gocui.Gui, v *gocui.View) error {
+	if err := gui.GitCommand.AbortMerge(); err != nil {
+		return gui.createErrorPanel(g, err.Error())
+	}
+	gui.createMessagePanel(g, v, "", gui.Tr.SLocalize("MergeAborted"))
+	gui.refreshStatus(g)
+	return gui.refreshFiles()
+}
+
 func (gui *Gui) openFile(filename string) error {
 	if err := gui.OSCommand.OpenFile(filename); err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	return nil
 }
--- a/pkg/gui/filtering.go
+++ b/pkg/gui/filtering.go
@@ -1,21 +0,0 @@
-package gui
-
-import "github.com/jesseduffield/gocui"
-
-func (gui *Gui) inFilterMode() bool {
-	return gui.State.FilterPath != ""
-}
-
-func (gui *Gui) validateNotInFilterMode() (bool, error) {
-	if gui.inFilterMode() {
-		return false, gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("MustExitFilterModeTitle"), gui.Tr.SLocalize("MustExitFilterModePrompt"), func(*gocui.Gui, *gocui.View) error {
-			return gui.exitFilterMode()
-		}, nil)
-	}
-	return true, nil
-}
-
-func (gui *Gui) exitFilterMode() error {
-	gui.State.FilterPath = ""
-	return gui.Errors.ErrRestart
-}
--- a/pkg/gui/filtering_menu_panel.go
+++ b/pkg/gui/filtering_menu_panel.go
@@ -1,62 +0,0 @@
-package gui
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/gocui"
-)
-
-func (gui *Gui) handleCreateFilteringMenuPanel(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	fileName := ""
-	switch v.Name() {
-	case "files":
-		file, err := gui.getSelectedFile()
-		if err == nil {
-			fileName = file.Name
-		}
-	case "commitFiles":
-		file := gui.getSelectedCommitFile()
-		if file != nil {
-			fileName = file.Name
-		}
-	}
-
-	menuItems := []*menuItem{}
-
-	if fileName != "" {
-		menuItems = append(menuItems, &menuItem{
-			displayString: fmt.Sprintf("%s '%s'", gui.Tr.SLocalize("filterBy"), fileName),
-			onPress: func() error {
-				gui.State.FilterPath = fileName
-				return gui.Errors.ErrRestart
-			},
-		})
-	}
-
-	menuItems = append(menuItems, &menuItem{
-		displayString: gui.Tr.SLocalize("filterPathOption"),
-		onPress: func() error {
-			return gui.createPromptPanel(gui.g, v, gui.Tr.SLocalize("enterFileName"), "", func(g *gocui.Gui, promptView *gocui.View) error {
-				gui.State.FilterPath = strings.TrimSpace(promptView.Buffer())
-				return gui.Errors.ErrRestart
-			})
-		},
-	})
-
-	if gui.inFilterMode() {
-		menuItems = append(menuItems, &menuItem{
-			displayString: gui.Tr.SLocalize("exitFilterMode"),
-			onPress: func() error {
-				gui.State.FilterPath = ""
-				return gui.Errors.ErrRestart
-			},
-		})
-	}
-
-	return gui.createMenu(gui.Tr.SLocalize("FilteringMenuTitle"), menuItems, createMenuOptions{showCancel: true})
-}
--- a/pkg/gui/git_flow.go
+++ b/pkg/gui/git_flow.go
@@ -28,7 +28,7 @@ func (gui *Gui) gitFlowFinishBranch(gitFlowConfig string, branchName string) err
 	}

 	if branchType == "" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NotAGitFlowBranch"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NotAGitFlowBranch"))
 	}

 	subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "finish", suffix)
@@ -45,7 +45,7 @@ func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
 	// get config
 	gitFlowConfig, err := gui.OSCommand.RunCommandWithOutput("git config --local --get-regexp gitflow")
 	if err != nil {
-		return gui.createErrorPanel("You need to install git-flow and enable it in this repo to use git-flow features")
+		return gui.createErrorPanel(gui.g, "You need to install git-flow and enable it in this repo to use git-flow features")
 	}

 	startHandler := func(branchType string) func() error {
@@ -76,10 +76,6 @@ func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
 			displayString: "start hotfix",
 			onPress:       startHandler("hotfix"),
 		},
-		{
-			displayString: "start bugfix",
-			onPress:       startHandler("bugfix"),
-		},
 		{
 			displayString: "start release",
 			onPress:       startHandler("release"),
--- a/pkg/gui/global_handlers.go
+++ b/pkg/gui/global_handlers.go
@@ -1,180 +0,0 @@
-package gui
-
-import (
-	"math"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func (gui *Gui) nextScreenMode(g *gocui.Gui, v *gocui.View) error {
-	gui.State.ScreenMode = utils.NextIntInCycle([]int{SCREEN_NORMAL, SCREEN_HALF, SCREEN_FULL}, gui.State.ScreenMode)
-	// commits render differently depending on whether we're in fullscreen more or not
-	if err := gui.refreshCommitsViewWithSelection(); err != nil {
-		return err
-	}
-	// same with branches
-	if err := gui.refreshBranchesViewWithSelection(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (gui *Gui) prevScreenMode(g *gocui.Gui, v *gocui.View) error {
-	gui.State.ScreenMode = utils.PrevIntInCycle([]int{SCREEN_NORMAL, SCREEN_HALF, SCREEN_FULL}, gui.State.ScreenMode)
-	// commits render differently depending on whether we're in fullscreen more or not
-	if err := gui.refreshCommitsViewWithSelection(); err != nil {
-		return err
-	}
-	// same with branches
-	if err := gui.refreshBranchesViewWithSelection(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (gui *Gui) scrollUpView(viewName string) error {
-	mainView, _ := gui.g.View(viewName)
-	ox, oy := mainView.Origin()
-	newOy := int(math.Max(0, float64(oy-gui.Config.GetUserConfig().GetInt("gui.scrollHeight"))))
-	return mainView.SetOrigin(ox, newOy)
-}
-
-func (gui *Gui) scrollDownView(viewName string) error {
-	mainView, _ := gui.g.View(viewName)
-	ox, oy := mainView.Origin()
-	y := oy
-	if !gui.Config.GetUserConfig().GetBool("gui.scrollPastBottom") {
-		_, sy := mainView.Size()
-		y += sy
-	}
-	scrollHeight := gui.Config.GetUserConfig().GetInt("gui.scrollHeight")
-	if y < mainView.LinesHeight() {
-		if err := mainView.SetOrigin(ox, oy+scrollHeight); err != nil {
-			return err
-		}
-	}
-	if manager, ok := gui.viewBufferManagerMap[viewName]; ok {
-		manager.ReadLines(scrollHeight)
-	}
-	return nil
-}
-
-func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
-	return gui.scrollUpView("main")
-}
-
-func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
-	return gui.scrollDownView("main")
-}
-
-func (gui *Gui) scrollUpSecondary(g *gocui.Gui, v *gocui.View) error {
-	return gui.scrollUpView("secondary")
-}
-
-func (gui *Gui) scrollDownSecondary(g *gocui.Gui, v *gocui.View) error {
-	return gui.scrollDownView("secondary")
-}
-
-func (gui *Gui) scrollUpConfirmationPanel(g *gocui.Gui, v *gocui.View) error {
-	if v.Editable {
-		return nil
-	}
-	return gui.scrollUpView("confirmation")
-}
-
-func (gui *Gui) scrollDownConfirmationPanel(g *gocui.Gui, v *gocui.View) error {
-	if v.Editable {
-		return nil
-	}
-	return gui.scrollDownView("confirmation")
-}
-
-func (gui *Gui) handleRefresh(g *gocui.Gui, v *gocui.View) error {
-	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
-}
-
-func (gui *Gui) handleMouseDownMain(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	switch g.CurrentView().Name() {
-	case "files":
-		return gui.enterFile(false, v.SelectedLineIdx())
-	case "commitFiles":
-		return gui.enterCommitFile(v.SelectedLineIdx())
-	}
-
-	return nil
-}
-
-func (gui *Gui) handleMouseDownSecondary(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	switch g.CurrentView().Name() {
-	case "files":
-		return gui.enterFile(true, v.SelectedLineIdx())
-	}
-
-	return nil
-}
-
-func (gui *Gui) handleInfoClick(g *gocui.Gui, v *gocui.View) error {
-	if !gui.g.Mouse {
-		return nil
-	}
-
-	cx, _ := v.Cursor()
-	width, _ := v.Size()
-
-	// if we're in the normal context there will be a donate button here
-	// if we have ('reset') at the end then
-	if gui.inFilterMode() {
-		if width-cx <= len(gui.Tr.SLocalize("(reset)")) {
-			return gui.exitFilterMode()
-		} else {
-			return nil
-		}
-	}
-
-	if gui.inDiffMode() {
-		if width-cx <= len(gui.Tr.SLocalize("(reset)")) {
-			return gui.exitDiffMode()
-		} else {
-			return nil
-		}
-	}
-
-	if cx <= len(gui.Tr.SLocalize("Donate")) {
-		return gui.OSCommand.OpenLink("https://github.com/sponsors/jesseduffield")
-	}
-	return nil
-}
-
-func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (unamePassOpend bool, err error) {
-	unamePassOpend = false
-	err = gui.GitCommand.Fetch(func(passOrUname string) string {
-		unamePassOpend = true
-		return gui.waitForPassUname(gui.g, v, passOrUname)
-	}, canAskForCredentials)
-
-	if canAskForCredentials && err != nil && strings.Contains(err.Error(), "exit status 128") {
-		colorFunction := color.New(color.FgRed).SprintFunc()
-		coloredMessage := colorFunction(strings.TrimSpace(gui.Tr.SLocalize("PassUnameWrong")))
-		close := func(g *gocui.Gui, v *gocui.View) error {
-			return nil
-		}
-		_ = gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Error"), coloredMessage, close, close)
-	}
-
-	gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, COMMITS, REMOTES, TAGS}, mode: ASYNC})
-
-	return unamePassOpend, err
-}
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
--- a/pkg/gui/layout.go
+++ b/pkg/gui/layout.go
@@ -1,520 +0,0 @@
-package gui
-
-import (
-	"fmt"
-
-	"github.com/fatih/color"
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// getFocusLayout returns a manager function for when view gain and lose focus
-func (gui *Gui) getFocusLayout() func(g *gocui.Gui) error {
-	var previousView *gocui.View
-	return func(g *gocui.Gui) error {
-		newView := gui.g.CurrentView()
-		if err := gui.onFocusChange(); err != nil {
-			return err
-		}
-		// for now we don't consider losing focus to a popup panel as actually losing focus
-		if newView != previousView && !gui.isPopupPanel(newView.Name()) {
-			if err := gui.onFocusLost(previousView, newView); err != nil {
-				return err
-			}
-			if err := gui.onFocus(newView); err != nil {
-				return err
-			}
-			previousView = newView
-		}
-		return nil
-	}
-}
-
-func (gui *Gui) onFocusChange() error {
-	currentView := gui.g.CurrentView()
-	for _, view := range gui.g.Views() {
-		view.Highlight = view == currentView
-	}
-	return nil
-}
-
-func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
-	if v == nil {
-		return nil
-	}
-	if v.IsSearching() && newView.Name() != "search" {
-		if err := gui.onSearchEscape(); err != nil {
-			return err
-		}
-	}
-	switch v.Name() {
-	case "main":
-		// if we have lost focus to a first-class panel, we need to do some cleanup
-		gui.changeMainViewsContext("normal")
-	case "commitFiles":
-		if gui.State.MainContext != "patch-building" {
-			if _, err := gui.g.SetViewOnBottom(v.Name()); err != nil {
-				return err
-			}
-		}
-	}
-	gui.Log.Info(v.Name() + " focus lost")
-	return nil
-}
-
-func (gui *Gui) onFocus(v *gocui.View) error {
-	if v == nil {
-		return nil
-	}
-	gui.Log.Info(v.Name() + " focus gained")
-	return nil
-}
-
-func (gui *Gui) getViewHeights() map[string]int {
-	currView := gui.g.CurrentView()
-	currentCyclebleView := gui.State.PreviousView
-	if currView != nil {
-		viewName := currView.Name()
-		usePreviousView := true
-		for _, view := range cyclableViews {
-			if view == viewName {
-				currentCyclebleView = viewName
-				usePreviousView = false
-				break
-			}
-		}
-		if usePreviousView {
-			currentCyclebleView = gui.State.PreviousView
-		}
-	}
-
-	// unfortunate result of the fact that these are separate views, have to map explicitly
-	if currentCyclebleView == "commitFiles" {
-		currentCyclebleView = "commits"
-	}
-
-	_, height := gui.g.Size()
-
-	if gui.State.ScreenMode == SCREEN_FULL || gui.State.ScreenMode == SCREEN_HALF {
-		vHeights := map[string]int{
-			"status":   0,
-			"files":    0,
-			"branches": 0,
-			"commits":  0,
-			"stash":    0,
-			"options":  0,
-		}
-		vHeights[currentCyclebleView] = height - 1
-		return vHeights
-	}
-
-	usableSpace := height - 7
-	extraSpace := usableSpace - (usableSpace/3)*3
-
-	if height >= 28 {
-		return map[string]int{
-			"status":   3,
-			"files":    (usableSpace / 3) + extraSpace,
-			"branches": usableSpace / 3,
-			"commits":  usableSpace / 3,
-			"stash":    3,
-			"options":  1,
-		}
-	}
-
-	defaultHeight := 3
-	if height < 21 {
-		defaultHeight = 1
-	}
-	vHeights := map[string]int{
-		"status":   defaultHeight,
-		"files":    defaultHeight,
-		"branches": defaultHeight,
-		"commits":  defaultHeight,
-		"stash":    defaultHeight,
-		"options":  defaultHeight,
-	}
-	vHeights[currentCyclebleView] = height - defaultHeight*4 - 1
-
-	return vHeights
-}
-
-// layout is called for every screen re-render e.g. when the screen is resized
-func (gui *Gui) layout(g *gocui.Gui) error {
-	g.Highlight = true
-	width, height := g.Size()
-
-	information := gui.Config.GetVersion()
-	if gui.g.Mouse {
-		donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
-		information = donate + " " + information
-	}
-	if gui.inDiffMode() {
-		information = utils.ColoredString(fmt.Sprintf("%s %s %s", gui.Tr.SLocalize("showingGitDiff"), "git diff "+gui.diffStr(), utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgMagenta)
-	} else if gui.inFilterMode() {
-		information = utils.ColoredString(fmt.Sprintf("%s '%s' %s", gui.Tr.SLocalize("filteringBy"), gui.State.FilterPath, utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgRed, color.Bold)
-	} else if len(gui.State.CherryPickedCommits) > 0 {
-		information = utils.ColoredString(fmt.Sprintf("%d commits copied", len(gui.State.CherryPickedCommits)), color.FgCyan)
-	}
-
-	minimumHeight := 9
-	minimumWidth := 10
-	if height < minimumHeight || width < minimumWidth {
-		v, err := g.SetView("limit", 0, 0, width-1, height-1, 0)
-		if err != nil {
-			if err.Error() != "unknown view" {
-				return err
-			}
-			v.Title = gui.Tr.SLocalize("NotEnoughSpace")
-			v.Wrap = true
-			_, _ = g.SetViewOnTop("limit")
-		}
-		return nil
-	}
-
-	vHeights := gui.getViewHeights()
-
-	optionsVersionBoundary := width - max(len(utils.Decolorise(information)), 1)
-
-	appStatus := gui.statusManager.getStatusString()
-	appStatusOptionsBoundary := 0
-	if appStatus != "" {
-		appStatusOptionsBoundary = len(appStatus) + 2
-	}
-
-	_, _ = g.SetViewOnBottom("limit")
-	_ = g.DeleteView("limit")
-
-	sidePanelWidthRatio := gui.Config.GetUserConfig().GetFloat64("gui.sidePanelWidth")
-
-	textColor := theme.GocuiDefaultTextColor
-	var leftSideWidth int
-	switch gui.State.ScreenMode {
-	case SCREEN_NORMAL:
-		leftSideWidth = int(float64(width) * sidePanelWidthRatio)
-	case SCREEN_HALF:
-		leftSideWidth = width/2 - 2
-	case SCREEN_FULL:
-		currentView := gui.g.CurrentView()
-		if currentView != nil && currentView.Name() == "main" {
-			leftSideWidth = 0
-		} else {
-			leftSideWidth = width - 1
-		}
-	}
-
-	mainPanelLeft := leftSideWidth + 1
-	mainPanelRight := width - 1
-	secondaryPanelLeft := width - 1
-	secondaryPanelTop := 0
-	mainPanelBottom := height - 2
-	if gui.State.SplitMainPanel {
-		if gui.State.ScreenMode == SCREEN_FULL {
-			mainPanelLeft = 0
-			panelSplitX := width/2 - 4
-			mainPanelRight = panelSplitX
-			secondaryPanelLeft = panelSplitX + 1
-		} else if width < 220 {
-			mainPanelBottom = height/2 - 1
-			secondaryPanelTop = mainPanelBottom + 1
-			secondaryPanelLeft = leftSideWidth + 1
-		} else {
-			units := 5
-			leftSideWidth = width / units
-			mainPanelLeft = leftSideWidth + 1
-			panelSplitX := (1 + ((units - 1) / 2)) * width / units
-			mainPanelRight = panelSplitX
-			secondaryPanelLeft = panelSplitX + 1
-		}
-	}
-
-	main := "main"
-	secondary := "secondary"
-	swappingMainPanels := gui.State.Panels.LineByLine != nil && gui.State.Panels.LineByLine.SecondaryFocused
-	if swappingMainPanels {
-		main = "secondary"
-		secondary = "main"
-	}
-
-	// reading more lines into main view buffers upon resize
-	prevMainView, err := gui.g.View("main")
-	if err == nil {
-		_, prevMainHeight := prevMainView.Size()
-		heightDiff := mainPanelBottom - prevMainHeight - 1
-		if heightDiff > 0 {
-			if manager, ok := gui.viewBufferManagerMap["main"]; ok {
-				manager.ReadLines(heightDiff)
-			}
-			if manager, ok := gui.viewBufferManagerMap["secondary"]; ok {
-				manager.ReadLines(heightDiff)
-			}
-		}
-	}
-
-	v, err := g.SetView(main, mainPanelLeft, 0, mainPanelRight, mainPanelBottom, gocui.LEFT)
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		v.Title = gui.Tr.SLocalize("DiffTitle")
-		v.Wrap = true
-		v.FgColor = textColor
-		v.IgnoreCarriageReturns = true
-	}
-
-	hiddenViewOffset := 9999
-
-	hiddenSecondaryPanelOffset := 0
-	if !gui.State.SplitMainPanel {
-		hiddenSecondaryPanelOffset = hiddenViewOffset
-	}
-	secondaryView, err := g.SetView(secondary, secondaryPanelLeft+hiddenSecondaryPanelOffset, hiddenSecondaryPanelOffset+secondaryPanelTop, width-1+hiddenSecondaryPanelOffset, height-2+hiddenSecondaryPanelOffset, gocui.LEFT)
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		secondaryView.Title = gui.Tr.SLocalize("DiffTitle")
-		secondaryView.Wrap = true
-		secondaryView.FgColor = gocui.ColorWhite
-		secondaryView.IgnoreCarriageReturns = true
-	}
-
-	if v, err := g.SetView("status", 0, 0, leftSideWidth, vHeights["status"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		v.Title = gui.Tr.SLocalize("StatusTitle")
-		v.FgColor = textColor
-	}
-
-	filesView, err := g.SetViewBeneath("files", "status", vHeights["files"])
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		filesView.Highlight = true
-		filesView.Title = gui.Tr.SLocalize("FilesTitle")
-		filesView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onFilesPanelSearchSelect))
-		filesView.ContainsList = true
-	}
-
-	branchesView, err := g.SetViewBeneath("branches", "files", vHeights["branches"])
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		branchesView.Title = gui.Tr.SLocalize("BranchesTitle")
-		branchesView.Tabs = []string{"Local Branches", "Remotes", "Tags"}
-		branchesView.FgColor = textColor
-		branchesView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onBranchesPanelSearchSelect))
-		branchesView.ContainsList = true
-	}
-
-	if v, err := g.SetViewBeneath("commitFiles", "branches", vHeights["commits"]); err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		v.Title = gui.Tr.SLocalize("CommitFiles")
-		v.FgColor = textColor
-		v.SetOnSelectItem(gui.onSelectItemWrapper(gui.onCommitFilesPanelSearchSelect))
-		v.ContainsList = true
-	}
-
-	commitsView, err := g.SetViewBeneath("commits", "branches", vHeights["commits"])
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		commitsView.Title = gui.Tr.SLocalize("CommitsTitle")
-		commitsView.Tabs = []string{"Commits", "Reflog"}
-		commitsView.FgColor = textColor
-		commitsView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onCommitsPanelSearchSelect))
-		commitsView.ContainsList = true
-	}
-
-	stashView, err := g.SetViewBeneath("stash", "commits", vHeights["stash"])
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		stashView.Title = gui.Tr.SLocalize("StashTitle")
-		stashView.FgColor = textColor
-		stashView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onStashPanelSearchSelect))
-		stashView.ContainsList = true
-	}
-
-	if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		v.Frame = false
-		v.FgColor = theme.OptionsColor
-	}
-
-	if gui.getCommitMessageView() == nil {
-		// doesn't matter where this view starts because it will be hidden
-		if commitMessageView, err := g.SetView("commitMessage", hiddenViewOffset, hiddenViewOffset, hiddenViewOffset+10, hiddenViewOffset+10, 0); err != nil {
-			if err.Error() != "unknown view" {
-				return err
-			}
-			_, _ = g.SetViewOnBottom("commitMessage")
-			commitMessageView.Title = gui.Tr.SLocalize("CommitMessage")
-			commitMessageView.FgColor = textColor
-			commitMessageView.Editable = true
-			commitMessageView.Editor = gocui.EditorFunc(gui.commitMessageEditor)
-		}
-	}
-
-	if check, _ := g.View("credentials"); check == nil {
-		// doesn't matter where this view starts because it will be hidden
-		if credentialsView, err := g.SetView("credentials", hiddenViewOffset, hiddenViewOffset, hiddenViewOffset+10, hiddenViewOffset+10, 0); err != nil {
-			if err.Error() != "unknown view" {
-				return err
-			}
-			_, err := g.SetViewOnBottom("credentials")
-			if err != nil {
-				return err
-			}
-			credentialsView.Title = gui.Tr.SLocalize("CredentialsUsername")
-			credentialsView.FgColor = textColor
-			credentialsView.Editable = true
-		}
-	}
-
-	searchViewOffset := hiddenViewOffset
-	if gui.State.Searching.isSearching {
-		searchViewOffset = 0
-	}
-
-	// this view takes up one character. Its only purpose is to show the slash when searching
-	searchPrefix := "search: "
-	if searchPrefixView, err := g.SetView("searchPrefix", appStatusOptionsBoundary-1+searchViewOffset, height-2+searchViewOffset, len(searchPrefix)+searchViewOffset, height+searchViewOffset, 0); err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-
-		searchPrefixView.BgColor = gocui.ColorDefault
-		searchPrefixView.FgColor = gocui.ColorGreen
-		searchPrefixView.Frame = false
-		gui.setViewContent(gui.g, searchPrefixView, searchPrefix)
-	}
-
-	if searchView, err := g.SetView("search", appStatusOptionsBoundary-1+searchViewOffset+len(searchPrefix), height-2+searchViewOffset, optionsVersionBoundary+searchViewOffset, height+searchViewOffset, 0); err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-
-		searchView.BgColor = gocui.ColorDefault
-		searchView.FgColor = gocui.ColorGreen
-		searchView.Frame = false
-		searchView.Editable = true
-	}
-
-	if appStatusView, err := g.SetView("appStatus", -1, height-2, width, height, 0); err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		appStatusView.BgColor = gocui.ColorDefault
-		appStatusView.FgColor = gocui.ColorCyan
-		appStatusView.Frame = false
-		if _, err := g.SetViewOnBottom("appStatus"); err != nil {
-			return err
-		}
-	}
-
-	informationView, err := g.SetView("information", optionsVersionBoundary-1, height-2, width, height, 0)
-	if err != nil {
-		if err.Error() != "unknown view" {
-			return err
-		}
-		informationView.BgColor = gocui.ColorDefault
-		informationView.FgColor = gocui.ColorGreen
-		informationView.Frame = false
-		gui.renderString(g, "information", information)
-
-		// doing this here because it'll only happen once
-		if err := gui.onInitialViewsCreation(); err != nil {
-			return err
-		}
-	}
-	if gui.State.OldInformation != information {
-		gui.setViewContent(g, informationView, information)
-		gui.State.OldInformation = information
-	}
-
-	if gui.g.CurrentView() == nil {
-		initialView := gui.getFilesView()
-		if gui.inFilterMode() {
-			initialView = gui.getCommitsView()
-		}
-		if _, err := gui.g.SetCurrentView(initialView.Name()); err != nil {
-			return err
-		}
-
-		if err := gui.switchFocus(gui.g, nil, initialView); err != nil {
-			return err
-		}
-	}
-
-	type listViewState struct {
-		selectedLine int
-		lineCount    int
-		view         *gocui.View
-		context      string
-	}
-
-	listViews := []listViewState{
-		{view: filesView, context: "", selectedLine: gui.State.Panels.Files.SelectedLine, lineCount: len(gui.State.Files)},
-		{view: branchesView, context: "local-branches", selectedLine: gui.State.Panels.Branches.SelectedLine, lineCount: len(gui.State.Branches)},
-		{view: branchesView, context: "remotes", selectedLine: gui.State.Panels.Remotes.SelectedLine, lineCount: len(gui.State.Remotes)},
-		{view: branchesView, context: "remote-branches", selectedLine: gui.State.Panels.RemoteBranches.SelectedLine, lineCount: len(gui.State.Remotes)},
-		{view: commitsView, context: "branch-commits", selectedLine: gui.State.Panels.Commits.SelectedLine, lineCount: len(gui.State.Commits)},
-		{view: commitsView, context: "reflog-commits", selectedLine: gui.State.Panels.ReflogCommits.SelectedLine, lineCount: len(gui.State.FilteredReflogCommits)},
-		{view: stashView, context: "", selectedLine: gui.State.Panels.Stash.SelectedLine, lineCount: len(gui.State.StashEntries)},
-	}
-
-	// menu view might not exist so we check to be safe
-	if menuView, err := gui.g.View("menu"); err == nil {
-		listViews = append(listViews, listViewState{view: menuView, context: "", selectedLine: gui.State.Panels.Menu.SelectedLine, lineCount: gui.State.MenuItemCount})
-	}
-	for _, listView := range listViews {
-		// ignore views where the context doesn't match up with the selected line we're trying to focus
-		if listView.context != "" && (listView.view.Context != listView.context) {
-			continue
-		}
-		// check if the selected line is now out of view and if so refocus it
-		listView.view.FocusPoint(0, listView.selectedLine)
-	}
-
-	mainViewWidth, mainViewHeight := gui.getMainView().Size()
-	if mainViewWidth != gui.State.PrevMainWidth || mainViewHeight != gui.State.PrevMainHeight {
-		gui.State.PrevMainWidth = mainViewWidth
-		gui.State.PrevMainHeight = mainViewHeight
-		if err := gui.onResize(); err != nil {
-			return err
-		}
-	}
-
-	// here is a good place log some stuff
-	// if you download humanlog and do tail -f development.log | humanlog
-	// this will let you see these branches as prettified json
-	// gui.Log.Info(utils.AsJson(gui.State.Branches[0:4]))
-	return gui.resizeCurrentPopupPanel(g)
-}
-
-func (gui *Gui) onInitialViewsCreation() error {
-	gui.changeMainViewsContext("normal")
-
-	gui.getBranchesView().Context = "local-branches"
-	gui.getCommitsView().Context = "branch-commits"
-
-	return gui.loadNewRepo()
-}
-
-func max(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
--- a/pkg/gui/line_by_line_panel.go
+++ b/pkg/gui/line_by_line_panel.go
@@ -88,8 +88,7 @@ func (gui *Gui) refreshLineByLinePanel(diff string, secondaryDiff string, second
 	}

 	gui.g.Update(func(*gocui.Gui) error {
-		gui.setViewContent(gui.g, gui.getSecondaryView(), secondaryPatchParser.Render(-1, -1, nil))
-		return nil
+		return gui.setViewContent(gui.g, gui.getSecondaryView(), secondaryPatchParser.Render(-1, -1, nil))
 	})

 	return false, nil
@@ -221,10 +220,6 @@ func (gui *Gui) handleMouseScrollDown(g *gocui.Gui, v *gocui.View) error {
 	return gui.handleCycleLine(1)
 }

-func (gui *Gui) getSelectedCommitFileName() string {
-	return gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine].Name
-}
-
 func (gui *Gui) refreshMainView() error {
 	state := gui.State.Panels.LineByLine

@@ -232,7 +227,7 @@ func (gui *Gui) refreshMainView() error {
 	// I'd prefer not to have knowledge of contexts using this file but I'm not sure
 	// how to get around this
 	if gui.State.MainContext == "patch-building" {
-		filename := gui.getSelectedCommitFileName()
+		filename := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine].Name
 		includedLineIndices = gui.GitCommand.PatchManager.GetFileIncLineIndices(filename)
 	}
 	colorDiff := state.PatchParser.Render(state.FirstLineIdx, state.LastLineIdx, includedLineIndices)
@@ -242,8 +237,7 @@ func (gui *Gui) refreshMainView() error {
 	mainView.Wrap = false

 	gui.g.Update(func(*gocui.Gui) error {
-		gui.setViewContent(gui.g, gui.getMainView(), colorDiff)
-		return nil
+		return gui.setViewContent(gui.g, gui.getMainView(), colorDiff)
 	})

 	return nil
--- a/pkg/gui/list_view.go
+++ b/pkg/gui/list_view.go
@@ -42,40 +42,6 @@ func (lv *listView) handleLineChange(change int) error {
 	return lv.handleItemSelect(lv.gui.g, view)
 }

-func (lv *listView) handleNextPage(g *gocui.Gui, v *gocui.View) error {
-	view, err := lv.gui.g.View(lv.viewName)
-	if err != nil {
-		return nil
-	}
-	_, height := view.Size()
-	delta := height - 1
-	if delta == 0 {
-		delta = 1
-	}
-	return lv.handleLineChange(delta)
-}
-
-func (lv *listView) handleGotoTop(g *gocui.Gui, v *gocui.View) error {
-	return lv.handleLineChange(-lv.getItemsLength())
-}
-
-func (lv *listView) handleGotoBottom(g *gocui.Gui, v *gocui.View) error {
-	return lv.handleLineChange(lv.getItemsLength())
-}
-
-func (lv *listView) handlePrevPage(g *gocui.Gui, v *gocui.View) error {
-	view, err := lv.gui.g.View(lv.viewName)
-	if err != nil {
-		return nil
-	}
-	_, height := view.Size()
-	delta := height - 1
-	if delta == 0 {
-		delta = 1
-	}
-	return lv.handleLineChange(-delta)
-}
-
 func (lv *listView) handleClick(g *gocui.Gui, v *gocui.View) error {
 	if !lv.gui.isPopupPanel(lv.viewName) && lv.gui.popupPanelFocused() {
 		return nil
@@ -183,7 +149,7 @@ func (gui *Gui) getListViews() []*listView {
 		{
 			viewName:              "commits",
 			context:               "reflog-commits",
-			getItemsLength:        func() int { return len(gui.State.FilteredReflogCommits) },
+			getItemsLength:        func() int { return len(gui.State.ReflogCommits) },
 			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.ReflogCommits.SelectedLine },
 			handleFocus:           gui.handleReflogCommitSelect,
 			handleItemSelect:      gui.handleReflogCommitSelect,
--- a/pkg/gui/menu_panel.go
+++ b/pkg/gui/menu_panel.go
@@ -17,8 +17,7 @@ type menuItem struct {
 // list panel functions

 func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error {
-	v.FocusPoint(0, gui.State.Panels.Menu.SelectedLine)
-	return nil
+	return gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, gui.State.MenuItemCount, v)
 }

 // specific functions
--- a/pkg/gui/merge_panel.go
+++ b/pkg/gui/merge_panel.go
@@ -104,7 +104,7 @@ func (gui *Gui) isIndexToDelete(i int, conflict commands.Conflict, pick string)
 }

 func (gui *Gui) resolveConflict(g *gocui.Gui, conflict commands.Conflict, pick string) error {
-	gitFile, err := gui.getSelectedFile()
+	gitFile, err := gui.getSelectedFile(g)
 	if err != nil {
 		return err
 	}
@@ -130,7 +130,7 @@ func (gui *Gui) resolveConflict(g *gocui.Gui, conflict commands.Conflict, pick s
 }

 func (gui *Gui) pushFileSnapshot(g *gocui.Gui) error {
-	gitFile, err := gui.getSelectedFile()
+	gitFile, err := gui.getSelectedFile(g)
 	if err != nil {
 		return err
 	}
@@ -147,23 +147,17 @@ func (gui *Gui) handlePopFileSnapshot(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 	prevContent := gui.State.Panels.Merging.EditHistory.Pop().(string)
-	gitFile, err := gui.getSelectedFile()
+	gitFile, err := gui.getSelectedFile(g)
 	if err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(gitFile.Name, []byte(prevContent), 0644); err != nil {
-		return err
-	}
-
+	ioutil.WriteFile(gitFile.Name, []byte(prevContent), 0644)
 	return gui.refreshMergePanel()
 }

 func (gui *Gui) handlePickHunk(g *gocui.Gui, v *gocui.View) error {
 	conflict := gui.State.Panels.Merging.Conflicts[gui.State.Panels.Merging.ConflictIndex]
-	if err := gui.pushFileSnapshot(g); err != nil {
-		return err
-	}
-
+	gui.pushFileSnapshot(g)
 	pick := "bottom"
 	if gui.State.Panels.Merging.ConflictTop {
 		pick = "top"
@@ -184,9 +178,7 @@ func (gui *Gui) handlePickHunk(g *gocui.Gui, v *gocui.View) error {

 func (gui *Gui) handlePickBothHunks(g *gocui.Gui, v *gocui.View) error {
 	conflict := gui.State.Panels.Merging.Conflicts[gui.State.Panels.Merging.ConflictIndex]
-	if err := gui.pushFileSnapshot(g); err != nil {
-		return err
-	}
+	gui.pushFileSnapshot(g)
 	err := gui.resolveConflict(g, conflict, "both")
 	if err != nil {
 		panic(err)
@@ -223,10 +215,10 @@ func (gui *Gui) refreshMergePanel() error {

 	mainView := gui.getMainView()
 	mainView.Wrap = false
-	if err := gui.newStringTask("main", content); err != nil {
+	if err := gui.setViewContent(gui.g, mainView, content); err != nil {
 		return err
 	}
-
+	gui.Log.Warn("scrolling to conflict")
 	if err := gui.scrollToConflict(gui.g); err != nil {
 		return err
 	}
@@ -257,13 +249,13 @@ func (gui *Gui) renderMergeOptions() error {
 		fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock")): gui.Tr.SLocalize("navigateConflicts"),
 		gui.getKeyDisplay("universal.select"):   gui.Tr.SLocalize("pickHunk"),
 		gui.getKeyDisplay("main.pickBothHunks"): gui.Tr.SLocalize("pickBothHunks"),
-		gui.getKeyDisplay("universal.undo"):     gui.Tr.SLocalize("undo"),
+		gui.getKeyDisplay("main.undo"):          gui.Tr.SLocalize("undo"),
 	})
 }

 func (gui *Gui) handleEscapeMerge(g *gocui.Gui, v *gocui.View) error {
 	gui.State.Panels.Merging.EditHistory = stack.New()
-	if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil {
+	if err := gui.refreshFiles(); err != nil {
 		return err
 	}
 	// it's possible this method won't be called from the merging view so we need to
@@ -278,12 +270,12 @@ func (gui *Gui) handleCompleteMerge() error {
 	if err := gui.stageSelectedFile(gui.g); err != nil {
 		return err
 	}
-	if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil {
+	if err := gui.refreshFiles(); err != nil {
 		return err
 	}
 	// if we got conflicts after unstashing, we don't want to call any git
 	// commands to continue rebasing/merging here
-	if gui.GitCommand.WorkingTreeState() == "normal" {
+	if gui.State.WorkingTreeState == "normal" {
 		return gui.handleEscapeMerge(gui.g, gui.getMainView())
 	}
 	// if there are no more files with merge conflicts, we should ask whether the user wants to continue
--- a/pkg/gui/patch_building_panel.go
+++ b/pkg/gui/patch_building_panel.go
@@ -2,7 +2,6 @@ package gui

 import (
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 func (gui *Gui) refreshPatchBuildingPanel(selectedLineIdx int) error {
@@ -16,10 +15,9 @@ func (gui *Gui) refreshPatchBuildingPanel(selectedLineIdx int) error {
 	gui.getSecondaryView().Title = "Custom Patch"

 	// get diff from commit file that's currently selected
-	commitFile := gui.getSelectedCommitFile()
+	commitFile := gui.getSelectedCommitFile(gui.g)
 	if commitFile == nil {
-		gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
-		return nil
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
 	}

 	diff, err := gui.GitCommand.ShowCommitFile(commitFile.Sha, commitFile.Name, true)
@@ -44,25 +42,38 @@ func (gui *Gui) refreshPatchBuildingPanel(selectedLineIdx int) error {
 	return nil
 }

-func (gui *Gui) handleToggleSelectionForPatch(g *gocui.Gui, v *gocui.View) error {
+func (gui *Gui) handleAddSelectionToPatch(g *gocui.Gui, v *gocui.View) error {
 	state := gui.State.Panels.LineByLine

-	toggleFunc := gui.GitCommand.PatchManager.AddFileLineRange
-	filename := gui.getSelectedCommitFileName()
-	includedLineIndices := gui.GitCommand.PatchManager.GetFileIncLineIndices(filename)
-	currentLineIsStaged := utils.IncludesInt(includedLineIndices, state.SelectedLineIdx)
-	if currentLineIsStaged {
-		toggleFunc = gui.GitCommand.PatchManager.RemoveFileLineRange
+	// add range of lines to those set for the file
+	commitFile := gui.getSelectedCommitFile(gui.g)
+	if commitFile == nil {
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
 	}

+	gui.GitCommand.PatchManager.AddFileLineRange(commitFile.Name, state.FirstLineIdx, state.LastLineIdx)
+
+	if err := gui.refreshCommitFilesView(); err != nil {
+		return err
+	}
+
+	if err := gui.refreshPatchBuildingPanel(-1); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleRemoveSelectionFromPatch(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
 	// add range of lines to those set for the file
-	commitFile := gui.getSelectedCommitFile()
+	commitFile := gui.getSelectedCommitFile(gui.g)
 	if commitFile == nil {
-		gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
-		return nil
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
 	}

-	toggleFunc(commitFile.Name, state.FirstLineIdx, state.LastLineIdx)
+	gui.GitCommand.PatchManager.RemoveFileLineRange(commitFile.Name, state.FirstLineIdx, state.LastLineIdx)

 	if err := gui.refreshCommitFilesView(); err != nil {
 		return err
@@ -94,8 +105,7 @@ func (gui *Gui) refreshSecondaryPatchPanel() error {
 		secondaryView.Wrap = false

 		gui.g.Update(func(*gocui.Gui) error {
-			gui.setViewContent(gui.g, gui.getSecondaryView(), gui.GitCommand.PatchManager.RenderAggregatedPatchColored(false))
-			return nil
+			return gui.setViewContent(gui.g, gui.getSecondaryView(), gui.GitCommand.PatchManager.RenderAggregatedPatchColored(false))
 		})
 	} else {
 		gui.State.SplitMainPanel = false
--- a/pkg/gui/patch_options_panel.go
+++ b/pkg/gui/patch_options_panel.go
@@ -8,7 +8,7 @@ import (

 func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	if !gui.GitCommand.PatchManager.CommitSelected() {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoPatchError"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoPatchError"))
 	}

 	menuItems := []*menuItem{
@@ -20,21 +20,13 @@ func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error
 			displayString: "pull patch out into index",
 			onPress:       gui.handlePullPatchIntoWorkingTree,
 		},
-		{
-			displayString: "apply patch",
-			onPress:       func() error { return gui.handleApplyPatch(false) },
-		},
-		{
-			displayString: "apply patch in reverse",
-			onPress:       func() error { return gui.handleApplyPatch(true) },
-		},
 		{
 			displayString: "reset patch",
 			onPress:       gui.handleResetPatch,
 		},
 	}

-	selectedCommit := gui.getSelectedCommit()
+	selectedCommit := gui.getSelectedCommit(gui.g)
 	if selectedCommit != nil && gui.GitCommand.PatchManager.CommitSha != selectedCommit.Sha {
 		// adding this option to index 1
 		menuItems = append(
@@ -63,11 +55,8 @@ func (gui *Gui) getPatchCommitIndex() int {
 }

 func (gui *Gui) validateNormalWorkingTreeState() (bool, error) {
-	if gui.GitCommand.WorkingTreeState() != "normal" {
-		return false, gui.createErrorPanel(gui.Tr.SLocalize("CantPatchWhileRebasingError"))
-	}
-	if gui.GitCommand.WorkingTreeState() != "normal" {
-		return false, gui.createErrorPanel(gui.Tr.SLocalize("CantPatchWhileRebasingError"))
+	if gui.State.WorkingTreeState != "normal" {
+		return false, gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantPatchWhileRebasingError"))
 	}
 	return true, nil
 }
@@ -120,32 +109,11 @@ func (gui *Gui) handlePullPatchIntoWorkingTree() error {
 		return err
 	}

-	pull := func(stash bool) error {
-		return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
-			commitIndex := gui.getPatchCommitIndex()
-			err := gui.GitCommand.PullPatchIntoIndex(gui.State.Commits, commitIndex, gui.GitCommand.PatchManager, stash)
-			return gui.handleGenericMergeCommandResult(err)
-		})
-	}
-
-	if len(gui.trackedFiles()) > 0 {
-		return gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("MustStashTitle"), gui.Tr.SLocalize("MustStashWarning"), func(*gocui.Gui, *gocui.View) error {
-			return pull(true)
-		}, nil)
-	} else {
-		return pull(false)
-	}
-}
-
-func (gui *Gui) handleApplyPatch(reverse bool) error {
-	if err := gui.returnFocusFromLineByLinePanelIfNecessary(); err != nil {
-		return err
-	}
-
-	if err := gui.GitCommand.PatchManager.ApplyPatches(reverse); err != nil {
-		return gui.surfaceError(err)
-	}
-	return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
+	return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
+		commitIndex := gui.getPatchCommitIndex()
+		err := gui.GitCommand.PullPatchIntoIndex(gui.State.Commits, commitIndex, gui.GitCommand.PatchManager)
+		return gui.handleGenericMergeCommandResult(err)
+	})
 }

 func (gui *Gui) handleResetPatch() error {
--- a/pkg/gui/presentation/branches.go
+++ b/pkg/gui/presentation/branches.go
@@ -10,48 +10,25 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-func GetBranchListDisplayStrings(branches []*commands.Branch, fullDescription bool, diffName string) [][]string {
+func GetBranchListDisplayStrings(branches []*commands.Branch, isFocused bool, selectedLine int) [][]string {
 	lines := make([][]string, len(branches))

 	for i := range branches {
-		diffed := branches[i].Name == diffName
-		lines[i] = getBranchDisplayStrings(branches[i], fullDescription, diffed)
+		showUpstreamDifferences := isFocused && i == selectedLine
+		lines[i] = getBranchDisplayStrings(branches[i], showUpstreamDifferences)
 	}

 	return lines
 }

 // getBranchDisplayStrings returns the display string of branch
-func getBranchDisplayStrings(b *commands.Branch, fullDescription bool, diffed bool) []string {
-	displayName := b.Name
-	if b.DisplayName != "" {
-		displayName = b.DisplayName
+func getBranchDisplayStrings(b *commands.Branch, showUpstreamDifferences bool) []string {
+	displayName := utils.ColoredString(b.Name, GetBranchColor(b.Name))
+	if showUpstreamDifferences && b.Pushables != "" && b.Pullables != "" {
+		displayName = fmt.Sprintf("%s ↑%s↓%s", displayName, b.Pushables, b.Pullables)
 	}

-	nameColorAttr := GetBranchColor(b.Name)
-	if diffed {
-		nameColorAttr = theme.DiffTerminalColor
-	}
-	coloredName := utils.ColoredString(displayName, nameColorAttr)
-	if b.Pushables != "" && b.Pullables != "" && b.Pushables != "?" && b.Pullables != "?" {
-		trackColor := color.FgYellow
-		if b.Pushables == "0" && b.Pullables == "0" {
-			trackColor = color.FgGreen
-		}
-		track := utils.ColoredString(fmt.Sprintf("↑%s↓%s", b.Pushables, b.Pullables), trackColor)
-		coloredName = fmt.Sprintf("%s %s", coloredName, track)
-	}
-
-	recencyColor := color.FgCyan
-	if b.Recency == "  *" {
-		recencyColor = color.FgGreen
-	}
-
-	if fullDescription {
-		return []string{utils.ColoredString(b.Recency, recencyColor), coloredName, utils.ColoredString(b.UpstreamName, color.FgYellow)}
-	}
-
-	return []string{utils.ColoredString(b.Recency, recencyColor), coloredName}
+	return []string{b.Recency, displayName}
 }

 // GetBranchColor branch color
--- a/pkg/gui/presentation/commit_files.go
+++ b/pkg/gui/presentation/commit_files.go
@@ -6,23 +6,21 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/theme"
 )

-func GetCommitFileListDisplayStrings(commitFiles []*commands.CommitFile, diffName string) [][]string {
-	lines := make([][]string, len(commitFiles))
+func GetCommitFileListDisplayStrings(branches []*commands.CommitFile) [][]string {
+	lines := make([][]string, len(branches))

-	for i := range commitFiles {
-		diffed := commitFiles[i].Name == diffName
-		lines[i] = getCommitFileDisplayStrings(commitFiles[i], diffed)
+	for i := range branches {
+		lines[i] = getCommitFileDisplayStrings(branches[i])
 	}

 	return lines
 }

 // getCommitFileDisplayStrings returns the display string of branch
-func getCommitFileDisplayStrings(f *commands.CommitFile, diffed bool) []string {
+func getCommitFileDisplayStrings(f *commands.CommitFile) []string {
 	yellow := color.New(color.FgYellow)
 	green := color.New(color.FgGreen)
 	defaultColor := color.New(theme.DefaultTextColor)
-	diffTerminalColor := color.New(theme.DiffTerminalColor)

 	var colour *color.Color
 	switch f.Status {
@@ -33,8 +31,5 @@ func getCommitFileDisplayStrings(f *commands.CommitFile, diffed bool) []string {
 	case commands.PART:
 		colour = yellow
 	}
-	if diffed {
-		colour = diffTerminalColor
-	}
 	return []string{colour.Sprint(f.DisplayString)}
 }
--- a/pkg/gui/presentation/commits.go
+++ b/pkg/gui/presentation/commits.go
@@ -9,10 +9,10 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-func GetCommitListDisplayStrings(commits []*commands.Commit, fullDescription bool, cherryPickedCommitShaMap map[string]bool, diffName string) [][]string {
+func GetCommitListDisplayStrings(commits []*commands.Commit, fullDescription bool) [][]string {
 	lines := make([][]string, len(commits))

-	var displayFunc func(*commands.Commit, map[string]bool, bool) []string
+	var displayFunc func(*commands.Commit) []string
 	if fullDescription {
 		displayFunc = getFullDescriptionDisplayStringsForCommit
 	} else {
@@ -20,21 +20,20 @@ func GetCommitListDisplayStrings(commits []*commands.Commit, fullDescription boo
 	}

 	for i := range commits {
-		diffed := commits[i].Sha == diffName
-		lines[i] = displayFunc(commits[i], cherryPickedCommitShaMap, diffed)
+		lines[i] = displayFunc(commits[i])
 	}

 	return lines
 }

-func getFullDescriptionDisplayStringsForCommit(c *commands.Commit, cherryPickedCommitShaMap map[string]bool, diffed bool) []string {
+func getFullDescriptionDisplayStringsForCommit(c *commands.Commit) []string {
 	red := color.New(color.FgRed)
 	yellow := color.New(color.FgYellow)
 	green := color.New(color.FgGreen)
 	blue := color.New(color.FgBlue)
 	cyan := color.New(color.FgCyan)
 	defaultColor := color.New(theme.DefaultTextColor)
-	diffedColor := color.New(theme.DiffTerminalColor)
+	magenta := color.New(color.FgMagenta)

 	// for some reason, setting the background to blue pads out the other commits
 	// horizontally. For the sake of accessibility I'm considering this a feature,
@@ -53,18 +52,19 @@ func getFullDescriptionDisplayStringsForCommit(c *commands.Commit, cherryPickedC
 		shaColor = blue
 	case "reflog":
 		shaColor = blue
+	case "selected":
+		shaColor = magenta
 	default:
 		shaColor = defaultColor
 	}

-	if diffed {
-		shaColor = diffedColor
-	} else if cherryPickedCommitShaMap[c.Sha] {
+	if c.Copied {
 		shaColor = copied
 	}

 	tagString := ""
-	secondColumnString := blue.Sprint(utils.UnixToDate(c.UnixTimestamp))
+	truncatedDate := utils.TruncateWithEllipsis(c.Date, 15)
+	secondColumnString := blue.Sprint(truncatedDate)
 	if c.Action != "" {
 		secondColumnString = cyan.Sprint(c.Action)
 	} else if c.ExtraInfo != "" {
@@ -74,17 +74,17 @@ func getFullDescriptionDisplayStringsForCommit(c *commands.Commit, cherryPickedC

 	truncatedAuthor := utils.TruncateWithEllipsis(c.Author, 17)

-	return []string{shaColor.Sprint(c.ShortSha()), secondColumnString, yellow.Sprint(truncatedAuthor), tagString + defaultColor.Sprint(c.Name)}
+	return []string{shaColor.Sprint(c.Sha[:8]), secondColumnString, yellow.Sprint(truncatedAuthor), tagString + defaultColor.Sprint(c.Name)}
 }

-func getDisplayStringsForCommit(c *commands.Commit, cherryPickedCommitShaMap map[string]bool, diffed bool) []string {
+func getDisplayStringsForCommit(c *commands.Commit) []string {
 	red := color.New(color.FgRed)
 	yellow := color.New(color.FgYellow)
 	green := color.New(color.FgGreen)
 	blue := color.New(color.FgBlue)
 	cyan := color.New(color.FgCyan)
 	defaultColor := color.New(theme.DefaultTextColor)
-	diffedColor := color.New(theme.DiffTerminalColor)
+	magenta := color.New(color.FgMagenta)

 	// for some reason, setting the background to blue pads out the other commits
 	// horizontally. For the sake of accessibility I'm considering this a feature,
@@ -103,13 +103,13 @@ func getDisplayStringsForCommit(c *commands.Commit, cherryPickedCommitShaMap map
 		shaColor = blue
 	case "reflog":
 		shaColor = blue
+	case "selected":
+		shaColor = magenta
 	default:
 		shaColor = defaultColor
 	}

-	if diffed {
-		shaColor = diffedColor
-	} else if cherryPickedCommitShaMap[c.Sha] {
+	if c.Copied {
 		shaColor = copied
 	}

@@ -122,5 +122,5 @@ func getDisplayStringsForCommit(c *commands.Commit, cherryPickedCommitShaMap map
 		tagString = utils.ColoredStringDirect(strings.Join(c.Tags, " "), tagColor) + " "
 	}

-	return []string{shaColor.Sprint(c.ShortSha()), actionString + tagString + defaultColor.Sprint(c.Name)}
+	return []string{shaColor.Sprint(c.Sha[:8]), actionString + tagString + defaultColor.Sprint(c.Name)}
 }
--- a/pkg/gui/presentation/files.go
+++ b/pkg/gui/presentation/files.go
@@ -3,42 +3,34 @@ package presentation
 import (
 	"github.com/fatih/color"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
 )

-func GetFileListDisplayStrings(files []*commands.File, diffName string) [][]string {
+func GetFileListDisplayStrings(files []*commands.File) [][]string {
 	lines := make([][]string, len(files))

 	for i := range files {
-		diffed := files[i].Name == diffName
-		lines[i] = getFileDisplayStrings(files[i], diffed)
+		lines[i] = getFileDisplayStrings(files[i])
 	}

 	return lines
 }

 // getFileDisplayStrings returns the display string of branch
-func getFileDisplayStrings(f *commands.File, diffed bool) []string {
+func getFileDisplayStrings(f *commands.File) []string {
 	// potentially inefficient to be instantiating these color
 	// objects with each render
 	red := color.New(color.FgRed)
 	green := color.New(color.FgGreen)
-	diffColor := color.New(theme.DiffTerminalColor)
 	if !f.Tracked && !f.HasStagedChanges {
 		return []string{red.Sprint(f.DisplayString)}
 	}

 	output := green.Sprint(f.DisplayString[0:1])
 	output += red.Sprint(f.DisplayString[1:3])
-
-	var restColor *color.Color
-	if diffed {
-		restColor = diffColor
-	} else if f.HasUnstagedChanges {
-		restColor = red
+	if f.HasUnstagedChanges {
+		output += red.Sprint(f.Name)
 	} else {
-		restColor = green
+		output += green.Sprint(f.Name)
 	}
-	output += restColor.Sprint(f.Name)
 	return []string{output}
 }
--- a/pkg/gui/presentation/reflog_commits.go
+++ b/pkg/gui/presentation/reflog_commits.go
@@ -1,45 +0,0 @@
-package presentation
-
-import (
-	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func GetReflogCommitListDisplayStrings(commits []*commands.Commit, fullDescription bool, diffName string) [][]string {
-	lines := make([][]string, len(commits))
-
-	var displayFunc func(*commands.Commit, bool) []string
-	if fullDescription {
-		displayFunc = getFullDescriptionDisplayStringsForReflogCommit
-	} else {
-		displayFunc = getDisplayStringsForReflogCommit
-	}
-
-	for i := range commits {
-		diffed := commits[i].Sha == diffName
-		lines[i] = displayFunc(commits[i], diffed)
-	}
-
-	return lines
-}
-
-func getFullDescriptionDisplayStringsForReflogCommit(c *commands.Commit, diffed bool) []string {
-	colorAttr := theme.DefaultTextColor
-	if diffed {
-		colorAttr = theme.DiffTerminalColor
-	}
-
-	return []string{
-		utils.ColoredString(c.ShortSha(), color.FgBlue),
-		utils.ColoredString(utils.UnixToDate(c.UnixTimestamp), color.FgMagenta),
-		utils.ColoredString(c.Name, colorAttr),
-	}
-}
-
-func getDisplayStringsForReflogCommit(c *commands.Commit, diffed bool) []string {
-	defaultColor := color.New(theme.DefaultTextColor)
-
-	return []string{utils.ColoredString(c.ShortSha(), color.FgBlue), defaultColor.Sprint(c.Name)}
-}
--- a/pkg/gui/presentation/remote_branches.go
+++ b/pkg/gui/presentation/remote_branches.go
@@ -2,29 +2,22 @@ package presentation

 import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-func GetRemoteBranchListDisplayStrings(branches []*commands.RemoteBranch, diffName string) [][]string {
+func GetRemoteBranchListDisplayStrings(branches []*commands.RemoteBranch) [][]string {
 	lines := make([][]string, len(branches))

 	for i := range branches {
-		diffed := branches[i].FullName() == diffName
-		lines[i] = getRemoteBranchDisplayStrings(branches[i], diffed)
+		lines[i] = getRemoteBranchDisplayStrings(branches[i])
 	}

 	return lines
 }

 // getRemoteBranchDisplayStrings returns the display string of branch
-func getRemoteBranchDisplayStrings(b *commands.RemoteBranch, diffed bool) []string {
-	nameColorAttr := GetBranchColor(b.Name)
-	if diffed {
-		nameColorAttr = theme.DiffTerminalColor
-	}
-
-	displayName := utils.ColoredString(b.Name, nameColorAttr)
+func getRemoteBranchDisplayStrings(b *commands.RemoteBranch) []string {
+	displayName := utils.ColoredString(b.Name, GetBranchColor(b.Name))

 	return []string{displayName}
 }
--- a/pkg/gui/presentation/remotes.go
+++ b/pkg/gui/presentation/remotes.go
@@ -1,33 +1,20 @@
 package presentation

 import (
-	"fmt"
-
-	"github.com/fatih/color"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-func GetRemoteListDisplayStrings(remotes []*commands.Remote, diffName string) [][]string {
+func GetRemoteListDisplayStrings(remotes []*commands.Remote) [][]string {
 	lines := make([][]string, len(remotes))

 	for i := range remotes {
-		diffed := remotes[i].Name == diffName
-		lines[i] = getRemoteDisplayStrings(remotes[i], diffed)
+		lines[i] = getRemoteDisplayStrings(remotes[i])
 	}

 	return lines
 }

 // getRemoteDisplayStrings returns the display string of branch
-func getRemoteDisplayStrings(r *commands.Remote, diffed bool) []string {
-	branchCount := len(r.Branches)
-
-	nameColorAttr := theme.DefaultTextColor
-	if diffed {
-		nameColorAttr = theme.DiffTerminalColor
-	}
-
-	return []string{utils.ColoredString(r.Name, nameColorAttr), utils.ColoredString(fmt.Sprintf("%d branches", branchCount), color.FgBlue)}
+func getRemoteDisplayStrings(r *commands.Remote) []string {
+	return []string{r.Name}
 }
--- a/pkg/gui/presentation/stash_entries.go
+++ b/pkg/gui/presentation/stash_entries.go
@@ -2,26 +2,19 @@ package presentation

 import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-func GetStashEntryListDisplayStrings(stashEntries []*commands.StashEntry, diffName string) [][]string {
+func GetStashEntryListDisplayStrings(stashEntries []*commands.StashEntry) [][]string {
 	lines := make([][]string, len(stashEntries))

 	for i := range stashEntries {
-		diffed := stashEntries[i].RefName() == diffName
-		lines[i] = getStashEntryDisplayStrings(stashEntries[i], diffed)
+		lines[i] = getStashEntryDisplayStrings(stashEntries[i])
 	}

 	return lines
 }

 // getStashEntryDisplayStrings returns the display string of branch
-func getStashEntryDisplayStrings(s *commands.StashEntry, diffed bool) []string {
-	attr := theme.DefaultTextColor
-	if diffed {
-		attr = theme.DiffTerminalColor
-	}
-	return []string{utils.ColoredString(s.Name, attr)}
+func getStashEntryDisplayStrings(s *commands.StashEntry) []string {
+	return []string{s.DisplayString}
 }
--- a/pkg/gui/presentation/tags.go
+++ b/pkg/gui/presentation/tags.go
@@ -2,26 +2,19 @@ package presentation

 import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-func GetTagListDisplayStrings(tags []*commands.Tag, diffName string) [][]string {
+func GetTagListDisplayStrings(tags []*commands.Tag) [][]string {
 	lines := make([][]string, len(tags))

 	for i := range tags {
-		diffed := tags[i].Name == diffName
-		lines[i] = getTagDisplayStrings(tags[i], diffed)
+		lines[i] = getTagDisplayStrings(tags[i])
 	}

 	return lines
 }

 // getTagDisplayStrings returns the display string of branch
-func getTagDisplayStrings(t *commands.Tag, diffed bool) []string {
-	attr := theme.DefaultTextColor
-	if diffed {
-		attr = theme.DiffTerminalColor
-	}
-	return []string{utils.ColoredString(t.Name, attr)}
+func getTagDisplayStrings(t *commands.Tag) []string {
+	return []string{t.Name}
 }
--- a/pkg/gui/pty.go
+++ b/pkg/gui/pty.go
@@ -1,74 +0,0 @@
-// +build !windows
-
-package gui
-
-import (
-	"os/exec"
-
-	"github.com/creack/pty"
-)
-
-func (gui *Gui) onResize() error {
-	if gui.State.Ptmx == nil {
-		return nil
-	}
-	mainView := gui.getMainView()
-	width, height := mainView.Size()
-
-	if err := pty.Setsize(gui.State.Ptmx, &pty.Winsize{Cols: uint16(width), Rows: uint16(height)}); err != nil {
-		return err
-	}
-
-	// TODO: handle resizing properly
-
-	return nil
-}
-
-// Some commands need to output for a terminal to active certain behaviour.
-// For example,  git won't invoke the GIT_PAGER env var unless it thinks it's
-// talking to a terminal. We typically write cmd outputs straight to a view,
-// which is just an io.Reader. the pty package lets us wrap a command in a
-// pseudo-terminal meaning we'll get the behaviour we want from the underlying
-// command.
-func (gui *Gui) newPtyTask(viewName string, cmd *exec.Cmd) error {
-	width, _ := gui.getMainView().Size()
-	pager := gui.GitCommand.GetPager(width)
-
-	if pager == "" {
-		// if we're not using a custom pager we don't need to use a pty
-		return gui.newCmdTask(viewName, cmd)
-	}
-
-	cmd.Env = append(cmd.Env, "GIT_PAGER="+pager)
-
-	view, err := gui.g.View(viewName)
-	if err != nil {
-		return nil // swallowing for now
-	}
-
-	_, height := view.Size()
-	_, oy := view.Origin()
-
-	manager := gui.getManager(view)
-
-	ptmx, err := pty.Start(cmd)
-	if err != nil {
-		return err
-	}
-
-	gui.State.Ptmx = ptmx
-	onClose := func() {
-		ptmx.Close()
-		gui.State.Ptmx = nil
-	}
-
-	if err := gui.onResize(); err != nil {
-		return err
-	}
-
-	if err := manager.NewTask(manager.NewCmdTask(ptmx, cmd, height+oy+10, onClose)); err != nil {
-		return err
-	}
-
-	return nil
-}
--- a/pkg/gui/pty_windows.go
+++ b/pkg/gui/pty_windows.go
@@ -1,13 +0,0 @@
-// +build windows
-
-package gui
-
-import "os/exec"
-
-func (gui *Gui) onResize() error {
-	return nil
-}
-
-func (gui *Gui) newPtyTask(viewName string, cmd *exec.Cmd) error {
-	return gui.newCmdTask(viewName, cmd)
-}
--- a/pkg/gui/quitting.go
+++ b/pkg/gui/quitting.go
@@ -38,12 +38,6 @@ func (gui *Gui) quit(v *gocui.View) error {
 	if gui.State.Updating {
 		return gui.createUpdateQuitConfirmation(gui.g, v)
 	}
-	if gui.inDiffMode() {
-		return gui.exitDiffMode()
-	}
-	if gui.inFilterMode() {
-		return gui.exitFilterMode()
-	}
 	if gui.Config.GetUserConfig().GetBool("confirmOnQuit") {
 		return gui.createConfirmationPanel(gui.g, v, true, "", gui.Tr.SLocalize("ConfirmQuit"), func(g *gocui.Gui, v *gocui.View) error {
 			return gocui.ErrQuit
--- a/pkg/gui/rebase_options_panel.go
+++ b/pkg/gui/rebase_options_panel.go
@@ -10,24 +10,24 @@ import (
 func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	options := []string{"continue", "abort"}

-	if gui.GitCommand.WorkingTreeState() == "rebasing" {
+	if gui.State.WorkingTreeState == "rebasing" {
 		options = append(options, "skip")
 	}

 	menuItems := make([]*menuItem, len(options))
 	for i, option := range options {
 		// note to self. Never, EVER, close over loop variables in a function
-		option := option
+		innerOption := option
 		menuItems[i] = &menuItem{
-			displayString: option,
+			displayString: innerOption,
 			onPress: func() error {
-				return gui.genericMergeCommand(option)
+				return gui.genericMergeCommand(innerOption)
 			},
 		}
 	}

 	var title string
-	if gui.GitCommand.WorkingTreeState() == "merging" {
+	if gui.State.WorkingTreeState == "merging" {
 		title = gui.Tr.SLocalize("MergeOptionsTitle")
 	} else {
 		title = gui.Tr.SLocalize("RebaseOptionsTitle")
@@ -37,10 +37,10 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
 }

 func (gui *Gui) genericMergeCommand(command string) error {
-	status := gui.GitCommand.WorkingTreeState()
+	status := gui.State.WorkingTreeState

 	if status != "merging" && status != "rebasing" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NotMergingOrRebasing"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NotMergingOrRebasing"))
 	}

 	commandType := strings.Replace(status, "ing", "e", 1)
@@ -63,7 +63,7 @@ func (gui *Gui) genericMergeCommand(command string) error {
 }

 func (gui *Gui) handleGenericMergeCommandResult(result error) error {
-	if err := gui.refreshSidePanels(refreshOptions{mode: ASYNC}); err != nil {
+	if err := gui.refreshSidePanels(gui.g); err != nil {
 		return err
 	}
 	if result == nil {
@@ -74,9 +74,6 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error {
 		return gui.genericMergeCommand("skip")
 	} else if strings.Contains(result.Error(), "The previous cherry-pick is now empty") {
 		return gui.genericMergeCommand("continue")
-	} else if strings.Contains(result.Error(), "No rebase in progress?") {
-		// assume in this case that we're already done
-		return nil
 	} else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") {
 		return gui.createConfirmationPanel(gui.g, gui.getFilesView(), true, gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"),
 			func(g *gocui.Gui, v *gocui.View) error {
@@ -86,6 +83,6 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error {
 			},
 		)
 	} else {
-		return gui.createErrorPanel(result.Error())
+		return gui.createErrorPanel(gui.g, result.Error())
 	}
 }
--- a/pkg/gui/recent_repos_panel.go
+++ b/pkg/gui/recent_repos_panel.go
@@ -32,7 +32,6 @@ func (gui *Gui) handleCreateRecentReposMenu(g *gocui.Gui, v *gocui.View) error {
 					return err
 				}
 				gui.GitCommand = newGitCommand
-				gui.State.FilterPath = ""
 				return gui.Errors.ErrSwitchRepo
 			},
 		}
--- a/pkg/gui/reflog_panel.go
+++ b/pkg/gui/reflog_panel.go
@@ -10,12 +10,11 @@ import (

 func (gui *Gui) getSelectedReflogCommit() *commands.Commit {
 	selectedLine := gui.State.Panels.ReflogCommits.SelectedLine
-	reflogComits := gui.State.FilteredReflogCommits
-	if selectedLine == -1 || len(reflogComits) == 0 {
+	if selectedLine == -1 || len(gui.State.ReflogCommits) == 0 {
 		return nil
 	}

-	return reflogComits[selectedLine]
+	return gui.State.ReflogCommits[selectedLine]
 }

 func (gui *Gui) handleReflogCommitSelect(g *gocui.Gui, v *gocui.View) error {
@@ -35,63 +34,27 @@ func (gui *Gui) handleReflogCommitSelect(g *gocui.Gui, v *gocui.View) error {
 	if commit == nil {
 		return gui.newStringTask("main", "No reflog history")
 	}
-	v.FocusPoint(0, gui.State.Panels.ReflogCommits.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	if err := gui.focusPoint(0, gui.State.Panels.ReflogCommits.SelectedLine, len(gui.State.ReflogCommits), v); err != nil {
+		return err
 	}

 	cmd := gui.OSCommand.ExecutableFromString(
-		gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.FilterPath),
+		gui.GitCommand.ShowCmdStr(commit.Sha),
 	)
-	if err := gui.newPtyTask("main", cmd); err != nil {
+	if err := gui.newCmdTask("main", cmd); err != nil {
 		gui.Log.Error(err)
 	}

 	return nil
 }

-// the reflogs panel is the only panel where we cache data, in that we only
-// load entries that have been created since we last ran the call. This means
-// we need to be more careful with how we use this, and to ensure we're emptying
-// the reflogs array when changing contexts.
-// This method also manages two things: ReflogCommits and FilteredReflogCommits.
-// FilteredReflogCommits are rendered in the reflogs panel, and ReflogCommits
-// are used by the branches panel to obtain recency values for sorting.
 func (gui *Gui) refreshReflogCommits() error {
-	// pulling state into its own variable incase it gets swapped out for another state
-	// and we get an out of bounds exception
-	state := gui.State
-	var lastReflogCommit *commands.Commit
-	if len(state.ReflogCommits) > 0 {
-		lastReflogCommit = state.ReflogCommits[0]
+	commits, err := gui.GitCommand.GetReflogCommits()
+	if err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

-	refresh := func(stateCommits *[]*commands.Commit, filterPath string) error {
-		commits, onlyObtainedNewReflogCommits, err := gui.GitCommand.GetReflogCommits(lastReflogCommit, filterPath)
-		if err != nil {
-			return gui.surfaceError(err)
-		}
-
-		if onlyObtainedNewReflogCommits {
-			*stateCommits = append(commits, *stateCommits...)
-		} else {
-			*stateCommits = commits
-		}
-		return nil
-	}
-
-	if err := refresh(&state.ReflogCommits, ""); err != nil {
-		return err
-	}
-
-	if gui.inFilterMode() {
-		if err := refresh(&state.FilteredReflogCommits, state.FilterPath); err != nil {
-			return err
-		}
-	} else {
-		state.FilteredReflogCommits = state.ReflogCommits
-	}
+	gui.State.ReflogCommits = commits

 	if gui.getCommitsView().Context == "reflog-commits" {
 		return gui.renderReflogCommitsWithSelection()
@@ -103,8 +66,8 @@ func (gui *Gui) refreshReflogCommits() error {
 func (gui *Gui) renderReflogCommitsWithSelection() error {
 	commitsView := gui.getCommitsView()

-	gui.refreshSelectedLine(&gui.State.Panels.ReflogCommits.SelectedLine, len(gui.State.FilteredReflogCommits))
-	displayStrings := presentation.GetReflogCommitListDisplayStrings(gui.State.FilteredReflogCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.State.Diff.Ref)
+	gui.refreshSelectedLine(&gui.State.Panels.ReflogCommits.SelectedLine, len(gui.State.ReflogCommits))
+	displayStrings := presentation.GetCommitListDisplayStrings(gui.State.ReflogCommits, gui.State.ScreenMode != SCREEN_NORMAL)
 	gui.renderDisplayStrings(commitsView, displayStrings)
 	if gui.g.CurrentView() == commitsView && commitsView.Context == "reflog-commits" {
 		if err := gui.handleReflogCommitSelect(gui.g, commitsView); err != nil {
@@ -122,7 +85,7 @@ func (gui *Gui) handleCheckoutReflogCommit(g *gocui.Gui, v *gocui.View) error {
 	}

 	err := gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
-		return gui.handleCheckoutRef(commit.Sha, handleCheckoutRefOptions{})
+		return gui.handleCheckoutRef(commit.Sha)
 	}, nil)
 	if err != nil {
 		return err
--- a/pkg/gui/remote_branches_panel.go
+++ b/pkg/gui/remote_branches_panel.go
@@ -32,19 +32,21 @@ func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error {

 	gui.getMainView().Title = "Remote Branch"

+	remote := gui.getSelectedRemote()
 	remoteBranch := gui.getSelectedRemoteBranch()
 	if remoteBranch == nil {
 		return gui.newStringTask("main", "No branches for this remote")
 	}

-	v.FocusPoint(0, gui.State.Panels.RemoteBranches.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, gui.State.MenuItemCount, v)
+	if err := gui.focusPoint(0, gui.State.Panels.RemoteBranches.SelectedLine, len(gui.State.RemoteBranches), v); err != nil {
+		return err
 	}

+	branchName := fmt.Sprintf("%s/%s", remote.Name, remoteBranch.Name)
+
 	cmd := gui.OSCommand.ExecutableFromString(
-		gui.GitCommand.GetBranchGraphCmdStr(remoteBranch.FullName()),
+		gui.GitCommand.GetBranchGraphCmdStr(branchName),
 	)
 	if err := gui.newCmdTask("main", cmd); err != nil {
 		gui.Log.Error(err)
@@ -61,7 +63,7 @@ func (gui *Gui) renderRemoteBranchesWithSelection() error {
 	branchesView := gui.getBranchesView()

 	gui.refreshSelectedLine(&gui.State.Panels.RemoteBranches.SelectedLine, len(gui.State.RemoteBranches))
-	displayStrings := presentation.GetRemoteBranchListDisplayStrings(gui.State.RemoteBranches, gui.State.Diff.Ref)
+	displayStrings := presentation.GetRemoteBranchListDisplayStrings(gui.State.RemoteBranches)
 	gui.renderDisplayStrings(branchesView, displayStrings)
 	if gui.g.CurrentView() == branchesView && branchesView.Context == "remote-branches" {
 		if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil {
@@ -77,7 +79,7 @@ func (gui *Gui) handleCheckoutRemoteBranch(g *gocui.Gui, v *gocui.View) error {
 	if remoteBranch == nil {
 		return nil
 	}
-	if err := gui.handleCheckoutRef(remoteBranch.FullName(), handleCheckoutRefOptions{}); err != nil {
+	if err := gui.handleCheckoutRef(remoteBranch.RemoteName + "/" + remoteBranch.Name); err != nil {
 		return err
 	}
 	return gui.switchBranchesPanelContext("local-branches")
@@ -100,7 +102,7 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error {
 				return err
 			}

-			return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
+			return gui.refreshRemotes()
 		})
 	}, nil)
 }
@@ -118,7 +120,7 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
 		"SetUpstreamMessage",
 		Teml{
 			"checkedOut": checkedOutBranch.Name,
-			"selected":   selectedBranch.FullName(),
+			"selected":   selectedBranch.RemoteName + "/" + selectedBranch.Name,
 		},
 	)

@@ -127,7 +129,7 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
 			return err
 		}

-		return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
+		return gui.refreshSidePanels(gui.g)
 	}, nil)
 }

--- a/pkg/gui/remotes_panel.go
+++ b/pkg/gui/remotes_panel.go
@@ -39,10 +39,8 @@ func (gui *Gui) handleRemoteSelect(g *gocui.Gui, v *gocui.View) error {
 	if remote == nil {
 		return gui.newStringTask("main", "No remotes")
 	}
-	v.FocusPoint(0, gui.State.Panels.Remotes.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	if err := gui.focusPoint(0, gui.State.Panels.Remotes.SelectedLine, len(gui.State.Remotes), v); err != nil {
+		return err
 	}

 	return gui.newStringTask("main", fmt.Sprintf("%s\nUrls:\n%s", utils.ColoredString(remote.Name, color.FgGreen), strings.Join(remote.Urls, "\n")))
@@ -53,7 +51,7 @@ func (gui *Gui) refreshRemotes() error {

 	remotes, err := gui.GitCommand.GetRemotes()
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

 	gui.State.Remotes = remotes
@@ -84,7 +82,7 @@ func (gui *Gui) renderRemotesWithSelection() error {

 	gui.refreshSelectedLine(&gui.State.Panels.Remotes.SelectedLine, len(gui.State.Remotes))

-	displayStrings := presentation.GetRemoteListDisplayStrings(gui.State.Remotes, gui.State.Diff.Ref)
+	displayStrings := presentation.GetRemoteListDisplayStrings(gui.State.Remotes)
 	gui.renderDisplayStrings(branchesView, displayStrings)

 	if gui.g.CurrentView() == branchesView && branchesView.Context == "remotes" {
@@ -123,7 +121,7 @@ func (gui *Gui) handleAddRemote(g *gocui.Gui, v *gocui.View) error {
 			if err := gui.GitCommand.AddRemote(remoteName, remoteUrl); err != nil {
 				return err
 			}
-			return gui.refreshSidePanels(refreshOptions{scope: []int{REMOTES}})
+			return gui.refreshRemotes()
 		})
 	})
 }
@@ -138,7 +136,7 @@ func (gui *Gui) handleRemoveRemote(g *gocui.Gui, v *gocui.View) error {
 			return err
 		}

-		return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
+		return gui.refreshRemotes()

 	}, nil)
 }
@@ -162,7 +160,7 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {

 		if updatedRemoteName != remote.Name {
 			if err := gui.GitCommand.RenameRemote(remote.Name, updatedRemoteName); err != nil {
-				return gui.surfaceError(err)
+				return gui.createErrorPanel(gui.g, err.Error())
 			}
 		}

@@ -176,9 +174,9 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {
 		return gui.createPromptPanel(g, branchesView, editUrlMessage, "", func(g *gocui.Gui, v *gocui.View) error {
 			updatedRemoteUrl := gui.trimmedContent(v)
 			if err := gui.GitCommand.UpdateRemoteUrl(updatedRemoteName, updatedRemoteUrl); err != nil {
-				return gui.surfaceError(err)
+				return gui.createErrorPanel(gui.g, err.Error())
 			}
-			return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
+			return gui.refreshRemotes()
 		})
 	})
 }
@@ -194,6 +192,6 @@ func (gui *Gui) handleFetchRemote(g *gocui.Gui, v *gocui.View) error {
 			return err
 		}

-		return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
+		return gui.refreshRemotes()
 	})
 }
--- a/pkg/gui/reset_menu_panel.go
+++ b/pkg/gui/reset_menu_panel.go
@@ -4,38 +4,13 @@ import (
 	"fmt"

 	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
 )

-func (gui *Gui) resetToRef(ref string, strength string, options commands.RunCommandOptions) error {
-	if err := gui.GitCommand.ResetToCommit(ref, strength, options); err != nil {
-		return gui.surfaceError(err)
-	}
-
-	if err := gui.switchCommitsPanelContext("branch-commits"); err != nil {
-		return err
-	}
-
-	gui.State.Panels.Commits.SelectedLine = 0
-	gui.State.Panels.ReflogCommits.SelectedLine = 0
-	// loading a heap of commits is slow so we limit them whenever doing a reset
-	gui.State.Panels.Commits.LimitCommits = true
-
-	if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES, BRANCHES, REFLOG, COMMITS}}); err != nil {
-		return err
-	}
-	if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
-		return err
-	}
-
-	return gui.handleCommitSelect(gui.g, gui.getCommitsView())
-}
-
 func (gui *Gui) createResetMenu(ref string) error {
 	strengths := []string{"soft", "mixed", "hard"}
 	menuItems := make([]*menuItem, len(strengths))
 	for i, strength := range strengths {
-		strength := strength
+		innerStrength := strength
 		menuItems[i] = &menuItem{
 			displayStrings: []string{
 				fmt.Sprintf("%s reset", strength),
@@ -44,7 +19,25 @@ func (gui *Gui) createResetMenu(ref string) error {
 				),
 			},
 			onPress: func() error {
-				return gui.resetToRef(ref, strength, commands.RunCommandOptions{})
+				if err := gui.GitCommand.ResetToCommit(ref, innerStrength); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				gui.switchCommitsPanelContext("branch-commits")
+				gui.State.Panels.Commits.SelectedLine = 0
+				gui.State.Panels.ReflogCommits.SelectedLine = 0
+
+				if err := gui.refreshCommits(gui.g); err != nil {
+					return err
+				}
+				if err := gui.refreshFiles(); err != nil {
+					return err
+				}
+				if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
+					return err
+				}
+
+				return gui.handleCommitSelect(gui.g, gui.getCommitsView())
 			},
 		}
 	}
--- a/pkg/gui/searching.go
+++ b/pkg/gui/searching.go
@@ -12,19 +12,14 @@ func (gui *Gui) handleOpenSearch(g *gocui.Gui, v *gocui.View) error {
 	gui.State.Searching.isSearching = true
 	gui.State.Searching.view = v
 	gui.renderString(gui.g, "search", "")
-	if err := gui.switchFocus(gui.g, v, gui.getSearchView()); err != nil {
-		return err
-	}
+	gui.switchFocus(gui.g, v, gui.getSearchView())

 	return nil
 }

 func (gui *Gui) handleSearch(g *gocui.Gui, v *gocui.View) error {
 	gui.State.Searching.searchString = gui.getSearchView().Buffer()
-	if err := gui.switchFocus(gui.g, nil, gui.State.Searching.view); err != nil {
-		return err
-	}
-
+	gui.switchFocus(gui.g, nil, gui.State.Searching.view)
 	if err := gui.State.Searching.view.Search(gui.State.Searching.searchString); err != nil {
 		return err
 	}
@@ -90,5 +85,7 @@ func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}

-	return gui.onSearchEscape()
+	gui.onSearchEscape()
+
+	return nil
 }
--- a/pkg/gui/staging_panel.go
+++ b/pkg/gui/staging_panel.go
@@ -19,7 +19,7 @@ func (gui *Gui) refreshStagingPanel(forceSecondaryFocused bool, selectedLineIdx
 		return err
 	}

-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
@@ -99,33 +99,32 @@ func (gui *Gui) handleStagingEscape(g *gocui.Gui, v *gocui.View) error {
 	return gui.switchFocus(gui.g, nil, gui.getFilesView())
 }

-func (gui *Gui) handleToggleStagedSelection(g *gocui.Gui, v *gocui.View) error {
-	state := gui.State.Panels.LineByLine
-
-	return gui.applySelection(state.SecondaryFocused)
+func (gui *Gui) handleStageSelection(g *gocui.Gui, v *gocui.View) error {
+	return gui.applySelectionWithPrompt(false)
 }

 func (gui *Gui) handleResetSelection(g *gocui.Gui, v *gocui.View) error {
+	return gui.applySelectionWithPrompt(true)
+}
+
+func (gui *Gui) applySelectionWithPrompt(reverse bool) error {
 	state := gui.State.Panels.LineByLine

-	if state.SecondaryFocused {
-		// for backwards compatibility
-		return gui.applySelection(true)
+	if !reverse && state.SecondaryFocused {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantStageStaged"))
+	} else if reverse && !state.SecondaryFocused && !gui.Config.GetUserConfig().GetBool("gui.skipUnstageLineWarning") {
+		return gui.createConfirmationPanel(gui.g, gui.getMainView(), false, "unstage lines", "Are you sure you want to unstage these lines? It is irreversible.\nTo disable this dialogue set the config key of 'gui.skipUnstageLineWarning' to true", func(*gocui.Gui, *gocui.View) error {
+			return gui.applySelection(reverse)
+		}, nil)
 	}

-	if !gui.Config.GetUserConfig().GetBool("gui.skipUnstageLineWarning") {
-		return gui.createConfirmationPanel(gui.g, gui.getMainView(), false, "unstage lines", "Are you sure you want to delete the selected lines (git reset)? It is irreversible.\nTo disable this dialogue set the config key of 'gui.skipUnstageLineWarning' to true", func(*gocui.Gui, *gocui.View) error {
-			return gui.applySelection(true)
-		}, nil)
-	} else {
-		return gui.applySelection(true)
-	}
+	return gui.applySelection(reverse)
 }

 func (gui *Gui) applySelection(reverse bool) error {
 	state := gui.State.Panels.LineByLine

-	file, err := gui.getSelectedFile()
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		return err
 	}
@@ -144,14 +143,14 @@ func (gui *Gui) applySelection(reverse bool) error {
 	}
 	err = gui.GitCommand.ApplyPatch(patch, applyFlags...)
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

 	if state.SelectMode == RANGE {
 		state.SelectMode = LINE
 	}

-	if err := gui.refreshSidePanels(refreshOptions{scope: []int{FILES}}); err != nil {
+	if err := gui.refreshFiles(); err != nil {
 		return err
 	}
 	if err := gui.refreshStagingPanel(false, -1); err != nil {
@@ -159,3 +158,11 @@ func (gui *Gui) applySelection(reverse bool) error {
 	}
 	return nil
 }
+
+func (gui *Gui) handleMouseDownSecondaryWhileStaging(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	state.SecondaryFocused = !state.SecondaryFocused
+
+	return gui.refreshStagingPanel(false, -1)
+}
--- a/pkg/gui/stash_panel.go
+++ b/pkg/gui/stash_panel.go
@@ -8,7 +8,7 @@ import (

 // list panel functions

-func (gui *Gui) getSelectedStashEntry() *commands.StashEntry {
+func (gui *Gui) getSelectedStashEntry(v *gocui.View) *commands.StashEntry {
 	selectedLine := gui.State.Panels.Stash.SelectedLine
 	if selectedLine == -1 {
 		return nil
@@ -30,20 +30,18 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {

 	gui.getMainView().Title = "Stash"

-	stashEntry := gui.getSelectedStashEntry()
+	stashEntry := gui.getSelectedStashEntry(v)
 	if stashEntry == nil {
 		return gui.newStringTask("main", gui.Tr.SLocalize("NoStashEntries"))
 	}
-	v.FocusPoint(0, gui.State.Panels.Stash.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	if err := gui.focusPoint(0, gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries), v); err != nil {
+		return err
 	}

 	cmd := gui.OSCommand.ExecutableFromString(
 		gui.GitCommand.ShowStashEntryCmdStr(stashEntry.Index),
 	)
-	if err := gui.newPtyTask("main", cmd); err != nil {
+	if err := gui.newCmdTask("main", cmd); err != nil {
 		gui.Log.Error(err)
 	}

@@ -51,54 +49,32 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {
-	gui.State.StashEntries = gui.GitCommand.GetStashEntries(gui.State.FilterPath)
+	g.Update(func(g *gocui.Gui) error {
+		gui.State.StashEntries = gui.GitCommand.GetStashEntries()

-	gui.refreshSelectedLine(&gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries))
+		gui.refreshSelectedLine(&gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries))

-	stashView := gui.getStashView()
+		stashView := gui.getStashView()

-	displayStrings := presentation.GetStashEntryListDisplayStrings(gui.State.StashEntries, gui.State.Diff.Ref)
-	gui.renderDisplayStrings(stashView, displayStrings)
+		displayStrings := presentation.GetStashEntryListDisplayStrings(gui.State.StashEntries)
+		gui.renderDisplayStrings(stashView, displayStrings)

-	return gui.resetOrigin(stashView)
+		if err := gui.resetOrigin(stashView); err != nil {
+			return err
+		}
+		return nil
+	})
+	return nil
 }

 // specific functions

 func (gui *Gui) handleStashApply(g *gocui.Gui, v *gocui.View) error {
-	skipStashWarning := gui.Config.GetUserConfig().GetBool("gui.skipStashWarning")
-
-	apply := func() error {
-		return gui.stashDo(g, v, "apply")
-	}
-
-	if skipStashWarning {
-		return apply()
-	}
-
-	title := gui.Tr.SLocalize("StashApply")
-	message := gui.Tr.SLocalize("SureApplyStashEntry")
-	return gui.createConfirmationPanel(g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		return apply()
-	}, nil)
+	return gui.stashDo(g, v, "apply")
 }

 func (gui *Gui) handleStashPop(g *gocui.Gui, v *gocui.View) error {
-	skipStashWarning := gui.Config.GetUserConfig().GetBool("gui.skipStashWarning")
-
-	pop := func() error {
-		return gui.stashDo(g, v, "pop")
-	}
-
-	if skipStashWarning {
-		return pop()
-	}
-
-	title := gui.Tr.SLocalize("StashPop")
-	message := gui.Tr.SLocalize("SurePopStashEntry")
-	return gui.createConfirmationPanel(g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		return pop()
-	}, nil)
+	return gui.stashDo(g, v, "pop")
 }

 func (gui *Gui) handleStashDrop(g *gocui.Gui, v *gocui.View) error {
@@ -110,7 +86,7 @@ func (gui *Gui) handleStashDrop(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error {
-	stashEntry := gui.getSelectedStashEntry()
+	stashEntry := gui.getSelectedStashEntry(v)
 	if stashEntry == nil {
 		errorMessage := gui.Tr.TemplateLocalize(
 			"NoStashTo",
@@ -118,23 +94,25 @@ func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error {
 				"method": method,
 			},
 		)
-		return gui.createErrorPanel(errorMessage)
+		return gui.createErrorPanel(g, errorMessage)
 	}
 	if err := gui.GitCommand.StashDo(stashEntry.Index, method); err != nil {
-		return gui.surfaceError(err)
+		gui.createErrorPanel(g, err.Error())
 	}
-	return gui.refreshSidePanels(refreshOptions{scope: []int{STASH, FILES}})
+	gui.refreshStashEntries(g)
+	return gui.refreshFiles()
 }

 func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
 	if len(gui.trackedFiles()) == 0 && len(gui.stagedFiles()) == 0 {
-		return gui.createErrorPanel(gui.Tr.SLocalize("NoTrackedStagedFilesStash"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoTrackedStagedFilesStash"))
 	}
 	return gui.createPromptPanel(gui.g, gui.getFilesView(), gui.Tr.SLocalize("StashChanges"), "", func(g *gocui.Gui, v *gocui.View) error {
 		if err := stashFunc(gui.trimmedContent(v)); err != nil {
-			return gui.surfaceError(err)
+			gui.createErrorPanel(g, err.Error())
 		}
-		return gui.refreshSidePanels(refreshOptions{scope: []int{STASH, FILES}})
+		gui.refreshStashEntries(g)
+		return gui.refreshFiles()
 	})
 }

--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -10,41 +10,41 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-// never call this on its own, it should only be called from within refreshCommits()
-func (gui *Gui) refreshStatus() {
-	gui.State.RefreshingStatusMutex.Lock()
-	defer gui.State.RefreshingStatusMutex.Unlock()
+func (gui *Gui) refreshStatus(g *gocui.Gui) error {
+	state := gui.State.Panels.Status

-	currentBranch := gui.currentBranch()
-	if currentBranch == nil {
-		// need to wait for branches to refresh
-		return
+	v, err := g.View("status")
+	if err != nil {
+		panic(err)
 	}
-	status := ""
+	// for some reason if this isn't wrapped in an update the clear seems to
+	// be applied after the other things or something like that; the panel's
+	// contents end up cleared
+	g.Update(func(*gocui.Gui) error {
+		v.Clear()
+		state.pushables, state.pullables = gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount()
+		if err := gui.updateWorkTreeState(); err != nil {
+			return err
+		}
+		status := fmt.Sprintf("↑%s↓%s", state.pushables, state.pullables)
+		branches := gui.State.Branches

-	if currentBranch.Pushables != "" && currentBranch.Pullables != "" {
-		trackColor := color.FgYellow
-		if currentBranch.Pushables == "0" && currentBranch.Pullables == "0" {
-			trackColor = color.FgGreen
-		} else if currentBranch.Pushables == "?" && currentBranch.Pullables == "?" {
-			trackColor = color.FgRed
+		if gui.State.WorkingTreeState != "normal" {
+			status += utils.ColoredString(fmt.Sprintf(" (%s)", gui.State.WorkingTreeState), color.FgYellow)
 		}

-		status = utils.ColoredString(fmt.Sprintf("↑%s↓%s ", currentBranch.Pushables, currentBranch.Pullables), trackColor)
-	}
+		if len(branches) > 0 {
+			branch := branches[0]
+			name := utils.ColoredString(branch.Name, presentation.GetBranchColor(branch.Name))
+			repoName := utils.GetCurrentRepoName()
+			status += fmt.Sprintf(" %s → %s", repoName, name)
+		}

-	if gui.GitCommand.WorkingTreeState() != "normal" {
-		status += utils.ColoredString(fmt.Sprintf("(%s) ", gui.GitCommand.WorkingTreeState()), color.FgYellow)
-	}
-
-	name := utils.ColoredString(currentBranch.Name, presentation.GetBranchColor(currentBranch.Name))
-	repoName := utils.GetCurrentRepoName()
-	status += fmt.Sprintf("%s → %s ", repoName, name)
-
-	gui.g.Update(func(*gocui.Gui) error {
-		gui.setViewContent(gui.g, gui.getStatusView(), status)
+		fmt.Fprint(v, status)
 		return nil
 	})
+
+	return nil
 }

 func runeCount(str string) int {
@@ -61,14 +61,15 @@ func (gui *Gui) handleCheckForUpdate(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleStatusClick(g *gocui.Gui, v *gocui.View) error {
-	currentBranch := gui.currentBranch()
+	state := gui.State.Panels.Status

 	cx, _ := v.Cursor()
-	upstreamStatus := fmt.Sprintf("↑%s↓%s", currentBranch.Pushables, currentBranch.Pullables)
+	upstreamStatus := fmt.Sprintf("↑%s↓%s", state.pushables, state.pullables)
 	repoName := utils.GetCurrentRepoName()
-	switch gui.GitCommand.WorkingTreeState() {
+	gui.Log.Warn(gui.State.WorkingTreeState)
+	switch gui.State.WorkingTreeState {
 	case "rebasing", "merging":
-		workingTreeStatus := fmt.Sprintf("(%s)", gui.GitCommand.WorkingTreeState())
+		workingTreeStatus := fmt.Sprintf("(%s)", gui.State.WorkingTreeState)
 		if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) {
 			return gui.handleCreateRebaseOptionsMenu(gui.g, v)
 		}
@@ -97,10 +98,6 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {

 	gui.getMainView().Title = ""

-	if gui.inDiffMode() {
-		return gui.renderDiff()
-	}
-
 	magenta := color.New(color.FgMagenta)

 	dashboardString := strings.Join(
@@ -138,14 +135,23 @@ func lazygitTitle() string {
               |___/ |___/       `
 }

-func (gui *Gui) workingTreeState() string {
-	rebaseMode, _ := gui.GitCommand.RebaseMode()
+func (gui *Gui) updateWorkTreeState() error {
+	rebaseMode, err := gui.GitCommand.RebaseMode()
+	if err != nil {
+		return err
+	}
 	if rebaseMode != "" {
-		return "rebasing"
+		gui.State.WorkingTreeState = "rebasing"
+		return nil
+	}
+	merging, err := gui.GitCommand.IsInMergeState()
+	if err != nil {
+		return err
 	}
-	merging, _ := gui.GitCommand.IsInMergeState()
 	if merging {
-		return "merging"
+		gui.State.WorkingTreeState = "merging"
+		return nil
 	}
-	return "normal"
+	gui.State.WorkingTreeState = "normal"
+	return nil
 }
--- a/pkg/gui/tags_panel.go
+++ b/pkg/gui/tags_panel.go
@@ -34,10 +34,8 @@ func (gui *Gui) handleTagSelect(g *gocui.Gui, v *gocui.View) error {
 	if tag == nil {
 		return gui.newStringTask("main", "No tags")
 	}
-	v.FocusPoint(0, gui.State.Panels.Tags.SelectedLine)
-
-	if gui.inDiffMode() {
-		return gui.renderDiff()
+	if err := gui.focusPoint(0, gui.State.Panels.Tags.SelectedLine, len(gui.State.Tags), v); err != nil {
+		return err
 	}

 	cmd := gui.OSCommand.ExecutableFromString(
@@ -53,13 +51,13 @@ func (gui *Gui) handleTagSelect(g *gocui.Gui, v *gocui.View) error {
 func (gui *Gui) refreshTags() error {
 	tags, err := gui.GitCommand.GetTags()
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}

 	gui.State.Tags = tags

 	if gui.getBranchesView().Context == "tags" {
-		return gui.renderTagsWithSelection()
+		gui.renderTagsWithSelection()
 	}

 	return nil
@@ -69,11 +67,11 @@ func (gui *Gui) renderTagsWithSelection() error {
 	branchesView := gui.getBranchesView()

 	gui.refreshSelectedLine(&gui.State.Panels.Tags.SelectedLine, len(gui.State.Tags))
-	displayStrings := presentation.GetTagListDisplayStrings(gui.State.Tags, gui.State.Diff.Ref)
+	displayStrings := presentation.GetTagListDisplayStrings(gui.State.Tags)
 	gui.renderDisplayStrings(branchesView, displayStrings)
 	if gui.g.CurrentView() == branchesView && branchesView.Context == "tags" {
 		if err := gui.handleTagSelect(gui.g, branchesView); err != nil {
-			return gui.surfaceError(err)
+			return err
 		}
 	}

@@ -85,7 +83,7 @@ func (gui *Gui) handleCheckoutTag(g *gocui.Gui, v *gocui.View) error {
 	if tag == nil {
 		return nil
 	}
-	if err := gui.handleCheckoutRef(tag.Name, handleCheckoutRefOptions{}); err != nil {
+	if err := gui.handleCheckoutRef(tag.Name); err != nil {
 		return err
 	}
 	return gui.switchBranchesPanelContext("local-branches")
@@ -106,9 +104,15 @@ func (gui *Gui) handleDeleteTag(g *gocui.Gui, v *gocui.View) error {

 	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("DeleteTagTitle"), prompt, func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.DeleteTag(tag.Name); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
-		return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{COMMITS, TAGS}})
+		if err := gui.refreshCommits(g); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		if err := gui.refreshTags(); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		return nil
 	}, nil)
 }

@@ -127,30 +131,25 @@ func (gui *Gui) handlePushTag(g *gocui.Gui, v *gocui.View) error {

 	return gui.createPromptPanel(gui.g, v, title, "origin", func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.PushTag(v.Buffer(), tag.Name); err != nil {
-			return gui.surfaceError(err)
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
-		return nil
+		return gui.refreshTags()
 	})
 }

 func (gui *Gui) handleCreateTag(g *gocui.Gui, v *gocui.View) error {
 	return gui.createPromptPanel(gui.g, v, gui.Tr.SLocalize("CreateTagTitle"), "", func(g *gocui.Gui, v *gocui.View) error {
 		// leaving commit SHA blank so that we're just creating the tag for the current commit
-		tagName := v.Buffer()
-		if err := gui.GitCommand.CreateLightweightTag(tagName, ""); err != nil {
-			return gui.surfaceError(err)
+		if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), ""); err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
-		return gui.refreshSidePanels(refreshOptions{scope: []int{COMMITS, TAGS}, then: func() {
-			// find the index of the tag and set that as the currently selected line
-			for i, tag := range gui.State.Tags {
-				if tag.Name == tagName {
-					gui.State.Panels.Tags.SelectedLine = i
-					gui.renderTagsWithSelection()
-					return
-				}
-			}
-		},
-		})
+		if err := gui.refreshCommits(g); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		if err := gui.refreshTags(); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		return nil
 	})
 }

--- a/pkg/gui/tasks_adapter.go
+++ b/pkg/gui/tasks_adapter.go
@@ -18,17 +18,7 @@ func (gui *Gui) newCmdTask(viewName string, cmd *exec.Cmd) error {

 	manager := gui.getManager(view)

-	r, err := cmd.StdoutPipe()
-	if err != nil {
-		return err
-	}
-	cmd.Stderr = cmd.Stdout
-
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	if err := manager.NewTask(manager.NewCmdTask(r, cmd, height+oy+10, nil)); err != nil {
+	if err := manager.NewTask(manager.NewCmdTask(cmd, height+oy+10)); err != nil {
 		return err
 	}

@@ -59,8 +49,7 @@ func (gui *Gui) newStringTask(viewName string, str string) error {
 	manager := gui.getManager(view)

 	f := func(stop chan struct{}) error {
-		gui.renderString(gui.g, viewName, str)
-		return nil
+		return gui.renderString(gui.g, viewName, str)
 	}

 	if err := manager.NewTask(f); err != nil {
@@ -80,9 +69,7 @@ func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
 				view.Clear()
 			},
 			func() {
-				gui.g.Update(func(*gocui.Gui) error {
-					return nil
-				})
+				gui.g.Update(func(*gocui.Gui) error { return nil })
 			})
 		gui.viewBufferManagerMap[view.Name()] = manager
 	}
--- a/pkg/gui/undoing.go
+++ b/pkg/gui/undoing.go
@@ -1,192 +0,0 @@
-package gui
-
-import (
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// Quick summary of how this all works:
-// when you want to undo or redo, we start from the top of the reflog and work
-// down until we've reached the last user-initiated reflog entry that hasn't already been undone
-// we then do the reverse of what that reflog describes.
-// When we do this, we create a new reflog entry, and tag it as either an undo or redo
-// Then, next time we want to undo, we'll use those entries to know which user-initiated
-// actions we can skip. E.g. if I do do three things, A, B, and C, and hit undo twice,
-// the reflog will read UUCBA, and when I read the first two undos, I know to skip the following
-// two user actions, meaning we end up undoing reflog entry C. Redoing works in a similar way.
-
-const (
-	CHECKOUT = iota
-	COMMIT
-	REBASE
-	CURRENT_REBASE
-)
-
-type reflogAction struct {
-	kind int // one of CHECKOUT, REBASE, and COMMIT
-	from string
-	to   string
-}
-
-// Here we're going through the reflog and maintaining a counter that represents how many
-// undos/redos/user actions we've seen. when we hit a user action we call the callback specifying
-// what the counter is up to and the nature of the action.
-// If we find ourselves mid-rebase, we just return because undo/redo mid rebase
-// requires knowledge of previous TODO file states, which you can't just get from the reflog.
-// Though we might support this later, hence the use of the CURRENT_REBASE action kind.
-func (gui *Gui) parseReflogForActions(onUserAction func(counter int, action reflogAction) (bool, error)) error {
-	counter := 0
-	reflogCommits := gui.State.FilteredReflogCommits
-	rebaseFinishCommitSha := ""
-	var action *reflogAction
-	for reflogCommitIdx, reflogCommit := range reflogCommits {
-		action = nil
-
-		prevCommitSha := ""
-		if len(reflogCommits)-1 >= reflogCommitIdx+1 {
-			prevCommitSha = reflogCommits[reflogCommitIdx+1].Sha
-		}
-
-		if rebaseFinishCommitSha == "" {
-			if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^\[lazygit undo\]`); ok {
-				counter++
-			} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^\[lazygit redo\]`); ok {
-				counter--
-			} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(abort\)|^rebase -i \(finish\)`); ok {
-				rebaseFinishCommitSha = reflogCommit.Sha
-			} else if ok, match := utils.FindStringSubmatch(reflogCommit.Name, `^checkout: moving from ([\S]+) to ([\S]+)`); ok {
-				action = &reflogAction{kind: CHECKOUT, from: match[1], to: match[2]}
-			} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^commit|^reset: moving to|^pull`); ok {
-				action = &reflogAction{kind: COMMIT, from: prevCommitSha, to: reflogCommit.Sha}
-			} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok {
-				// if we're here then we must be currently inside an interactive rebase
-				action = &reflogAction{kind: CURRENT_REBASE, from: prevCommitSha}
-			}
-		} else if ok, _ := utils.FindStringSubmatch(reflogCommit.Name, `^rebase -i \(start\)`); ok {
-			action = &reflogAction{kind: REBASE, from: prevCommitSha, to: rebaseFinishCommitSha}
-			rebaseFinishCommitSha = ""
-		}
-
-		if action != nil {
-			if action.kind != CURRENT_REBASE && action.from == action.to {
-				// if we're going from one place to the same place we'll ignore the action.
-				continue
-			}
-			ok, err := onUserAction(counter, *action)
-			if ok {
-				return err
-			}
-			counter--
-		}
-	}
-	return nil
-}
-
-func (gui *Gui) reflogUndo(g *gocui.Gui, v *gocui.View) error {
-	undoEnvVars := []string{"GIT_REFLOG_ACTION=[lazygit undo]"}
-	undoingStatus := gui.Tr.SLocalize("UndoingStatus")
-
-	if gui.GitCommand.WorkingTreeState() == "rebasing" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("cantUndoWhileRebasing"))
-	}
-
-	return gui.parseReflogForActions(func(counter int, action reflogAction) (bool, error) {
-		if counter != 0 {
-			return false, nil
-		}
-
-		switch action.kind {
-		case COMMIT, REBASE:
-			return true, gui.handleHardResetWithAutoStash(action.from, handleHardResetWithAutoStashOptions{
-				EnvVars:       undoEnvVars,
-				WaitingStatus: undoingStatus,
-			})
-		case CHECKOUT:
-			return true, gui.handleCheckoutRef(action.from, handleCheckoutRefOptions{
-				EnvVars:       undoEnvVars,
-				WaitingStatus: undoingStatus,
-			})
-		}
-
-		gui.Log.Error("didn't match on the user action when trying to undo")
-		return true, nil
-	})
-}
-
-func (gui *Gui) reflogRedo(g *gocui.Gui, v *gocui.View) error {
-	redoEnvVars := []string{"GIT_REFLOG_ACTION=[lazygit redo]"}
-	redoingStatus := gui.Tr.SLocalize("RedoingStatus")
-
-	if gui.GitCommand.WorkingTreeState() == "rebasing" {
-		return gui.createErrorPanel(gui.Tr.SLocalize("cantRedoWhileRebasing"))
-	}
-
-	return gui.parseReflogForActions(func(counter int, action reflogAction) (bool, error) {
-		// if we're redoing and the counter is zero, we just return
-		if counter == 0 {
-			return true, nil
-		} else if counter > 1 {
-			return false, nil
-		}
-
-		switch action.kind {
-		case COMMIT, REBASE:
-			return true, gui.handleHardResetWithAutoStash(action.to, handleHardResetWithAutoStashOptions{
-				EnvVars:       redoEnvVars,
-				WaitingStatus: redoingStatus,
-			})
-		case CHECKOUT:
-			return true, gui.handleCheckoutRef(action.to, handleCheckoutRefOptions{
-				EnvVars:       redoEnvVars,
-				WaitingStatus: redoingStatus,
-			})
-		}
-
-		gui.Log.Error("didn't match on the user action when trying to redo")
-		return true, nil
-	})
-}
-
-type handleHardResetWithAutoStashOptions struct {
-	WaitingStatus string
-	EnvVars       []string
-}
-
-// only to be used in the undo flow for now
-func (gui *Gui) handleHardResetWithAutoStash(commitSha string, options handleHardResetWithAutoStashOptions) error {
-	reset := func() error {
-		if err := gui.resetToRef(commitSha, "hard", commands.RunCommandOptions{EnvVars: options.EnvVars}); err != nil {
-			return gui.surfaceError(err)
-		}
-		return nil
-	}
-
-	// if we have any modified tracked files we need to ask the user if they want us to stash for them
-	dirtyWorkingTree := len(gui.trackedFiles()) > 0
-	if dirtyWorkingTree {
-		// offer to autostash changes
-		return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("AutoStashTitle"), gui.Tr.SLocalize("AutoStashPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-			return gui.WithWaitingStatus(options.WaitingStatus, func() error {
-				if err := gui.GitCommand.StashSave(gui.Tr.SLocalize("StashPrefix") + commitSha); err != nil {
-					return gui.surfaceError(err)
-				}
-				if err := reset(); err != nil {
-					return err
-				}
-
-				if err := gui.GitCommand.StashDo(0, "pop"); err != nil {
-					if err := gui.refreshSidePanels(refreshOptions{}); err != nil {
-						return err
-					}
-					return gui.surfaceError(err)
-				}
-				return nil
-			})
-		}, nil)
-	}
-
-	return gui.WithWaitingStatus(options.WaitingStatus, func() error {
-		return reset()
-	})
-}
--- a/pkg/gui/updates.go
+++ b/pkg/gui/updates.go
@@ -14,10 +14,10 @@ func (gui *Gui) showUpdatePrompt(newVersion string) error {

 func (gui *Gui) onUserUpdateCheckFinish(newVersion string, err error) error {
 	if err != nil {
-		return gui.surfaceError(err)
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	if newVersion == "" {
-		return gui.createErrorPanel("New version not found")
+		return gui.createErrorPanel(gui.g, "New version not found")
 	}
 	return gui.showUpdatePrompt(newVersion)
 }
@@ -47,9 +47,11 @@ func (gui *Gui) startUpdating(newVersion string) {
 func (gui *Gui) onUpdateFinish(err error) error {
 	gui.State.Updating = false
 	gui.statusManager.removeStatus("updating")
-	gui.renderString(gui.g, "appStatus", "")
+	if err := gui.renderString(gui.g, "appStatus", ""); err != nil {
+		return err
+	}
 	if err != nil {
-		return gui.createErrorPanel("Update failed: " + err.Error())
+		return gui.createErrorPanel(gui.g, "Update failed: "+err.Error())
 	}
 	return nil
 }
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"sort"
 	"strings"
-	"sync"

 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/gocui"
@@ -14,128 +13,18 @@ import (

 var cyclableViews = []string{"status", "files", "branches", "commits", "stash"}

-// models/views that we can refresh
-const (
-	COMMITS = iota
-	BRANCHES
-	FILES
-	STASH
-	REFLOG
-	TAGS
-	REMOTES
-	STATUS
-)
-
-const (
-	SYNC     = iota // wait until everything is done before returning
-	ASYNC           // return immediately, allowing each independent thing to update itself
-	BLOCK_UI        // wrap code in an update call to ensure UI updates all at once and keybindings aren't executed till complete
-)
-
-type refreshOptions struct {
-	then  func()
-	scope []int // e.g. []int{COMMITS, BRANCHES}. Leave empty to refresh everything
-	mode  int   // one of SYNC (default), ASYNC, and BLOCK_UI
-}
-
-func intArrToMap(arr []int) map[int]bool {
-	output := map[int]bool{}
-	for _, el := range arr {
-		output[el] = true
+func (gui *Gui) refreshSidePanels(g *gocui.Gui) error {
+	if err := gui.refreshBranches(g); err != nil {
+		return err
 	}
-	return output
-}
-
-func (gui *Gui) refreshSidePanels(options refreshOptions) error {
-	wg := sync.WaitGroup{}
-
-	f := func() {
-		var scopeMap map[int]bool
-		if len(options.scope) == 0 {
-			scopeMap = intArrToMap([]int{COMMITS, BRANCHES, FILES, STASH, REFLOG, TAGS, REMOTES, STATUS})
-		} else {
-			scopeMap = intArrToMap(options.scope)
-		}
-
-		if scopeMap[COMMITS] || scopeMap[BRANCHES] || scopeMap[REFLOG] {
-			wg.Add(1)
-			func() {
-				if options.mode == ASYNC {
-					go gui.refreshCommits()
-				} else {
-					gui.refreshCommits()
-				}
-				wg.Done()
-			}()
-		}
-
-		if scopeMap[FILES] {
-			wg.Add(1)
-			func() {
-				if options.mode == ASYNC {
-					go gui.refreshFiles()
-				} else {
-					gui.refreshFiles()
-				}
-				wg.Done()
-			}()
-		}
-
-		if scopeMap[STASH] {
-			wg.Add(1)
-			func() {
-				if options.mode == ASYNC {
-					go gui.refreshStashEntries(gui.g)
-				} else {
-					gui.refreshStashEntries(gui.g)
-				}
-				wg.Done()
-			}()
-		}
-
-		if scopeMap[TAGS] {
-			wg.Add(1)
-			func() {
-				if options.mode == ASYNC {
-					go gui.refreshTags()
-				} else {
-					gui.refreshTags()
-				}
-				wg.Done()
-			}()
-		}
-
-		if scopeMap[REMOTES] {
-			wg.Add(1)
-			func() {
-				if options.mode == ASYNC {
-					go gui.refreshRemotes()
-				} else {
-					gui.refreshRemotes()
-				}
-				wg.Done()
-			}()
-		}
-
-		wg.Wait()
-
-		gui.refreshStatus()
-
-		if options.then != nil {
-			options.then()
-		}
+	if err := gui.refreshFiles(); err != nil {
+		return err
+	}
+	if err := gui.refreshCommits(g); err != nil {
+		return err
 	}

-	if options.mode == BLOCK_UI {
-		gui.g.Update(func(g *gocui.Gui) error {
-			f()
-			return nil
-		})
-	} else {
-		f()
-	}
-
-	return nil
+	return gui.refreshStashEntries(g)
 }

 func (gui *Gui) nextView(g *gocui.Gui, v *gocui.View) error {
@@ -169,9 +58,6 @@ func (gui *Gui) nextView(g *gocui.Gui, v *gocui.View) error {
 	if err != nil {
 		panic(err)
 	}
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
-		return err
-	}
 	return gui.switchFocus(g, v, focusedView)
 }

@@ -206,9 +92,6 @@ func (gui *Gui) previousView(g *gocui.Gui, v *gocui.View) error {
 	if err != nil {
 		panic(err)
 	}
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
-		return err
-	}
 	return gui.switchFocus(g, v, focusedView)
 }

@@ -335,18 +218,25 @@ func (gui *Gui) resetOrigin(v *gocui.View) error {
 	return v.SetOrigin(0, 0)
 }

+// if the cursor down past the last item, move it to the last line
+func (gui *Gui) focusPoint(cx int, cy int, lineCount int, v *gocui.View) error {
+	v.FocusPoint(cx, cy)
+	return nil
+}
+
 func (gui *Gui) cleanString(s string) string {
 	output := string(bom.Clean([]byte(s)))
 	return utils.NormalizeLinefeeds(output)
 }

-func (gui *Gui) setViewContent(g *gocui.Gui, v *gocui.View, s string) {
+func (gui *Gui) setViewContent(g *gocui.Gui, v *gocui.View, s string) error {
 	v.Clear()
 	fmt.Fprint(v, gui.cleanString(s))
+	return nil
 }

 // renderString resets the origin of a view and sets its content
-func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) {
+func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error {
 	g.Update(func(*gocui.Gui) error {
 		v, err := g.View(viewName)
 		if err != nil {
@@ -358,9 +248,9 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) {
 		if err := v.SetCursor(0, 0); err != nil {
 			return err
 		}
-		gui.setViewContent(gui.g, v, s)
-		return nil
+		return gui.setViewContent(gui.g, v, s)
 	})
+	return nil
 }

 func (gui *Gui) optionsMapToString(optionsMap map[string]string) string {
@@ -373,8 +263,7 @@ func (gui *Gui) optionsMapToString(optionsMap map[string]string) string {
 }

 func (gui *Gui) renderOptionsMap(optionsMap map[string]string) error {
-	gui.renderString(gui.g, "options", gui.optionsMapToString(optionsMap))
-	return nil
+	return gui.renderString(gui.g, "options", gui.optionsMapToString(optionsMap))
 }

 // TODO: refactor properly
@@ -429,11 +318,6 @@ func (gui *Gui) getSearchView() *gocui.View {
 	return v
 }

-func (gui *Gui) getStatusView() *gocui.View {
-	v, _ := gui.g.View("status")
-	return v
-}
-
 func (gui *Gui) trimmedContent(v *gocui.View) string {
 	return strings.TrimSpace(v.Buffer())
 }
@@ -465,6 +349,22 @@ func (gui *Gui) resizePopupPanel(g *gocui.Gui, v *gocui.View) error {
 	return err
 }

+// generalFocusLine takes a lineNumber to focus, and a bottomLine to ensure we can see
+func (gui *Gui) generalFocusLine(lineNumber int, bottomLine int, v *gocui.View) error {
+	_, height := v.Size()
+	overScroll := bottomLine - height + 1
+	if overScroll < 0 {
+		overScroll = 0
+	}
+	if err := v.SetOrigin(0, overScroll); err != nil {
+		return err
+	}
+	if err := v.SetCursor(0, lineNumber-overScroll); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (gui *Gui) changeSelectedLine(line *int, total int, change int) {
 	// TODO: find out why we're doing this
 	if *line == -1 {
@@ -509,14 +409,9 @@ func (gui *Gui) renderPanelOptions() error {
 	return gui.renderGlobalOptions()
 }

-func (gui *Gui) renderGlobalOptions() error {
-	return gui.renderOptionsMap(map[string]string{
-		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")):                                                                                 gui.Tr.SLocalize("scroll"),
-		fmt.Sprintf("%s %s %s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock"), gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"),
-		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")):                                                                                                 gui.Tr.SLocalize("close"),
-		gui.getKeyDisplay("universal.optionMenu"): gui.Tr.SLocalize("menu"),
-		"1-5": gui.Tr.SLocalize("jump"),
-	})
+func (gui *Gui) handleFocusView(g *gocui.Gui, v *gocui.View) error {
+	_, err := gui.g.SetCurrentView(v.Name())
+	return err
 }

 func (gui *Gui) isPopupPanel(viewName string) bool {
--- a/pkg/gui/workspace_reset_options_panel.go
+++ b/pkg/gui/workspace_reset_options_panel.go
@@ -16,10 +16,10 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.ResetAndClean(); err != nil {
-					return gui.surfaceError(err)
+					return gui.createErrorPanel(gui.g, err.Error())
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 		{
@@ -29,10 +29,10 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.DiscardAnyUnstagedFileChanges(); err != nil {
-					return gui.surfaceError(err)
+					return gui.createErrorPanel(gui.g, err.Error())
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 		{
@@ -42,10 +42,10 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.RemoveUntrackedFiles(); err != nil {
-					return gui.surfaceError(err)
+					return gui.createErrorPanel(gui.g, err.Error())
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 		{
@@ -55,10 +55,10 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
-					return gui.surfaceError(err)
+					return gui.createErrorPanel(gui.g, err.Error())
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 		{
@@ -68,10 +68,10 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
-					return gui.surfaceError(err)
+					return gui.createErrorPanel(gui.g, err.Error())
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 		{
@@ -81,10 +81,10 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			},
 			onPress: func() error {
 				if err := gui.GitCommand.ResetHard("HEAD"); err != nil {
-					return gui.surfaceError(err)
+					return gui.createErrorPanel(gui.g, err.Error())
 				}

-				return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}})
+				return gui.refreshFiles()
 			},
 		},
 	}
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -763,9 +763,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "IgnoreTrackedPrompt",
 			Other: "Are you sure you want to ignore a tracked file?",
-		}, &i18n.Message{
-			ID:    "commitPrefixPatternError",
-			Other: "Error in commitPrefix pattern",
 		},
 	)
 }
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -36,6 +36,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CommitsTitle",
 			Other: "Commits",
+		}, &i18n.Message{
+			ID:    "CommitsDiffTitle",
+			Other: "Commits (specific diff mode)",
+		}, &i18n.Message{
+			ID:    "CommitsDiff",
+			Other: "select commit to diff with another commit",
 		}, &i18n.Message{
 			ID:    "StashTitle",
 			Other: "Stash",
@@ -354,12 +360,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "undo",
 			Other: "undo",
-		}, &i18n.Message{
-			ID:    "undoReflog",
-			Other: "undo (via reflog) (experimental)",
-		}, &i18n.Message{
-			ID:    "redoReflog",
-			Other: "redo (via reflog) (experimental)",
 		}, &i18n.Message{
 			ID:    "pop",
 			Other: "pop",
@@ -378,18 +378,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "SureDropStashEntry",
 			Other: "Are you sure you want to drop this stash entry?",
-		}, &i18n.Message{
-			ID:    "StashPop",
-			Other: "Stash pop",
-		}, &i18n.Message{
-			ID:    "SurePopStashEntry",
-			Other: "Are you sure you want to pop this stash entry?",
-		}, &i18n.Message{
-			ID:    "StashApply",
-			Other: "Stash apply",
-		}, &i18n.Message{
-			ID:    "SureApplyStashEntry",
-			Other: "Are you sure you want to apply this stash entry?",
 		}, &i18n.Message{
 			ID:    "NoStashTo",
 			Other: "No stash to {{.method}}",
@@ -513,19 +501,16 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: `select hunk`,
 		}, &i18n.Message{
 			ID:    "StageSelection",
-			Other: `toggle line staged / unstaged`,
+			Other: `stage selection`,
 		}, &i18n.Message{
 			ID:    "ResetSelection",
-			Other: `delete change (git reset)`,
+			Other: `reset selection`,
 		}, &i18n.Message{
 			ID:    "ToggleDragSelect",
 			Other: `toggle drag select`,
 		}, &i18n.Message{
 			ID:    "ToggleSelectHunk",
 			Other: `toggle select hunk`,
-		}, &i18n.Message{
-			ID:    "ToggleSelectionForPatch",
-			Other: `add/remove line(s) to patch`,
 		},
 		&i18n.Message{
 			ID:    "TogglePanel",
@@ -753,15 +738,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CherryPickingStatus",
 			Other: "cherry-picking",
-		}, &i18n.Message{
-			ID:    "UndoingStatus",
-			Other: "undoing",
-		}, &i18n.Message{
-			ID:    "RedoingStatus",
-			Other: "redoing",
-		}, &i18n.Message{
-			ID:    "CheckingOutStatus",
-			Other: "checking out",
 		}, &i18n.Message{
 			ID:    "CommitFiles",
 			Other: "Commit files",
@@ -1029,129 +1005,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "prevScreenMode",
 			Other: "prev screen mode",
-		}, &i18n.Message{
-			ID:    "startSearch",
-			Other: "start search",
 		}, &i18n.Message{
 			ID:    "Panel",
 			Other: "Panel",
 		}, &i18n.Message{
 			ID:    "Keybindings",
 			Other: "Keybindings",
-		}, &i18n.Message{
-			ID:    "renameBranch",
-			Other: "rename branch",
-		}, &i18n.Message{
-			ID:    "NewBranchNamePrompt",
-			Other: "Enter new branch name for branch",
-		}, &i18n.Message{
-			ID:    "RenameBranchWarning",
-			Other: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
-		}, &i18n.Message{
-			ID:    "openMenu",
-			Other: "open menu",
-		}, &i18n.Message{
-			ID:    "closeMenu",
-			Other: "close menu",
-		}, &i18n.Message{
-			ID:    "resetCherryPick",
-			Other: "reset cherry-picked (copied) commits selection",
-		}, &i18n.Message{
-			ID:    "nextTab",
-			Other: "next tab",
-		}, &i18n.Message{
-			ID:    "prevTab",
-			Other: "previous tab",
-		}, &i18n.Message{
-			ID:    "cantUndoWhileRebasing",
-			Other: "Can't undo while rebasing",
-		}, &i18n.Message{
-			ID:    "cantRedoWhileRebasing",
-			Other: "Can't redo while rebasing",
-		}, &i18n.Message{
-			ID:    "MustStashWarning",
-			Other: "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
-		}, &i18n.Message{
-			ID:    "MustStashTitle",
-			Other: "Must stash",
-		}, &i18n.Message{
-			ID:    "ConfirmationTitle",
-			Other: "Confirmation Panel",
-		}, &i18n.Message{
-			ID:    "prevPage",
-			Other: "previous page",
-		}, &i18n.Message{
-			ID:    "nextPage",
-			Other: "next page",
-		}, &i18n.Message{
-			ID:    "gotoTop",
-			Other: "scroll to top",
-		}, &i18n.Message{
-			ID:    "gotoBottom",
-			Other: "scroll to bottom",
-		}, &i18n.Message{
-			ID:    "filteringBy",
-			Other: "filtering by",
-		}, &i18n.Message{
-			ID:    "(reset)",
-			Other: "(reset)",
-		}, &i18n.Message{
-			ID:    "openScopingMenu",
-			Other: "view scoping options",
-		}, &i18n.Message{
-			ID:    "filterBy",
-			Other: "filter by",
-		}, &i18n.Message{
-			ID:    "exitFilterMode",
-			Other: "stop filtering by path",
-		}, &i18n.Message{
-			ID:    "filterPathOption",
-			Other: "enter path to filter by",
-		}, &i18n.Message{
-			ID:    "enterFileName",
-			Other: "enter path:",
-		}, &i18n.Message{
-			ID:    "FilteringMenuTitle",
-			Other: "Filtering",
-		}, &i18n.Message{
-			ID:    "MustExitFilterModeTitle",
-			Other: "Command not available",
-		}, &i18n.Message{
-			ID:    "MustExitFilterModePrompt",
-			Other: "Command not available in filtered mode. Exit filtered mode?",
-		}, &i18n.Message{
-			ID:    "diff",
-			Other: "diff",
-		}, &i18n.Message{
-			ID:    "enterRefToDiff",
-			Other: "enter ref to diff",
-		}, &i18n.Message{
-			ID:    "enteRefName",
-			Other: "enter ref:",
-		}, &i18n.Message{
-			ID:    "exitDiffMode",
-			Other: "exit diff mode",
-		}, &i18n.Message{
-			ID:    "DiffingMenuTitle",
-			Other: "Diffing",
-		}, &i18n.Message{
-			ID:    "swapDiff",
-			Other: "reverse diff direction",
-		}, &i18n.Message{
-			ID:    "openDiffingMenu",
-			Other: "open diff menu",
-		}, &i18n.Message{
-			ID:    "showingGitDiff",
-			Other: "showing output for:",
-		}, &i18n.Message{
-			ID:    "copyCommitShaToClipboard",
-			Other: "copy commit SHA to clipboard",
-		}, &i18n.Message{
-			ID:    "copyBranchNameToClipboard",
-			Other: "copy branch name to clipboard",
-		}, &i18n.Message{
-			ID:    "commitPrefixPatternError",
-			Other: "Error in commitPrefix pattern",
 		},
 	)
 }
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -746,9 +746,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "IgnoreTrackedPrompt",
 			Other: "Are you sure you want to ignore a tracked file?",
-		}, &i18n.Message{
-			ID:    "commitPrefixPatternError",
-			Other: "Error in commitPrefix pattern",
 		},
 	)
 }
--- a/pkg/tasks/tasks.go
+++ b/pkg/tasks/tasks.go
@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"

-	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/sirupsen/logrus"
 )

@@ -23,6 +22,7 @@ type Task struct {

 type ViewBufferManager struct {
 	writer       io.Writer
+	waitingTask  *Task
 	currentTask  *Task
 	waitingMutex sync.Mutex
 	taskIDMutex  sync.Mutex
@@ -45,20 +45,27 @@ func (m *ViewBufferManager) ReadLines(n int) {
 	}()
 }

-func (m *ViewBufferManager) NewCmdTask(r io.Reader, cmd *exec.Cmd, linesToRead int, onDone func()) func(chan struct{}) error {
+func (m *ViewBufferManager) NewCmdTask(cmd *exec.Cmd, linesToRead int) func(chan struct{}) error {
 	return func(stop chan struct{}) error {
+		r, err := cmd.StdoutPipe()
+		if err != nil {
+			return err
+		}
+		cmd.Stderr = cmd.Stdout
+
+		if err := cmd.Start(); err != nil {
+			return err
+		}
+
 		go func() {
 			<-stop
-			if err := commands.Kill(cmd); err != nil {
-				m.Log.Warn(err)
-			}
-			if onDone != nil {
-				onDone()
+			if cmd.ProcessState == nil {
+				if err := kill(cmd); err != nil {
+					m.Log.Warn(err)
+				}
 			}
 		}()

-		loadingMutex := sync.Mutex{}
-
 		// not sure if it's the right move to redefine this or not
 		m.readLines = make(chan int, 1024)

@@ -75,13 +82,11 @@ func (m *ViewBufferManager) NewCmdTask(r io.Reader, cmd *exec.Cmd, linesToRead i
 				defer ticker.Stop()
 				select {
 				case <-ticker.C:
-					loadingMutex.Lock()
 					if !loaded {
 						m.beforeStart()
-						_, _ = m.writer.Write([]byte("loading..."))
+						m.writer.Write([]byte("loading..."))
 						m.refreshView()
 					}
-					loadingMutex.Unlock()
 				case <-stop:
 					return
 				}
@@ -93,16 +98,13 @@ func (m *ViewBufferManager) NewCmdTask(r io.Reader, cmd *exec.Cmd, linesToRead i
 				case linesToRead := <-m.readLines:
 					for i := 0; i < linesToRead; i++ {
 						ok := scanner.Scan()
-						loadingMutex.Lock()
 						if !loaded {
 							m.beforeStart()
 							loaded = true
 						}
-						loadingMutex.Unlock()

 						select {
 						case <-stop:
-							m.refreshView()
 							break outer
 						default:
 						}
@@ -110,11 +112,10 @@ func (m *ViewBufferManager) NewCmdTask(r io.Reader, cmd *exec.Cmd, linesToRead i
 							m.refreshView()
 							break outer
 						}
-						_, _ = m.writer.Write(append(scanner.Bytes(), []byte("\n")...))
+						m.writer.Write(append(scanner.Bytes(), []byte("\n")...))
 					}
 					m.refreshView()
 				case <-stop:
-					m.refreshView()
 					break outer
 				}
 			}
@@ -123,12 +124,6 @@ func (m *ViewBufferManager) NewCmdTask(r io.Reader, cmd *exec.Cmd, linesToRead i
 				m.Log.Warn(err)
 			}

-			m.refreshView()
-
-			if onDone != nil {
-				onDone()
-			}
-
 			close(done)
 		}()

@@ -146,7 +141,7 @@ func (t *ViewBufferManager) Close() {
 		return
 	}

-	c := make(chan struct{})
+	c := make(chan struct{}, 1)

 	go func() {
 		t.currentTask.Stop()
@@ -175,10 +170,7 @@ func (m *ViewBufferManager) NewTask(f func(stop chan struct{}) error) error {

 		m.waitingMutex.Lock()
 		defer m.waitingMutex.Unlock()
-
-		m.Log.Infof("done waiting")
 		if taskID < m.newTaskId {
-			m.Log.Infof("returning cos the task is obsolete")
 			return
 		}

@@ -222,4 +214,15 @@ func (t *Task) Stop() {
 	<-t.notifyStopped
 	t.Log.Info("received notifystopped message")
 	t.stopped = true
+	return
+}
+
+// kill kills a process
+func kill(cmd *exec.Cmd) error {
+	if cmd.Process == nil {
+		// somebody got to it before we were able to, poor bastard
+		return nil
+	}
+
+	return cmd.Process.Kill()
 }
--- a/pkg/theme/theme.go
+++ b/pkg/theme/theme.go
@@ -27,8 +27,6 @@ var (
 	OptionsFgColor color.Attribute

 	OptionsColor gocui.Attribute
-
-	DiffTerminalColor = color.FgMagenta
 )

 // UpdateTheme updates all theme variables
--- a/pkg/utils/date.go
+++ b/pkg/utils/date.go
@@ -1,25 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"time"
-)
-
-func UnixToTimeAgo(timestamp int64) string {
-	now := time.Now().Unix()
-	delta := float64(now - timestamp)
-	// we go seconds, minutes, hours, days, weeks, months, years
-	conversions := []float64{60, 60, 24, 7, 4.34524, 12}
-	labels := []string{"s", "m", "h", "d", "w", "m", "y"}
-	for i, conversion := range conversions {
-		if delta < conversion {
-			return fmt.Sprintf("%d%s", int(delta), labels[i])
-		}
-		delta /= conversion
-	}
-	return fmt.Sprintf("%dy", int(delta))
-}
-
-func UnixToDate(timestamp int64) string {
-	return time.Unix(timestamp, 0).Format(time.RFC822)
-}
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -39,8 +39,8 @@ func WithPadding(str string, padding int) string {

 // ColoredString takes a string and a colour attribute and returns a colored
 // string with that attribute
-func ColoredString(str string, colorAttributes ...color.Attribute) string {
-	colour := color.New(colorAttributes...)
+func ColoredString(str string, colorAttribute color.Attribute) string {
+	colour := color.New(colorAttribute)
 	return ColoredStringDirect(str, colour)
 }

@@ -316,9 +316,3 @@ func TruncateWithEllipsis(str string, limit int) string {
 	remainingLength := limit - len(ellipsis)
 	return str[0:remainingLength] + "..."
 }
-
-func FindStringSubmatch(str string, regexpStr string) (bool, []string) {
-	re := regexp.MustCompile(regexpStr)
-	match := re.FindStringSubmatch(str)
-	return len(match) > 0, match
-}
--- a/pkg/utils/utils_test.go
+++ b/pkg/utils/utils_test.go
@@ -196,6 +196,8 @@ func TestDisplayArraysAligned(t *testing.T) {
 	}
 }

+type myStruct struct{}
+
 // TestGetPaddedDisplayStrings is a function.
 func TestGetPaddedDisplayStrings(t *testing.T) {
 	type scenario struct {
--- a/scripts/generate_cheatsheet.go
+++ b/scripts/generate_cheatsheet.go
@@ -83,7 +83,9 @@ func getBindingSections(mApp *app.App) []*bindingSection {
 		if len(binding.Contexts) == 0 {
 			contexts = append(contexts, "")
 		} else {
-			contexts = append(contexts, binding.Contexts...)
+			for _, context := range binding.Contexts {
+				contexts = append(contexts, context)
+			}
 		}

 		for _, context := range contexts {
--- a/Show More
+++ b/Show More