don't pass single commands directly to RunCommand (or equivalent function)

when it contains percentages. This is a really strange one. It's a linting warning in my editor and it doesn't stop me from compiling, but it breaks `go test`. A basic file to reproduce what I'm talking about: package main import "fmt" func main() { notSprintf("test %s") // compiler complains here thinking %s needs a corresponding argument } func notSprintf(formatStr string, formatArgs ...interface{}) string { if formatArgs != nil { return formatStr } return fmt.Sprintf(formatStr, formatArgs...) }
fix specs
2019-11-21 21:59:25 +11:00 · 2019-11-21 21:51:35 +11:00 · 2019-11-21 21:17:31 +11:00 · 2019-11-21 21:16:05 +11:00 · 2019-11-21 21:16:05 +11:00 · 2019-11-21 21:15:49 +11:00
282 changed files with 47955 additions and 48975 deletions
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -17,16 +17,16 @@ builds:
    ldflags:
      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease

-archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: 32-bit
-      amd64: x86_64
-    format_overrides:
-      - goos: windows
-        format: zip
+archive:
+  replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: 32-bit
+    amd64: x86_64
+  format_overrides:
+    - goos: windows
+      format: zip
 checksum:
  name_template: 'checksums.txt'
 snapshot:
@@ -38,28 +38,27 @@ changelog:
      - '^docs:'
      - '^test:'
      - '^bump'
-brews:
-  -
-    # Reporitory to push the tap to.
-    github:
-      owner: jesseduffield
-      name: homebrew-lazygit
+brew:
+  # Reporitory to push the tap to.
+  github:
+    owner: jesseduffield
+    name: homebrew-lazygit

-    # Your app's homepage.
-    # Default is empty.
-    homepage: 'https://github.com/jesseduffield/lazygit/'
+  # Your app's homepage.
+  # Default is empty.
+  homepage: 'https://github.com/jesseduffield/lazygit/'

-    # Your app's description.
-    # Default is empty.
-    description: 'A simple terminal UI for git commands, written in Go'
+  # Your app's description.
+  # Default is empty.
+  description: 'A simple terminal UI for git commands, written in Go'

-    # # Packages your package depends on.
-    # dependencies:
-    #   - git
-    #   - zsh
-    # # Packages that conflict with your package.
-    # conflicts:
-    #   - svn
-    #   - bash
+  # # Packages your package depends on.
+  # dependencies:
+  #   - git
+  #   - zsh
+  # # Packages that conflict with your package.
+  # conflicts:
+  #   - svn
+  #   - bash

-  # test comment to see if goreleaser only releases on new commits
+# test comment to see if goreleaser only releases on new commits
--- a/README.md
+++ b/README.md
@@ -46,7 +46,11 @@ sudo port install lazygit

 ### Ubuntu

-Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
+Packages for Ubuntu 16.04, 18.04 and 18.10 are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
+
+**Release builds**
+
+Built from git tags. Supposed to be more stable.

 ```sh
 sudo add-apt-repository ppa:lazygit-team/release
@@ -54,6 +58,16 @@ sudo apt-get update
 sudo apt-get install lazygit
 ```

+**Daily builds**
+
+Built from master branch once in 24 hours (or more sometimes).
+
+```sh
+sudo add-apt-repository ppa:lazygit-team/daily
+sudo apt-get update
+sudo apt-get install lazygit
+```
+
 ### Void Linux

 Packages for Void Linux are available in the distro repo
@@ -77,15 +91,6 @@ and the git version which builds from the most recent commit.
 Instruction of how to install AUR content can be found here:
 https://wiki.archlinux.org/index.php/Arch_User_Repository

-### Fedora and CentOS 7
-
-Packages for Fedora and CentOS 7 are available via [Copr](https://copr.fedorainfracloud.org/coprs/atim/lazygit/) (Cool Other Package Repo).
-
-```sh
-sudo dnf copr enable atim/lazygit -y
-sudo dnf install lazygit
-```
-
 ### Conda

 Released versions are available for different platforms, see https://anaconda.org/conda-forge/lazygit
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -1,10 +1,5 @@
 # User Config:

-Default path for the config file:
-
-* Linux: `~/.config/jesseduffield/lazygit/config.yml`
-* MacOS: `~/Library/Application Support/jesseduffield/lazygit/config.yml`
-
 ## Default:

 ```yaml
@@ -18,15 +13,12 @@ Default path for the config file:
        - white
        - bold
      inactiveBorderColor:
-        - green
+        - white
      optionsTextColor:
        - blue
-      selectedLineBgColor:
-        - blue
    commitLength:
      show: true
    mouseEvents: true
-    skipUnstageLineWarning: false
  git:
    merging:
      # only applicable to unix users
@@ -38,102 +30,6 @@ Default path for the config file:
    days: 14 # how often an update is checked for
  reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined'
  confirmOnQuit: false
-  keybinding:
-    universal:
-      quit: 'q'
-      quit-alt1: '<c-c>' # alternative/alias of quit
-      return: '<esc>' # return to previous menu, will quit if there's nowhere to return
-      quitWithoutChangingDirectory: 'Q'
-      togglePanel: '<tab>' # goto the next panel
-      prevItem: '<up>' # go one line up
-      nextItem: '<down>' # go one line down
-      prevItem-alt: 'k' # go one line up
-      nextItem-alt: 'j' # go one line down
-      prevBlock: '<left>' # goto the previous block / panel
-      nextBlock: '<right>' # goto the next block / panel
-      prevBlock-alt: 'h' # goto the previous block / panel
-      nextBlock-alt: 'l' # goto the next block / panel
-      nextMatch: 'n'
-      prevMatch: 'N'
-      optionMenu: 'x' # show help menu
-      optionMenu-alt1: '?' # show help menu
-      select: '<space>'
-      goInto: '<enter>'
-      remove: 'd'
-      new: 'n'
-      edit: 'e'
-      openFile: 'o'
-      scrollUpMain: '<pgup>' # main panel scrool up
-      scrollDownMain: '<pgdown>' # main panel scrool down
-      scrollUpMain-alt1: 'K' # main panel scrool up
-      scrollDownMain-alt1: 'J' # main panel scrool down
-      scrollUpMain-alt2: '<c-u>' # main panel scrool up
-      scrollDownMain-alt2: '<c-d>' # main panel scrool down
-      executeCustomCommand: ':'
-      createRebaseOptionsMenu: 'm'
-      pushFiles: 'P'
-      pullFiles: 'p'
-      refresh: 'R'
-      createPatchOptionsMenu: '<c-p>'
-      nextTab: ']'
-      prevTab: '['
-      nextScreenMode: '+'
-      prevScreenMode: '_'
-    status:
-      checkForUpdate: 'u'
-      recentRepos: '<enter>'
-    files:
-      commitChanges: 'c'
-      commitChangesWithoutHook: 'w' # commit changes without pre-commit hook
-      amendLastCommit: 'A'
-      commitChangesWithEditor: 'C'
-      ignoreFile: 'i'
-      refreshFiles: 'r'
-      stashAllChanges: 's'
-      viewStashOptions: 'S'
-      toggleStagedAll: 'a' # stage/unstage all
-      viewResetOptions: 'D'
-      fetch: 'f'
-    branches:
-      createPullRequest: 'o'
-      checkoutBranchByName: 'c'
-      forceCheckoutBranch: 'F'
-      rebaseBranch: 'r'
-      mergeIntoCurrentBranch: 'M'
-      viewGitFlowOptions: 'i'
-      fastForward: 'f' # fast-forward this branch from its upstream
-      pushTag: 'P'
-      setUpstream: 'u' # set as upstream of checked-out branch
-      fetchRemote: 'f'
-    commits:
-      squashDown: 's'
-      renameCommit: 'r'
-      renameCommitWithEditor: 'R'
-      viewResetOptions: 'g'
-      markCommitAsFixup: 'f'
-      createFixupCommit: 'F' # create fixup commit for this commit
-      squashAboveCommits: 'S'
-      moveDownCommit: '<c-j>' # move commit down one
-      moveUpCommit: '<c-k>' # move commit up one
-      amendToCommit: 'A'
-      pickCommit: 'p' # pick commit (when mid-rebase)
-      revertCommit: 't'
-      cherryPickCopy: 'c'
-      cherryPickCopyRange: 'C'
-      pasteCommits: 'v'
-      tagCommit: 'T'
-      toggleDiffCommit: 'i'
-      checkoutCommit: '<space>'
-    stash:
-      popStash: 'g'
-    commitFiles:
-      checkoutCommitFile: 'c'
-    main:
-      toggleDragSelect: 'v'
-      toggleDragSelect-alt: 'V'
-      toggleSelectHunk: 'a'
-      pickBothHunks: 'b'
-      undo: 'z'
 ```

 ## Platform Defaults:
@@ -199,42 +95,8 @@ If you have issues with a light terminal theme where you can't read / see the te
        - bold
      inactiveBorderColor:
        - black
-      selectedLineBgColor:
-        - blue
 ```

 ## Example Coloring:

 ![border example](/docs/resources/colored-border-example.png)
-
-## Keybindings:
-For all possible keybinding options, check [Custom_Keybinding.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybinding.md)
-
-
-#### Example Keybindings For Colemak Users:
-```yaml
-  keybinding:
-    universal:
-      prevItem-alt: 'u'
-      nextItem-alt: 'e'
-      prevBlock-alt: 'n'
-      nextBlock-alt: 'i'
-      nextMatch: '='
-      prevMatch: '-'
-      new: 'k'
-      edit: 'o'
-      openFile: 'O'
-      scrollUpMain-alt1: 'U'
-      scrollDownMain-alt1: 'E'
-      scrollUpMain-alt2: '<c-u>'
-      scrollDownMain-alt2: '<c-e>'
-    files:
-      ignoreFile: 'I'
-    commits:
-      moveDownCommit: '<c-e>'
-      moveUpCommit: '<c-u>'
-      toggleDiffCommit: 'l'
-    branches:
-      viewGitFlowOptions: 'I'
-```
-
--- a/docs/keybindings/Custom_Keybindings.md
+++ b/docs/keybindings/Custom_Keybindings.md
@@ -1,59 +0,0 @@
-## Possible keybindings
-| Put in        | You will get   |
-|---------------|----------------|
-| `<f1>`        | F1             |
-| `<f2>`        | F2             |
-| `<f3>`        | F3             |
-| `<f4>`        | F4             |
-| `<f5>`        | F5             |
-| `<f6>`        | F6             |
-| `<f7>`        | F7             |
-| `<f8>`        | F8             |
-| `<f9>`        | F9             |
-| `<f10>`       | F10            |
-| `<f11>`       | F11            |
-| `<f12>`       | F12            |
-| `<insert>`    | Insert         |
-| `<delete>`    | Delete         |
-| `<home>`      | Home           |
-| `<end>`       | End            |
-| `<pgup>`      | Pgup           |
-| `<pgdown>`    | Pgdn           |
-| `<up>`        | ArrowUp        |
-| `<down>`      | ArrowDown      |
-| `<left>`      | ArrowLeft      |
-| `<right>`     | ArrowRight     |
-| `<tab>`       | Tab            |
-| `<enter>`     | Enter          |
-| `<esc>`       | Esc            |
-| `<backspace>` | Backspace      |
-| `<c-space>`   | CtrlSpace      |
-| `<c-/>`       | CtrlSlash      |
-| `<space>`     | Space          |
-| `<c-a>`       | CtrlA          |
-| `<c-b>`       | CtrlB          |
-| `<c-c>`       | CtrlC          |
-| `<c-d>`       | CtrlD          |
-| `<c-e>`       | CtrlE          |
-| `<c-f>`       | CtrlF          |
-| `<c-g>`       | CtrlG          |
-| `<c-j>`       | CtrlJ          |
-| `<c-k>`       | CtrlK          |
-| `<c-l>`       | CtrlL          |
-| `<c-n>`       | CtrlN          |
-| `<c-o>`       | CtrlO          |
-| `<c-p>`       | CtrlP          |
-| `<c-q>`       | CtrlQ          |
-| `<c-r>`       | CtrlR          |
-| `<c-s>`       | CtrlS          |
-| `<c-t>`       | CtrlT          |
-| `<c-u>`       | CtrlU          |
-| `<c-v>`       | CtrlV          |
-| `<c-w>`       | CtrlW          |
-| `<c-x>`       | CtrlX          |
-| `<c-y>`       | CtrlY          |
-| `<c-z>`       | CtrlZ          |
-| `<c-4>`       | Ctrl4          |
-| `<c-5>`       | Ctrl5          |
-| `<c-6>`       | Ctrl6          |
-| `<c-8>`       | Ctrl8          |
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -4,7 +4,6 @@

 <pre>
  <kbd>m</kbd>: view merge/rebase options
-  <kbd>ctrl+p</kbd>: view custom patch options
  <kbd>P</kbd>: push
  <kbd>p</kbd>: pull
  <kbd>R</kbd>: refresh
--- a/go.mod
+++ b/go.mod
@@ -10,35 +10,30 @@ require (
 	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.20200224201655-5024a02682ed
+	github.com/integrii/flaggy v1.3.0
+	github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532
 	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/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7
+	github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e // indirect
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mattn/go-isatty v0.0.11 // indirect
-	github.com/mattn/go-runewidth v0.0.8
+	github.com/mattn/go-isatty v0.0.10 // indirect
+	github.com/mattn/go-runewidth v0.0.6 // indirect
 	github.com/mgutz/str v1.2.0
-	github.com/nicksnyder/go-i18n/v2 v2.0.3
+	github.com/nicksnyder/go-i18n/v2 v2.0.2
 	github.com/onsi/ginkgo v1.10.3 // indirect
 	github.com/onsi/gomega v1.7.1 // indirect
-	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0
 	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.6.1
+	github.com/spf13/viper v1.5.0
 	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/crypto v0.0.0-20191112222119-e1110fd1c708 // indirect
+	golang.org/x/net v0.0.0-20191112182307-2180aed22343 // indirect
+	golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea // 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
+	gopkg.in/yaml.v2 v2.2.5
 )
--- a/go.sum
+++ b/go.sum
@@ -63,8 +63,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -73,24 +71,12 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM=
-github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
+github.com/integrii/flaggy v1.3.0 h1:8I5Qqz22C6+EwUqJuaN5ITh77obI8VSg6RwYLe2VB7o=
+github.com/integrii/flaggy v1.3.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.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=
@@ -99,12 +85,8 @@ github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 h1:CRD7bVjlG
 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=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
@@ -114,8 +96,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
 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=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -128,12 +108,10 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 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/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-runewidth v0.0.6 h1:V2iyH+aX9C5fsYCpK60U8BYIvmhqxuOL3JZcqc1NB7k=
+github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
 github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
@@ -142,8 +120,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 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/nicksnyder/go-i18n/v2 v2.0.2 h1:KsHGcTByIM0mHZKQGy0nlJLOjPNjQ6MVib/3PvsBDNY=
+github.com/nicksnyder/go-i18n/v2 v2.0.2/go.mod h1:JXS4+OKhbcwDoVTEj0sLFWL1vOwec2g/YBAxZ9owJqY=
 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=
@@ -153,8 +131,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 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=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -178,28 +154,18 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 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=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-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=
-github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
-github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
+github.com/spf13/viper v1.5.0 h1:GpsTwfsQ27oS/Aha/6d1oD7tpKIqWnOA6tgOX9HHkt4=
+github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4=
 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=
@@ -231,8 +197,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 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/crypto v0.0.0-20191112222119-e1110fd1c708 h1:pXVtWnwHkrWD9ru3sDxY/qFK/bfc0egRovX91EjWjf4=
+golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/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=
@@ -246,8 +212,8 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR
 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/net v0.0.0-20191112182307-2180aed22343 h1:00ohfJ4K98s3m6BGUoBd8nyfp4Yl0GoIKvw5abItTjI=
+golang.org/x/net v0.0.0-20191112182307-2180aed22343/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=
@@ -266,9 +232,10 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20191210023423-ac6580df4449 h1:gSbV7h1NRL2G1xTg/owz62CST1oJBmxy4QpMMregXVQ=
-golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea h1:Mz1TMnfJDRJLk8S8OPCoJYgrsp/Se/2TBre2+vwX128=
+golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/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=
@@ -277,7 +244,6 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-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=
@@ -292,8 +258,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/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=
@@ -309,6 +273,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -14,6 +14,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/updates"
+	"github.com/jesseduffield/rollrus"
 	"github.com/shibukawa/configdir"
 	"github.com/sirupsen/logrus"
 )
@@ -72,7 +73,9 @@ func newDevelopmentLogger(config config.AppConfigurer) *logrus.Logger {

 func newLogger(config config.AppConfigurer) *logrus.Entry {
 	var log *logrus.Logger
+	environment := "production"
 	if config.GetDebug() || os.Getenv("DEBUG") == "TRUE" {
+		environment = "development"
 		log = newDevelopmentLogger(config)
 	} else {
 		log = newProductionLogger(config)
@@ -82,6 +85,11 @@ func newLogger(config config.AppConfigurer) *logrus.Entry {
 	// https://github.com/aybabtme/humanlog
 	log.Formatter = &logrus.JSONFormatter{}

+	if config.GetUserConfig().GetString("reporting") == "on" {
+		// this isn't really a secret token: it only has permission to push new rollbar items
+		hook := rollrus.NewHook("23432119147a4367abf7c0de2aa99a2d", environment)
+		log.Hooks.Add(hook)
+	}
 	return log.WithFields(logrus.Fields{
 		"debug":     config.GetDebug(),
 		"version":   config.GetVersion(),
--- a/pkg/commands/branch.go
+++ b/pkg/commands/branch.go
@@ -1,5 +1,15 @@
 package commands

+import (
+	"fmt"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/theme"
+
+	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
 // Branch : A git branch
 // duplicating this for now
 type Branch struct {
@@ -7,4 +17,31 @@ type Branch struct {
 	Recency   string
 	Pushables string
 	Pullables string
+	Selected  bool
+}
+
+// GetDisplayStrings returns the display string of branch
+func (b *Branch) GetDisplayStrings(isFocused bool) []string {
+	displayName := utils.ColoredString(b.Name, GetBranchColor(b.Name))
+	if isFocused && b.Selected && b.Pushables != "" && b.Pullables != "" {
+		displayName = fmt.Sprintf("%s ↑%s↓%s", displayName, b.Pushables, b.Pullables)
+	}
+
+	return []string{b.Recency, displayName}
+}
+
+// GetBranchColor branch color
+func GetBranchColor(name string) color.Attribute {
+	branchType := strings.Split(name, "/")[0]
+
+	switch branchType {
+	case "feature":
+		return color.FgGreen
+	case "bugfix":
+		return color.FgYellow
+	case "hotfix":
+		return color.FgRed
+	default:
+		return theme.DefaultTextColor
+	}
 }
--- a/pkg/commands/branch_list_builder.go
+++ b/pkg/commands/branch_list_builder.go
@@ -48,7 +48,7 @@ func (b *BranchListBuilder) obtainCurrentBranch() *Branch {
 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"
+	unescaped := "git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD"
 	rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput(unescaped)
 	if err != nil {
 		return branches
@@ -56,11 +56,9 @@ func (b *BranchListBuilder) obtainReflogBranches() []*Branch {

 	branchLines := utils.SplitLines(rawString)
 	for _, line := range branchLines {
-		recency, branchName := branchInfoFromLine(line)
-		if branchName == "" {
-			continue
-		}
-		branch := &Branch{Name: branchName, Recency: recency}
+		timeNumber, timeUnit, branchName := branchInfoFromLine(line)
+		timeUnit = abbreviatedTimeUnit(timeUnit)
+		branch := &Branch{Name: branchName, Recency: timeNumber + timeUnit}
 		branches = append(branches, branch)
 	}
 	return uniqueByName(branches)
@@ -145,17 +143,11 @@ func uniqueByName(branches []*Branch) []*Branch {

 // 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 branchInfoFromLine(line string) (string, string, string) {
+	r := regexp.MustCompile("\\|.*\\s")
+	line = r.ReplaceAllString(line, " ")
+	words := strings.Split(line, " ")
+	return words[0], words[1], words[len(words)-1]
 }

 func abbreviatedTimeUnit(timeUnit string) string {
--- a/pkg/commands/commit.go
+++ b/pkg/commands/commit.go
@@ -1,5 +1,13 @@
 package commands

+import (
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/theme"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
 // Commit : A git commit
 type Commit struct {
 	Sha           string
@@ -9,7 +17,50 @@ type Commit struct {
 	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
-	Date          string
+}
+
+// GetDisplayStrings is a function.
+func (c *Commit) GetDisplayStrings(isFocused bool) []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)
+	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,
+	// not a bug
+	copied := color.New(color.FgCyan, color.BgBlue)
+
+	var shaColor *color.Color
+	switch c.Status {
+	case "unpushed":
+		shaColor = red
+	case "pushed":
+		shaColor = yellow
+	case "merged":
+		shaColor = green
+	case "rebasing":
+		shaColor = blue
+	case "selected":
+		shaColor = magenta
+	default:
+		shaColor = defaultColor
+	}
+
+	if c.Copied {
+		shaColor = copied
+	}
+
+	actionString := ""
+	tagString := ""
+	if c.Action != "" {
+		actionString = cyan.Sprint(utils.WithPadding(c.Action, 7)) + " "
+	} else if len(c.Tags) > 0 {
+		tagString = utils.ColoredString(strings.Join(c.Tags, " "), color.FgMagenta) + " "
+	}
+
+	return []string{shaColor.Sprint(c.Sha), actionString + tagString + defaultColor.Sprint(c.Name)}
 }
--- a/pkg/commands/commit_file.go
+++ b/pkg/commands/commit_file.go
@@ -1,5 +1,10 @@
 package commands

+import (
+	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/theme"
+)
+
 // CommitFile : A git commit file
 type CommitFile struct {
 	Sha           string
@@ -17,3 +22,21 @@ const (
 	// PART is for when you're only talking about specific lines that have been modified
 	PART
 )
+
+// GetDisplayStrings is a function.
+func (f *CommitFile) GetDisplayStrings(isFocused bool) []string {
+	yellow := color.New(color.FgYellow)
+	green := color.New(color.FgGreen)
+	defaultColor := color.New(theme.DefaultTextColor)
+
+	var colour *color.Color
+	switch f.Status {
+	case UNSELECTED:
+		colour = defaultColor
+	case WHOLE:
+		colour = green
+	case PART:
+		colour = yellow
+	}
+	return []string{colour.Sprint(f.DisplayString)}
+}
--- a/pkg/commands/commit_list_builder.go
+++ b/pkg/commands/commit_list_builder.go
@@ -23,8 +23,6 @@ import (
 // if we find out we need to use one of these functions in the git.go file, we
 // can just pull them out of here and put them there and then call them from in here

-const SEPARATION_CHAR = "|"
-
 // CommitListBuilder returns a list of Branch objects for the current repo
 type CommitListBuilder struct {
 	Log                 *logrus.Entry
@@ -47,41 +45,8 @@ func NewCommitListBuilder(log *logrus.Entry, gitCommand *GitCommand, osCommand *
 	}, nil
 }

-// extractCommitFromLine takes a line from a git log and extracts the sha, message, date, and tag if present
-// then puts them into a commit object
-// example input:
-// 8ad01fe32fcc20f07bc6693f87aa4977c327f1e1|10 hours ago|Jesse Duffield| (HEAD -> master, tag: v0.15.2)|refresh commits when adding a tag
-func (c *CommitListBuilder) extractCommitFromLine(line string) *Commit {
-	split := strings.Split(line, SEPARATION_CHAR)
-
-	sha := split[0]
-	date := split[1]
-	author := split[2]
-	extraInfo := strings.TrimSpace(split[3])
-	message := strings.Join(split[4:], SEPARATION_CHAR)
-	tags := []string{}
-
-	if extraInfo != "" {
-		re := regexp.MustCompile(`tag: ([^,\)]+)`)
-		tagMatch := re.FindStringSubmatch(extraInfo)
-		if len(tagMatch) > 1 {
-			tags = append(tags, tagMatch[1])
-		}
-	}
-
-	return &Commit{
-		Sha:           sha,
-		Name:          message,
-		DisplayString: line,
-		Tags:          tags,
-		ExtraInfo:     extraInfo,
-		Date:          date,
-		Author:        author,
-	}
-}
-
 // GetCommits obtains the commits of the current branch
-func (c *CommitListBuilder) GetCommits(limit bool) ([]*Commit, error) {
+func (c *CommitListBuilder) GetCommits() ([]*Commit, error) {
 	commits := []*Commit{}
 	var rebasingCommits []*Commit
 	rebaseMode, err := c.GitCommand.RebaseMode()
@@ -100,14 +65,21 @@ func (c *CommitListBuilder) GetCommits(limit bool) ([]*Commit, error) {
 	}

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

 	// 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)
+		splitLine := strings.Split(line, " ")
+		sha := splitLine[0]
+		_, unpushed := unpushedCommits[sha]
+		status := map[bool]string{true: "unpushed", false: "pushed"}[unpushed]
+		commits = append(commits, &Commit{
+			Sha:           sha,
+			Name:          strings.Join(splitLine[1:], " "),
+			Status:        status,
+			DisplayString: strings.Join(splitLine, " "),
+			// TODO: add tags here
+		})
 	}
 	if rebaseMode != "" {
 		currentCommit := commits[len(rebasingCommits)]
@@ -218,7 +190,7 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) {
 		}
 		splitLine := strings.Split(line, " ")
 		commits = append([]*Commit{{
-			Sha:    splitLine[1],
+			Sha:    splitLine[1][0:7],
 			Name:   strings.Join(splitLine[2:], " "),
 			Status: "rebasing",
 			Action: splitLine[0],
@@ -235,7 +207,7 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) {
 // Subject: second commit on master
 func (c *CommitListBuilder) commitFromPatch(content string) (*Commit, error) {
 	lines := strings.Split(content, "\n")
-	sha := strings.Split(lines[0], " ")[1]
+	sha := strings.Split(lines[0], " ")[1][0:7]
 	name := strings.TrimPrefix(lines[3], "Subject: ")
 	return &Commit{
 		Sha:    sha,
@@ -309,15 +281,12 @@ func (c *CommitListBuilder) getUnpushedCommits() map[string]bool {
 	return pushables
 }

-// getLog gets the git log.
-func (c *CommitListBuilder) getLog(limit bool) string {
-	limitFlag := ""
-	if limit {
-		limitFlag = "-30"
-	}
-
-	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))
-
+// getLog gets the git log (currently limited to 30 commits for performance
+// until we work out lazy loading
+func (c *CommitListBuilder) getLog() string {
+	// currently limiting to 30 for performance reasons
+	// TODO: add lazyloading when you scroll down
+	result, err := c.OSCommand.RunCommandWithOutput("git log --oneline -30")
 	if err != nil {
 		// assume if there is an error there are no commits yet for this branch
 		return ""
--- a/pkg/commands/commit_list_builder_test.go
+++ b/pkg/commands/commit_list_builder_test.go
@@ -149,3 +149,170 @@ func TestCommitListBuilderGetMergeBase(t *testing.T) {
 		})
 	}
 }
+
+// TestCommitListBuilderGetLog is a function.
+func TestCommitListBuilderGetLog(t *testing.T) {
+	type scenario struct {
+		testName string
+		command  func(string, ...string) *exec.Cmd
+		test     func(string)
+	}
+
+	scenarios := []scenario{
+		{
+			"Retrieves logs",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+
+				return exec.Command("echo", "6f0b32f commands/git : add GetCommits tests refactor\n9d9d775 circle : remove new line")
+			},
+			func(output string) {
+				assert.EqualValues(t, "6f0b32f commands/git : add GetCommits tests refactor\n9d9d775 circle : remove new line\n", output)
+			},
+		},
+		{
+			"An error occurred when retrieving logs",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+				return exec.Command("test")
+			},
+			func(output string) {
+				assert.Empty(t, output)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			c := NewDummyCommitListBuilder()
+			c.OSCommand.SetCommand(s.command)
+			s.test(c.getLog())
+		})
+	}
+}
+
+// TestCommitListBuilderGetCommits is a function.
+func TestCommitListBuilderGetCommits(t *testing.T) {
+	type scenario struct {
+		testName string
+		command  func(string, ...string) *exec.Cmd
+		test     func([]*Commit, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"No data found",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+
+				switch args[0] {
+				case "rev-list":
+					assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args)
+					return exec.Command("echo")
+				case "log":
+					assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+					return exec.Command("echo")
+				case "merge-base":
+					assert.EqualValues(t, []string{"merge-base", "HEAD", "master"}, args)
+					return exec.Command("test")
+				case "symbolic-ref":
+					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
+					return exec.Command("echo", "master")
+				}
+
+				return nil
+			},
+			func(commits []*Commit, err error) {
+				assert.NoError(t, err)
+				assert.Len(t, commits, 0)
+			},
+		},
+		{
+			"GetCommits returns 2 commits, 1 unpushed, the other merged",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+
+				switch args[0] {
+				case "rev-list":
+					assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args)
+					return exec.Command("echo", "8a2bb0e")
+				case "log":
+					assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+					return exec.Command("echo", "8a2bb0e commit 1\n78976bc commit 2")
+				case "merge-base":
+					assert.EqualValues(t, []string{"merge-base", "HEAD", "master"}, args)
+					return exec.Command("echo", "78976bc")
+				case "symbolic-ref":
+					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
+					return exec.Command("echo", "master")
+				}
+
+				return nil
+			},
+			func(commits []*Commit, err error) {
+				assert.NoError(t, err)
+				assert.Len(t, commits, 2)
+				assert.EqualValues(t, []*Commit{
+					{
+						Sha:           "8a2bb0e",
+						Name:          "commit 1",
+						Status:        "unpushed",
+						DisplayString: "8a2bb0e commit 1",
+					},
+					{
+						Sha:           "78976bc",
+						Name:          "commit 2",
+						Status:        "merged",
+						DisplayString: "78976bc commit 2",
+					},
+				}, commits)
+			},
+		},
+		{
+			"GetCommits bubbles up an error from setCommitMergedStatuses",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+
+				switch args[0] {
+				case "rev-list":
+					assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args)
+					return exec.Command("echo", "8a2bb0e")
+				case "log":
+					assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args)
+					return exec.Command("echo", "8a2bb0e commit 1\n78976bc commit 2")
+				case "merge-base":
+					assert.EqualValues(t, []string{"merge-base", "HEAD", "master"}, args)
+					return exec.Command("echo", "78976bc")
+				case "symbolic-ref":
+					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
+					// here's where we are returning the error
+					return exec.Command("test")
+				case "branch":
+					assert.EqualValues(t, []string{"branch", "--contains"}, args)
+					// here too
+					return exec.Command("test")
+				case "rev-parse":
+					assert.EqualValues(t, []string{"rev-parse", "--short", "HEAD"}, args)
+					// here too
+					return exec.Command("test")
+				}
+
+				return nil
+			},
+			func(commits []*Commit, err error) {
+				assert.Error(t, err)
+				assert.Len(t, commits, 0)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			c := NewDummyCommitListBuilder()
+			c.OSCommand.SetCommand(s.command)
+			s.test(c.GetCommits())
+		})
+	}
+}
--- a/pkg/commands/file.go
+++ b/pkg/commands/file.go
@@ -1,5 +1,7 @@
 package commands

+import "github.com/fatih/color"
+
 // File : A file from git status
 // duplicating this for now
 type File struct {
@@ -14,3 +16,23 @@ type File struct {
 	Type                    string // one of 'file', 'directory', and 'other'
 	ShortStatus             string // e.g. 'AD', ' A', 'M ', '??'
 }
+
+// GetDisplayStrings returns the display string of a file
+func (f *File) GetDisplayStrings(isFocused bool) []string {
+	// potentially inefficient to be instantiating these color
+	// objects with each render
+	red := color.New(color.FgRed)
+	green := color.New(color.FgGreen)
+	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])
+	if f.HasUnstagedChanges {
+		output += red.Sprint(f.Name)
+	} else {
+		output += green.Sprint(f.Name)
+	}
+	return []string{output}
+}
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -176,8 +176,8 @@ func stashEntryFromLine(line string, index int) *StashEntry {
 }

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

 // GetStatusFiles git status files
@@ -191,10 +191,10 @@ func (c *GitCommand) GetStatusFiles() []*File {
 		stagedChange := change[0:1]
 		unstagedChange := statusString[1:2]
 		filename := c.OSCommand.Unquote(statusString[3:])
-		untracked := utils.IncludesString([]string{"??", "A ", "AM"}, change)
-		hasNoStagedChanges := utils.IncludesString([]string{" ", "U", "?"}, stagedChange)
-		hasMergeConflicts := utils.IncludesString([]string{"DD", "AA", "UU", "AU", "UA", "UD", "DU"}, change)
-		hasInlineMergeConflicts := utils.IncludesString([]string{"UU", "AA"}, change)
+		_, untracked := map[string]bool{"??": true, "A ": true, "AM": true}[change]
+		_, hasNoStagedChanges := map[string]bool{" ": true, "U": true, "?": true}[stagedChange]
+		hasMergeConflicts := change == "UU" || change == "AA" || change == "DU"
+		hasInlineMergeConflicts := change == "UU" || change == "AA"

 		file := &File{
 			Name:                    filename,
@@ -265,7 +265,7 @@ func includesInt(list []int, a int) bool {

 // ResetAndClean removes all unstaged changes and removes all untracked files
 func (c *GitCommand) ResetAndClean() error {
-	if err := c.ResetHard("HEAD"); err != nil {
+	if err := c.ResetHardHead(); err != nil {
 		return err
 	}

@@ -404,17 +404,12 @@ func (c *GitCommand) AmendHead() (*exec.Cmd, error) {
 }

 // Pull pulls from repo
-func (c *GitCommand) Pull(args string, ask func(string) string) error {
-	return c.OSCommand.DetectUnamePass("git pull --no-edit "+args, ask)
-}
-
-// PullWithoutPasswordCheck assumes that the pull will not prompt the user for a password
-func (c *GitCommand) PullWithoutPasswordCheck(args string) error {
-	return c.OSCommand.RunCommand("git pull --no-edit " + args)
+func (c *GitCommand) Pull(ask func(string) string) error {
+	return c.OSCommand.DetectUnamePass("git pull --no-edit", ask)
 }

 // Push pushes to a branch
-func (c *GitCommand) Push(branchName string, force bool, upstream string, args string, ask func(string) string) error {
+func (c *GitCommand) Push(branchName string, force bool, upstream string, ask func(string) string) error {
 	forceFlag := ""
 	if force {
 		forceFlag = "--force-with-lease"
@@ -425,7 +420,7 @@ func (c *GitCommand) Push(branchName string, force bool, upstream string, args s
 		setUpstreamArg = "--set-upstream " + upstream
 	}

-	cmd := fmt.Sprintf("git push --follow-tags %s %s %s", forceFlag, setUpstreamArg, args)
+	cmd := fmt.Sprintf("git push --follow-tags %s %s", forceFlag, setUpstreamArg)
 	return c.OSCommand.DetectUnamePass(cmd, ask)
 }

@@ -520,7 +515,7 @@ func (c *GitCommand) DiscardUnstagedFileChanges(file *File) error {
 	return c.OSCommand.RunCommand("git checkout -- %s", quotedFileName)
 }

-// Checkout checks out a branch (or commit), with --force if you set the force arg to true
+// Checkout checks out a branch, with --force if you set the force arg to true
 func (c *GitCommand) Checkout(branch string, force bool) error {
 	forceArg := ""
 	if force {
@@ -543,8 +538,7 @@ func (c *GitCommand) PrepareCommitAmendSubProcess() *exec.Cmd {
 // Currently it limits the result to 100 commits, but when we get async stuff
 // working we can do lazy loading
 func (c *GitCommand) GetBranchGraph(branchName string) (string, error) {
-	cmdStr := c.GetBranchGraphCmdStr(branchName)
-	return c.OSCommand.RunCommandWithOutput(cmdStr)
+	return c.OSCommand.RunCommandWithOutput("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium -100 %s", branchName)
 }

 func (c *GitCommand) GetUpstreamForBranch(branchName string) (string, error) {
@@ -557,12 +551,41 @@ func (c *GitCommand) Ignore(filename string) error {
 	return c.OSCommand.AppendLineToFile(".gitignore", filename)
 }

-func (c *GitCommand) ShowCmdStr(sha string) string {
-	return fmt.Sprintf("git show --color --no-renames --stat -p %s", sha)
-}
+// Show shows the diff of a commit
+func (c *GitCommand) Show(sha string) (string, error) {
+	show, err := c.OSCommand.RunCommandWithOutput("git show --color --no-renames %s", sha)
+	if err != nil {
+		return "", err
+	}

-func (c *GitCommand) GetBranchGraphCmdStr(branchName string) string {
-	return fmt.Sprintf("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium %s", branchName)
+	// if this is a merge commit, we need to go a step further and get the diff between the two branches we merged
+	revList, err := c.OSCommand.RunCommandWithOutput("git rev-list -1 --merges %s^...%s", sha, sha)
+	if err != nil {
+		// turns out we get an error here when it's the first commit. We'll just return the original show
+		return show, nil
+	}
+	if len(revList) == 0 {
+		return show, nil
+	}
+
+	// we want to pull out 1a6a69a and 3b51d7c from this:
+	// commit ccc771d8b13d5b0d4635db4463556366470fd4f6
+	// Merge: 1a6a69a 3b51d7c
+	lines := utils.SplitLines(show)
+	if len(lines) < 2 {
+		return show, nil
+	}
+
+	secondLineWords := strings.Split(lines[1], " ")
+	if len(secondLineWords) < 3 {
+		return show, nil
+	}
+
+	mergeDiff, err := c.OSCommand.RunCommandWithOutput("git diff --color %s...%s", secondLineWords[1], secondLineWords[2])
+	if err != nil {
+		return "", err
+	}
+	return show + mergeDiff, nil
 }

 // GetRemoteURL returns current repo remote url
@@ -583,12 +606,6 @@ func (c *GitCommand) CheckRemoteBranchExists(branch *Branch) bool {

 // Diff returns the diff of a file
 func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
-	// for now we assume an error means the file was deleted
-	s, _ := c.OSCommand.RunCommandWithOutput(c.DiffCmdStr(file, plain, cached))
-	return s
-}
-
-func (c *GitCommand) DiffCmdStr(file *File, plain bool, cached bool) string {
 	cachedArg := ""
 	trackedArg := "--"
 	colorArg := "--color"
@@ -597,19 +614,21 @@ func (c *GitCommand) DiffCmdStr(file *File, plain bool, cached bool) string {
 	if cached {
 		cachedArg = "--cached"
 	}
-	if !file.Tracked && !file.HasStagedChanges && !cached {
+	if !file.Tracked && !file.HasStagedChanges {
 		trackedArg = "--no-index /dev/null"
 	}
 	if plain {
 		colorArg = ""
 	}

-	return fmt.Sprintf("git diff --stat -p %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
+	// for now we assume an error means the file was deleted
+	s, _ := c.OSCommand.RunCommandWithOutput("git diff %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
+	return s
 }

 func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
 	c.Log.Warn(patch)
-	filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
+	filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format(time.StampNano)+".patch")
 	if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil {
 		return err
 	}
@@ -628,12 +647,10 @@ func (c *GitCommand) FastForward(branchName string, remoteName string, remoteBra

 func (c *GitCommand) RunSkipEditorCommand(command string) error {
 	cmd := c.OSCommand.ExecutableFromString(command)
-	lazyGitPath := c.OSCommand.GetLazygitPath()
 	cmd.Env = append(
 		cmd.Env,
 		"LAZYGIT_CLIENT_COMMAND=EXIT_IMMEDIATELY",
-		"EDITOR="+lazyGitPath,
-		"VISUAL="+lazyGitPath,
+		"EDITOR="+c.OSCommand.GetLazygitPath(),
 	)
 	return c.OSCommand.RunExecutable(cmd)
 }
@@ -891,17 +908,11 @@ func (c *GitCommand) GetCommitFiles(commitSha string, patchManager *PatchManager

 // ShowCommitFile get the diff of specified commit file
 func (c *GitCommand) ShowCommitFile(commitSha, fileName string, plain bool) (string, error) {
-	cmdStr := c.ShowCommitFileCmdStr(commitSha, fileName, plain)
-	return c.OSCommand.RunCommandWithOutput(cmdStr)
-}
-
-func (c *GitCommand) ShowCommitFileCmdStr(commitSha, fileName string, plain bool) string {
 	colorArg := "--color"
 	if plain {
 		colorArg = ""
 	}
-
-	return fmt.Sprintf("git show --no-renames %s %s -- %s", colorArg, commitSha, fileName)
+	return c.OSCommand.RunCommandWithOutput("git show --no-renames %s %s -- %s", colorArg, commitSha, fileName)
 }

 // CheckoutFile checks out the file for the given commit
@@ -945,29 +956,24 @@ func (c *GitCommand) DiscardAnyUnstagedFileChanges() error {
 	return c.OSCommand.RunCommand("git checkout -- .")
 }

-// RemoveTrackedFiles will delete the given file(s) even if they are currently tracked
-func (c *GitCommand) RemoveTrackedFiles(name string) error {
-	return c.OSCommand.RunCommand("git rm -r --cached %s", name)
-}
-
 // RemoveUntrackedFiles runs `git clean -fd`
 func (c *GitCommand) RemoveUntrackedFiles() error {
 	return c.OSCommand.RunCommand("git clean -fd")
 }

-// ResetHardHead runs `git reset --hard`
-func (c *GitCommand) ResetHard(ref string) error {
-	return c.OSCommand.RunCommand("git reset --hard " + ref)
+// ResetHardHead runs `git reset --hard HEAD`
+func (c *GitCommand) ResetHardHead() error {
+	return c.OSCommand.RunCommand("git reset --hard HEAD")
 }

-// ResetSoft runs `git reset --soft HEAD`
-func (c *GitCommand) ResetSoft(ref string) error {
-	return c.OSCommand.RunCommand("git reset --soft " + ref)
+// ResetSoftHead runs `git reset --soft HEAD`
+func (c *GitCommand) ResetSoftHead() error {
+	return c.OSCommand.RunCommand("git reset --soft HEAD")
 }

 // 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)
+	return c.OSCommand.RunCommandWithOutput("git diff --color %s %s", sha1, sha2)
 }

 // CreateFixupCommit creates a commit that fixes up a previous commit
@@ -1092,6 +1098,10 @@ func (c *GitCommand) CreateLightweightTag(tagName string, commitSha string) erro
 	return c.OSCommand.RunCommand("git tag %s %s", tagName, commitSha)
 }

+func (c *GitCommand) ShowTag(tagName string) (string, error) {
+	return c.OSCommand.RunCommandWithOutput("git tag -n99 %s", tagName)
+}
+
 func (c *GitCommand) DeleteTag(tagName string) error {
 	return c.OSCommand.RunCommand("git tag -d %s", tagName)
 }
@@ -1099,32 +1109,3 @@ func (c *GitCommand) DeleteTag(tagName string) error {
 func (c *GitCommand) PushTag(remoteName string, tagName string) error {
 	return c.OSCommand.RunCommand("git push %s %s", remoteName, tagName)
 }
-
-func (c *GitCommand) FetchRemote(remoteName string) error {
-	return c.OSCommand.RunCommand("git fetch %s", remoteName)
-}
-
-func (c *GitCommand) GetReflogCommits() ([]*Commit, error) {
-	output, err := c.OSCommand.RunCommandWithOutput("git reflog --abbrev=20")
-	if err != nil {
-		return nil, err
-	}
-
-	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 {
-			continue
-		}
-
-		commits[i] = &Commit{
-			Sha:    match[1],
-			Name:   match[2],
-			Status: "reflog",
-		}
-	}
-
-	return commits, nil
-}
--- a/pkg/commands/git_test.go
+++ b/pkg/commands/git_test.go
@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"regexp"
 	"testing"
 	"time"

@@ -319,6 +318,21 @@ func TestGitCommandGetStashEntries(t *testing.T) {
 	}
 }

+// TestGitCommandGetStashEntryDiff is a function.
+func TestGitCommandGetStashEntryDiff(t *testing.T) {
+	gitCmd := NewDummyGitCommand()
+	gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
+		assert.EqualValues(t, "git", cmd)
+		assert.EqualValues(t, []string{"stash", "show", "-p", "--color", "stash@{1}"}, args)
+
+		return exec.Command("echo")
+	}
+
+	_, err := gitCmd.GetStashEntryDiff(1)
+
+	assert.NoError(t, err)
+}
+
 // TestGitCommandGetStatusFiles is a function.
 func TestGitCommandGetStatusFiles(t *testing.T) {
 	type scenario struct {
@@ -1016,7 +1030,7 @@ func TestGitCommandPush(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command
-			err := gitCmd.Push("test", s.forcePush, "", "", func(passOrUname string) string {
+			err := gitCmd.Push("test", s.forcePush, "", func(passOrUname string) string {
 				return "\n"
 			})
 			s.test(err)
@@ -1397,6 +1411,66 @@ func TestGitCommandDiscardAllFileChanges(t *testing.T) {
 	}
 }

+// TestGitCommandShow is a function.
+func TestGitCommandShow(t *testing.T) {
+	type scenario struct {
+		testName string
+		arg      string
+		command  func(string, ...string) *exec.Cmd
+		test     func(string, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"regular commit",
+			"456abcde",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git show --color --no-renames 456abcde",
+					Replace: "echo \"commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nblah\"",
+				},
+				{
+					Expect:  "git rev-list -1 --merges 456abcde^...456abcde",
+					Replace: "echo",
+				},
+			}),
+			func(result string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nblah\n", result)
+			},
+		},
+		{
+			"merge commit",
+			"456abcde",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git show --color --no-renames 456abcde",
+					Replace: "echo \"commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nMerge: 1a6a69a 3b51d7c\"",
+				},
+				{
+					Expect:  "git rev-list -1 --merges 456abcde^...456abcde",
+					Replace: "echo aa30e006433628ba9281652952b34d8aacda9c01",
+				},
+				{
+					Expect:  "git diff --color 1a6a69a...3b51d7c",
+					Replace: "echo blah",
+				},
+			}),
+			func(result string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nMerge: 1a6a69a 3b51d7c\nblah\n", result)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		gitCmd.OSCommand.command = s.command
+		s.test(gitCmd.Show(s.arg))
+	}
+}
+
 // TestGitCommandCheckout is a function.
 func TestGitCommandCheckout(t *testing.T) {
 	type scenario struct {
@@ -1449,7 +1523,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", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "test"}, args)
+		assert.EqualValues(t, []string{"log", "--graph", "--color", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium", "-100", "test"}, args)

 		return exec.Command("echo")
 	}
@@ -1473,7 +1547,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", "--stat", "-p", "--color", "--", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--color", "--", "test.txt"}, args)

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

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

 				return exec.Command("echo")
 			},
@@ -1521,7 +1595,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", "--stat", "-p", "--color", "--no-index", "/dev/null", "test.txt"}, args)
+				assert.EqualValues(t, []string{"diff", "--color", "--no-index", "/dev/null", "test.txt"}, args)

 				return exec.Command("echo")
 			},
@@ -2032,11 +2106,10 @@ func TestGitCommandRemoveUntrackedFiles(t *testing.T) {
 	}
 }

-// TestGitCommandResetHard is a function.
-func TestGitCommandResetHard(t *testing.T) {
+// TestGitCommandResetHardHead is a function.
+func TestGitCommandResetHardHead(t *testing.T) {
 	type scenario struct {
 		testName string
-		ref      string
 		command  func(string, ...string) *exec.Cmd
 		test     func(error)
 	}
@@ -2044,7 +2117,6 @@ func TestGitCommandResetHard(t *testing.T) {
 	scenarios := []scenario{
 		{
 			"valid case",
-			"HEAD",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
 					Expect:  `git reset --hard HEAD`,
@@ -2062,7 +2134,7 @@ func TestGitCommandResetHard(t *testing.T) {
 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd.OSCommand.command = s.command
-			s.test(gitCmd.ResetHard(s.ref))
+			s.test(gitCmd.ResetHardHead())
 		})
 	}
 }
@@ -2102,37 +2174,6 @@ func TestGitCommandCreateFixupCommit(t *testing.T) {
 	}
 }

-// TestGitCommandSkipEditorCommand confirms that SkipEditorCommand injects
-// environment variables that suppress an interactive editor
-func TestGitCommandSkipEditorCommand(t *testing.T) {
-	cmd := NewDummyGitCommand()
-
-	cmd.OSCommand.SetBeforeExecuteCmd(func(cmd *exec.Cmd) {
-		test.AssertContainsMatch(
-			t,
-			cmd.Env,
-			regexp.MustCompile("^VISUAL="),
-			"expected VISUAL to be set for a non-interactive external command",
-		)
-
-		test.AssertContainsMatch(
-			t,
-			cmd.Env,
-			regexp.MustCompile("^EDITOR="),
-			"expected EDITOR to be set for a non-interactive external command",
-		)
-
-		test.AssertContainsMatch(
-			t,
-			cmd.Env,
-			regexp.MustCompile("^LAZYGIT_CLIENT_COMMAND=EXIT_IMMEDIATELY$"),
-			"expected LAZYGIT_CLIENT_COMMAND to be set for a non-interactive external command",
-		)
-	})
-
-	cmd.RunSkipEditorCommand("true")
-}
-
 func TestFindDotGitDir(t *testing.T) {
 	type scenario struct {
 		testName string
--- a/pkg/commands/loading_remotes.go
+++ b/pkg/commands/loading_remotes.go
@@ -9,8 +9,7 @@ import (

 func (c *GitCommand) GetRemotes() ([]*Remote, error) {
 	// get remote branches
-	unescaped := "git branch -r"
-	remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(unescaped)
+	remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput("git for-each-ref --format='%%(refname:strip=2)' refs/remotes")
 	if err != nil {
 		return nil, err
 	}
@@ -25,7 +24,7 @@ func (c *GitCommand) GetRemotes() ([]*Remote, error) {
 	for i, goGitRemote := range goGitRemotes {
 		remoteName := goGitRemote.Config().Name

-		re := regexp.MustCompile(fmt.Sprintf(`%s\/([\S]+)`, remoteName))
+		re := regexp.MustCompile(fmt.Sprintf("%s\\/(.*)", remoteName))
 		matches := re.FindAllStringSubmatch(remoteBranchesStr, -1)
 		branches := make([]*RemoteBranch, len(matches))
 		for j, match := range matches {
--- a/pkg/commands/loading_tags.go
+++ b/pkg/commands/loading_tags.go
@@ -3,7 +3,6 @@ package commands
 import (
 	"regexp"
 	"sort"
-	"strconv"
 	"strings"

 	"github.com/jesseduffield/lazygit/pkg/utils"
@@ -11,14 +10,6 @@ import (

 const semverRegex = `v?((\d+\.?)+)([^\d]?.*)`

-func convertToInt(s string) int {
-	i, err := strconv.Atoi(s)
-	if err != nil {
-		return 0
-	}
-	return i
-}
-
 func (c *GitCommand) GetTags() ([]*Tag, error) {
 	// get remote branches
 	remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(`git tag --list`)
@@ -68,10 +59,10 @@ func (c *GitCommand) GetTags() ([]*Tag, error) {
 				if len(numbersB) == k {
 					return false
 				}
-				if convertToInt(numbersA[k]) < convertToInt(numbersB[k]) {
+				if mustConvertToInt(numbersA[k]) < mustConvertToInt(numbersB[k]) {
 					return true
 				}
-				if convertToInt(numbersA[k]) > convertToInt(numbersB[k]) {
+				if mustConvertToInt(numbersA[k]) > mustConvertToInt(numbersB[k]) {
 					return false
 				}
 				k++
--- a/pkg/commands/os.go
+++ b/pkg/commands/os.go
@@ -36,7 +36,6 @@ type OSCommand struct {
 	Platform           *Platform
 	Config             config.AppConfigurer
 	command            func(string, ...string) *exec.Cmd
-	beforeExecuteCmd   func(*exec.Cmd)
 	getGlobalGitConfig func(string) (string, error)
 	getenv             func(string) string
 }
@@ -48,7 +47,6 @@ func NewOSCommand(log *logrus.Entry, config config.AppConfigurer) *OSCommand {
 		Platform:           getPlatform(),
 		Config:             config,
 		command:            exec.Command,
-		beforeExecuteCmd:   func(*exec.Cmd) {},
 		getGlobalGitConfig: gitconfig.Global,
 		getenv:             os.Getenv,
 	}
@@ -60,16 +58,9 @@ func (c *OSCommand) SetCommand(cmd func(string, ...string) *exec.Cmd) {
 	c.command = cmd
 }

-func (c *OSCommand) SetBeforeExecuteCmd(cmd func(*exec.Cmd)) {
-	c.beforeExecuteCmd = cmd
-}
-
 // 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
-// with a percent sign because it thinks it's supposed to be a formatString when
-// in that case it's not. To get around that error you'll need to define the string
-// in a variable and pass the variable into RunCommandWithOutput.
+// NOTE: because this takes a format string followed by format args, you'll need
+// to escape any percentage signs via '%%'.
 func (c *OSCommand) RunCommandWithOutput(formatString string, formatArgs ...interface{}) (string, error) {
 	command := formatString
 	if formatArgs != nil {
@@ -82,7 +73,6 @@ func (c *OSCommand) RunCommandWithOutput(formatString string, formatArgs ...inte

 // RunExecutableWithOutput runs an executable file and returns its output
 func (c *OSCommand) RunExecutableWithOutput(cmd *exec.Cmd) (string, error) {
-	c.beforeExecuteCmd(cmd)
 	return sanitisedCommandOutput(cmd.CombinedOutput())
 }

@@ -315,7 +305,6 @@ func (c *OSCommand) FileExists(path string) (bool, error) {
 // this is useful if you need to give your command some environment variables
 // before running it
 func (c *OSCommand) RunPreparedCommand(cmd *exec.Cmd) error {
-	c.beforeExecuteCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	outString := string(out)
 	c.Log.Info(outString)
@@ -334,7 +323,7 @@ func (c *OSCommand) GetLazygitPath() string {
 	if err != nil {
 		ex = os.Args[0] // fallback to the first call argument if needed
 	}
-	return `"` + filepath.ToSlash(ex) + `"`
+	return filepath.ToSlash(ex)
 }

 // RunCustomCommand returns the pointer to a custom command
--- a/pkg/commands/patch_parser.go
+++ b/pkg/commands/patch_parser.go
@@ -120,7 +120,7 @@ func coloredString(colorAttr color.Attribute, str string, selected bool, include
 	var cl *color.Color
 	attributes := []color.Attribute{colorAttr}
 	if selected {
-		attributes = append(attributes, theme.SelectedLineBgColor)
+		attributes = append(attributes, color.BgBlue)
 	}
 	cl = color.New(attributes...)
 	var clIncluded *color.Color
--- a/pkg/commands/remote_branch.go
+++ b/pkg/commands/remote_branch.go
@@ -1,7 +1,19 @@
 package commands

+import (
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
 // Remote Branch : A git remote branch
 type RemoteBranch struct {
 	Name       string
+	Selected   bool
 	RemoteName string
 }
+
+// GetDisplayStrings returns the display string of branch
+func (b *RemoteBranch) GetDisplayStrings(isFocused bool) []string {
+	displayName := utils.ColoredString(b.Name, GetBranchColor(b.Name))
+
+	return []string{displayName}
+}
--- a/pkg/commands/tag.go
+++ b/pkg/commands/tag.go
@@ -4,3 +4,8 @@ package commands
 type Tag struct {
 	Name string
 }
+
+// GetDisplayStrings returns the display string of a remote
+func (r *Tag) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.Name}
+}
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -243,18 +243,15 @@ func GetDefaultConfig() []byte {
  scrollHeight: 2
  scrollPastBottom: true
  mouseEvents: true
-  skipUnstageLineWarning: false
  theme:
    lightTheme: false
    activeBorderColor:
-      - green
+      - white
      - bold
    inactiveBorderColor:
      - white
    optionsTextColor:
      - blue
-    selectedLineBgColor:
-      - blue
  commitLength:
    show: true
 git:
@@ -268,103 +265,6 @@ update:
 reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined'
 splashUpdatesIndex: 0
 confirmOnQuit: false
-keybinding:
-  universal:
-    quit: 'q'
-    quit-alt1: '<c-c>'
-    return: '<esc>'
-    quitWithoutChangingDirectory: 'Q'
-    togglePanel: '<tab>'
-    prevItem: '<up>'
-    nextItem: '<down>'
-    prevItem-alt: 'k'
-    nextItem-alt: 'j'
-    prevBlock: '<left>'
-    nextBlock: '<right>'
-    prevBlock-alt: 'h'
-    nextBlock-alt: 'l'
-    nextMatch: 'n'
-    prevMatch: 'N'
-    startSearch: '/'
-    optionMenu: 'x'
-    optionMenu-alt1: '?'
-    select: '<space>'
-    goInto: '<enter>'
-    remove: 'd'
-    new: 'n'
-    edit: 'e'
-    openFile: 'o'
-    scrollUpMain: '<pgup>'
-    scrollDownMain: '<pgdown>'
-    scrollUpMain-alt1: 'K'
-    scrollDownMain-alt1: 'J'
-    scrollUpMain-alt2: '<c-u>'
-    scrollDownMain-alt2: '<c-d>'
-    executeCustomCommand: ':'
-    createRebaseOptionsMenu: 'm'
-    pushFiles: 'P'
-    pullFiles: 'p'
-    refresh: 'R'
-    createPatchOptionsMenu: '<c-p>'
-    nextTab: ']'
-    prevTab: '['
-    nextScreenMode: '+'
-    prevScreenMode: '_'
-  status:
-    checkForUpdate: 'u'
-    recentRepos: '<enter>'
-  files:
-    commitChanges: 'c'
-    commitChangesWithoutHook: 'w'
-    amendLastCommit: 'A'
-    commitChangesWithEditor: 'C'
-    ignoreFile: 'i'
-    refreshFiles: 'r'
-    stashAllChanges: 's'
-    viewStashOptions: 'S'
-    toggleStagedAll: 'a'
-    viewResetOptions: 'D'
-    fetch: 'f'
-  branches:
-    createPullRequest: 'o'
-    checkoutBranchByName: 'c'
-    forceCheckoutBranch: 'F'
-    rebaseBranch: 'r'
-    mergeIntoCurrentBranch: 'M'
-    viewGitFlowOptions: 'i'
-    fastForward: 'f'
-    pushTag: 'P'
-    setUpstream: 'u'
-    fetchRemote: 'f'
-  commits:
-    squashDown: 's'
-    renameCommit: 'r'
-    renameCommitWithEditor: 'R'
-    viewResetOptions: 'g'
-    markCommitAsFixup: 'f'
-    createFixupCommit: 'F'
-    squashAboveCommits: 'S'
-    moveDownCommit: '<c-j>'
-    moveUpCommit: '<c-k>'
-    amendToCommit: 'A'
-    pickCommit: 'p'
-    revertCommit: 't'
-    cherryPickCopy: 'c'
-    cherryPickCopyRange: 'C'
-    pasteCommits: 'v'
-    tagCommit: 'T'
-    toggleDiffCommit: 'i'
-    checkoutCommit: '<space>'
-  stash:
-    popStash: 'g'
-  commitFiles:
-    checkoutCommitFile: 'c'
-  main:
-    toggleDragSelect: 'v'
-    toggleDragSelect-alt: 'V'
-    toggleSelectHunk: 'a'
-    pickBothHunks: 'b'
-    undo: 'z'
 `)
 }

--- a/pkg/gui/app_status_manager.go
+++ b/pkg/gui/app_status_manager.go
@@ -1,8 +1,6 @@
 package gui

 import (
-	"time"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -51,26 +49,15 @@ func (m *statusManager) getStatusString() string {
 // WithWaitingStatus wraps a function and shows a waiting status while the function is still executing
 func (gui *Gui) WithWaitingStatus(name string, f func() error) error {
 	go func() {
-		gui.statusManager.addWaitingStatus(name)
+		gui.g.Update(func(g *gocui.Gui) error {
+			gui.statusManager.addWaitingStatus(name)
+			return nil
+		})

-		defer func() {
+		defer gui.g.Update(func(g *gocui.Gui) error {
 			gui.statusManager.removeStatus(name)
-		}()
-
-		go func() {
-			ticker := time.NewTicker(time.Millisecond * 50)
-			defer ticker.Stop()
-			for range ticker.C {
-				appStatus := gui.statusManager.getStatusString()
-				gui.Log.Warn(appStatus)
-				if appStatus == "" {
-					return
-				}
-				if err := gui.renderString(gui.g, "appStatus", appStatus); err != nil {
-					gui.Log.Warn(err)
-				}
-			}
-		}()
+			return nil
+		})

 		if err := f(); err != nil {
 			gui.g.Update(func(g *gocui.Gui) error {
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"

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

@@ -37,41 +37,40 @@ func (gui *Gui) handleBranchSelect(g *gocui.Gui, v *gocui.View) error {

 	// This really shouldn't happen: there should always be a master branch
 	if len(gui.State.Branches) == 0 {
-		return gui.newStringTask("main", gui.Tr.SLocalize("NoBranchesThisRepo"))
+		return gui.renderString(g, "main", gui.Tr.SLocalize("NoBranchesThisRepo"))
 	}
 	branch := gui.getSelectedBranch()
 	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(
-		gui.GitCommand.GetBranchGraphCmdStr(branch.Name),
-	)
-	if err := gui.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
-	}
+	go func() {
+		_ = gui.RenderSelectedBranchUpstreamDifferences()
+	}()
+	go func() {
+		upstream, _ := gui.GitCommand.GetUpstreamForBranch(branch.Name)
+		if strings.Contains(upstream, "no upstream configured for branch") || strings.Contains(upstream, "unknown revision or path not in the working tree") {
+			upstream = gui.Tr.SLocalize("notTrackingRemote")
+		}
+		graph, err := gui.GitCommand.GetBranchGraph(branch.Name)
+		if err != nil && strings.HasPrefix(graph, "fatal: ambiguous argument") {
+			graph = gui.Tr.SLocalize("NoTrackingThisBranch")
+		}
+		_ = gui.renderString(g, "main", fmt.Sprintf("%s → %s\n\n%s", utils.ColoredString(branch.Name, color.FgGreen), utils.ColoredString(upstream, color.FgRed), graph))
+	}()
 	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)
+	// here we tell the selected branch that it is selected.
+	// this is necessary for showing stats on a branch that is selected, because
+	// the displaystring function doesn't have access to gui state to tell if it's selected
+	for i, branch := range gui.State.Branches {
+		branch.Selected = i == gui.State.Panels.Branches.SelectedLine
+	}

-		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
-	})
+	branch := gui.getSelectedBranch()
+	branch.Pushables, branch.Pullables = gui.GitCommand.GetBranchUpstreamDifferenceCount(branch.Name)
+	return gui.renderListPanel(gui.getBranchesView(), gui.State.Branches)
 }

 // gui.refreshStatus is called at the end of this because that's when we can
@@ -94,7 +93,8 @@ func (gui *Gui) refreshBranches(g *gocui.Gui) error {

 		// 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 {
+			gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
+			if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
 				return err
 			}
 		}
@@ -108,13 +108,11 @@ func (gui *Gui) renderLocalBranchesWithSelection() error {
 	branchesView := gui.getBranchesView()

 	gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
-	if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
+	if err := gui.renderListPanel(branchesView, gui.State.Branches); err != nil {
 		return err
 	}
-	if gui.g.CurrentView() == branchesView {
-		if err := gui.handleBranchSelect(gui.g, branchesView); err != nil {
-			return err
-		}
+	if err := gui.handleBranchSelect(gui.g, branchesView); err != nil {
+		return err
 	}

 	return nil
@@ -130,7 +128,7 @@ func (gui *Gui) handleBranchPress(g *gocui.Gui, v *gocui.View) error {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("AlreadyCheckedOutBranch"))
 	}
 	branch := gui.getSelectedBranch()
-	return gui.handleCheckoutRef(branch.Name)
+	return gui.handleCheckoutBranch(branch.Name)
 }

 func (gui *Gui) handleCreatePullRequestPress(g *gocui.Gui, v *gocui.View) error {
@@ -167,17 +165,17 @@ func (gui *Gui) handleForceCheckout(g *gocui.Gui, v *gocui.View) error {
 	}, nil)
 }

-func (gui *Gui) handleCheckoutRef(ref string) error {
-	if err := gui.GitCommand.Checkout(ref, false); err != nil {
+func (gui *Gui) handleCheckoutBranch(branchName string) error {
+	if err := gui.GitCommand.Checkout(branchName, 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

 		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 {
+				if err := gui.GitCommand.StashSave(gui.Tr.SLocalize("StashPrefix") + branchName); err != nil {
 					return gui.createErrorPanel(g, err.Error())
 				}
-				if err := gui.GitCommand.Checkout(ref, false); err != nil {
+				if err := gui.GitCommand.Checkout(branchName, false); err != nil {
 					return gui.createErrorPanel(g, err.Error())
 				}

@@ -200,13 +198,12 @@ func (gui *Gui) handleCheckoutRef(ref string) error {
 	}

 	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 {
 	gui.createPromptPanel(g, v, gui.Tr.SLocalize("BranchName")+":", "", func(g *gocui.Gui, v *gocui.View) error {
-		return gui.handleCheckoutRef(gui.trimmedContent(v))
+		return gui.handleCheckoutBranch(gui.trimmedContent(v))
 	})
 	return nil
 }
@@ -369,19 +366,12 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
 	go func() {
 		_ = gui.createLoaderPanel(gui.g, v, message)

-		if gui.State.Panels.Branches.SelectedLine == 0 {
-			if err := gui.GitCommand.PullWithoutPasswordCheck("--ff-only"); err != nil {
-				_ = gui.createErrorPanel(gui.g, err.Error())
-			}
-			_ = gui.refreshSidePanels(gui.g)
+		if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
+			_ = gui.createErrorPanel(gui.g, err.Error())
 		} else {
-			if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
-				_ = gui.createErrorPanel(gui.g, err.Error())
-			}
+			_ = gui.closeConfirmationPrompt(gui.g, true)
 			_ = gui.RenderSelectedBranchUpstreamDifferences()
 		}
-
-		_ = gui.closeConfirmationPrompt(gui.g, true)
 	}()
 	return nil
 }
@@ -397,7 +387,6 @@ func (gui *Gui) onBranchesTabClick(tabIndex int) error {
 func (gui *Gui) switchBranchesPanelContext(context string) error {
 	branchesView := gui.getBranchesView()
 	branchesView.Context = context
-	gui.onSearchEscape()

 	contextTabIndexMap := map[string]int{
 		"local-branches":  0,
@@ -433,28 +422,3 @@ func (gui *Gui) handlePrevBranchesTab(g *gocui.Gui, v *gocui.View) error {
 		utils.ModuloWithWrap(v.TabIndex-1, len(v.Tabs)),
 	)
 }
-
-func (gui *Gui) handleCreateResetToBranchMenu(g *gocui.Gui, v *gocui.View) error {
-	branch := gui.getSelectedBranch()
-	if branch == nil {
-		return nil
-	}
-
-	return gui.createResetMenu(branch.Name)
-}
-
-func (gui *Gui) onBranchesPanelSearchSelect(selectedLine int) error {
-	branchesView := gui.getBranchesView()
-	switch branchesView.Context {
-	case "local-branches":
-		gui.State.Panels.Branches.SelectedLine = selectedLine
-		return gui.handleBranchSelect(gui.g, branchesView)
-	case "remotes":
-		gui.State.Panels.Remotes.SelectedLine = selectedLine
-		return gui.handleRemoteSelect(gui.g, branchesView)
-	case "remote-branches":
-		gui.State.Panels.RemoteBranches.SelectedLine = selectedLine
-		return gui.handleRemoteBranchSelect(gui.g, branchesView)
-	}
-	return nil
-}
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -4,7 +4,6 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 )

 func (gui *Gui) getSelectedCommitFile(g *gocui.Gui) *commands.CommitFile {
@@ -30,9 +29,7 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
 	}

 	gui.getMainView().Title = "Patch"
-	if gui.currentViewName() == "commitFiles" {
-		gui.handleEscapeLineByLinePanel()
-	}
+	gui.State.Panels.LineByLine = nil

 	commitFile := gui.getSelectedCommitFile(g)
 	if commitFile == nil {
@@ -46,15 +43,11 @@ func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
 	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.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
+	commitText, err := gui.GitCommand.ShowCommitFile(commitFile.Sha, commitFile.Name, false)
+	if err != nil {
+		return err
 	}
-
-	return nil
+	return gui.renderString(g, "main", commitText)
 }

 func (gui *Gui) handleSwitchToCommitsPanel(g *gocui.Gui, v *gocui.View) error {
@@ -113,11 +106,11 @@ func (gui *Gui) refreshCommitFilesView() error {

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

-	commitsFileView := gui.getCommitFilesView()
-	displayStrings := presentation.GetCommitFileListDisplayStrings(gui.State.CommitFiles)
-	gui.renderDisplayStrings(commitsFileView, displayStrings)
+	if err := gui.renderListPanel(gui.getCommitFilesView(), gui.State.CommitFiles); err != nil {
+		return err
+	}

-	return gui.handleCommitFileSelect(gui.g, commitsFileView)
+	return gui.handleCommitFileSelect(gui.g, gui.getCommitFilesView())
 }

 func (gui *Gui) handleOpenOldCommitFile(g *gocui.Gui, v *gocui.View) error {
@@ -197,7 +190,9 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
 			}
 		}

-		gui.changeMainViewsContext("patch-building")
+		if err := gui.changeMainViewsContext("patch-building"); err != nil {
+			return err
+		}
 		if err := gui.switchFocus(gui.g, gui.getCommitFilesView(), gui.getMainView()); err != nil {
 			return err
 		}
@@ -213,8 +208,3 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {

 	return enterTheFile(selectedLineIdx)
 }
-
-func (gui *Gui) onCommitFilesPanelSearchSelect(selectedLine int) error {
-	gui.State.Panels.CommitFiles.SelectedLine = selectedLine
-	return gui.handleCommitFileSelect(gui.g, gui.getCommitFilesView())
-}
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -83,38 +83,3 @@ func (gui *Gui) RenderCommitLength() {
 	v := gui.getCommitMessageView()
 	v.Subtitle = gui.getBufferLength(v)
 }
-
-// we've just copy+pasted the editor from gocui to here so that we can also re-
-// render the commit message length on each keypress
-func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
-	switch {
-	case key == gocui.KeyBackspace || key == gocui.KeyBackspace2:
-		v.EditDelete(true)
-	case key == gocui.KeyDelete:
-		v.EditDelete(false)
-	case key == gocui.KeyArrowDown:
-		v.MoveCursor(0, 1, false)
-	case key == gocui.KeyArrowUp:
-		v.MoveCursor(0, -1, false)
-	case key == gocui.KeyArrowLeft:
-		v.MoveCursor(-1, 0, false)
-	case key == gocui.KeyArrowRight:
-		v.MoveCursor(1, 0, false)
-	case key == gocui.KeyTab:
-		v.EditNewLine()
-	case key == gocui.KeySpace:
-		v.EditWrite(' ')
-	case key == gocui.KeyInsert:
-		v.Overwrite = !v.Overwrite
-	case key == gocui.KeyCtrlU:
-		v.EditDeleteToStartOfLine()
-	case key == gocui.KeyCtrlA:
-		v.EditGotoToStartOfLine()
-	case key == gocui.KeyCtrlE:
-		v.EditGotoToEndOfLine()
-	default:
-		v.EditWrite(ch)
-	}
-
-	gui.RenderCommitLength()
-}
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -1,13 +1,14 @@
 package gui

 import (
+	"fmt"
 	"strconv"

+	"github.com/fatih/color"
 	"github.com/go-errors/errors"

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

@@ -36,23 +37,13 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}

-	state := gui.State.Panels.Commits
-	if state.SelectedLine > 20 && state.LimitCommits {
-		state.LimitCommits = false
-		go func() {
-			if err := gui.refreshCommitsWithLimit(); err != nil {
-				_ = gui.createErrorPanel(gui.g, err.Error())
-			}
-		}()
-	}
-
 	gui.getMainView().Title = "Patch"
 	gui.getSecondaryView().Title = "Custom Patch"
-	gui.handleEscapeLineByLinePanel()
+	gui.State.Panels.LineByLine = nil

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

 	if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits), v); err != nil {
@@ -64,32 +55,41 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}

-	cmd := gui.OSCommand.ExecutableFromString(
-		gui.GitCommand.ShowCmdStr(commit.Sha),
-	)
-	if err := gui.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
+	commitText, err := gui.GitCommand.Show(commit.Sha)
+	if err != nil {
+		return err
 	}
-
-	return nil
+	return gui.renderString(g, "main", commitText)
 }

 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)
+		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()
+		if err != nil {
+			return err
+		}
+		gui.State.Commits = commits

-		if err := gui.refreshCommitsWithLimit(); err != nil {
+		gui.refreshSelectedLine(&gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits))
+
+		isFocused := gui.g.CurrentView().Name() == "commits"
+		list, err := utils.RenderList(gui.State.Commits, isFocused)
+		if err != nil {
 			return err
 		}

-		// doing this async because it shouldn't hold anything up
-		go func() {
-			if err := gui.refreshReflogCommits(); err != nil {
-				_ = gui.createErrorPanel(gui.g, err.Error())
-			}
-		}()
+		v := gui.getCommitsView()
+		v.Clear()
+		fmt.Fprint(v, list)

+		gui.refreshStatus(g)
+		if g.CurrentView() == v {
+			gui.handleCommitSelect(g, v)
+		}
 		if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
 			return gui.refreshCommitFilesView()
 		}
@@ -98,27 +98,6 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 	return nil
 }

-func (gui *Gui) refreshCommitsWithLimit() error {
-	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(gui.State.Panels.Commits.LimitCommits)
-	if err != nil {
-		return err
-	}
-	gui.State.Commits = commits
-
-	if gui.getCommitsView().Context == "branch-commits" {
-		if err := gui.renderBranchCommitsWithSelection(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // specific functions

 func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error {
@@ -465,7 +444,7 @@ func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
 	// get selected commit
 	commit := gui.getSelectedCommit(g)
 	if commit == nil {
-		return gui.newStringTask("main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}

 	// if already selected commit delete
@@ -488,7 +467,7 @@ func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
 			return gui.createErrorPanel(gui.g, err.Error())
 		}

-		return gui.newStringTask("main", commitText)
+		return gui.renderString(g, "main", commitText)
 	}

 	return nil
@@ -559,6 +538,53 @@ func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) er
 	}, nil)
 }

+type resetOption struct {
+	description string
+	command     string
+}
+
+// GetDisplayStrings is a function.
+func (r *resetOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description, color.New(color.FgRed).Sprint(r.command)}
+}
+
+func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	strengths := []string{"soft", "mixed", "hard"}
+	options := make([]*resetOption, len(strengths))
+	for i, strength := range strengths {
+		options[i] = &resetOption{
+			description: fmt.Sprintf("%s reset", strength),
+			command:     fmt.Sprintf("reset --%s %s", strength, commit.Sha),
+		}
+	}
+
+	handleMenuPress := func(index int) error {
+		if err := gui.GitCommand.ResetToCommit(commit.Sha, strengths[index]); err != nil {
+			return err
+		}
+
+		if err := gui.refreshCommits(g); err != nil {
+			return err
+		}
+		if err := gui.refreshFiles(); err != nil {
+			return err
+		}
+		if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
+			return err
+		}
+
+		gui.State.Panels.Commits.SelectedLine = 0
+		return gui.handleCommitSelect(g, gui.getCommitsView())
+	}
+
+	return gui.createMenu(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), commit.Sha), options, len(options), handleMenuPress)
+}
+
 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
@@ -585,111 +611,3 @@ func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
 		return gui.handleCommitSelect(g, v)
 	})
 }
-
-func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
-	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)
-	}, nil)
-}
-
-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.renderDisplayStrings(commitsView, displayStrings)
-	if gui.g.CurrentView() == commitsView && commitsView.Context == "branch-commits" {
-		if err := gui.handleCommitSelect(gui.g, commitsView); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (gui *Gui) onCommitsTabClick(tabIndex int) error {
-	contexts := []string{"branch-commits", "reflog-commits"}
-	commitsView := gui.getCommitsView()
-	commitsView.TabIndex = tabIndex
-
-	return gui.switchCommitsPanelContext(contexts[tabIndex])
-}
-
-func (gui *Gui) switchCommitsPanelContext(context string) error {
-	commitsView := gui.getCommitsView()
-	commitsView.Context = context
-	gui.onSearchEscape()
-
-	contextTabIndexMap := map[string]int{
-		"branch-commits": 0,
-		"reflog-commits": 1,
-	}
-
-	commitsView.TabIndex = contextTabIndexMap[context]
-
-	return gui.refreshCommitsViewWithSelection()
-}
-
-func (gui *Gui) refreshCommitsViewWithSelection() error {
-	commitsView := gui.getCommitsView()
-
-	switch commitsView.Context {
-	case "branch-commits":
-		return gui.renderBranchCommitsWithSelection()
-	case "reflog-commits":
-		return gui.renderReflogCommitsWithSelection()
-	}
-
-	return nil
-}
-
-func (gui *Gui) handleNextCommitsTab(g *gocui.Gui, v *gocui.View) error {
-	return gui.onCommitsTabClick(
-		utils.ModuloWithWrap(v.TabIndex+1, len(v.Tabs)),
-	)
-}
-
-func (gui *Gui) handlePrevCommitsTab(g *gocui.Gui, v *gocui.View) error {
-	return gui.onCommitsTabClick(
-		utils.ModuloWithWrap(v.TabIndex-1, len(v.Tabs)),
-	)
-}
-
-func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedCommit(g)
-	if commit == nil {
-		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
-	}
-
-	return gui.createResetMenu(commit.Sha)
-}
-
-func (gui *Gui) onCommitsPanelSearchSelect(selectedLine int) error {
-	commitsView := gui.getCommitsView()
-	switch commitsView.Context {
-	case "branch-commits":
-		gui.State.Panels.Commits.SelectedLine = selectedLine
-		return gui.handleCommitSelect(gui.g, commitsView)
-	case "reflog-commits":
-		gui.State.Panels.ReflogCommits.SelectedLine = selectedLine
-		return gui.handleReflogCommitSelect(gui.g, commitsView)
-	}
-	return nil
-}
-
-func (gui *Gui) handleOpenSearchForCommitsPanel(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.refreshCommits(gui.g); err != nil {
-			return err
-		}
-	}
-
-	return gui.handleOpenSearch(gui.g, v)
-}
--- a/pkg/gui/confirmation_panel.go
+++ b/pkg/gui/confirmation_panel.go
@@ -75,9 +75,6 @@ func (gui *Gui) prepareConfirmationPanel(currentView *gocui.View, title, prompt
 			return nil, err
 		}
 		confirmationView.HasLoader = hasLoader
-		if hasLoader {
-			gui.g.StartTicking()
-		}
 		confirmationView.Title = title
 		confirmationView.Wrap = true
 		confirmationView.FgColor = theme.GocuiDefaultTextColor
--- a/pkg/gui/context.go
+++ b/pkg/gui/context.go
@@ -4,9 +4,9 @@ package gui
 // which currently just means a context that affects both the main and secondary views
 // other views can have their context changed directly but this function helps
 // keep the main and secondary views in sync
-func (gui *Gui) changeMainViewsContext(context string) {
+func (gui *Gui) changeMainViewsContext(context string) error {
 	if gui.State.MainContext == context {
-		return
+		return nil
 	}

 	switch context {
@@ -16,5 +16,5 @@ func (gui *Gui) changeMainViewsContext(context string) {
 	}

 	gui.State.MainContext = context
-	return
+	return nil
 }
--- a/pkg/gui/discard_changes_menu_panel.go
+++ b/pkg/gui/discard_changes_menu_panel.go
@@ -1,42 +0,0 @@
-package gui
-
-import (
-	"github.com/jesseduffield/gocui"
-)
-
-func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile(g)
-	if err != nil {
-		if err != gui.Errors.ErrNoFiles {
-			return err
-		}
-		return nil
-	}
-
-	menuItems := []*menuItem{
-		{
-			displayString: gui.Tr.SLocalize("discardAllChanges"),
-			onPress: func() error {
-				if err := gui.GitCommand.DiscardAllFileChanges(file); err != nil {
-					return err
-				}
-				return gui.refreshFiles()
-			},
-		},
-	}
-
-	if file.HasStagedChanges && file.HasUnstagedChanges {
-		menuItems = append(menuItems, &menuItem{
-			displayString: gui.Tr.SLocalize("discardUnstagedChanges"),
-			onPress: func() error {
-				if err := gui.GitCommand.DiscardUnstagedFileChanges(file); err != nil {
-					return err
-				}
-
-				return gui.refreshFiles()
-			},
-		})
-	}
-
-	return gui.createMenu(file.Name, menuItems, createMenuOptions{showCancel: true})
-}
--- a/pkg/gui/file_watching.go
+++ b/pkg/gui/file_watching.go
@@ -6,124 +6,22 @@ import (

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

-// macs for some bizarre reason cap the number of watchable files to 256.
-// there's no obvious platform agonstic way to check the situation of the user's
-// computer so we're just arbitrarily capping at 200. This isn't so bad because
-// file watching is only really an added bonus for faster refreshing.
-const MAX_WATCHED_FILES = 50
-
-type fileWatcher struct {
-	Watcher          *fsnotify.Watcher
-	WatchedFilenames []string
-	Log              *logrus.Entry
-	Disabled         bool
-}
-
-func NewFileWatcher(log *logrus.Entry) *fileWatcher {
-	watcher, err := fsnotify.NewWatcher()
-	log.Error(err)
-	return &fileWatcher{
-		Disabled: true,
-	}
-	if err != nil {
-		log.Error(err)
-		return &fileWatcher{
-			Disabled: true,
-		}
-	}
-
-	return &fileWatcher{
-		Watcher:          watcher,
-		Log:              log,
-		WatchedFilenames: make([]string, 0, MAX_WATCHED_FILES),
-	}
-}
-
-func (w *fileWatcher) watchingFilename(filename string) bool {
-	for _, watchedFilename := range w.WatchedFilenames {
-		if watchedFilename == filename {
-			return true
-		}
-	}
-	return false
-}
-
-func (w *fileWatcher) popOldestFilename() {
-	// shift the last off the array to make way for this one
-	oldestFilename := w.WatchedFilenames[0]
-	w.WatchedFilenames = w.WatchedFilenames[1:]
-	if err := w.Watcher.Remove(oldestFilename); err != nil {
-		// swallowing errors here because it doesn't really matter if we can't unwatch a file
-		w.Log.Warn(err)
-	}
-}
-
-func (w *fileWatcher) watchFilename(filename string) {
-	w.Log.Warn(filename)
-	if err := w.Watcher.Add(filename); err != nil {
-		// swallowing errors here because it doesn't really matter if we can't watch a file
-		w.Log.Warn(err)
-	}
-
-	// assume we're watching it now to be safe
-	w.WatchedFilenames = append(w.WatchedFilenames, filename)
-}
-
-func (w *fileWatcher) addFilesToFileWatcher(files []*commands.File) error {
-	if w.Disabled {
-		return nil
-	}
-
-	if len(files) == 0 {
-		return nil
-	}
-
-	// watch the files for changes
-	dirName, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	for _, file := range files[0:min(MAX_WATCHED_FILES, len(files))] {
-		if file.Deleted {
-			continue
-		}
-		filename := filepath.Join(dirName, file.Name)
-		if w.watchingFilename(filename) {
-			continue
-		}
-		if len(w.WatchedFilenames) > MAX_WATCHED_FILES {
-			w.popOldestFilename()
-		}
-
-		w.watchFilename(filename)
-	}
-
-	return nil
-}
-
-func min(a int, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
 // NOTE: given that we often edit files ourselves, this may make us end up refreshing files too often
 // TODO: consider watching the whole directory recursively (could be more expensive)
 func (gui *Gui) watchFilesForChanges() {
-	gui.fileWatcher = NewFileWatcher(gui.Log)
-	if gui.fileWatcher.Disabled {
+	var err error
+	gui.fileWatcher, err = fsnotify.NewWatcher()
+	if err != nil {
+		gui.Log.Error(err)
 		return
 	}
 	go func() {
 		for {
 			select {
 			// watch for events
-			case event := <-gui.fileWatcher.Watcher.Events:
+			case event := <-gui.fileWatcher.Events:
 				if event.Op == fsnotify.Chmod {
 					// for some reason we pick up chmod events when they don't actually happen
 					continue
@@ -139,7 +37,7 @@ func (gui *Gui) watchFilesForChanges() {
 				}

 			// watch for errors
-			case err := <-gui.fileWatcher.Watcher.Errors:
+			case err := <-gui.fileWatcher.Errors:
 				if err != nil {
 					gui.Log.Warn(err)
 				}
@@ -147,3 +45,20 @@ func (gui *Gui) watchFilesForChanges() {
 		}
 	}()
 }
+
+func (gui *Gui) addFilesToFileWatcher(files []*commands.File) error {
+	// watch the files for changes
+	dirName, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	for _, file := range files {
+		if err := gui.fileWatcher.Add(filepath.Join(dirName, file.Name)); err != nil {
+			// swallowing errors here because it doesn't really matter if we can't watch a file
+			gui.Log.Warn(err)
+		}
+	}
+
+	return nil
+}
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -10,9 +10,10 @@ import (
 	"fmt"
 	"strings"

+	"github.com/fatih/color"
 	"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
@@ -26,15 +27,21 @@ func (gui *Gui) getSelectedFile(g *gocui.Gui) (*commands.File, error) {
 	return gui.State.Files[selectedLine], nil
 }

+func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error {
+	return gui.selectFile(false)
+}
+
 func (gui *Gui) selectFile(alreadySelected bool) error {
+	if _, err := gui.g.SetCurrentView("files"); err != nil {
+		return err
+	}
+
 	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
 		}
-		gui.State.SplitMainPanel = false
-		gui.getMainView().Title = ""
-		return gui.newStringTask("main", gui.Tr.SLocalize("NoChangedFiles"))
+		return gui.renderString(gui.g, "main", gui.Tr.SLocalize("NoChangedFiles"))
 	}

 	if err := gui.focusPoint(0, gui.State.Panels.Files.SelectedLine, len(gui.State.Files), gui.getFilesView()); err != nil {
@@ -47,40 +54,37 @@ func (gui *Gui) selectFile(alreadySelected bool) error {
 		return gui.refreshMergePanel()
 	}

-	if !alreadySelected {
-		if err := gui.resetOrigin(gui.getMainView()); err != nil {
-			return err
-		}
-		if err := gui.resetOrigin(gui.getSecondaryView()); err != nil {
-			return err
-		}
-	}
-
+	content := gui.GitCommand.Diff(file, false, false)
+	contentCached := gui.GitCommand.Diff(file, false, true)
+	leftContent := content
 	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.newCmdTask("secondary", cmd); err != nil {
-			return err
-		}
 	} else {
 		gui.State.SplitMainPanel = false
 		if file.HasUnstagedChanges {
+			leftContent = content
 			gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
 		} else {
+			leftContent = contentCached
 			gui.getMainView().Title = gui.Tr.SLocalize("StagedChanges")
 		}
 	}

-	cmdStr := gui.GitCommand.DiffCmdStr(file, false, !file.HasUnstagedChanges && file.HasStagedChanges)
-	cmd := gui.OSCommand.ExecutableFromString(cmdStr)
-	if err := gui.newCmdTask("main", cmd); err != nil {
+	if alreadySelected {
+		gui.g.Update(func(*gocui.Gui) error {
+			if err := gui.setViewContent(gui.g, gui.getSecondaryView(), contentCached); err != nil {
+				return err
+			}
+			return gui.setViewContent(gui.g, gui.getMainView(), leftContent)
+		})
+		return nil
+	}
+	if err := gui.renderString(gui.g, "secondary", contentCached); err != nil {
 		return err
 	}
-
-	return nil
+	return gui.renderString(gui.g, "main", leftContent)
 }

 func (gui *Gui) refreshFiles() error {
@@ -103,8 +107,14 @@ func (gui *Gui) refreshFiles() error {
 	}

 	gui.g.Update(func(g *gocui.Gui) error {
-		displayStrings := presentation.GetFileListDisplayStrings(gui.State.Files)
-		gui.renderDisplayStrings(filesView, displayStrings)
+
+		filesView.Clear()
+		isFocused := gui.g.CurrentView().Name() == "files"
+		list, err := utils.RenderList(gui.State.Files, isFocused)
+		if err != nil {
+			return err
+		}
+		fmt.Fprint(filesView, list)

 		if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == "merging") {
 			newSelectedFile, _ := gui.getSelectedFile(gui.g)
@@ -167,7 +177,9 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error
 	if file.HasMergeConflicts {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FileStagingRequirements"))
 	}
-	gui.changeMainViewsContext("staging")
+	if err := gui.changeMainViewsContext("staging"); err != nil {
+		return err
+	}
 	if err := gui.switchFocus(gui.g, gui.getFilesView(), gui.getMainView()); err != nil {
 		return err
 	}
@@ -209,14 +221,6 @@ func (gui *Gui) allFilesStaged() bool {
 	return true
 }

-func (gui *Gui) focusAndSelectFile(g *gocui.Gui, v *gocui.View) error {
-	if _, err := gui.g.SetCurrentView("files"); err != nil {
-		return err
-	}
-
-	return gui.selectFile(false)
-}
-
 func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
 	var err error
 	if gui.allFilesStaged() {
@@ -232,33 +236,20 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}

-	return gui.selectFile(false)
+	return gui.handleFileSelect(gui.g, v)
 }

 func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile(gui.g)
+	file, err := gui.getSelectedFile(g)
 	if err != nil {
-		return gui.createErrorPanel(gui.g, err.Error())
+		return gui.createErrorPanel(g, err.Error())
 	}
-
 	if file.Tracked {
-		return gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("IgnoreTracked"), gui.Tr.SLocalize("IgnoreTrackedPrompt"),
-			// On confirmation
-			func(_ *gocui.Gui, _ *gocui.View) error {
-				if err := gui.GitCommand.Ignore(file.Name); err != nil {
-					return err
-				}
-				if err := gui.GitCommand.RemoveTrackedFiles(file.Name); err != nil {
-					return err
-				}
-				return gui.refreshFiles()
-			}, nil)
+		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantIgnoreTrackFiles"))
 	}
-
 	if err := gui.GitCommand.Ignore(file.Name); err != nil {
-		return gui.createErrorPanel(gui.g, err.Error())
+		return gui.createErrorPanel(g, err.Error())
 	}
-
 	return gui.refreshFiles()
 }

@@ -365,7 +356,7 @@ func (gui *Gui) refreshStateFiles() error {
 	files := gui.GitCommand.GetStatusFiles()
 	gui.State.Files = gui.GitCommand.MergeStatusFiles(gui.State.Files, files)

-	if err := gui.fileWatcher.addFilesToFileWatcher(files); err != nil {
+	if err := gui.addFilesToFileWatcher(files); err != nil {
 		return err
 	}

@@ -379,15 +370,15 @@ func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {
 		if err != gui.Errors.ErrNoFiles {
 			return "", err
 		}
-		return "", gui.newStringTask("main", gui.Tr.SLocalize("NoFilesDisplay"))
+		return "", gui.renderString(g, "main", gui.Tr.SLocalize("NoFilesDisplay"))
 	}
 	if item.Type != "file" {
-		return "", gui.newStringTask("main", gui.Tr.SLocalize("NotAFile"))
+		return "", gui.renderString(g, "main", gui.Tr.SLocalize("NotAFile"))
 	}
 	cat, err := gui.GitCommand.CatFile(item.Name)
 	if err != nil {
 		gui.Log.Error(err)
-		return "", gui.newStringTask("main", err.Error())
+		return "", gui.renderString(g, "main", err.Error())
 	}
 	return cat, nil
 }
@@ -400,17 +391,6 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
 		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.createErrorPanel(gui.g, err.Error())
-		}
-		for branchName, branch := range conf.Branches {
-			if branchName == currentBranchName {
-				return gui.pullFiles(v, fmt.Sprintf("%s %s", branch.Remote, branchName))
-			}
-		}
-
 		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 {
@@ -420,21 +400,21 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
 				}
 				return gui.createErrorPanel(gui.g, errorMessage)
 			}
-			return gui.pullFiles(v, "")
+			return gui.pullFiles(v)
 		})
 	}

-	return gui.pullFiles(v, "")
+	return gui.pullFiles(v)
 }

-func (gui *Gui) pullFiles(v *gocui.View, args string) error {
+func (gui *Gui) pullFiles(v *gocui.View) error {
 	if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PullWait")); err != nil {
 		return err
 	}

 	go func() {
 		unamePassOpend := false
-		err := gui.GitCommand.Pull(args, func(passOrUname string) string {
+		err := gui.GitCommand.Pull(func(passOrUname string) string {
 			unamePassOpend = true
 			return gui.waitForPassUname(gui.g, v, passOrUname)
 		})
@@ -444,14 +424,14 @@ func (gui *Gui) pullFiles(v *gocui.View, args string) error {
 	return nil
 }

-func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string, args string) error {
+func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string) error {
 	if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PushWait")); err != nil {
 		return err
 	}
 	go func() {
 		unamePassOpend := false
 		branchName := gui.getCheckedOutBranch().Name
-		err := gui.GitCommand.Push(branchName, force, upstream, args, func(passOrUname string) string {
+		err := gui.GitCommand.Push(branchName, force, upstream, func(passOrUname string) string {
 			unamePassOpend = true
 			return gui.waitForPassUname(g, v, passOrUname)
 		})
@@ -469,25 +449,14 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
 	}

 	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.createErrorPanel(gui.g, err.Error())
-		}
-		for branchName, branch := range conf.Branches {
-			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 "+currentBranchName, func(g *gocui.Gui, v *gocui.View) error {
-			return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v), "")
+			return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v))
 		})
 	} else if pullables == "0" {
-		return gui.pushWithForceFlag(g, v, false, "", "")
+		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 {
-		return gui.pushWithForceFlag(g, v, true, "", "")
+	return gui.createConfirmationPanel(g, nil, true, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.pushWithForceFlag(g, v, true, "")
 	}, nil)
 }

@@ -502,7 +471,9 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
 	if !file.HasInlineMergeConflicts {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons"))
 	}
-	gui.changeMainViewsContext("merging")
+	if err := gui.changeMainViewsContext("merging"); err != nil {
+		return err
+	}
 	if err := gui.switchFocus(g, v, gui.getMainView()); err != nil {
 		return err
 	}
@@ -534,6 +505,134 @@ func (gui *Gui) anyFilesWithMergeConflicts() bool {
 	return false
 }

+type discardOption struct {
+	handler     func(fileName *commands.File) error
+	description string
+}
+
+type discardAllOption struct {
+	handler     func() error
+	description string
+	command     string
+}
+
+// GetDisplayStrings is a function.
+func (r *discardOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description}
+}
+
+// GetDisplayStrings is a function.
+func (r *discardAllOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description, color.New(color.FgRed).Sprint(r.command)}
+}
+
+func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
+	file, err := gui.getSelectedFile(g)
+	if err != nil {
+		if err != gui.Errors.ErrNoFiles {
+			return err
+		}
+		return nil
+	}
+
+	options := []*discardOption{
+		{
+			description: gui.Tr.SLocalize("discardAllChanges"),
+			handler: func(file *commands.File) error {
+				return gui.GitCommand.DiscardAllFileChanges(file)
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func(file *commands.File) error {
+				return nil
+			},
+		},
+	}
+
+	if file.HasStagedChanges && file.HasUnstagedChanges {
+		discardUnstagedChanges := &discardOption{
+			description: gui.Tr.SLocalize("discardUnstagedChanges"),
+			handler: func(file *commands.File) error {
+				return gui.GitCommand.DiscardUnstagedFileChanges(file)
+			},
+		}
+
+		options = append(options[:1], append([]*discardOption{discardUnstagedChanges}, options[1:]...)...)
+	}
+
+	handleMenuPress := func(index int) error {
+		file, err := gui.getSelectedFile(g)
+		if err != nil {
+			return err
+		}
+
+		if err := options[index].handler(file); err != nil {
+			return err
+		}
+
+		return gui.refreshFiles()
+	}
+
+	return gui.createMenu(file.Name, options, len(options), handleMenuPress)
+}
+
+func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
+	options := []*discardAllOption{
+		{
+			description: gui.Tr.SLocalize("discardAllChangesToAllFiles"),
+			command:     "reset --hard HEAD && git clean -fd",
+			handler: func() error {
+				return gui.GitCommand.ResetAndClean()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("discardAnyUnstagedChanges"),
+			command:     "git checkout -- .",
+			handler: func() error {
+				return gui.GitCommand.DiscardAnyUnstagedFileChanges()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("discardUntrackedFiles"),
+			command:     "git clean -fd",
+			handler: func() error {
+				return gui.GitCommand.RemoveUntrackedFiles()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("softReset"),
+			command:     "git reset --soft HEAD",
+			handler: func() error {
+				return gui.GitCommand.ResetSoftHead()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("hardReset"),
+			command:     "git reset --hard HEAD",
+			handler: func() error {
+				return gui.GitCommand.ResetHardHead()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func() error {
+				return nil
+			},
+		},
+	}
+
+	handleMenuPress := func(index int) error {
+		if err := options[index].handler(); err != nil {
+			return err
+		}
+
+		return gui.refreshFiles()
+	}
+
+	return gui.createMenu("", options, len(options), handleMenuPress)
+}
+
 func (gui *Gui) handleCustomCommand(g *gocui.Gui, v *gocui.View) error {
 	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("CustomCommand"), "", func(g *gocui.Gui, v *gocui.View) error {
 		command := gui.trimmedContent(v)
@@ -542,34 +641,45 @@ func (gui *Gui) handleCustomCommand(g *gocui.Gui, v *gocui.View) error {
 	})
 }

+type stashOption struct {
+	description string
+	handler     func() error
+}
+
+// GetDisplayStrings is a function.
+func (o *stashOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{o.description}
+}
+
 func (gui *Gui) handleCreateStashMenu(g *gocui.Gui, v *gocui.View) error {
-	menuItems := []*menuItem{
+	options := []*stashOption{
 		{
-			displayString: gui.Tr.SLocalize("stashAllChanges"),
-			onPress: func() error {
+			description: gui.Tr.SLocalize("stashAllChanges"),
+			handler: func() error {
 				return gui.handleStashSave(gui.GitCommand.StashSave)
 			},
 		},
 		{
-			displayString: gui.Tr.SLocalize("stashStagedChanges"),
-			onPress: func() error {
+			description: gui.Tr.SLocalize("stashStagedChanges"),
+			handler: func() error {
 				return gui.handleStashSave(gui.GitCommand.StashSaveStagedChanges)
 			},
 		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func() error {
+				return nil
+			},
+		},
 	}

-	return gui.createMenu(gui.Tr.SLocalize("stashOptions"), menuItems, createMenuOptions{showCancel: true})
+	handleMenuPress := func(index int) error {
+		return options[index].handler()
+	}
+
+	return gui.createMenu(gui.Tr.SLocalize("stashOptions"), options, len(options), handleMenuPress)
 }

 func (gui *Gui) handleStashChanges(g *gocui.Gui, v *gocui.View) error {
 	return gui.handleStashSave(gui.GitCommand.StashSave)
 }
-
-func (gui *Gui) handleCreateResetToUpstreamMenu(g *gocui.Gui, v *gocui.View) error {
-	return gui.createResetMenu("@{upstream}")
-}
-
-func (gui *Gui) onFilesPanelSearchSelect(selectedLine int) error {
-	gui.State.Panels.Files.SelectedLine = selectedLine
-	return gui.focusAndSelectFile(gui.g, gui.getFilesView())
-}
--- a/pkg/gui/git_flow.go
+++ b/pkg/gui/git_flow.go
@@ -1,86 +0,0 @@
-package gui
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/jesseduffield/gocui"
-)
-
-func (gui *Gui) gitFlowFinishBranch(gitFlowConfig string, branchName string) error {
-	// need to find out what kind of branch this is
-	prefix := strings.SplitAfterN(branchName, "/", 2)[0]
-	suffix := strings.Replace(branchName, prefix, "", 1)
-
-	branchType := ""
-	for _, line := range strings.Split(strings.TrimSpace(gitFlowConfig), "\n") {
-		if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) {
-			// now I just need to how do you say
-			regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*")
-			matches := regex.FindAllStringSubmatch(line, 1)
-
-			if len(matches) > 0 && len(matches[0]) > 1 {
-				branchType = matches[0][1]
-				break
-			}
-		}
-	}
-
-	if branchType == "" {
-		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NotAGitFlowBranch"))
-	}
-
-	subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "finish", suffix)
-	gui.SubProcess = subProcess
-	return gui.Errors.ErrSubProcess
-}
-
-func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
-	branch := gui.getSelectedBranch()
-	if branch == nil {
-		return nil
-	}
-
-	// get config
-	gitFlowConfig, err := gui.OSCommand.RunCommandWithOutput("git config --local --get-regexp gitflow")
-	if err != nil {
-		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 {
-		return func() error {
-			title := gui.Tr.TemplateLocalize("NewBranchNamePrompt", map[string]interface{}{"branchType": branchType})
-			return gui.createPromptPanel(gui.g, gui.getMenuView(), title, "", func(g *gocui.Gui, v *gocui.View) error {
-				name := gui.trimmedContent(v)
-				subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "start", name)
-				gui.SubProcess = subProcess
-				return gui.Errors.ErrSubProcess
-			})
-		}
-	}
-
-	menuItems := []*menuItem{
-		{
-			// not localising here because it's one to one with the actual git flow commands
-			displayString: fmt.Sprintf("finish branch '%s'", branch.Name),
-			onPress: func() error {
-				return gui.gitFlowFinishBranch(gitFlowConfig, branch.Name)
-			},
-		},
-		{
-			displayString: "start feature",
-			onPress:       startHandler("feature"),
-		},
-		{
-			displayString: "start hotfix",
-			onPress:       startHandler("hotfix"),
-		},
-		{
-			displayString: "start release",
-			onPress:       startHandler("release"),
-		},
-	}
-
-	return gui.createMenu("git flow", menuItems, createMenuOptions{})
-}
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"math"
 	"os"
-	"runtime"
 	"sync"

 	// "io"
@@ -15,6 +14,7 @@ import (
 	"strings"
 	"time"

+	"github.com/fsnotify/fsnotify"
 	"github.com/go-errors/errors"

 	// "strings"
@@ -24,22 +24,13 @@ import (
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/tasks"
 	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/updates"
 	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/mattn/go-runewidth"
 	"github.com/sirupsen/logrus"
 )

-const (
-	SCREEN_NORMAL int = iota
-	SCREEN_HALF
-	SCREEN_FULL
-)
-
 const StartupPopupVersion = 1

 // OverlappingEdges determines if panel edges overlap
@@ -76,22 +67,20 @@ type Teml i18n.Teml

 // Gui wraps the gocui Gui object which handles rendering and events
 type Gui struct {
-	g                    *gocui.Gui
-	Log                  *logrus.Entry
-	GitCommand           *commands.GitCommand
-	OSCommand            *commands.OSCommand
-	SubProcess           *exec.Cmd
-	State                guiState
-	Config               config.AppConfigurer
-	Tr                   *i18n.Localizer
-	Errors               SentinelErrors
-	Updater              *updates.Updater
-	statusManager        *statusManager
-	credentials          credentials
-	waitForIntro         sync.WaitGroup
-	fileWatcher          *fileWatcher
-	viewBufferManagerMap map[string]*tasks.ViewBufferManager
-	stopChan             chan struct{}
+	g             *gocui.Gui
+	Log           *logrus.Entry
+	GitCommand    *commands.GitCommand
+	OSCommand     *commands.OSCommand
+	SubProcess    *exec.Cmd
+	State         guiState
+	Config        config.AppConfigurer
+	Tr            *i18n.Localizer
+	Errors        SentinelErrors
+	Updater       *updates.Updater
+	statusManager *statusManager
+	credentials   credentials
+	waitForIntro  sync.WaitGroup
+	fileWatcher   *fsnotify.Watcher
 }

 // for now the staging panel state, unlike the other panel states, is going to be
@@ -138,11 +127,6 @@ type tagsPanelState struct {
 type commitPanelState struct {
 	SelectedLine     int
 	SpecificDiffMode bool
-	LimitCommits     bool
-}
-
-type reflogCommitPanelState struct {
-	SelectedLine int
 }

 type stashPanelState struct {
@@ -170,7 +154,6 @@ type panelStates struct {
 	RemoteBranches *remoteBranchesState
 	Tags           *tagsPanelState
 	Commits        *commitPanelState
-	ReflogCommits  *reflogCommitPanelState
 	Stash          *stashPanelState
 	Menu           *menuPanelState
 	LineByLine     *lineByLinePanelState
@@ -179,19 +162,12 @@ type panelStates struct {
 	Status         *statusPanelState
 }

-type searchingState struct {
-	view         *gocui.View
-	isSearching  bool
-	searchString string
-}
-
 type guiState struct {
 	Files                []*commands.File
 	Branches             []*commands.Branch
 	Commits              []*commands.Commit
 	StashEntries         []*commands.StashEntry
 	CommitFiles          []*commands.CommitFile
-	ReflogCommits        []*commands.Commit
 	DiffEntries          []*commands.Commit
 	Remotes              []*commands.Remote
 	RemoteBranches       []*commands.RemoteBranch
@@ -208,9 +184,6 @@ type guiState struct {
 	RetainOriginalDir    bool
 	IsRefreshingFiles    bool
 	RefreshingFilesMutex sync.Mutex
-	Searching            searchingState
-	ScreenMode           int
-	SideView             *gocui.View
 }

 // for now the split view will always be on
@@ -232,8 +205,7 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 			Remotes:        &remotePanelState{SelectedLine: 0},
 			RemoteBranches: &remoteBranchesState{SelectedLine: -1},
 			Tags:           &tagsPanelState{SelectedLine: -1},
-			Commits:        &commitPanelState{SelectedLine: -1, LimitCommits: true},
-			ReflogCommits:  &reflogCommitPanelState{SelectedLine: 0}, // TODO: might need to make -1
+			Commits:        &commitPanelState{SelectedLine: -1},
 			CommitFiles:    &commitFilesPanelState{SelectedLine: -1},
 			Stash:          &stashPanelState{SelectedLine: -1},
 			Menu:           &menuPanelState{SelectedLine: 0},
@@ -245,20 +217,17 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 			},
 			Status: &statusPanelState{},
 		},
-		ScreenMode: SCREEN_NORMAL,
-		SideView:   nil,
 	}

 	gui := &Gui{
-		Log:                  log,
-		GitCommand:           gitCommand,
-		OSCommand:            oSCommand,
-		State:                initialState,
-		Config:               config,
-		Tr:                   tr,
-		Updater:              updater,
-		statusManager:        &statusManager{},
-		viewBufferManagerMap: map[string]*tasks.ViewBufferManager{},
+		Log:           log,
+		GitCommand:    gitCommand,
+		OSCommand:     oSCommand,
+		State:         initialState,
+		Config:        config,
+		Tr:            tr,
+		Updater:       updater,
+		statusManager: &statusManager{},
 	}

 	gui.watchFilesForChanges()
@@ -268,26 +237,6 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 	return gui, nil
 }

-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
-	}
-
-	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
-	}
-
-	return nil
-}
-
 func (gui *Gui) scrollUpView(viewName string) error {
 	mainView, _ := gui.g.View(viewName)
 	ox, oy := mainView.Origin()
@@ -303,14 +252,8 @@ func (gui *Gui) scrollDownView(viewName string) error {
 		_, 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)
+	if y < len(mainView.BufferLines()) {
+		return mainView.SetOrigin(ox, oy+gui.Config.GetUserConfig().GetInt("gui.scrollHeight"))
 	}
 	return nil
 }
@@ -376,19 +319,20 @@ func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
 	if v == nil {
 		return nil
 	}
-	if v.IsSearching() && newView.Name() != "search" {
-		gui.onSearchEscape()
-	}
 	switch v.Name() {
 	case "branches":
 		if v.Context == "local-branches" {
 			// This stops the branches panel from showing the upstream/downstream changes to the selected branch, when it loses focus
-			displayStrings := presentation.GetBranchListDisplayStrings(gui.State.Branches, false, -1)
-			gui.renderDisplayStrings(gui.getBranchesView(), displayStrings)
+			// inside renderListPanel it checks to see if the panel has focus
+			if err := gui.renderListPanel(gui.getBranchesView(), gui.State.Branches); err != nil {
+				return err
+			}
 		}
 	case "main":
 		// if we have lost focus to a first-class panel, we need to do some cleanup
-		gui.changeMainViewsContext("normal")
+		if err := gui.changeMainViewsContext("normal"); err != nil {
+			return err
+		}
 	case "commitFiles":
 		if gui.State.MainContext != "patch-building" {
 			if _, err := gui.g.SetViewOnBottom(v.Name()); err != nil {
@@ -408,75 +352,6 @@ func (gui *Gui) onFocus(v *gocui.View) error {
 	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
@@ -503,7 +378,50 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		return nil
 	}

-	vHeights := gui.getViewHeights()
+	currView := gui.g.CurrentView()
+	currentCyclebleView := gui.State.PreviousView
+	if currView != nil {
+		viewName := currView.Name()
+		usePreviouseView := true
+		for _, view := range cyclableViews {
+			if view == viewName {
+				currentCyclebleView = viewName
+				usePreviouseView = false
+				break
+			}
+		}
+		if usePreviouseView {
+			currentCyclebleView = gui.State.PreviousView
+		}
+	}
+
+	usableSpace := height - 7
+	extraSpace := usableSpace - (usableSpace/3)*3
+
+	vHeights := map[string]int{
+		"status":   3,
+		"files":    (usableSpace / 3) + extraSpace,
+		"branches": usableSpace / 3,
+		"commits":  usableSpace / 3,
+		"stash":    3,
+		"options":  1,
+	}
+
+	if height < 28 {
+		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
+	}

 	optionsVersionBoundary := width - max(len(utils.Decolorise(information)), 1)

@@ -513,49 +431,21 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		appStatusOptionsBoundary = len(appStatus) + 2
 	}

+	panelSpacing := 1
+	if OverlappingEdges {
+		panelSpacing = 0
+	}
+
 	_, _ = g.SetViewOnBottom("limit")
 	g.DeleteView("limit")

 	textColor := theme.GocuiDefaultTextColor
-	var leftSideWidth int
-	switch gui.State.ScreenMode {
-	case SCREEN_NORMAL:
-		leftSideWidth = width / 3
-	case SCREEN_HALF:
-		leftSideWidth = width / 2
-	case SCREEN_FULL:
-		currentView := gui.g.CurrentView()
-		if currentView != nil && currentView.Name() == "main" {
-			leftSideWidth = 0
-		} else {
-			leftSideWidth = width - 1
-		}
-	}
-
+	leftSideWidth := width / 3
 	panelSplitX := 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
-		}
+		units := 7
+		leftSideWidth = width / units
+		panelSplitX = (1 + ((units - 1) / 2)) * width / units
 	}

 	main := "main"
@@ -566,22 +456,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		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)
+	v, err := g.SetView(main, leftSideWidth+panelSpacing, 0, panelSplitX, height-2, gocui.LEFT)
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
@@ -589,16 +464,13 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		v.Title = gui.Tr.SLocalize("DiffTitle")
 		v.Wrap = true
 		v.FgColor = textColor
-		v.IgnoreCarriageReturns = true
 	}

-	hiddenViewOffset := 9999
-
-	hiddenSecondaryPanelOffset := 0
+	hiddenViewOffset := 0
 	if !gui.State.SplitMainPanel {
-		hiddenSecondaryPanelOffset = hiddenViewOffset
+		hiddenViewOffset = 9999
 	}
-	secondaryView, err := g.SetView(secondary, secondaryPanelLeft+hiddenSecondaryPanelOffset, hiddenSecondaryPanelOffset+secondaryPanelTop, width-1+hiddenSecondaryPanelOffset, height-2+hiddenSecondaryPanelOffset, gocui.LEFT)
+	secondaryView, err := g.SetView(secondary, panelSplitX+1+hiddenViewOffset, hiddenViewOffset, width-1+hiddenViewOffset, height-2+hiddenViewOffset, gocui.LEFT)
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
@@ -606,7 +478,6 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		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 {
@@ -624,8 +495,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 		filesView.Highlight = true
 		filesView.Title = gui.Tr.SLocalize("FilesTitle")
-		filesView.SetOnSelectItem(gui.onSelectItemWrapper(gui.onFilesPanelSearchSelect))
-		filesView.ContainsList = true
+		v.FgColor = textColor
 	}

 	branchesView, err := g.SetViewBeneath("branches", "files", vHeights["branches"])
@@ -636,8 +506,6 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		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 {
@@ -646,8 +514,6 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 		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"])
@@ -656,10 +522,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			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"])
@@ -669,8 +532,6 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 		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 {
@@ -678,12 +539,13 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 		v.Frame = false
-		v.FgColor = theme.OptionsColor
+		userConfig := gui.Config.GetUserConfig()
+		v.FgColor = theme.GetColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
 	}

 	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 commitMessageView, err := g.SetView("commitMessage", width, height, width*2, height*2, 0); err != nil {
 			if err.Error() != "unknown view" {
 				return err
 			}
@@ -691,13 +553,12 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			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 credentialsView, err := g.SetView("credentials", width, height, width*2, height*2, 0); err != nil {
 			if err.Error() != "unknown view" {
 				return err
 			}
@@ -711,35 +572,6 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 	}

-	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
@@ -791,8 +623,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		{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.ReflogCommits)},
+		{view: commitsView, context: "", selectedLine: gui.State.Panels.Commits.SelectedLine, lineCount: len(gui.State.Commits)},
 		{view: stashView, context: "", selectedLine: gui.State.Panels.Stash.SelectedLine, lineCount: len(gui.State.StashEntries)},
 	}

@@ -819,10 +650,11 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 }

 func (gui *Gui) onInitialViewsCreation() error {
-	gui.changeMainViewsContext("normal")
+	if err := gui.changeMainViewsContext("normal"); err != nil {
+		return err
+	}

 	gui.getBranchesView().Context = "local-branches"
-	gui.getCommitsView().Context = "branch-commits"

 	return gui.loadNewRepo()
 }
@@ -898,27 +730,28 @@ func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (u
 	return unamePassOpend, err
 }

+func (gui *Gui) renderAppStatus() error {
+	appStatus := gui.statusManager.getStatusString()
+	if appStatus != "" {
+		return gui.renderString(gui.g, "appStatus", appStatus)
+	}
+	return nil
+}
+
 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"),
-		fmt.Sprintf("%s", gui.getKeyDisplay("universal.optionMenu")):                                                                                                                                     gui.Tr.SLocalize("menu"),
-		"1-5": gui.Tr.SLocalize("jump"),
+		"PgUp/PgDn": gui.Tr.SLocalize("scroll"),
+		"← → ↑ ↓":   gui.Tr.SLocalize("navigate"),
+		"esc/q":     gui.Tr.SLocalize("close"),
+		"x":         gui.Tr.SLocalize("menu"),
+		"1-5":       gui.Tr.SLocalize("jump"),
 	})
 }

-func (gui *Gui) goEvery(interval time.Duration, stop chan struct{}, function func() error) {
+func (gui *Gui) goEvery(interval time.Duration, function func() error) {
 	go func() {
-		ticker := time.NewTicker(interval)
-		defer ticker.Stop()
-		for {
-			select {
-			case <-ticker.C:
-				_ = function()
-			case <-stop:
-				return
-			}
+		for range time.Tick(interval) {
+			_ = function()
 		}
 	}()
 }
@@ -933,7 +766,7 @@ func (gui *Gui) startBackgroundFetch() {
 	if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
 		_ = gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil)
 	} else {
-		gui.goEvery(time.Second*60, gui.stopChan, func() error {
+		gui.goEvery(time.Second*60, func() error {
 			_, err := gui.fetch(gui.g, gui.g.CurrentView(), false)
 			return err
 		})
@@ -948,15 +781,6 @@ func (gui *Gui) Run() error {
 	}
 	defer g.Close()

-	g.OnSearchEscape = gui.onSearchEscape
-	g.SearchEscapeKey = gui.getKey("universal.return")
-	g.NextSearchMatchKey = gui.getKey("universal.nextMatch")
-	g.PrevSearchMatchKey = gui.getKey("universal.prevMatch")
-
-	gui.stopChan = make(chan struct{})
-
-	g.ASCII = runtime.GOOS == "windows" && runewidth.IsEastAsian()
-
 	if gui.Config.GetUserConfig().GetBool("gui.mouseEvents") {
 		g.Mouse = true
 	}
@@ -983,7 +807,8 @@ func (gui *Gui) Run() error {
 		go gui.startBackgroundFetch()
 	}

-	gui.goEvery(time.Second*10, gui.stopChan, gui.refreshFiles)
+	gui.goEvery(time.Second*10, gui.refreshFiles)
+	gui.goEvery(time.Millisecond*50, gui.renderAppStatus)

 	g.SetManager(gocui.ManagerFunc(gui.layout), gocui.ManagerFunc(gui.getFocusLayout()))

@@ -1003,17 +828,6 @@ func (gui *Gui) Run() error {
 func (gui *Gui) RunWithSubprocesses() error {
 	for {
 		if err := gui.Run(); err != nil {
-			for _, manager := range gui.viewBufferManagerMap {
-				manager.Close()
-			}
-			gui.viewBufferManagerMap = map[string]*tasks.ViewBufferManager{}
-
-			if !gui.fileWatcher.Disabled {
-				gui.fileWatcher.Watcher.Close()
-			}
-
-			close(gui.stopChan)
-
 			if err == gocui.ErrQuit {
 				if !gui.State.RetainOriginalDir {
 					if err := gui.recordCurrentDirectory(); err != nil {
@@ -1021,6 +835,8 @@ func (gui *Gui) RunWithSubprocesses() error {
 					}
 				}

+				gui.fileWatcher.Close()
+
 				break
 			} else if err == gui.Errors.ErrSwitchRepo {
 				continue
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
--- a/pkg/gui/line_by_line_panel.go
+++ b/pkg/gui/line_by_line_panel.go
@@ -314,8 +314,3 @@ func (gui *Gui) handleToggleSelectHunk(g *gocui.Gui, v *gocui.View) error {

 	return gui.focusSelection(state.SelectMode == HUNK)
 }
-
-func (gui *Gui) handleEscapeLineByLinePanel() {
-	gui.changeMainViewsContext("normal")
-	gui.State.Panels.LineByLine = nil
-}
--- a/pkg/gui/list_view.go
+++ b/pkg/gui/list_view.go
@@ -34,7 +34,6 @@ func (lv *listView) handleLineChange(change int) error {
 			return err
 		}
 	}
-
 	view, err := lv.gui.g.View(lv.viewName)
 	if err != nil {
 		return err
@@ -57,14 +56,7 @@ func (lv *listView) handleClick(g *gocui.Gui, v *gocui.View) error {

 	*selectedLineIdxPtr = newSelectedLineIdx

-	if lv.rendersToMainView {
-		if err := lv.gui.resetOrigin(lv.gui.getMainView()); err != nil {
-			return err
-		}
-	}
-
-	prevViewName := lv.gui.currentViewName()
-	if prevSelectedLineIdx == newSelectedLineIdx && prevViewName == lv.viewName && lv.handleClickSelectedItem != nil {
+	if prevSelectedLineIdx == newSelectedLineIdx && lv.gui.currentViewName() == lv.viewName && lv.handleClickSelectedItem != nil {
 		return lv.handleClickSelectedItem(lv.gui.g, v)
 	}
 	return lv.handleItemSelect(lv.gui.g, v)
@@ -87,8 +79,8 @@ func (gui *Gui) getListViews() []*listView {
 			viewName:                "files",
 			getItemsLength:          func() int { return len(gui.State.Files) },
 			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Files.SelectedLine },
-			handleFocus:             gui.focusAndSelectFile,
-			handleItemSelect:        gui.focusAndSelectFile,
+			handleFocus:             gui.wrappedHandler(func() error { return gui.selectFile(true) }),
+			handleItemSelect:        gui.wrappedHandler(func() error { return gui.selectFile(true) }),
 			handleClickSelectedItem: gui.handleFilePress,
 			gui:                     gui,
 			rendersToMainView:       true,
@@ -134,10 +126,8 @@ func (gui *Gui) getListViews() []*listView {
 			gui:                   gui,
 			rendersToMainView:     true,
 		},
-
 		{
 			viewName:                "commits",
-			context:                 "branch-commits",
 			getItemsLength:          func() int { return len(gui.State.Commits) },
 			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Commits.SelectedLine },
 			handleFocus:             gui.handleCommitSelect,
@@ -146,16 +136,6 @@ func (gui *Gui) getListViews() []*listView {
 			gui:                     gui,
 			rendersToMainView:       true,
 		},
-		{
-			viewName:              "commits",
-			context:               "reflog-commits",
-			getItemsLength:        func() int { return len(gui.State.ReflogCommits) },
-			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.ReflogCommits.SelectedLine },
-			handleFocus:           gui.handleReflogCommitSelect,
-			handleItemSelect:      gui.handleReflogCommitSelect,
-			gui:                   gui,
-			rendersToMainView:     true,
-		},
 		{
 			viewName:              "stash",
 			getItemsLength:        func() int { return len(gui.State.StashEntries) },
--- a/pkg/gui/menu_panel.go
+++ b/pkg/gui/menu_panel.go
@@ -8,12 +8,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

-type menuItem struct {
-	displayString  string
-	displayStrings []string
-	onPress        func() error
-}
-
 // list panel functions

 func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error {
@@ -24,9 +18,9 @@ func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error {

 func (gui *Gui) renderMenuOptions() error {
 	optionsMap := map[string]string{
-		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")):       gui.Tr.SLocalize("close"),
-		fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"),
-		gui.getKeyDisplay("universal.select"): gui.Tr.SLocalize("execute"),
+		"esc/q": gui.Tr.SLocalize("close"),
+		"↑ ↓":   gui.Tr.SLocalize("navigate"),
+		"space": gui.Tr.SLocalize("execute"),
 	}
 	return gui.renderOptionsMap(optionsMap)
 }
@@ -44,49 +38,27 @@ func (gui *Gui) handleMenuClose(g *gocui.Gui, v *gocui.View) error {
 	return gui.returnFocus(g, v)
 }

-type createMenuOptions struct {
-	showCancel bool
-}
-
-func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions createMenuOptions) error {
-	if createMenuOptions.showCancel {
-		// this is mutative but I'm okay with that for now
-		items = append(items, &menuItem{
-			displayStrings: []string{gui.Tr.SLocalize("cancel")},
-			onPress: func() error {
-				return nil
-			},
-		})
+func (gui *Gui) createMenu(title string, items interface{}, itemCount int, handlePress func(int) error) error {
+	isFocused := gui.g.CurrentView().Name() == "menu"
+	gui.State.MenuItemCount = itemCount
+	list, err := utils.RenderList(items, isFocused)
+	if err != nil {
+		return err
 	}

-	gui.State.MenuItemCount = len(items)
-
-	stringArrays := make([][]string, len(items))
-	for i, item := range items {
-		if item.displayStrings == nil {
-			stringArrays[i] = []string{item.displayString}
-		} else {
-			stringArrays[i] = item.displayStrings
-		}
-	}
-
-	list := utils.RenderDisplayStrings(stringArrays)
-
 	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, false, list)
 	menuView, _ := gui.g.SetView("menu", x0, y0, x1, y1, 0)
 	menuView.Title = title
 	menuView.FgColor = theme.GocuiDefaultTextColor
-	menuView.ContainsList = true
 	menuView.Clear()
 	fmt.Fprint(menuView, list)
 	gui.State.Panels.Menu.SelectedLine = 0

 	wrappedHandlePress := func(g *gocui.Gui, v *gocui.View) error {
 		selectedLine := gui.State.Panels.Menu.SelectedLine
-		if err := items[selectedLine].onPress(); err != nil {
+		if err := handlePress(selectedLine); err != nil {
 			return err
 		}
-
 		if _, err := gui.g.View("menu"); err == nil {
 			if _, err := gui.g.SetViewOnBottom("menu"); err != nil {
 				return err
--- a/pkg/gui/merge_panel.go
+++ b/pkg/gui/merge_panel.go
@@ -5,7 +5,6 @@ package gui
 import (
 	"bufio"
 	"bytes"
-	"fmt"
 	"io/ioutil"
 	"math"
 	"os"
@@ -212,17 +211,16 @@ func (gui *Gui) refreshMergePanel() error {
 	if err != nil {
 		return err
 	}
-
-	mainView := gui.getMainView()
-	mainView.Wrap = false
-	if err := gui.setViewContent(gui.g, mainView, content); err != nil {
+	if err := gui.renderString(gui.g, "main", content); err != nil {
 		return err
 	}
-	gui.Log.Warn("scrolling to conflict")
 	if err := gui.scrollToConflict(gui.g); err != nil {
 		return err
 	}

+	mainView := gui.getMainView()
+	mainView.Wrap = false
+
 	return nil
 }

@@ -245,11 +243,11 @@ func (gui *Gui) scrollToConflict(g *gocui.Gui) error {

 func (gui *Gui) renderMergeOptions() error {
 	return gui.renderOptionsMap(map[string]string{
-		fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")):   gui.Tr.SLocalize("selectHunk"),
-		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("main.undo"):          gui.Tr.SLocalize("undo"),
+		"↑ ↓":   gui.Tr.SLocalize("selectHunk"),
+		"← →":   gui.Tr.SLocalize("navigateConflicts"),
+		"space": gui.Tr.SLocalize("pickHunk"),
+		"b":     gui.Tr.SLocalize("pickBothHunks"),
+		"z":     gui.Tr.SLocalize("undo"),
 	})
 }

--- a/pkg/gui/options_menu_panel.go
+++ b/pkg/gui/options_menu_panel.go
@@ -3,6 +3,8 @@ package gui
 import (
 	"strings"

+	"github.com/go-errors/errors"
+
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -15,7 +17,7 @@ func (gui *Gui) getBindings(v *gocui.View) []*Binding {
 	bindings := gui.GetInitialKeybindings()

 	for _, binding := range bindings {
-		if GetKeyDisplay(binding.Key) != "" && binding.Description != "" {
+		if binding.GetKey() != "" && binding.Description != "" {
 			switch binding.ViewName {
 			case "":
 				bindingsGlobal = append(bindingsGlobal, binding)
@@ -36,23 +38,19 @@ func (gui *Gui) getBindings(v *gocui.View) []*Binding {
 func (gui *Gui) handleCreateOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	bindings := gui.getBindings(v)

-	menuItems := make([]*menuItem, len(bindings))
-
-	for i, binding := range bindings {
-		innerBinding := binding // note to self, never close over loop variables
-		menuItems[i] = &menuItem{
-			displayStrings: []string{GetKeyDisplay(innerBinding.Key), innerBinding.Description},
-			onPress: func() error {
-				if innerBinding.Key == nil {
-					return nil
-				}
-				if err := gui.handleMenuClose(g, v); err != nil {
-					return err
-				}
-				return innerBinding.Handler(g, v)
-			},
+	handleMenuPress := func(index int) error {
+		if bindings[index].Key == nil {
+			return nil
 		}
+		if index >= len(bindings) {
+			return errors.New("Index is greater than size of bindings")
+		}
+		err := gui.handleMenuClose(g, v)
+		if err != nil {
+			return err
+		}
+		return bindings[index].Handler(g, v)
 	}

-	return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), menuItems, createMenuOptions{})
+	return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), bindings, len(bindings), handleMenuPress)
 }
--- a/pkg/gui/patch_building_panel.go
+++ b/pkg/gui/patch_building_panel.go
@@ -87,7 +87,8 @@ func (gui *Gui) handleRemoveSelectionFromPatch(g *gocui.Gui, v *gocui.View) erro
 }

 func (gui *Gui) handleEscapePatchBuildingPanel(g *gocui.Gui, v *gocui.View) error {
-	gui.handleEscapeLineByLinePanel()
+	gui.State.Panels.LineByLine = nil
+	gui.changeMainViewsContext("normal")

 	if gui.GitCommand.PatchManager.IsEmpty() {
 		gui.GitCommand.PatchManager.Reset()
--- a/pkg/gui/patch_options_panel.go
+++ b/pkg/gui/patch_options_panel.go
@@ -6,43 +6,48 @@ import (
 	"github.com/jesseduffield/gocui"
 )

+type patchMenuOption struct {
+	displayName string
+	function    func() error
+}
+
+// GetDisplayStrings is a function.
+func (o *patchMenuOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{o.displayName}
+}
+
 func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 	if !gui.GitCommand.PatchManager.CommitSelected() {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoPatchError"))
 	}

-	menuItems := []*menuItem{
-		{
-			displayString: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.CommitSha),
-			onPress:       gui.handleDeletePatchFromCommit,
-		},
-		{
-			displayString: "pull patch out into index",
-			onPress:       gui.handlePullPatchIntoWorkingTree,
-		},
-		{
-			displayString: "reset patch",
-			onPress:       gui.handleResetPatch,
-		},
+	options := []*patchMenuOption{
+		{displayName: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.CommitSha), function: gui.handleDeletePatchFromCommit},
+		{displayName: "pull patch out into index", function: gui.handlePullPatchIntoWorkingTree},
+		{displayName: "reset patch", function: gui.handleResetPatch},
 	}

 	selectedCommit := gui.getSelectedCommit(gui.g)
 	if selectedCommit != nil && gui.GitCommand.PatchManager.CommitSha != selectedCommit.Sha {
 		// adding this option to index 1
-		menuItems = append(
-			menuItems[:1],
+		options = append(
+			options[:1],
 			append(
-				[]*menuItem{
+				[]*patchMenuOption{
 					{
-						displayString: fmt.Sprintf("move patch to selected commit (%s)", selectedCommit.Sha),
-						onPress:       gui.handleMovePatchToSelectedCommit,
+						displayName: fmt.Sprintf("move patch to selected commit (%s)", selectedCommit.Sha),
+						function:    gui.handleMovePatchToSelectedCommit,
 					},
-				}, menuItems[1:]...,
+				}, options[1:]...,
 			)...,
 		)
 	}

-	return gui.createMenu(gui.Tr.SLocalize("PatchOptionsTitle"), menuItems, createMenuOptions{showCancel: true})
+	handleMenuPress := func(index int) error {
+		return options[index].function()
+	}
+
+	return gui.createMenu(gui.Tr.SLocalize("PatchOptionsTitle"), options, len(options), handleMenuPress)
 }

 func (gui *Gui) getPatchCommitIndex() int {
--- a/pkg/gui/presentation/branches.go
+++ b/pkg/gui/presentation/branches.go
@@ -1,48 +0,0 @@
-package presentation
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func GetBranchListDisplayStrings(branches []*commands.Branch, isFocused bool, selectedLine int) [][]string {
-	lines := make([][]string, len(branches))
-
-	for i := range branches {
-		showUpstreamDifferences := isFocused && i == selectedLine
-		lines[i] = getBranchDisplayStrings(branches[i], showUpstreamDifferences)
-	}
-
-	return lines
-}
-
-// getBranchDisplayStrings returns the display string of branch
-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)
-	}
-
-	return []string{b.Recency, displayName}
-}
-
-// GetBranchColor branch color
-func GetBranchColor(name string) color.Attribute {
-	branchType := strings.Split(name, "/")[0]
-
-	switch branchType {
-	case "feature":
-		return color.FgGreen
-	case "bugfix":
-		return color.FgYellow
-	case "hotfix":
-		return color.FgRed
-	default:
-		return theme.DefaultTextColor
-	}
-}
--- a/pkg/gui/presentation/commit_files.go
+++ b/pkg/gui/presentation/commit_files.go
@@ -1,35 +0,0 @@
-package presentation
-
-import (
-	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-)
-
-func GetCommitFileListDisplayStrings(branches []*commands.CommitFile) [][]string {
-	lines := make([][]string, len(branches))
-
-	for i := range branches {
-		lines[i] = getCommitFileDisplayStrings(branches[i])
-	}
-
-	return lines
-}
-
-// getCommitFileDisplayStrings returns the display string of branch
-func getCommitFileDisplayStrings(f *commands.CommitFile) []string {
-	yellow := color.New(color.FgYellow)
-	green := color.New(color.FgGreen)
-	defaultColor := color.New(theme.DefaultTextColor)
-
-	var colour *color.Color
-	switch f.Status {
-	case commands.UNSELECTED:
-		colour = defaultColor
-	case commands.WHOLE:
-		colour = green
-	case commands.PART:
-		colour = yellow
-	}
-	return []string{colour.Sprint(f.DisplayString)}
-}
--- a/pkg/gui/presentation/commits.go
+++ b/pkg/gui/presentation/commits.go
@@ -1,126 +0,0 @@
-package presentation
-
-import (
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func GetCommitListDisplayStrings(commits []*commands.Commit, fullDescription bool) [][]string {
-	lines := make([][]string, len(commits))
-
-	var displayFunc func(*commands.Commit) []string
-	if fullDescription {
-		displayFunc = getFullDescriptionDisplayStringsForCommit
-	} else {
-		displayFunc = getDisplayStringsForCommit
-	}
-
-	for i := range commits {
-		lines[i] = displayFunc(commits[i])
-	}
-
-	return lines
-}
-
-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)
-	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,
-	// not a bug
-	copied := color.New(color.FgCyan, color.BgBlue)
-
-	var shaColor *color.Color
-	switch c.Status {
-	case "unpushed":
-		shaColor = red
-	case "pushed":
-		shaColor = yellow
-	case "merged":
-		shaColor = green
-	case "rebasing":
-		shaColor = blue
-	case "reflog":
-		shaColor = blue
-	case "selected":
-		shaColor = magenta
-	default:
-		shaColor = defaultColor
-	}
-
-	if c.Copied {
-		shaColor = copied
-	}
-
-	tagString := ""
-	truncatedDate := utils.TruncateWithEllipsis(c.Date, 15)
-	secondColumnString := blue.Sprint(truncatedDate)
-	if c.Action != "" {
-		secondColumnString = cyan.Sprint(c.Action)
-	} else if c.ExtraInfo != "" {
-		tagColor := color.New(color.FgMagenta, color.Bold)
-		tagString = utils.ColoredStringDirect(c.ExtraInfo, tagColor) + " "
-	}
-
-	truncatedAuthor := utils.TruncateWithEllipsis(c.Author, 17)
-
-	return []string{shaColor.Sprint(c.Sha[:8]), secondColumnString, yellow.Sprint(truncatedAuthor), tagString + defaultColor.Sprint(c.Name)}
-}
-
-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)
-	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,
-	// not a bug
-	copied := color.New(color.FgCyan, color.BgBlue)
-
-	var shaColor *color.Color
-	switch c.Status {
-	case "unpushed":
-		shaColor = red
-	case "pushed":
-		shaColor = yellow
-	case "merged":
-		shaColor = green
-	case "rebasing":
-		shaColor = blue
-	case "reflog":
-		shaColor = blue
-	case "selected":
-		shaColor = magenta
-	default:
-		shaColor = defaultColor
-	}
-
-	if c.Copied {
-		shaColor = copied
-	}
-
-	actionString := ""
-	tagString := ""
-	if c.Action != "" {
-		actionString = cyan.Sprint(utils.WithPadding(c.Action, 7)) + " "
-	} else if len(c.Tags) > 0 {
-		tagColor := color.New(color.FgMagenta, color.Bold)
-		tagString = utils.ColoredStringDirect(strings.Join(c.Tags, " "), tagColor) + " "
-	}
-
-	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
@@ -1,36 +0,0 @@
-package presentation
-
-import (
-	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-)
-
-func GetFileListDisplayStrings(files []*commands.File) [][]string {
-	lines := make([][]string, len(files))
-
-	for i := range files {
-		lines[i] = getFileDisplayStrings(files[i])
-	}
-
-	return lines
-}
-
-// getFileDisplayStrings returns the display string of branch
-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)
-	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])
-	if f.HasUnstagedChanges {
-		output += red.Sprint(f.Name)
-	} else {
-		output += green.Sprint(f.Name)
-	}
-	return []string{output}
-}
--- a/pkg/gui/presentation/remote_branches.go
+++ b/pkg/gui/presentation/remote_branches.go
@@ -1,23 +0,0 @@
-package presentation
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func GetRemoteBranchListDisplayStrings(branches []*commands.RemoteBranch) [][]string {
-	lines := make([][]string, len(branches))
-
-	for i := range branches {
-		lines[i] = getRemoteBranchDisplayStrings(branches[i])
-	}
-
-	return lines
-}
-
-// getRemoteBranchDisplayStrings returns the display string of branch
-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,20 +0,0 @@
-package presentation
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/commands"
-)
-
-func GetRemoteListDisplayStrings(remotes []*commands.Remote) [][]string {
-	lines := make([][]string, len(remotes))
-
-	for i := range remotes {
-		lines[i] = getRemoteDisplayStrings(remotes[i])
-	}
-
-	return lines
-}
-
-// getRemoteDisplayStrings returns the display string of branch
-func getRemoteDisplayStrings(r *commands.Remote) []string {
-	return []string{r.Name}
-}
--- a/pkg/gui/presentation/stash_entries.go
+++ b/pkg/gui/presentation/stash_entries.go
@@ -1,20 +0,0 @@
-package presentation
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/commands"
-)
-
-func GetStashEntryListDisplayStrings(stashEntries []*commands.StashEntry) [][]string {
-	lines := make([][]string, len(stashEntries))
-
-	for i := range stashEntries {
-		lines[i] = getStashEntryDisplayStrings(stashEntries[i])
-	}
-
-	return lines
-}
-
-// getStashEntryDisplayStrings returns the display string of branch
-func getStashEntryDisplayStrings(s *commands.StashEntry) []string {
-	return []string{s.DisplayString}
-}
--- a/pkg/gui/presentation/tags.go
+++ b/pkg/gui/presentation/tags.go
@@ -1,20 +0,0 @@
-package presentation
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/commands"
-)
-
-func GetTagListDisplayStrings(tags []*commands.Tag) [][]string {
-	lines := make([][]string, len(tags))
-
-	for i := range tags {
-		lines[i] = getTagDisplayStrings(tags[i])
-	}
-
-	return lines
-}
-
-// getTagDisplayStrings returns the display string of branch
-func getTagDisplayStrings(t *commands.Tag) []string {
-	return []string{t.Name}
-}
--- a/pkg/gui/rebase_options_panel.go
+++ b/pkg/gui/rebase_options_panel.go
@@ -7,23 +7,33 @@ import (
 	"github.com/jesseduffield/gocui"
 )

-func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error {
-	options := []string{"continue", "abort"}
+type option struct {
+	value string
+}

-	if gui.State.WorkingTreeState == "rebasing" {
-		options = append(options, "skip")
+// GetDisplayStrings is a function.
+func (r *option) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.value}
+}
+
+func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error {
+	options := []*option{
+		{value: "continue"},
+		{value: "abort"},
 	}

-	menuItems := make([]*menuItem, len(options))
-	for i, option := range options {
-		// note to self. Never, EVER, close over loop variables in a function
-		innerOption := option
-		menuItems[i] = &menuItem{
-			displayString: innerOption,
-			onPress: func() error {
-				return gui.genericMergeCommand(innerOption)
-			},
+	if gui.State.WorkingTreeState == "rebasing" {
+		options = append(options, &option{value: "skip"})
+	}
+
+	options = append(options, &option{value: "cancel"})
+
+	handleMenuPress := func(index int) error {
+		command := options[index].value
+		if command == "cancel" {
+			return nil
 		}
+		return gui.genericMergeCommand(command)
 	}

 	var title string
@@ -33,7 +43,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
 		title = gui.Tr.SLocalize("RebaseOptionsTitle")
 	}

-	return gui.createMenu(title, menuItems, createMenuOptions{showCancel: true})
+	return gui.createMenu(title, options, len(options), handleMenuPress)
 }

 func (gui *Gui) genericMergeCommand(command string) error {
--- a/pkg/gui/recent_repos_panel.go
+++ b/pkg/gui/recent_repos_panel.go
@@ -10,34 +10,41 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

+type recentRepo struct {
+	path string
+}
+
+// GetDisplayStrings returns the path from a recent repo.
+func (r *recentRepo) GetDisplayStrings(isFocused bool) []string {
+	yellow := color.New(color.FgMagenta)
+	base := filepath.Base(r.path)
+	path := yellow.Sprint(r.path)
+	return []string{base, path}
+}
+
 func (gui *Gui) handleCreateRecentReposMenu(g *gocui.Gui, v *gocui.View) error {
 	recentRepoPaths := gui.Config.GetAppState().RecentRepos
 	reposCount := utils.Min(len(recentRepoPaths), 20)
-	yellow := color.New(color.FgMagenta)
 	// we won't show the current repo hence the -1
-	menuItems := make([]*menuItem, reposCount-1)
+	recentRepos := make([]*recentRepo, reposCount-1)
 	for i, path := range recentRepoPaths[1:reposCount] {
-		innerPath := path
-		menuItems[i] = &menuItem{
-			displayStrings: []string{
-				filepath.Base(innerPath),
-				yellow.Sprint(innerPath),
-			},
-			onPress: func() error {
-				if err := os.Chdir(innerPath); err != nil {
-					return err
-				}
-				newGitCommand, err := commands.NewGitCommand(gui.Log, gui.OSCommand, gui.Tr, gui.Config)
-				if err != nil {
-					return err
-				}
-				gui.GitCommand = newGitCommand
-				return gui.Errors.ErrSwitchRepo
-			},
-		}
+		recentRepos[i] = &recentRepo{path: path}
 	}

-	return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), menuItems, createMenuOptions{showCancel: true})
+	handleMenuPress := func(index int) error {
+		repo := recentRepos[index]
+		if err := os.Chdir(repo.path); err != nil {
+			return err
+		}
+		newGitCommand, err := commands.NewGitCommand(gui.Log, gui.OSCommand, gui.Tr, gui.Config)
+		if err != nil {
+			return err
+		}
+		gui.GitCommand = newGitCommand
+		return gui.Errors.ErrSwitchRepo
+	}
+
+	return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), recentRepos, len(recentRepos), handleMenuPress)
 }

 // updateRecentRepoList registers the fact that we opened lazygit in this repo,
--- a/pkg/gui/reflog_panel.go
+++ b/pkg/gui/reflog_panel.go
@@ -1,103 +0,0 @@
-package gui
-
-import (
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
-)
-
-// list panel functions
-
-func (gui *Gui) getSelectedReflogCommit() *commands.Commit {
-	selectedLine := gui.State.Panels.ReflogCommits.SelectedLine
-	if selectedLine == -1 || len(gui.State.ReflogCommits) == 0 {
-		return nil
-	}
-
-	return gui.State.ReflogCommits[selectedLine]
-}
-
-func (gui *Gui) handleReflogCommitSelect(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	gui.State.SplitMainPanel = false
-
-	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
-		return err
-	}
-
-	gui.getMainView().Title = "Reflog Entry"
-
-	commit := gui.getSelectedReflogCommit()
-	if commit == nil {
-		return gui.newStringTask("main", "No reflog history")
-	}
-	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),
-	)
-	if err := gui.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
-	}
-
-	return nil
-}
-
-func (gui *Gui) refreshReflogCommits() error {
-	commits, err := gui.GitCommand.GetReflogCommits()
-	if err != nil {
-		return gui.createErrorPanel(gui.g, err.Error())
-	}
-
-	gui.State.ReflogCommits = commits
-
-	if gui.getCommitsView().Context == "reflog-commits" {
-		return gui.renderReflogCommitsWithSelection()
-	}
-
-	return nil
-}
-
-func (gui *Gui) renderReflogCommitsWithSelection() error {
-	commitsView := gui.getCommitsView()
-
-	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 {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (gui *Gui) handleCheckoutReflogCommit(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedReflogCommit()
-	if commit == nil {
-		return nil
-	}
-
-	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)
-	}, nil)
-	if err != nil {
-		return err
-	}
-
-	gui.State.Panels.ReflogCommits.SelectedLine = 0
-
-	return nil
-}
-
-func (gui *Gui) handleCreateReflogResetMenu(g *gocui.Gui, v *gocui.View) error {
-	commit := gui.getSelectedReflogCommit()
-
-	return gui.createResetMenu(commit.Sha)
-}
--- a/pkg/gui/remote_branches_panel.go
+++ b/pkg/gui/remote_branches_panel.go
@@ -2,10 +2,12 @@ package gui

 import (
 	"fmt"
+	"strings"

+	"github.com/fatih/color"
 	"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
@@ -35,7 +37,7 @@ func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error {
 	remote := gui.getSelectedRemote()
 	remoteBranch := gui.getSelectedRemoteBranch()
 	if remoteBranch == nil {
-		return gui.newStringTask("main", "No branches for this remote")
+		return gui.renderString(g, "main", "No branches for this remote")
 	}

 	gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, gui.State.MenuItemCount, v)
@@ -43,14 +45,13 @@ func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}

-	branchName := fmt.Sprintf("%s/%s", remote.Name, remoteBranch.Name)
-
-	cmd := gui.OSCommand.ExecutableFromString(
-		gui.GitCommand.GetBranchGraphCmdStr(branchName),
-	)
-	if err := gui.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
-	}
+	go func() {
+		graph, err := gui.GitCommand.GetBranchGraph(fmt.Sprintf("%s/%s", remote.Name, remoteBranch.Name))
+		if err != nil && strings.HasPrefix(graph, "fatal: ambiguous argument") {
+			graph = gui.Tr.SLocalize("NoTrackingThisBranch")
+		}
+		_ = gui.renderString(g, "main", fmt.Sprintf("%s/%s\n\n%s", utils.ColoredString(remote.Name, color.FgRed), utils.ColoredString(remoteBranch.Name, color.FgGreen), graph))
+	}()

 	return nil
 }
@@ -63,12 +64,11 @@ 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.renderDisplayStrings(branchesView, displayStrings)
-	if gui.g.CurrentView() == branchesView && branchesView.Context == "remote-branches" {
-		if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil {
-			return err
-		}
+	if err := gui.renderListPanel(branchesView, gui.State.RemoteBranches); err != nil {
+		return err
+	}
+	if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil {
+		return err
 	}

 	return nil
@@ -79,7 +79,7 @@ func (gui *Gui) handleCheckoutRemoteBranch(g *gocui.Gui, v *gocui.View) error {
 	if remoteBranch == nil {
 		return nil
 	}
-	if err := gui.handleCheckoutRef(remoteBranch.RemoteName + "/" + remoteBranch.Name); err != nil {
+	if err := gui.handleCheckoutBranch(remoteBranch.RemoteName + "/" + remoteBranch.Name); err != nil {
 		return err
 	}
 	return gui.switchBranchesPanelContext("local-branches")
@@ -132,12 +132,3 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
 		return gui.refreshSidePanels(gui.g)
 	}, nil)
 }
-
-func (gui *Gui) handleCreateResetToRemoteBranchMenu(g *gocui.Gui, v *gocui.View) error {
-	selectedBranch := gui.getSelectedRemoteBranch()
-	if selectedBranch == nil {
-		return nil
-	}
-
-	return gui.createResetMenu(fmt.Sprintf("%s/%s", selectedBranch.RemoteName, selectedBranch.Name))
-}
--- a/pkg/gui/remotes_panel.go
+++ b/pkg/gui/remotes_panel.go
@@ -7,7 +7,6 @@ import (
 	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )

@@ -37,13 +36,13 @@ func (gui *Gui) handleRemoteSelect(g *gocui.Gui, v *gocui.View) error {

 	remote := gui.getSelectedRemote()
 	if remote == nil {
-		return gui.newStringTask("main", "No remotes")
+		return gui.renderString(g, "main", "No remotes")
 	}
 	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")))
+	return gui.renderString(g, "main", fmt.Sprintf("%s\nUrls:\n%s", utils.ColoredString(remote.Name, color.FgGreen), strings.Join(remote.Urls, "\n")))
 }

 func (gui *Gui) refreshRemotes() error {
@@ -81,14 +80,11 @@ func (gui *Gui) renderRemotesWithSelection() error {
 	branchesView := gui.getBranchesView()

 	gui.refreshSelectedLine(&gui.State.Panels.Remotes.SelectedLine, len(gui.State.Remotes))
-
-	displayStrings := presentation.GetRemoteListDisplayStrings(gui.State.Remotes)
-	gui.renderDisplayStrings(branchesView, displayStrings)
-
-	if gui.g.CurrentView() == branchesView && branchesView.Context == "remotes" {
-		if err := gui.handleRemoteSelect(gui.g, branchesView); err != nil {
-			return err
-		}
+	if err := gui.renderListPanel(branchesView, gui.State.Remotes); err != nil {
+		return err
+	}
+	if err := gui.handleRemoteSelect(gui.g, branchesView); err != nil {
+		return err
 	}

 	return nil
@@ -180,18 +176,3 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {
 		})
 	})
 }
-
-func (gui *Gui) handleFetchRemote(g *gocui.Gui, v *gocui.View) error {
-	remote := gui.getSelectedRemote()
-	if remote == nil {
-		return nil
-	}
-
-	return gui.WithWaitingStatus(gui.Tr.SLocalize("FetchingRemoteStatus"), func() error {
-		if err := gui.GitCommand.FetchRemote(remote.Name); err != nil {
-			return err
-		}
-
-		return gui.refreshRemotes()
-	})
-}
--- a/pkg/gui/reset_menu_panel.go
+++ b/pkg/gui/reset_menu_panel.go
@@ -1,46 +0,0 @@
-package gui
-
-import (
-	"fmt"
-
-	"github.com/fatih/color"
-)
-
-func (gui *Gui) createResetMenu(ref string) error {
-	strengths := []string{"soft", "mixed", "hard"}
-	menuItems := make([]*menuItem, len(strengths))
-	for i, strength := range strengths {
-		innerStrength := strength
-		menuItems[i] = &menuItem{
-			displayStrings: []string{
-				fmt.Sprintf("%s reset", strength),
-				color.New(color.FgRed).Sprint(
-					fmt.Sprintf("reset --%s %s", strength, ref),
-				),
-			},
-			onPress: func() error {
-				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())
-			},
-		}
-	}
-
-	return gui.createMenu(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), ref), menuItems, createMenuOptions{showCancel: true})
-}
--- a/pkg/gui/searching.go
+++ b/pkg/gui/searching.go
@@ -1,91 +0,0 @@
-package gui
-
-import (
-	"fmt"
-
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/theme"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-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", "")
-	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()
-	gui.switchFocus(gui.g, nil, gui.State.Searching.view)
-	if err := gui.State.Searching.view.Search(gui.State.Searching.searchString); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, int) error {
-	return func(y int, index int, total int) error {
-		if total == 0 {
-			gui.renderString(
-				gui.g,
-				"search",
-				fmt.Sprintf(
-					"no matches for '%s' %s",
-					gui.State.Searching.searchString,
-					utils.ColoredString(
-						fmt.Sprintf("%s: exit search mode", gui.getKeyDisplay("universal.return")),
-						theme.OptionsFgColor,
-					),
-				),
-			)
-			return nil
-		}
-		gui.renderString(
-			gui.g,
-			"search",
-			fmt.Sprintf(
-				"matches for '%s' (%d of %d) %s",
-				gui.State.Searching.searchString,
-				index+1,
-				total,
-				utils.ColoredString(
-					fmt.Sprintf(
-						"%s: next match, %s: previous match, %s: exit search mode",
-						gui.getKeyDisplay("universal.nextMatch"),
-						gui.getKeyDisplay("universal.prevMatch"),
-						gui.getKeyDisplay("universal.return"),
-					),
-					theme.OptionsFgColor,
-				),
-			),
-		)
-		if err := innerFunc(y); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-func (gui *Gui) onSearchEscape() error {
-	gui.State.Searching.isSearching = false
-	if gui.State.Searching.view != nil {
-		gui.State.Searching.view.ClearSearch()
-		gui.State.Searching.view = nil
-	}
-
-	return nil
-}
-
-func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error {
-	if err := gui.switchFocus(gui.g, nil, gui.State.Searching.view); err != nil {
-		return err
-	}
-
-	gui.onSearchEscape()
-
-	return nil
-}
--- a/pkg/gui/staging_panel.go
+++ b/pkg/gui/staging_panel.go
@@ -12,13 +12,6 @@ func (gui *Gui) refreshStagingPanel(forceSecondaryFocused bool, selectedLineIdx

 	state := gui.State.Panels.LineByLine

-	// We need to force focus here because the confirmation panel for safely staging lines does not return focus automatically.
-	// This is because if we tell it to return focus it will unconditionally return it to the main panel which may not be what we want
-	// e.g. in the event that there's nothing left to stage.
-	if err := gui.switchFocus(gui.g, nil, gui.getMainView()); err != nil {
-		return err
-	}
-
 	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
@@ -94,36 +87,26 @@ func (gui *Gui) handleTogglePanel(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleStagingEscape(g *gocui.Gui, v *gocui.View) error {
-	gui.handleEscapeLineByLinePanel()
+	gui.State.Panels.LineByLine = nil

 	return gui.switchFocus(gui.g, nil, gui.getFilesView())
 }

 func (gui *Gui) handleStageSelection(g *gocui.Gui, v *gocui.View) error {
-	return gui.applySelectionWithPrompt(false)
+	return gui.applySelection(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 !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)
-	}
-
-	return gui.applySelection(reverse)
+	return gui.applySelection(true)
 }

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

+	if !reverse && state.SecondaryFocused {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantStageStaged"))
+	}
+
 	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		return err
--- a/pkg/gui/stash_panel.go
+++ b/pkg/gui/stash_panel.go
@@ -1,9 +1,11 @@
 package gui

 import (
+	"fmt"
+
 	"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
@@ -32,19 +34,16 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {

 	stashEntry := gui.getSelectedStashEntry(v)
 	if stashEntry == nil {
-		return gui.newStringTask("main", gui.Tr.SLocalize("NoStashEntries"))
+		return gui.renderString(g, "main", gui.Tr.SLocalize("NoStashEntries"))
 	}
 	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.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
-	}
-
+	go func() {
+		// doing this asynchronously cos it can take time
+		diff, _ := gui.GitCommand.GetStashEntryDiff(stashEntry.Index)
+		_ = gui.renderString(g, "main", diff)
+	}()
 	return nil
 }

@@ -54,12 +53,17 @@ func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {

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

-		stashView := gui.getStashView()
+		isFocused := gui.g.CurrentView().Name() == "stash"
+		list, err := utils.RenderList(gui.State.StashEntries, isFocused)
+		if err != nil {
+			return err
+		}

-		displayStrings := presentation.GetStashEntryListDisplayStrings(gui.State.StashEntries)
-		gui.renderDisplayStrings(stashView, displayStrings)
+		v := gui.getStashView()
+		v.Clear()
+		fmt.Fprint(v, list)

-		if err := gui.resetOrigin(stashView); err != nil {
+		if err := gui.resetOrigin(v); err != nil {
 			return err
 		}
 		return nil
@@ -115,8 +119,3 @@ func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
 		return gui.refreshFiles()
 	})
 }
-
-func (gui *Gui) onStashPanelSearchSelect(selectedLine int) error {
-	gui.State.Panels.Stash.SelectedLine = selectedLine
-	return gui.handleStashEntrySelect(gui.g, gui.getStashView())
-}
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -6,7 +6,7 @@ import (

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

@@ -35,7 +35,7 @@ func (gui *Gui) refreshStatus(g *gocui.Gui) error {

 		if len(branches) > 0 {
 			branch := branches[0]
-			name := utils.ColoredString(branch.Name, presentation.GetBranchColor(branch.Name))
+			name := utils.ColoredString(branch.Name, commands.GetBranchColor(branch.Name))
 			repoName := utils.GetCurrentRepoName()
 			status += fmt.Sprintf(" %s → %s", repoName, name)
 		}
@@ -111,7 +111,7 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
 			magenta.Sprint("Become a sponsor (github is matching all donations for 12 months): https://github.com/sponsors/jesseduffield"), // caffeine ain't free
 		}, "\n\n")

-	return gui.newStringTask("main", dashboardString)
+	return gui.renderString(g, "main", dashboardString)
 }

 func (gui *Gui) handleOpenConfig(g *gocui.Gui, v *gocui.View) error {
@@ -136,14 +136,6 @@ func lazygitTitle() string {
 }

 func (gui *Gui) updateWorkTreeState() error {
-	rebaseMode, err := gui.GitCommand.RebaseMode()
-	if err != nil {
-		return err
-	}
-	if rebaseMode != "" {
-		gui.State.WorkingTreeState = "rebasing"
-		return nil
-	}
 	merging, err := gui.GitCommand.IsInMergeState()
 	if err != nil {
 		return err
@@ -152,6 +144,14 @@ func (gui *Gui) updateWorkTreeState() error {
 		gui.State.WorkingTreeState = "merging"
 		return nil
 	}
+	rebaseMode, err := gui.GitCommand.RebaseMode()
+	if err != nil {
+		return err
+	}
+	if rebaseMode != "" {
+		gui.State.WorkingTreeState = "rebasing"
+		return nil
+	}
 	gui.State.WorkingTreeState = "normal"
 	return nil
 }
--- a/pkg/gui/tags_panel.go
+++ b/pkg/gui/tags_panel.go
@@ -1,9 +1,10 @@
 package gui

 import (
+	"fmt"
+
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
 )

 // list panel functions
@@ -32,18 +33,25 @@ func (gui *Gui) handleTagSelect(g *gocui.Gui, v *gocui.View) error {

 	tag := gui.getSelectedTag()
 	if tag == nil {
-		return gui.newStringTask("main", "No tags")
+		return gui.renderString(g, "main", "No tags")
 	}
 	if err := gui.focusPoint(0, gui.State.Panels.Tags.SelectedLine, len(gui.State.Tags), v); err != nil {
 		return err
 	}

-	cmd := gui.OSCommand.ExecutableFromString(
-		gui.GitCommand.GetBranchGraphCmdStr(tag.Name),
-	)
-	if err := gui.newCmdTask("main", cmd); err != nil {
-		gui.Log.Error(err)
-	}
+	go func() {
+		show, err := gui.GitCommand.ShowTag(tag.Name)
+		if err != nil {
+			show = ""
+		}
+
+		graph, err := gui.GitCommand.GetBranchGraph(tag.Name)
+		if err != nil {
+			graph = "No graph for tag " + tag.Name
+		}
+
+		_ = gui.renderString(g, "main", fmt.Sprintf("%s\n%s", show, graph))
+	}()

 	return nil
 }
@@ -67,12 +75,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.renderDisplayStrings(branchesView, displayStrings)
-	if gui.g.CurrentView() == branchesView && branchesView.Context == "tags" {
-		if err := gui.handleTagSelect(gui.g, branchesView); err != nil {
-			return err
-		}
+	if err := gui.renderListPanel(branchesView, gui.State.Tags); err != nil {
+		return err
+	}
+	if err := gui.handleTagSelect(gui.g, branchesView); err != nil {
+		return err
 	}

 	return nil
@@ -83,7 +90,7 @@ func (gui *Gui) handleCheckoutTag(g *gocui.Gui, v *gocui.View) error {
 	if tag == nil {
 		return nil
 	}
-	if err := gui.handleCheckoutRef(tag.Name); err != nil {
+	if err := gui.handleCheckoutBranch(tag.Name); err != nil {
 		return err
 	}
 	return gui.switchBranchesPanelContext("local-branches")
@@ -106,13 +113,7 @@ func (gui *Gui) handleDeleteTag(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.DeleteTag(tag.Name); err != nil {
 			return gui.createErrorPanel(gui.g, err.Error())
 		}
-		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
+		return gui.refreshTags()
 	}, nil)
 }

@@ -143,21 +144,6 @@ func (gui *Gui) handleCreateTag(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), ""); err != nil {
 			return gui.createErrorPanel(gui.g, err.Error())
 		}
-		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
+		return gui.refreshTags()
 	})
 }
-
-func (gui *Gui) handleCreateResetToTagMenu(g *gocui.Gui, v *gocui.View) error {
-	tag := gui.getSelectedTag()
-	if tag == nil {
-		return nil
-	}
-
-	return gui.createResetMenu(tag.Name)
-}
--- a/pkg/gui/tasks_adapter.go
+++ b/pkg/gui/tasks_adapter.go
@@ -1,78 +0,0 @@
-package gui
-
-import (
-	"os/exec"
-
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/tasks"
-)
-
-func (gui *Gui) newCmdTask(viewName string, cmd *exec.Cmd) error {
-	view, err := gui.g.View(viewName)
-	if err != nil {
-		return nil // swallowing for now
-	}
-
-	_, height := view.Size()
-	_, oy := view.Origin()
-
-	manager := gui.getManager(view)
-
-	if err := manager.NewTask(manager.NewCmdTask(cmd, height+oy+10)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (gui *Gui) newTask(viewName string, f func(chan struct{}) error) error {
-	view, err := gui.g.View(viewName)
-	if err != nil {
-		return nil // swallowing for now
-	}
-
-	manager := gui.getManager(view)
-
-	if err := manager.NewTask(f); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (gui *Gui) newStringTask(viewName string, str string) error {
-	view, err := gui.g.View(viewName)
-	if err != nil {
-		return nil // swallowing for now
-	}
-
-	manager := gui.getManager(view)
-
-	f := func(stop chan struct{}) error {
-		return gui.renderString(gui.g, viewName, str)
-	}
-
-	if err := manager.NewTask(f); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
-	manager, ok := gui.viewBufferManagerMap[view.Name()]
-	if !ok {
-		manager = tasks.NewViewBufferManager(
-			gui.Log,
-			view,
-			func() {
-				view.Clear()
-			},
-			func() {
-				gui.g.Update(func(*gocui.Gui) error { return nil })
-			})
-		gui.viewBufferManagerMap[view.Name()] = manager
-	}
-
-	return manager
-}
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -102,7 +102,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 	case "status":
 		return gui.handleStatusSelect(g, v)
 	case "files":
-		return gui.focusAndSelectFile(g, v)
+		return gui.handleFileSelect(g, v)
 	case "branches":
 		branchesView := gui.getBranchesView()
 		switch branchesView.Context {
@@ -135,8 +135,6 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 		}
 		v.Highlight = false
 		return nil
-	case "search":
-		return nil
 	default:
 		panic(gui.Tr.SLocalize("NoViewMachingNewLineFocusedSwitchStatement"))
 	}
@@ -220,7 +218,32 @@ func (gui *Gui) resetOrigin(v *gocui.View) error {

 // 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)
+	if cy < 0 || cy > lineCount {
+		return nil
+	}
+	ox, oy := v.Origin()
+	_, height := v.Size()
+
+	ly := height - 1
+	if ly == -1 {
+		ly = 0
+	}
+
+	// if line is above origin, move origin and set cursor to zero
+	// if line is below origin + height, move origin and set cursor to max
+	// otherwise set cursor to value - origin
+	if ly > lineCount {
+		_ = v.SetCursor(cx, cy)
+		_ = v.SetOrigin(ox, 0)
+	} else if cy < oy {
+		_ = v.SetCursor(cx, 0)
+		_ = v.SetOrigin(ox, cy)
+	} else if cy > oy+ly {
+		_ = v.SetCursor(cx, ly)
+		_ = v.SetOrigin(ox, cy-ly)
+	} else {
+		_ = v.SetCursor(cx, cy-oy)
+	}
 	return nil
 }

@@ -245,9 +268,6 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error {
 		if err := v.SetOrigin(0, 0); err != nil {
 			return err
 		}
-		if err := v.SetCursor(0, 0); err != nil {
-			return err
-		}
 		return gui.setViewContent(gui.g, v, s)
 	})
 	return nil
@@ -313,11 +333,6 @@ func (gui *Gui) getMenuView() *gocui.View {
 	return v
 }

-func (gui *Gui) getSearchView() *gocui.View {
-	v, _ := gui.g.View("search")
-	return v
-}
-
 func (gui *Gui) trimmedContent(v *gocui.View) string {
 	return strings.TrimSpace(v.Buffer())
 }
@@ -387,13 +402,18 @@ func (gui *Gui) refreshSelectedLine(line *int, total int) {
 	}
 }

-func (gui *Gui) renderDisplayStrings(v *gocui.View, displayStrings [][]string) {
+func (gui *Gui) renderListPanel(v *gocui.View, items interface{}) error {
 	gui.g.Update(func(g *gocui.Gui) error {
-		list := utils.RenderDisplayStrings(displayStrings)
+		isFocused := gui.g.CurrentView().Name() == v.Name()
+		list, err := utils.RenderList(items, isFocused)
+		if err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
 		v.Clear()
 		fmt.Fprint(v, list)
 		return nil
 	})
+	return nil
 }

 func (gui *Gui) renderPanelOptions() error {
--- a/pkg/gui/workspace_reset_options_panel.go
+++ b/pkg/gui/workspace_reset_options_panel.go
@@ -1,93 +0,0 @@
-package gui
-
-import (
-	"github.com/fatih/color"
-	"github.com/jesseduffield/gocui"
-)
-
-func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
-	red := color.New(color.FgRed)
-
-	menuItems := []*menuItem{
-		{
-			displayStrings: []string{
-				gui.Tr.SLocalize("discardAllChangesToAllFiles"),
-				red.Sprint("reset --hard HEAD && git clean -fd"),
-			},
-			onPress: func() error {
-				if err := gui.GitCommand.ResetAndClean(); err != nil {
-					return gui.createErrorPanel(gui.g, err.Error())
-				}
-
-				return gui.refreshFiles()
-			},
-		},
-		{
-			displayStrings: []string{
-				gui.Tr.SLocalize("discardAnyUnstagedChanges"),
-				red.Sprint("git checkout -- ."),
-			},
-			onPress: func() error {
-				if err := gui.GitCommand.DiscardAnyUnstagedFileChanges(); err != nil {
-					return gui.createErrorPanel(gui.g, err.Error())
-				}
-
-				return gui.refreshFiles()
-			},
-		},
-		{
-			displayStrings: []string{
-				gui.Tr.SLocalize("discardUntrackedFiles"),
-				red.Sprint("git clean -fd"),
-			},
-			onPress: func() error {
-				if err := gui.GitCommand.RemoveUntrackedFiles(); err != nil {
-					return gui.createErrorPanel(gui.g, err.Error())
-				}
-
-				return gui.refreshFiles()
-			},
-		},
-		{
-			displayStrings: []string{
-				gui.Tr.SLocalize("softReset"),
-				red.Sprint("git reset --soft HEAD"),
-			},
-			onPress: func() error {
-				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
-					return gui.createErrorPanel(gui.g, err.Error())
-				}
-
-				return gui.refreshFiles()
-			},
-		},
-		{
-			displayStrings: []string{
-				"mixed reset",
-				red.Sprint("git reset --mixed HEAD"),
-			},
-			onPress: func() error {
-				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
-					return gui.createErrorPanel(gui.g, err.Error())
-				}
-
-				return gui.refreshFiles()
-			},
-		},
-		{
-			displayStrings: []string{
-				gui.Tr.SLocalize("hardReset"),
-				red.Sprint("git reset --hard HEAD"),
-			},
-			onPress: func() error {
-				if err := gui.GitCommand.ResetHard("HEAD"); err != nil {
-					return gui.createErrorPanel(gui.g, err.Error())
-				}
-
-				return gui.refreshFiles()
-			},
-		},
-	}
-
-	return gui.createMenu("", menuItems, createMenuOptions{showCancel: true})
-}
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -136,6 +136,9 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotGitAdd",
 			Other: "Kan commando niet uitvoeren git add --path untracked files",
+		}, &i18n.Message{
+			ID:    "CantIgnoreTrackFiles",
+			Other: "Kan gevolgde bestanden niet negeren",
 		}, &i18n.Message{
 			ID:    "NoStagedFilesToCommit",
 			Other: "Er zijn geen staged bestanden om te commiten",
@@ -757,12 +760,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "ReturnToRemotesList",
 			Other: `return to remotes list`,
-		}, &i18n.Message{
-			ID:    "IgnoreTracked",
-			Other: "Ignore tracked file",
-		}, &i18n.Message{
-			ID:    "IgnoreTrackedPrompt",
-			Other: "Are you sure you want to ignore a tracked file?",
 		},
 	)
 }
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -162,6 +162,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotGitAdd",
 			Other: "Cannot git add --patch untracked files",
+		}, &i18n.Message{
+			ID:    "CantIgnoreTrackFiles",
+			Other: "Cannot ignore tracked files",
 		}, &i18n.Message{
 			ID:    "NoStagedFilesToCommit",
 			Other: "There are no staged files to commit",
@@ -750,9 +753,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "hardReset",
 			Other: "hard reset",
-		}, &i18n.Message{
-			ID:    "hardResetUpstream",
-			Other: "hard reset to upstream branch",
 		}, &i18n.Message{
 			ID:    "viewResetOptions",
 			Other: `view reset options`,
@@ -822,9 +822,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "toggleAddToPatch",
 			Other: "toggle file included in patch",
-		}, &i18n.Message{
-			ID:    "ViewPatchOptions",
-			Other: "view custom patch options",
 		}, &i18n.Message{
 			ID:    "PatchOptionsTitle",
 			Other: "Patch Options",
@@ -907,50 +904,14 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "PushTagTitle",
 			Other: "remote to push tag '{{.tagName}}' to:",
 		}, &i18n.Message{
-			ID:    "pushTag",
-			Other: "push tag",
+			ID:    "pushTags",
+			Other: "push tags",
 		}, &i18n.Message{
 			ID:    "createTag",
 			Other: "create tag",
 		}, &i18n.Message{
 			ID:    "CreateTagTitle",
 			Other: "Tag name:",
-		}, &i18n.Message{
-			ID:    "fetchRemote",
-			Other: "fetch remote",
-		}, &i18n.Message{
-			ID:    "FetchingRemoteStatus",
-			Other: "fetching remote",
-		}, &i18n.Message{
-			ID:    "checkoutCommit",
-			Other: "checkout commit",
-		}, &i18n.Message{
-			ID:    "SureCheckoutThisCommit",
-			Other: "Are you sure you want to checkout this commit?",
-		}, &i18n.Message{
-			ID:    "gitFlowOptions",
-			Other: "show git-flow options",
-		}, &i18n.Message{
-			ID:    "NotAGitFlowBranch",
-			Other: "This does not seem to be a git flow branch",
-		}, &i18n.Message{
-			ID:    "NewBranchNamePrompt",
-			Other: "new {{.branchType}} name:",
-		}, &i18n.Message{
-			ID:    "IgnoreTracked",
-			Other: "Ignore tracked file",
-		}, &i18n.Message{
-			ID:    "IgnoreTrackedPrompt",
-			Other: "Are you sure you want to ignore a tracked file?",
-		}, &i18n.Message{
-			ID:    "viewResetToUpstreamOptions",
-			Other: "view upstream reset options",
-		}, &i18n.Message{
-			ID:    "nextScreenMode",
-			Other: "next screen mode (normal/half/fullscreen)",
-		}, &i18n.Message{
-			ID:    "prevScreenMode",
-			Other: "prev screen mode",
 		},
 	)
 }
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -128,6 +128,9 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotGitAdd",
 			Other: "Nie można git add --patch nieśledzonych plików",
+		}, &i18n.Message{
+			ID:    "CantIgnoreTrackFiles",
+			Other: "Nie można zignorować nieśledzonych plików",
 		}, &i18n.Message{
 			ID:    "NoStagedFilesToCommit",
 			Other: "Brak zatwierdzonych plików do commita",
@@ -740,12 +743,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "ReturnToRemotesList",
 			Other: `return to remotes list`,
-		}, &i18n.Message{
-			ID:    "IgnoreTracked",
-			Other: "Ignore tracked file",
-		}, &i18n.Message{
-			ID:    "IgnoreTrackedPrompt",
-			Other: "Are you sure you want to ignore a tracked file?",
 		},
 	)
 }
--- a/pkg/tasks/tasks.go
+++ b/pkg/tasks/tasks.go
@@ -1,228 +0,0 @@
-package tasks
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os/exec"
-	"sync"
-	"time"
-
-	"github.com/sirupsen/logrus"
-)
-
-type Task struct {
-	stop          chan struct{}
-	stopped       bool
-	stopMutex     sync.Mutex
-	notifyStopped chan struct{}
-	Log           *logrus.Entry
-	f             func(chan struct{}) error
-}
-
-type ViewBufferManager struct {
-	writer       io.Writer
-	waitingTask  *Task
-	currentTask  *Task
-	waitingMutex sync.Mutex
-	taskIDMutex  sync.Mutex
-	Log          *logrus.Entry
-	newTaskId    int
-	readLines    chan int
-
-	// beforeStart is the function that is called before starting a new task
-	beforeStart func()
-	refreshView func()
-}
-
-func NewViewBufferManager(log *logrus.Entry, writer io.Writer, beforeStart func(), refreshView func()) *ViewBufferManager {
-	return &ViewBufferManager{Log: log, writer: writer, beforeStart: beforeStart, refreshView: refreshView, readLines: make(chan int, 1024)}
-}
-
-func (m *ViewBufferManager) ReadLines(n int) {
-	go func() {
-		m.readLines <- n
-	}()
-}
-
-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 cmd.ProcessState == nil {
-				if err := kill(cmd); err != nil {
-					m.Log.Warn(err)
-				}
-			}
-		}()
-
-		// not sure if it's the right move to redefine this or not
-		m.readLines = make(chan int, 1024)
-
-		done := make(chan struct{})
-
-		go func() {
-			scanner := bufio.NewScanner(r)
-			scanner.Split(bufio.ScanLines)
-
-			loaded := false
-
-			go func() {
-				ticker := time.NewTicker(time.Millisecond * 100)
-				defer ticker.Stop()
-				select {
-				case <-ticker.C:
-					if !loaded {
-						m.beforeStart()
-						m.writer.Write([]byte("loading..."))
-						m.refreshView()
-					}
-				case <-stop:
-					return
-				}
-			}()
-
-		outer:
-			for {
-				select {
-				case linesToRead := <-m.readLines:
-					for i := 0; i < linesToRead; i++ {
-						ok := scanner.Scan()
-						if !loaded {
-							m.beforeStart()
-							loaded = true
-						}
-
-						select {
-						case <-stop:
-							break outer
-						default:
-						}
-						if !ok {
-							m.refreshView()
-							break outer
-						}
-						m.writer.Write(append(scanner.Bytes(), []byte("\n")...))
-					}
-					m.refreshView()
-				case <-stop:
-					break outer
-				}
-			}
-
-			if err := cmd.Wait(); err != nil {
-				m.Log.Warn(err)
-			}
-
-			close(done)
-		}()
-
-		m.readLines <- linesToRead
-
-		<-done
-
-		return nil
-	}
-}
-
-// Close closes the task manager, killing whatever task may currently be running
-func (t *ViewBufferManager) Close() {
-	if t.currentTask == nil {
-		return
-	}
-
-	c := make(chan struct{}, 1)
-
-	go func() {
-		t.currentTask.Stop()
-		c <- struct{}{}
-	}()
-
-	select {
-	case <-c:
-		return
-	case <-time.After(3 * time.Second):
-		fmt.Println("cannot kill child process")
-	}
-}
-
-// different kinds of tasks:
-// 1) command based, where the manager can be asked to read more lines,  but the command can be killed
-// 2) string based, where the manager can also be asked to read more lines
-
-func (m *ViewBufferManager) NewTask(f func(stop chan struct{}) error) error {
-	go func() {
-		m.taskIDMutex.Lock()
-		m.newTaskId++
-		taskID := m.newTaskId
-		m.Log.Infof("starting task %d", taskID)
-		m.taskIDMutex.Unlock()
-
-		m.waitingMutex.Lock()
-		defer m.waitingMutex.Unlock()
-		if taskID < m.newTaskId {
-			return
-		}
-
-		stop := make(chan struct{})
-		notifyStopped := make(chan struct{})
-
-		if m.currentTask != nil {
-			m.Log.Info("asking task to stop")
-			m.currentTask.Stop()
-			m.Log.Info("task stopped")
-		}
-
-		m.currentTask = &Task{
-			stop:          stop,
-			notifyStopped: notifyStopped,
-			Log:           m.Log,
-			f:             f,
-		}
-
-		go func() {
-			if err := f(stop); err != nil {
-				m.Log.Error(err) // might need an onError callback
-			}
-
-			m.Log.Infof("returning from task %d", taskID)
-			close(notifyStopped)
-		}()
-	}()
-
-	return nil
-}
-
-func (t *Task) Stop() {
-	t.stopMutex.Lock()
-	defer t.stopMutex.Unlock()
-	if t.stopped {
-		return
-	}
-	close(t.stop)
-	t.Log.Info("closed stop channel, waiting for notifyStopped message")
-	<-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/test/utils.go
+++ b/pkg/test/utils.go
@@ -3,7 +3,6 @@ package test
 import (
 	"fmt"
 	"os/exec"
-	"regexp"
 	"strings"
 	"testing"

@@ -44,15 +43,3 @@ func CreateMockCommand(t *testing.T, swappers []*CommandSwapper) func(cmd string
 		return command
 	}
 }
-
-func AssertContainsMatch(t *testing.T, strs []string, pattern *regexp.Regexp, message string) {
-	t.Helper()
-
-	for _, str := range strs {
-		if pattern.Match([]byte(str)) {
-			return
-		}
-	}
-
-	assert.Fail(t, message)
-}
--- a/pkg/theme/theme.go
+++ b/pkg/theme/theme.go
@@ -20,22 +20,12 @@ var (

 	// InactiveBorderColor is the border color of the inactive active frames
 	InactiveBorderColor gocui.Attribute
-
-	// SelectedLineBgColor is the background color for the selected line
-	SelectedLineBgColor color.Attribute
-
-	OptionsFgColor color.Attribute
-
-	OptionsColor gocui.Attribute
 )

 // UpdateTheme updates all theme variables
 func UpdateTheme(userConfig *viper.Viper) {
-	ActiveBorderColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.activeBorderColor"))
-	InactiveBorderColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.inactiveBorderColor"))
-	SelectedLineBgColor = GetBgColor(userConfig.GetStringSlice("gui.theme.selectedLineBgColor"))
-	OptionsColor = GetGocuiColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
-	OptionsFgColor = GetFgColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
+	ActiveBorderColor = getColor(userConfig.GetStringSlice("gui.theme.activeBorderColor"))
+	InactiveBorderColor = getColor(userConfig.GetStringSlice("gui.theme.inactiveBorderColor"))

 	isLightTheme := userConfig.GetBool("gui.theme.lightTheme")
 	if isLightTheme {
@@ -49,8 +39,8 @@ func UpdateTheme(userConfig *viper.Viper) {
 	}
 }

-// GetAttribute gets the gocui color attribute from the string
-func GetGocuiAttribute(key string) gocui.Attribute {
+// getAttribute gets the gocui color attribute from the string
+func getAttribute(key string) gocui.Attribute {
 	colorMap := map[string]gocui.Attribute{
 		"default":   gocui.ColorDefault,
 		"black":     gocui.ColorBlack,
@@ -72,75 +62,43 @@ func GetGocuiAttribute(key string) gocui.Attribute {
 	return gocui.ColorWhite
 }

-// GetFgAttribute gets the color foreground attribute from the string
-func GetFgAttribute(key string) color.Attribute {
-	colorMap := map[string]color.Attribute{
-		"default":   color.FgWhite,
-		"black":     color.FgBlack,
-		"red":       color.FgRed,
-		"green":     color.FgGreen,
-		"yellow":    color.FgYellow,
-		"blue":      color.FgBlue,
-		"magenta":   color.FgMagenta,
-		"cyan":      color.FgCyan,
-		"white":     color.FgWhite,
-		"bold":      color.Bold,
-		"reverse":   color.ReverseVideo,
-		"underline": color.Underline,
-	}
-	value, present := colorMap[key]
-	if present {
-		return value
-	}
-	return color.FgWhite
-}
-
-// GetBgAttribute gets the color background attribute from the string
-func GetBgAttribute(key string) color.Attribute {
-	colorMap := map[string]color.Attribute{
-		"default":   color.BgWhite,
-		"black":     color.BgBlack,
-		"red":       color.BgRed,
-		"green":     color.BgGreen,
-		"yellow":    color.BgYellow,
-		"blue":      color.BgBlue,
-		"magenta":   color.BgMagenta,
-		"cyan":      color.BgCyan,
-		"white":     color.BgWhite,
-		"bold":      color.Bold,
-		"reverse":   color.ReverseVideo,
-		"underline": color.Underline,
-	}
-	value, present := colorMap[key]
-	if present {
-		return value
-	}
-	return color.FgWhite
-}
-
-// GetGocuiColor bitwise OR's a list of attributes obtained via the given keys
-func GetGocuiColor(keys []string) gocui.Attribute {
+// getColor bitwise OR's a list of attributes obtained via the given keys
+func getColor(keys []string) gocui.Attribute {
 	var attribute gocui.Attribute
 	for _, key := range keys {
-		attribute |= GetGocuiAttribute(key)
+		attribute |= getAttribute(key)
 	}
 	return attribute
 }

-// GetColor bitwise OR's a list of attributes obtained via the given keys
-func GetBgColor(keys []string) color.Attribute {
-	var attribute color.Attribute
-	for _, key := range keys {
-		attribute |= GetBgAttribute(key)
+// GetAttribute gets the gocui color attribute from the string
+func GetAttribute(key string) gocui.Attribute {
+	colorMap := map[string]gocui.Attribute{
+		"default":   gocui.ColorDefault,
+		"black":     gocui.ColorBlack,
+		"red":       gocui.ColorRed,
+		"green":     gocui.ColorGreen,
+		"yellow":    gocui.ColorYellow,
+		"blue":      gocui.ColorBlue,
+		"magenta":   gocui.ColorMagenta,
+		"cyan":      gocui.ColorCyan,
+		"white":     gocui.ColorWhite,
+		"bold":      gocui.AttrBold,
+		"reverse":   gocui.AttrReverse,
+		"underline": gocui.AttrUnderline,
 	}
-	return attribute
+	value, present := colorMap[key]
+	if present {
+		return value
+	}
+	return gocui.ColorWhite
 }

 // GetColor bitwise OR's a list of attributes obtained via the given keys
-func GetFgColor(keys []string) color.Attribute {
-	var attribute color.Attribute
+func GetColor(keys []string) gocui.Attribute {
+	var attribute gocui.Attribute
 	for _, key := range keys {
-		attribute |= GetFgAttribute(key)
+		attribute |= GetAttribute(key)
 	}
 	return attribute
 }
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -6,10 +6,13 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"reflect"
 	"regexp"
 	"strings"
 	"time"

+	"github.com/go-errors/errors"
+
 	"github.com/fatih/color"
 )

@@ -111,11 +114,51 @@ func Min(x, y int) int {
 	return y
 }

-func RenderDisplayStrings(displayStringsArr [][]string) string {
-	padWidths := getPadWidths(displayStringsArr)
-	paddedDisplayStrings := getPaddedDisplayStrings(displayStringsArr, padWidths)
+type Displayable interface {
+	GetDisplayStrings(bool) []string
+}

-	return strings.Join(paddedDisplayStrings, "\n")
+// RenderList takes a slice of items, confirms they implement the Displayable
+// interface, then generates a list of their displaystrings to write to a panel's
+// buffer
+func RenderList(slice interface{}, isFocused bool) (string, error) {
+	s := reflect.ValueOf(slice)
+	if s.Kind() != reflect.Slice {
+		return "", errors.New("RenderList given a non-slice type")
+	}
+
+	displayables := make([]Displayable, s.Len())
+
+	for i := 0; i < s.Len(); i++ {
+		value, ok := s.Index(i).Interface().(Displayable)
+		if !ok {
+			return "", errors.New("item does not implement the Displayable interface")
+		}
+		displayables[i] = value
+	}
+
+	return renderDisplayableList(displayables, isFocused)
+}
+
+// renderDisplayableList takes a list of displayable items, obtains their display
+// strings via GetDisplayStrings() and then returns a single string containing
+// each item's string representation on its own line, with appropriate horizontal
+// padding between the item's own strings
+func renderDisplayableList(items []Displayable, isFocused bool) (string, error) {
+	if len(items) == 0 {
+		return "", nil
+	}
+
+	stringArrays := getDisplayStringArrays(items, isFocused)
+
+	if !displayArraysAligned(stringArrays) {
+		return "", errors.New("Each item must return the same number of strings to display")
+	}
+
+	padWidths := getPadWidths(stringArrays)
+	paddedDisplayStrings := getPaddedDisplayStrings(stringArrays, padWidths)
+
+	return strings.Join(paddedDisplayStrings, "\n"), nil
 }

 // Decolorise strips a string of color
@@ -125,16 +168,10 @@ func Decolorise(str string) string {
 }

 func getPadWidths(stringArrays [][]string) []int {
-	maxWidth := 0
-	for _, stringArray := range stringArrays {
-		if len(stringArray) > maxWidth {
-			maxWidth = len(stringArray)
-		}
-	}
-	if maxWidth-1 < 0 {
+	if len(stringArrays[0]) <= 1 {
 		return []int{}
 	}
-	padWidths := make([]int, maxWidth-1)
+	padWidths := make([]int, len(stringArrays[0])-1)
 	for i := range padWidths {
 		for _, strings := range stringArrays {
 			uncoloredString := Decolorise(strings[i])
@@ -153,14 +190,8 @@ func getPaddedDisplayStrings(stringArrays [][]string, padWidths []int) []string
 			continue
 		}
 		for j, padWidth := range padWidths {
-			if len(stringArray)-1 < j {
-				continue
-			}
 			paddedDisplayStrings[i] += WithPadding(stringArray[j], padWidth) + " "
 		}
-		if len(stringArray)-1 < len(padWidths) {
-			continue
-		}
 		paddedDisplayStrings[i] += stringArray[len(padWidths)]
 	}
 	return paddedDisplayStrings
@@ -177,6 +208,14 @@ func displayArraysAligned(stringArrays [][]string) bool {
 	return true
 }

+func getDisplayStringArrays(displayables []Displayable, isFocused bool) [][]string {
+	stringArrays := make([][]string, len(displayables))
+	for i, item := range displayables {
+		stringArrays[i] = item.GetDisplayStrings(isFocused)
+	}
+	return stringArrays
+}
+
 // IncludesString if the list contains the string
 func IncludesString(list []string, a string) bool {
 	for _, b := range list {
@@ -271,48 +310,3 @@ func ModuloWithWrap(n, max int) int {
 		return n
 	}
 }
-
-// NextIntInCycle returns the next int in a slice, returning to the first index if we've reached the end
-func NextIntInCycle(sl []int, current int) int {
-	for i, val := range sl {
-		if val == current {
-			if i == len(sl)-1 {
-				return sl[0]
-			}
-			return sl[i+1]
-		}
-	}
-	return sl[0]
-}
-
-// PrevIntInCycle returns the prev int in a slice, returning to the first index if we've reached the end
-func PrevIntInCycle(sl []int, current int) int {
-	for i, val := range sl {
-		if val == current {
-			if i > 0 {
-				return sl[i-1]
-			}
-			return sl[len(sl)-1]
-		}
-	}
-	return sl[len(sl)-1]
-}
-
-// TruncateWithEllipsis returns a string, truncated to a certain length, with an ellipsis
-func TruncateWithEllipsis(str string, limit int) string {
-	if limit == 1 && len(str) > 1 {
-		return "."
-	}
-
-	if limit == 2 && len(str) > 2 {
-		return ".."
-	}
-
-	ellipsis := "..."
-	if len(str) <= limit {
-		return str
-	}
-
-	remainingLength := limit - len(ellipsis)
-	return str[0:remainingLength] + "..."
-}
--- a/pkg/utils/utils_test.go
+++ b/pkg/utils/utils_test.go
@@ -196,8 +196,166 @@ func TestDisplayArraysAligned(t *testing.T) {
 	}
 }

+type myDisplayable struct {
+	strings []string
+}
+
 type myStruct struct{}

+// GetDisplayStrings is a function.
+func (d *myDisplayable) GetDisplayStrings(isFocused bool) []string {
+	if isFocused {
+		return append(d.strings, "blah")
+	}
+	return d.strings
+}
+
+// TestGetDisplayStringArrays is a function.
+func TestGetDisplayStringArrays(t *testing.T) {
+	type scenario struct {
+		input     []Displayable
+		isFocused bool
+		expected  [][]string
+	}
+
+	scenarios := []scenario{
+		{
+			[]Displayable{
+				Displayable(&myDisplayable{[]string{"a", "b"}}),
+				Displayable(&myDisplayable{[]string{"c", "d"}}),
+			},
+			false,
+			[][]string{{"a", "b"}, {"c", "d"}},
+		},
+		{
+			[]Displayable{
+				Displayable(&myDisplayable{[]string{"a", "b"}}),
+				Displayable(&myDisplayable{[]string{"c", "d"}}),
+			},
+			true,
+			[][]string{{"a", "b", "blah"}, {"c", "d", "blah"}},
+		},
+	}
+
+	for _, s := range scenarios {
+		assert.EqualValues(t, s.expected, getDisplayStringArrays(s.input, s.isFocused))
+	}
+}
+
+// TestRenderDisplayableList is a function.
+func TestRenderDisplayableList(t *testing.T) {
+	type scenario struct {
+		input                []Displayable
+		isFocused            bool
+		expectedString       string
+		expectedErrorMessage string
+	}
+
+	scenarios := []scenario{
+		{
+			[]Displayable{
+				Displayable(&myDisplayable{[]string{}}),
+				Displayable(&myDisplayable{[]string{}}),
+			},
+			false,
+			"\n",
+			"",
+		},
+		{
+			[]Displayable{
+				Displayable(&myDisplayable{[]string{"aa", "b"}}),
+				Displayable(&myDisplayable{[]string{"c", "d"}}),
+			},
+			false,
+			"aa b\nc  d",
+			"",
+		},
+		{
+			[]Displayable{
+				Displayable(&myDisplayable{[]string{"a"}}),
+				Displayable(&myDisplayable{[]string{"b", "c"}}),
+			},
+			false,
+			"",
+			"Each item must return the same number of strings to display",
+		},
+		{
+			[]Displayable{
+				Displayable(&myDisplayable{[]string{"a"}}),
+				Displayable(&myDisplayable{[]string{"b"}}),
+			},
+			true,
+			"a blah\nb blah",
+			"",
+		},
+	}
+
+	for _, s := range scenarios {
+		str, err := renderDisplayableList(s.input, s.isFocused)
+		assert.EqualValues(t, s.expectedString, str)
+		if s.expectedErrorMessage != "" {
+			assert.EqualError(t, err, s.expectedErrorMessage)
+		} else {
+			assert.NoError(t, err)
+		}
+	}
+}
+
+// TestRenderList is a function.
+func TestRenderList(t *testing.T) {
+	type scenario struct {
+		input                interface{}
+		isFocused            bool
+		expectedString       string
+		expectedErrorMessage string
+	}
+
+	scenarios := []scenario{
+		{
+			[]*myDisplayable{
+				{[]string{"aa", "b"}},
+				{[]string{"c", "d"}},
+			},
+			false,
+			"aa b\nc  d",
+			"",
+		},
+		{
+			[]*myStruct{
+				{},
+				{},
+			},
+			false,
+			"",
+			"item does not implement the Displayable interface",
+		},
+		{
+			&myStruct{},
+			false,
+			"",
+			"RenderList given a non-slice type",
+		},
+		{
+			[]*myDisplayable{
+				{[]string{"a"}},
+			},
+			true,
+			"a blah",
+			"",
+		},
+	}
+
+	for _, s := range scenarios {
+		str, err := RenderList(s.input, s.isFocused)
+		assert.EqualValues(t, s.expectedString, str)
+		if s.expectedErrorMessage != "" {
+			assert.EqualError(t, err, s.expectedErrorMessage)
+		} else {
+			assert.NoError(t, err)
+		}
+	}
+}
+
 // TestGetPaddedDisplayStrings is a function.
 func TestGetPaddedDisplayStrings(t *testing.T) {
 	type scenario struct {
--- a/vendor/github.com/integrii/flaggy/.gitignore
+++ b/vendor/github.com/integrii/flaggy/.gitignore
@@ -12,5 +12,3 @@

 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
-
-.idea/
--- a/vendor/github.com/integrii/flaggy/README.md
+++ b/vendor/github.com/integrii/flaggy/README.md
@@ -172,57 +172,41 @@ Other more specific types can also be used as flag types.  They will be automati
 - time.Duration
 - []time.Duration

-# An Example Program
+# Recommended Program Structure

-Best practice when using flaggy includes setting your program's name, description, and version (at build time) as shown in this example program.
+Best practice when using flaggy includes setting your program's name, description, and version (at build time).

 ```go
 package main

 import "github.com/integrii/flaggy"

-// Make a variable for the version which will be set at build time.
+// make a variable for the version which will be set at build time
 var version = "unknown"

-// Keep subcommands as globals so you can easily check if they were used later on.
+// keep subcommands as globals so you can easily check if they were used later on
 var mySubcommand *flaggy.Subcommand

-// Setup the variables you want your incoming flags to set.
-var testVar string
-
-// If you would like an environment variable as the default for a value, just populate the flag
-// with the value of the environment by default.  If the flag corresponding to this value is not
-// used, then it will not be changed.
-var myVar = os.Getenv("MY_VAR")
-
-
 func init() {
  // Set your program's name and description.  These appear in help output.
  flaggy.SetName("Test Program")
  flaggy.SetDescription("A little example program")

-  // You can disable various things by changing bools on the default parser
-  // (or your own parser if you have created one).
+  // you can disable various things by changing bools on the default parser
+  // (or your own parser if you have created one)
  flaggy.DefaultParser.ShowHelpOnUnexpected = false

-  // You can set a help prepend or append on the default parser.
+  // you can set a help prepend or append on the default parser
  flaggy.DefaultParser.AdditionalHelpPrepend = "http://github.com/integrii/flaggy"
-  
-  // Add a flag to the main program (this will be available in all subcommands as well).
-  flaggy.String(&testVar, "tv", "testVariable", "A variable just for testing things!")

-  // Create any subcommands and set their parameters.
+  // create any subcommands and set their parameters
  mySubcommand = flaggy.NewSubcommand("mySubcommand")
  mySubcommand.Description = "My great subcommand!"
-  
-  // Add a flag to the subcommand.
-  mySubcommand.String(&myVar, "mv", "myVariable", "A variable just for me!")

-  // Set the version and parse all inputs into variables.
+  // set the version and parse all inputs into variables
  flaggy.SetVersion(version)
  flaggy.Parse()
 }
-
 func main(){
    if mySubcommand.Used {
      ...
--- a/vendor/github.com/integrii/flaggy/argumentParser.go
+++ b/vendor/github.com/integrii/flaggy/argumentParser.go
@@ -5,20 +5,22 @@ package flaggy
 // The return values represent the key being set, and any errors
 // returned when setting the key, such as failures to convert the string
 // into the appropriate flag value.  We stop assigning values as soon
-// as we find a any parser that accepts it.
+// as we find a parser that accepts it.
 func setValueForParsers(key string, value string, parsers ...ArgumentParser) (bool, error) {

+	var valueWasSet bool
+
 	for _, p := range parsers {
 		valueWasSet, err := p.SetValueForKey(key, value)
 		if err != nil {
 			return valueWasSet, err
 		}
 		if valueWasSet {
-			return true, nil
+			break
 		}
 	}

-	return false, nil
+	return valueWasSet, nil
 }

 // ArgumentParser represents a parser or subcommand
--- a/vendor/github.com/integrii/flaggy/main.go
+++ b/vendor/github.com/integrii/flaggy/main.go
@@ -327,18 +327,6 @@ func exitOrPanic(code int) {
 	os.Exit(code)
 }

-// ShowHelpOnUnexpectedEnable enables the ShowHelpOnUnexpected behavior on the
-// default parser.  This causes unknown inputs to error out.
-func ShowHelpOnUnexpectedEnable() {
-	DefaultParser.ShowHelpOnUnexpected = true
-}
-
-// ShowHelpOnUnexpectedDisable disables the ShowHelpOnUnexpected behavior on the
-// default parser.  This causes unknown inputs to error out.
-func ShowHelpOnUnexpectedDisable() {
-	DefaultParser.ShowHelpOnUnexpected = false
-}
-
 // AddPositionalValue adds a positional value to the main parser at the global
 // context
 func AddPositionalValue(assignmentVar *string, name string, relativePosition int, required bool, description string) {
--- a/vendor/github.com/integrii/flaggy/parsedValue.go
+++ b/vendor/github.com/integrii/flaggy/parsedValue.go
@@ -1,23 +0,0 @@
-package flaggy
-
-// parsedValue represents a flag or subcommand that was parsed.  Primairily used
-// to account for all parsed values in order to determine if unknown values were
-// passed to the root parser after all subcommands have been parsed.
-type parsedValue struct {
-	Key          string
-	Value        string
-	IsPositional bool // indicates that this value was positional and not a key/value
-}
-
-// newParsedValue creates and returns a new parsedValue struct with the
-// supplied values set
-func newParsedValue(key string, value string, isPositional bool) parsedValue {
-	if len(key) == 0 && len(value) == 0 {
-		panic("cant add parsed value with no key or value")
-	}
-	return parsedValue{
-		Key:          key,
-		Value:        value,
-		IsPositional: isPositional,
-	}
-}
--- a/vendor/github.com/integrii/flaggy/parser.go
+++ b/vendor/github.com/integrii/flaggy/parser.go
@@ -4,20 +4,18 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"strconv"

 	"text/template"
 )

-// Parser represents the set of flags and subcommands we are expecting
-// from our input arguments.  Parser is the top level struct responsible for
-// parsing an entire set of subcommands and flags.
+// Parser represents the set of vars and subcommands we are expecting
+// from our input args, and the parser than handles them all.
 type Parser struct {
 	Subcommand
 	Version                    string             // the optional version of the parser.
 	ShowHelpWithHFlag          bool               // display help when -h or --help passed
 	ShowVersionWithVersionFlag bool               // display the version when --version passed
-	ShowHelpOnUnexpected       bool               // display help when an unexpected flag or subcommand is passed
+	ShowHelpOnUnexpected       bool               // display help when an unexpected flag is passed
 	TrailingArguments          []string           // everything after a -- is placed here
 	HelpTemplate               *template.Template // template for Help output
 	trailingArgumentsExtracted bool               // indicates that trailing args have been parsed and should not be appended again
@@ -48,89 +46,8 @@ func (p *Parser) ParseArgs(args []string) error {
 		return errors.New("Parser.Parse() called twice on parser with name: " + " " + p.Name + " " + p.ShortName)
 	}
 	p.parsed = true
-
-	debugPrint("Kicking off parsing with args:", args)
-	err := p.parse(p, args, 0)
-	if err != nil {
-		return err
-	}
-
-	// if we are set to crash on unexpected args, look for those here TODO
-	if p.ShowHelpOnUnexpected {
-		parsedValues := p.findAllParsedValues()
-		debugPrint("parsedValues:", parsedValues)
-		argsNotParsed := findArgsNotInParsedValues(args, parsedValues)
-		if len(argsNotParsed) > 0 {
-			// flatten out unused args for our error message
-			var argsNotParsedFlat string
-			for _, a := range argsNotParsed {
-				argsNotParsedFlat = argsNotParsedFlat + " " + a
-			}
-			p.ShowHelpAndExit("Unknown arguments supplied: " + argsNotParsedFlat)
-		}
-	}
-
-	return nil
-}
-
-// findArgsNotInParsedValues finds arguments not used in parsed values.  The
-// incoming args should be in the order supplied by the user and should not
-// include the invoked binary, which is normally the first thing in os.Args.
-func findArgsNotInParsedValues(args []string, parsedValues []parsedValue) []string {
-	var argsNotUsed []string
-	var skipNext bool
-	for _, a := range args {
-
-		// if the final argument (--) is seen, then we stop checking because all
-		// further values are trailing arguments.
-		if determineArgType(a) == argIsFinal {
-			return argsNotUsed
-		}
-
-		// allow for skipping the next arg when needed
-		if skipNext {
-			skipNext = false
-			continue
-		}
-
-		// strip flag slashes from incoming arguments so they match up with the
-		// keys from parsedValues.
-		arg := parseFlagToName(a)
-
-		// indicates that we found this arg used in one of the parsed values. Used
-		// to indicate which values should be added to argsNotUsed.
-		var foundArgUsed bool
-
-		// search all args for a corresponding parsed value
-		for _, pv := range parsedValues {
-			// this argumenet was a key
-			// debugPrint(pv.Key, "==", arg)
-			debugPrint(pv.Key + "==" + arg + " || (" + strconv.FormatBool(pv.IsPositional) + " && " + pv.Value + " == " + arg + ")")
-			if pv.Key == arg || (pv.IsPositional && pv.Value == arg) {
-				debugPrint("Found matching parsed arg for " + pv.Key)
-				foundArgUsed = true // the arg was used in this parsedValues set
-				// if the value is not a positional value and the parsed value had a
-				// value that was not blank, we skip the next value in the argument list
-				if !pv.IsPositional && len(pv.Value) > 0 {
-					skipNext = true
-					break
-				}
-			}
-			// this prevents excessive parsed values from being checked after we find
-			// the arg used for the first time
-			if foundArgUsed {
-				break
-			}
-		}
-
-		// if the arg was not used in any parsed values, then we add it to the slice
-		// of arguments not used
-		if !foundArgUsed {
-			argsNotUsed = append(argsNotUsed, arg)
-		}
-	}
-
-	return argsNotUsed
+	// debugPrint("Kicking off parsing with args:", args)
+	return p.parse(p, args, 0)
 }

 // ShowVersionAndExit shows the version of this parser
@@ -188,8 +105,7 @@ func (p *Parser) ShowHelpWithMessage(message string) {
 	}
 }

-// DisableShowVersionWithVersion disables the showing of version information
-// with --version. It is enabled by default.
+// Disable show version with --version. It is enabled by default.
 func (p *Parser) DisableShowVersionWithVersion() {
 	p.ShowVersionWithVersionFlag = false
 }
--- a/vendor/github.com/integrii/flaggy/subCommand.go
+++ b/vendor/github.com/integrii/flaggy/subCommand.go
@@ -23,20 +23,15 @@ type Subcommand struct {
 	Subcommands           []*Subcommand
 	Flags                 []*Flag
 	PositionalFlags       []*PositionalValue
-	ParsedValues          []parsedValue // a list of values and positionals parsed
-	AdditionalHelpPrepend string        // additional prepended message when Help is displayed
-	AdditionalHelpAppend  string        // additional appended message when Help is displayed
-	Used                  bool          // indicates this subcommand was found and parsed
-	Hidden                bool          // indicates this subcommand should be hidden from help
+	AdditionalHelpPrepend string // additional prepended message when Help is displayed
+	AdditionalHelpAppend  string // additional appended message when Help is displayed
+	Used                  bool   // indicates this subcommand was found and parsed
+	Hidden                bool   // indicates this subcommand should be hidden from help
 }

 // NewSubcommand creates a new subcommand that can have flags or PositionalFlags
 // added to it.  The position starts with 1, not 0
 func NewSubcommand(name string) *Subcommand {
-	if len(name) == 0 {
-		fmt.Fprintln(os.Stderr, "Error creating subcommand (NewSubcommand()).  No subcommand name was specified.")
-		exitOrPanic(2)
-	}
 	newSC := &Subcommand{
 		Name: name,
 	}
@@ -44,11 +39,10 @@ func NewSubcommand(name string) *Subcommand {
 }

 // parseAllFlagsFromArgs parses the non-positional flags such as -f or -v=value
-// out of the supplied args and returns the resulting positional items in order,
-// all the flag names found (without values), a bool to indicate if help was
-// requested, and any errors found during parsing
+// out of the supplied args and returns the positional items in order.
 func (sc *Subcommand) parseAllFlagsFromArgs(p *Parser, args []string) ([]string, bool, error) {

+	var err error
 	var positionalOnlyArguments []string
 	var helpRequested bool // indicates the user has supplied -h and we
 	// should render help if we are the last subcommand
@@ -64,7 +58,7 @@ func (sc *Subcommand) parseAllFlagsFromArgs(p *Parser, args []string) ([]string,
 	// find all the normal flags (not positional) and parse them out
 	for i, a := range args {

-		debugPrint("parsing arg:", a)
+		debugPrint("parsing arg", 1, a)

 		// evaluate if there is a following arg to avoid panics
 		var nextArgExists bool
@@ -127,107 +121,62 @@ func (sc *Subcommand) parseAllFlagsFromArgs(p *Parser, args []string) ([]string,
 			// this positional argument into a slice of their own, so that
 			// we can determine if its a subcommand or positional value later
 			positionalOnlyArguments = append(positionalOnlyArguments, a)
-			// track this as a parsed value with the subcommand
-			sc.addParsedPositionalValue(a)
-		case argIsFlagWithSpace: // a flag with a space. ex) -k v or --key value
+		case argIsFlagWithSpace:
 			a = parseFlagToName(a)
-
 			// debugPrint("Arg", i, "is flag with space:", a)
 			// parse next arg as value to this flag and apply to subcommand flags
 			// if the flag is a bool flag, then we check for a following positional
 			// and skip it if necessary
 			if flagIsBool(sc, p, a) {
 				debugPrint(sc.Name, "bool flag", a, "next var is:", nextArg)
-				// set the value in this subcommand and its root parser
-				valueSet, err := setValueForParsers(a, "true", p, sc)
+				_, err = setValueForParsers(a, "true", p, sc)

 				// if an error occurs, just return it and quit parsing
 				if err != nil {
 					return []string{}, false, err
 				}
-
-				// log all values parsed by this subcommand.  We leave the value blank
-				// because the bool value had no explicit true or false supplied
-				if valueSet {
-					sc.addParsedFlag(a, "")
-				}
-
-				// we've found and set a standalone bool flag, so we move on to the next
-				// argument in the list of arguments
+				// by default, we just assign the next argument to the value and continue
 				continue
 			}

 			skipNext = true
-			// debugPrint(sc.Name, "NOT bool flag", a)
+			debugPrint(sc.Name, "NOT bool flag", a)

 			// if the next arg was not found, then show a Help message
 			if !nextArgExists {
 				p.ShowHelpWithMessage("Expected a following arg for flag " + a + ", but it did not exist.")
 				exitOrPanic(2)
 			}
-			valueSet, err := setValueForParsers(a, nextArg, p, sc)
+			_, err = setValueForParsers(a, nextArg, p, sc)
 			if err != nil {
 				return []string{}, false, err
 			}
-
-			// log all parsed values in the subcommand
-			if valueSet {
-				sc.addParsedFlag(a, nextArg)
-			}
-		case argIsFlagWithValue: // a flag with an equals sign. ex) -k=v or --key=value
+		case argIsFlagWithValue:
 			// debugPrint("Arg", i, "is flag with value:", a)
 			a = parseFlagToName(a)
-
 			// parse flag into key and value and apply to subcommand flags
 			key, val := parseArgWithValue(a)
-
-			// set the value in this subcommand and its root parser
-			valueSet, err := setValueForParsers(key, val, p, sc)
+			_, err = setValueForParsers(key, val, p, sc)
 			if err != nil {
 				return []string{}, false, err
 			}
-
-			// log all values parsed by the subcommand
-			if valueSet {
-				sc.addParsedFlag(a, val)
-			}
+			// if this flag type was found and not set, and the parser is set to show
+			// Help when an unknown flag is found, then show Help and exit.
 		}
+
 	}

 	return positionalOnlyArguments, helpRequested, nil
 }

-// findAllParsedValues finds all values parsed by all subcommands and this
-// subcommand and its child subcommands
-func (sc *Subcommand) findAllParsedValues() []parsedValue {
-	parsedValues := sc.ParsedValues
-	for _, sc := range sc.Subcommands {
-		// skip unused subcommands
-		if !sc.Used {
-			continue
-		}
-		parsedValues = append(parsedValues, sc.findAllParsedValues()...)
-	}
-	return parsedValues
-}
-
-// parse causes the argument parser to parse based on the supplied []string.
-// depth specifies the non-flag subcommand positional depth.  A slice of flags
-// and subcommands parsed is returned so that the parser can ultimately decide
-// if there were any unexpected values supplied by the user
+// Parse causes the argument parser to parse based on the supplied []string.
+// depth specifies the non-flag subcommand positional depth
 func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {

 	debugPrint("- Parsing subcommand", sc.Name, "with depth of", depth, "and args", args)

 	// if a command is parsed, its used
 	sc.Used = true
-	debugPrint("used subcommand", sc.Name, sc.ShortName)
-	if len(sc.Name) > 0 {
-		sc.addParsedPositionalValue(sc.Name)
-	}
-	if len(sc.ShortName) > 0 {
-		sc.addParsedPositionalValue(sc.ShortName)
-	}

 	// as subcommands are used, they become the context of the parser.  This helps
 	// us understand how to display help based on which subcommand is being used
@@ -242,10 +191,9 @@ func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {
 		sc.ensureNoConflictWithBuiltinVersion()
 	}

-	// Parse the normal flags out of the argument list and return the positionals
-	// (subcommands and positional values), along with the flags used.
-	// Then the flag values are applied to the parent parser and the current
-	// subcommand being parsed.
+	// Parse the normal flags out of the argument list and retain the positionals.
+	// Apply the flags to the parent parser and the current subcommand context.
+	// ./command -f -z subcommand someVar -b becomes ./command subcommand somevar
 	positionalOnlyArguments, helpRequested, err := sc.parseAllFlagsFromArgs(p, args)
 	if err != nil {
 		return err
@@ -344,7 +292,7 @@ func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {
 	}

 	// find any positionals that were not used on subcommands that were
-	// found and throw help (unknown argument) in the global parse or subcommand
+	// found and throw help (unknown argument)
 	for _, pv := range p.PositionalFlags {
 		if pv.Required && !pv.Found {
 			p.ShowHelpWithMessage("Required global positional variable " + pv.Name + " not found at position " + strconv.Itoa(pv.Position))
@@ -361,17 +309,6 @@ func (sc *Subcommand) parse(p *Parser, args []string, depth int) error {
 	return nil
 }

-// addParsedFlag makes it easy to append flag values parsed by the subcommand
-func (sc *Subcommand) addParsedFlag(key string, value string) {
-	sc.ParsedValues = append(sc.ParsedValues, newParsedValue(key, value, false))
-}
-
-// addParsedPositionalValue makes it easy to append positionals parsed by the
-// subcommand
-func (sc *Subcommand) addParsedPositionalValue(value string) {
-	sc.ParsedValues = append(sc.ParsedValues, newParsedValue("", value, true))
-}
-
 // FlagExists lets you know if the flag name exists as either a short or long
 // name in the (sub)command
 func (sc *Subcommand) FlagExists(name string) bool {
--- a/vendor/github.com/jesseduffield/gocui/escape.go
+++ b/vendor/github.com/jesseduffield/gocui/escape.go
@@ -5,9 +5,8 @@
 package gocui

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

 type escapeInterpreter struct {
--- a/vendor/github.com/jesseduffield/gocui/gui.go
+++ b/vendor/github.com/jesseduffield/gocui/gui.go
@@ -6,9 +6,7 @@ package gocui

 import (
 	standardErrors "errors"
-	"fmt"
 	"strings"
-	"sync"
 	"time"

 	"github.com/go-errors/errors"
@@ -91,16 +89,6 @@ type Gui struct {
 	// SupportOverlaps is true when we allow for view edges to overlap with other
 	// view edges
 	SupportOverlaps bool
-
-	// tickingMutex ensures we don't have two loops ticking. The point of 'ticking'
-	// is to refresh the gui rapidly so that loader characters can be animated.
-	tickingMutex sync.Mutex
-
-	OnSearchEscape func() error
-	// these keys must either be of type Key of rune
-	SearchEscapeKey    interface{}
-	NextSearchMatchKey interface{}
-	PrevSearchMatchKey interface{}
 }

 // NewGui returns a new Gui object with a given output mode.
@@ -131,18 +119,15 @@ func NewGui(mode OutputMode, supportOverlaps bool) (*Gui, error) {
 	// view edges
 	g.SupportOverlaps = supportOverlaps

-	// default keys for when searching strings in a view
-	g.SearchEscapeKey = KeyEsc
-	g.NextSearchMatchKey = 'n'
-	g.PrevSearchMatchKey = 'N'
-
 	return g, nil
 }

 // Close finalizes the library. It should be called after a successful
 // initialization and when gocui is not needed anymore.
 func (g *Gui) Close() {
-	close(g.stop)
+	go func() {
+		g.stop <- struct{}{}
+	}()
 	termbox.Close()
 }

@@ -424,6 +409,7 @@ func (g *Gui) SetManagerFunc(manager func(*Gui) error) {
 // MainLoop runs the main loop until an error is returned. A successful
 // finish should return ErrQuit.
 func (g *Gui) MainLoop() error {
+	g.loaderTick()
 	if err := g.flush(); err != nil {
 		return err
 	}
@@ -543,11 +529,6 @@ func (g *Gui) flush() error {
 					return err
 				}
 			}
-			if v.ContainsList {
-				if err := g.drawListFooter(v, fgColor, bgColor); err != nil {
-					return err
-				}
-			}
 		}
 		if err := g.draw(v); err != nil {
 			return err
@@ -735,34 +716,6 @@ func (g *Gui) drawSubtitle(v *View, fgColor, bgColor Attribute) error {
 	return nil
 }

-// drawListFooter draws the footer of a list view, showing something like '1 of 10'
-func (g *Gui) drawListFooter(v *View, fgColor, bgColor Attribute) error {
-	if len(v.lines) == 0 {
-		return nil
-	}
-
-	message := fmt.Sprintf("%d of %d", v.cy+v.oy+1, len(v.lines))
-
-	if v.y1 < 0 || v.y1 >= g.maxY {
-		return nil
-	}
-
-	start := v.x1 - 1 - len(message)
-	if start < v.x0 {
-		return nil
-	}
-	for i, ch := range message {
-		x := start + i
-		if x >= v.x1 {
-			break
-		}
-		if err := g.SetRune(x, v.y1, ch, fgColor, bgColor); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // draw manages the cursor and calls the draw function of a view.
 func (g *Gui) draw(v *View) error {
 	if g.Cursor {
@@ -848,23 +801,6 @@ func (g *Gui) execKeybindings(v *View, ev *termbox.Event) (matched bool, err err
 	var globalKb *keybinding
 	var matchingParentViewKb *keybinding

-	// if we're searching, and we've hit n/N/Esc, we ignore the default keybinding
-	if v.IsSearching() && Modifier(ev.Mod) == ModNone {
-		if eventMatchesKey(ev, g.NextSearchMatchKey) {
-			return true, v.gotoNextMatch()
-		} else if eventMatchesKey(ev, g.PrevSearchMatchKey) {
-			return true, v.gotoPreviousMatch()
-		} else if eventMatchesKey(ev, g.SearchEscapeKey) {
-			v.searcher.clearSearch()
-			if g.OnSearchEscape != nil {
-				if err := g.OnSearchEscape(); err != nil {
-					return true, err
-				}
-			}
-			return true, nil
-		}
-	}
-
 	for _, kb := range g.keybindings {
 		if kb.handler == nil {
 			continue
@@ -899,25 +835,14 @@ func (g *Gui) execKeybinding(v *View, kb *keybinding) (bool, error) {
 	return true, nil
 }

-func (g *Gui) StartTicking() {
+func (g *Gui) loaderTick() {
 	go func() {
-		g.tickingMutex.Lock()
-		defer g.tickingMutex.Unlock()
-		ticker := time.NewTicker(time.Millisecond * 50)
-		defer ticker.Stop()
-	outer:
-		for {
-			select {
-			case <-ticker.C:
-				for _, view := range g.Views() {
-					if view.HasLoader {
-						g.userEvents <- userEvent{func(g *Gui) error { return nil }}
-						continue outer
-					}
+		for range time.Tick(time.Millisecond * 50) {
+			for _, view := range g.Views() {
+				if view.HasLoader {
+					g.userEvents <- userEvent{func(g *Gui) error { return nil }}
+					break
 				}
-				return
-			case <-g.stop:
-				return
 			}
 		}
 	}()
--- a/vendor/github.com/jesseduffield/gocui/keybinding.go
+++ b/vendor/github.com/jesseduffield/gocui/keybinding.go
@@ -29,20 +29,6 @@ func newKeybinding(viewname string, contexts []string, key Key, ch rune, mod Mod
 	return kb
 }

-func eventMatchesKey(ev *termbox.Event, key interface{}) bool {
-	// assuming ModNone for now
-	if Modifier(ev.Mod) != ModNone {
-		return false
-	}
-
-	k, ch, err := getKey(key)
-	if err != nil {
-		return false
-	}
-
-	return k == Key(ev.Key) && ch == ev.Ch
-}
-
 // matchKeypress returns if the keybinding matches the keypress.
 func (kb *keybinding) matchKeypress(key Key, ch rune, mod Modifier) bool {
 	return kb.key == key && kb.ch == ch && kb.mod == mod
--- a/vendor/github.com/jesseduffield/gocui/view.go
+++ b/vendor/github.com/jesseduffield/gocui/view.go
@@ -105,140 +105,6 @@ type View struct {
 	ParentView *View

 	Context string // this is for assigning keybindings to a view only in certain contexts
-
-	searcher *searcher
-
-	// when ContainsList is true, we show the current index and total count in the view
-	ContainsList bool
-}
-
-type searcher struct {
-	searchString       string
-	searchPositions    []cellPos
-	currentSearchIndex int
-	onSelectItem       func(int, int, int) error
-}
-
-func (v *View) SetOnSelectItem(onSelectItem func(int, int, int) error) {
-	v.searcher.onSelectItem = onSelectItem
-}
-
-func (v *View) gotoNextMatch() error {
-	if len(v.searcher.searchPositions) == 0 {
-		return nil
-	}
-	if v.searcher.currentSearchIndex == len(v.searcher.searchPositions)-1 {
-		v.searcher.currentSearchIndex = 0
-	} else {
-		v.searcher.currentSearchIndex++
-	}
-	return v.SelectSearchResult(v.searcher.currentSearchIndex)
-}
-
-func (v *View) gotoPreviousMatch() error {
-	if len(v.searcher.searchPositions) == 0 {
-		return nil
-	}
-	if v.searcher.currentSearchIndex == 0 {
-		if len(v.searcher.searchPositions) > 0 {
-			v.searcher.currentSearchIndex = len(v.searcher.searchPositions) - 1
-		}
-	} else {
-		v.searcher.currentSearchIndex--
-	}
-	return v.SelectSearchResult(v.searcher.currentSearchIndex)
-}
-
-func (v *View) SelectSearchResult(index int) error {
-	y := v.searcher.searchPositions[index].y
-	v.FocusPoint(0, y)
-	if v.searcher.onSelectItem != nil {
-		return v.searcher.onSelectItem(y, index, len(v.searcher.searchPositions))
-	}
-	return nil
-}
-
-func (v *View) Search(str string) error {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
-
-	v.searcher.search(str)
-	v.updateSearchPositions()
-	if len(v.searcher.searchPositions) > 0 {
-		// get the first result past the current cursor
-		currentIndex := 0
-		adjustedY := v.oy + v.cy
-		adjustedX := v.ox + v.cx
-		for i, pos := range v.searcher.searchPositions {
-			if pos.y > adjustedY || (pos.y == adjustedY && pos.x > adjustedX) {
-				currentIndex = i
-				break
-			}
-		}
-		v.searcher.currentSearchIndex = currentIndex
-		return v.SelectSearchResult(currentIndex)
-	} else {
-		return v.searcher.onSelectItem(-1, -1, 0)
-	}
-	return nil
-}
-
-func (v *View) ClearSearch() {
-	v.searcher.clearSearch()
-}
-
-func (v *View) IsSearching() bool {
-	return v.searcher.searchString != ""
-}
-
-func (v *View) FocusPoint(cx int, cy int) {
-	lineCount := len(v.lines)
-	if cy < 0 || cy > lineCount {
-		return
-	}
-	_, height := v.Size()
-
-	ly := height - 1
-	if ly == -1 {
-		ly = 0
-	}
-
-	// if line is above origin, move origin and set cursor to zero
-	// if line is below origin + height, move origin and set cursor to max
-	// otherwise set cursor to value - origin
-	if ly > lineCount {
-		v.cx = cx
-		v.cy = cy
-		v.oy = 0
-	} else if cy < v.oy {
-		v.cx = cx
-		v.cy = 0
-		v.oy = cy
-	} else if cy > v.oy+ly {
-		v.cx = cx
-		v.cy = ly
-		v.oy = cy - ly
-	} else {
-		v.cx = cx
-		v.cy = cy - v.oy
-	}
-}
-
-func (s *searcher) search(str string) {
-	s.searchString = str
-	s.searchPositions = []cellPos{}
-	s.currentSearchIndex = 0
-}
-
-func (s *searcher) clearSearch() {
-	s.searchString = ""
-	s.searchPositions = []cellPos{}
-	s.currentSearchIndex = 0
-}
-
-type cellPos struct {
-	x int
-	y int
 }

 type viewLine struct {
@@ -265,16 +131,15 @@ func (l lineType) String() string {
 // newView returns a new View object.
 func newView(name string, x0, y0, x1, y1 int, mode OutputMode) *View {
 	v := &View{
-		name:     name,
-		x0:       x0,
-		y0:       y0,
-		x1:       x1,
-		y1:       y1,
-		Frame:    true,
-		Editor:   DefaultEditor,
-		tainted:  true,
-		ei:       newEscapeInterpreter(mode),
-		searcher: &searcher{},
+		name:    name,
+		x0:      x0,
+		y0:      y0,
+		x1:      x1,
+		y1:      y1,
+		Frame:   true,
+		Editor:  DefaultEditor,
+		tainted: true,
+		ei:      newEscapeInterpreter(mode),
 	}
 	return v
 }
@@ -466,35 +331,8 @@ func (v *View) Rewind() {
 	v.readOffset = 0
 }

-func (v *View) updateSearchPositions() {
-	if v.searcher.searchString != "" {
-		v.searcher.searchPositions = []cellPos{}
-		for y, line := range v.lines {
-		lineLoop:
-			for x, _ := range line {
-				if line[x].chr == rune(v.searcher.searchString[0]) {
-					for offset := 1; offset < len(v.searcher.searchString); offset++ {
-						if len(line)-1 < x+offset {
-							continue lineLoop
-						}
-						if line[x+offset].chr != rune(v.searcher.searchString[offset]) {
-							continue lineLoop
-						}
-					}
-					v.searcher.searchPositions = append(v.searcher.searchPositions, cellPos{x: x, y: y})
-				}
-			}
-		}
-	}
-
-}
-
 // draw re-draws the view's contents.
 func (v *View) draw() error {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
-
-	v.updateSearchPositions()
 	maxX, maxY := v.Size()

 	if v.Wrap {
@@ -554,13 +392,6 @@ func (v *View) draw() error {
 			if bgColor == ColorDefault {
 				bgColor = v.BgColor
 			}
-			if matched, selected := v.isPatternMatchedRune(x, y); matched {
-				if selected {
-					bgColor = ColorCyan
-				} else {
-					bgColor = ColorYellow
-				}
-			}

 			if err := v.setRune(x, y, c.chr, fgColor, bgColor); err != nil {
 				return err
@@ -572,18 +403,6 @@ func (v *View) draw() error {
 	return nil
 }

-func (v *View) isPatternMatchedRune(x, y int) (bool, bool) {
-	searchStringLength := len(v.searcher.searchString)
-	for i, pos := range v.searcher.searchPositions {
-		adjustedY := y + v.oy
-		adjustedX := x + v.ox
-		if adjustedY == pos.y && adjustedX >= pos.x && adjustedX < pos.x+searchStringLength {
-			return true, i == v.searcher.currentSearchIndex
-		}
-	}
-	return false, false
-}
-
 // realPosition returns the position in the internal buffer corresponding to the
 // point (x, y) of the view.
 func (v *View) realPosition(vx, vy int) (x, y int, err error) {
@@ -639,8 +458,6 @@ func (v *View) clearRunes() {
 // BufferLines returns the lines in the view's internal
 // buffer.
 func (v *View) BufferLines() []string {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
 	lines := make([]string, len(v.lines))
 	for i, l := range v.lines {
 		str := lineType(l).String()
@@ -659,8 +476,6 @@ func (v *View) Buffer() string {
 // ViewBufferLines returns the lines in the view's internal
 // buffer that is shown to the user.
 func (v *View) ViewBufferLines() []string {
-	v.writeMutex.Lock()
-	defer v.writeMutex.Unlock()
 	lines := make([]string, len(v.viewLines))
 	for i, l := range v.viewLines {
 		str := lineType(l.line).String()
--- a/vendor/github.com/jesseduffield/pty/types.go
+++ b/vendor/github.com/jesseduffield/pty/types.go
@@ -0,0 +1,10 @@
+// +build ignore
+
+package pty
+
+import "C"
+
+type (
+	_C_int  C.int
+	_C_uint C.uint
+)
--- a/vendor/github.com/jesseduffield/pty/types_dragonfly.go
+++ b/vendor/github.com/jesseduffield/pty/types_dragonfly.go
@@ -0,0 +1,17 @@
+// +build ignore
+
+package pty
+
+/*
+#define _KERNEL
+#include <sys/conf.h>
+#include <sys/param.h>
+#include <sys/filio.h>
+*/
+import "C"
+
+const (
+	_C_SPECNAMELEN = C.SPECNAMELEN /* max length of devicename */
+)
+
+type fiodgnameArg C.struct_fiodname_args
--- a/vendor/github.com/jesseduffield/pty/types_freebsd.go
+++ b/vendor/github.com/jesseduffield/pty/types_freebsd.go
@@ -0,0 +1,15 @@
+// +build ignore
+
+package pty
+
+/*
+#include <sys/param.h>
+#include <sys/filio.h>
+*/
+import "C"
+
+const (
+	_C_SPECNAMELEN = C.SPECNAMELEN /* max length of devicename */
+)
+
+type fiodgnameArg C.struct_fiodgname_arg
--- a/vendor/github.com/jesseduffield/pty/types_openbsd.go
+++ b/vendor/github.com/jesseduffield/pty/types_openbsd.go
@@ -0,0 +1,14 @@
+// +build ignore
+
+package pty
+
+/*
+#include <sys/time.h>
+#include <stdlib.h>
+#include <sys/tty.h>
+*/
+import "C"
+
+type ptmget C.struct_ptmget
+
+var ioctl_PTMGET = C.PTMGET
--- a/vendor/github.com/jesseduffield/roll/.gitignore
+++ b/vendor/github.com/jesseduffield/roll/.gitignore
@@ -0,0 +1 @@
+rollbar.test
--- a/vendor/github.com/jesseduffield/roll/CHANGELOG
+++ b/vendor/github.com/jesseduffield/roll/CHANGELOG
@@ -0,0 +1,24 @@
+0.2.0 - May 22nd, 2016
+====================
+
+* Do not use title to determine fingerprint.
+
+0.1.1 - August 24th, 2016
+=========================
+
+* Fix Go 1.6 support by removing call to runtime.CallersFrames, which was added
+	in Go 1.7.
+
+0.1.0 - August 23rd, 2016
+=========================
+
+* Allow passing in arbitrary function pointer stacks. (thanks @apg!)
+* Remove unneeded exported constants.
+* Make HTTP(S) endpoint configurable.
+* Remove unneeded debug print statement.
+
+0.0.1 - January 19th, 2015
+==========================
+
+* Initial release based on https://github.com/stvp/rollbar
+
--- a/vendor/github.com/jesseduffield/roll/LICENSE
+++ b/vendor/github.com/jesseduffield/roll/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2016 Stovepipe Studios
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/vendor/github.com/jesseduffield/roll/README.md
+++ b/vendor/github.com/jesseduffield/roll/README.md
@@ -0,0 +1,53 @@
+roll
+----
+
+`roll` is a basic Rollbar client for Go that reports errors and logs
+messages. It automatically builds stack traces and also supports
+arbitrary traces. All errors and messages are sent to Rollbar
+synchronously.
+
+`roll` is intentionally simple. For more advanced functionality, check
+out [heroku/rollbar](https://github.com/heroku/rollbar).
+
+[API docs on godoc.org](http://godoc.org/github.com/stvp/roll)
+
+Notes
+=====
+
+* Critical-, Error-, and Warning-level messages include a stack trace.
+  However, Go's `error` type doesn't include stack information from the
+  location the error was set or allocated. Instead, `roll` uses the
+  stack information from where the error was reported.
+* Info- and Debug-level Rollbar messages do not include stack traces.
+* When calling `roll` away from where the error actually occurred,
+  `roll`'s stack walking won't represent the actual stack trace at the
+  time the error occurred. The `*Stack` variants of Critical, Error, and
+  Warning take a `[]uintptr`, allowing the stack to be provided, rather
+  than walked.
+
+Running Tests
+=============
+
+`go test` will run tests against a fake server by default.
+
+If the environment variable `TOKEN` is a Rollbar access token, running
+`go test` will produce errors using an environment named `test`.
+
+    TOKEN=f0df01587b8f76b2c217af34c479f9ea go test
+
+Verify the reported errors manually in the Rollbar dashboard.
+
+Contributors
+============
+
+* @challiwill
+* @tysonmote
+* @apg
+
+This library was forked from [stvp/rollbar](https://github.com/stvp/rollbar),
+which had contributions from:
+
+* @kjk
+* @Soulou
+* @paulmach
+
--- a/vendor/github.com/jesseduffield/roll/client.go
+++ b/vendor/github.com/jesseduffield/roll/client.go
@@ -0,0 +1,242 @@
+package roll
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"hash/adler32"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"reflect"
+	"runtime"
+	"strings"
+	"time"
+)
+
+const (
+	// By default, all Rollbar API requests are sent to this endpoint.
+	endpoint = "https://api.rollbar.com/api/1/item/"
+
+	// Identify this Rollbar client library to the Rollbar API.
+	clientName     = "go-roll"
+	clientVersion  = "0.2.0"
+	clientLanguage = "go"
+)
+
+var (
+	// Endpoint is the default HTTP(S) endpoint that all Rollbar API requests
+	// will be sent to. By default, this is Rollbar's "Items" API endpoint. If
+	// this is blank, no items will be sent to Rollbar.
+	Endpoint = endpoint
+
+	// Rollbar access token for the global client. If this is blank, no items
+	// will be sent to Rollbar.
+	Token = ""
+
+	// Environment for all items reported with the global client.
+	Environment = "development"
+)
+
+type rollbarSuccess struct {
+	Result map[string]string `json:"result"`
+}
+
+// Client reports items to a single Rollbar project.
+type Client interface {
+	Critical(err error, custom map[string]string) (uuid string, e error)
+	CriticalStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error)
+	Error(err error, custom map[string]string) (uuid string, e error)
+	ErrorStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error)
+	Warning(err error, custom map[string]string) (uuid string, e error)
+	WarningStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error)
+	Info(msg string, custom map[string]string) (uuid string, e error)
+	Debug(msg string, custom map[string]string) (uuid string, e error)
+}
+
+type rollbarClient struct {
+	token string
+	env   string
+}
+
+// New creates a new Rollbar client that reports items to the given project
+// token and with the given environment (eg. "production", "development", etc).
+func New(token, env string) Client {
+	return &rollbarClient{token, env}
+}
+
+func Critical(err error, custom map[string]string) (uuid string, e error) {
+	return CriticalStack(err, getCallers(2), custom)
+}
+
+func CriticalStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error) {
+	return New(Token, Environment).CriticalStack(err, ptrs, custom)
+}
+
+func Error(err error, custom map[string]string) (uuid string, e error) {
+	return ErrorStack(err, getCallers(2), custom)
+}
+
+func ErrorStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error) {
+	return New(Token, Environment).ErrorStack(err, ptrs, custom)
+}
+
+func Warning(err error, custom map[string]string) (uuid string, e error) {
+	return WarningStack(err, getCallers(2), custom)
+}
+
+func WarningStack(err error, ptrs []uintptr, custom map[string]string) (uuid string, e error) {
+	return New(Token, Environment).WarningStack(err, ptrs, custom)
+}
+
+func Info(msg string, custom map[string]string) (uuid string, e error) {
+	return New(Token, Environment).Info(msg, custom)
+}
+
+func Debug(msg string, custom map[string]string) (uuid string, e error) {
+	return New(Token, Environment).Debug(msg, custom)
+}
+
+func (c *rollbarClient) Critical(err error, custom map[string]string) (uuid string, e error) {
+	return c.CriticalStack(err, getCallers(2), custom)
+}
+
+func (c *rollbarClient) CriticalStack(err error, callers []uintptr, custom map[string]string) (uuid string, e error) {
+	item := c.buildTraceItem("critical", err, callers, custom)
+	return c.send(item)
+}
+
+func (c *rollbarClient) Error(err error, custom map[string]string) (uuid string, e error) {
+	return c.ErrorStack(err, getCallers(2), custom)
+}
+
+func (c *rollbarClient) ErrorStack(err error, callers []uintptr, custom map[string]string) (uuid string, e error) {
+	item := c.buildTraceItem("error", err, callers, custom)
+	return c.send(item)
+}
+
+func (c *rollbarClient) Warning(err error, custom map[string]string) (uuid string, e error) {
+	return c.WarningStack(err, getCallers(2), custom)
+}
+
+func (c *rollbarClient) WarningStack(err error, callers []uintptr, custom map[string]string) (uuid string, e error) {
+	item := c.buildTraceItem("warning", err, callers, custom)
+	return c.send(item)
+}
+
+func (c *rollbarClient) Info(msg string, custom map[string]string) (uuid string, e error) {
+	item := c.buildMessageItem("info", msg, custom)
+	return c.send(item)
+}
+
+func (c *rollbarClient) Debug(msg string, custom map[string]string) (uuid string, e error) {
+	item := c.buildMessageItem("debug", msg, custom)
+	return c.send(item)
+}
+
+func (c *rollbarClient) buildTraceItem(level string, err error, callers []uintptr, custom map[string]string) (item map[string]interface{}) {
+	stack := buildRollbarFrames(callers)
+	item = c.buildItem(level, err.Error(), custom)
+	itemData := item["data"].(map[string]interface{})
+	itemData["fingerprint"] = stack.fingerprint()
+	itemData["body"] = map[string]interface{}{
+		"trace": map[string]interface{}{
+			"frames": stack,
+			"exception": map[string]interface{}{
+				"class":   errorClass(err),
+				"message": err.Error(),
+			},
+		},
+	}
+
+	return item
+}
+
+func (c *rollbarClient) buildMessageItem(level string, msg string, custom map[string]string) (item map[string]interface{}) {
+	item = c.buildItem(level, msg, custom)
+	itemData := item["data"].(map[string]interface{})
+	itemData["body"] = map[string]interface{}{
+		"message": map[string]interface{}{
+			"body": msg,
+		},
+	}
+
+	return item
+}
+
+func (c *rollbarClient) buildItem(level, title string, custom map[string]string) map[string]interface{} {
+	hostname, _ := os.Hostname()
+
+	return map[string]interface{}{
+		"access_token": c.token,
+		"data": map[string]interface{}{
+			"environment": c.env,
+			"title":       title,
+			"level":       level,
+			"timestamp":   time.Now().Unix(),
+			"platform":    runtime.GOOS,
+			"language":    clientLanguage,
+			"server": map[string]interface{}{
+				"host": hostname,
+			},
+			"notifier": map[string]interface{}{
+				"name":    clientName,
+				"version": clientVersion,
+			},
+			"custom": custom,
+		},
+	}
+}
+
+// send reports the given item to Rollbar and returns either a UUID for the
+// reported item or an error.
+func (c *rollbarClient) send(item map[string]interface{}) (uuid string, err error) {
+	if len(c.token) == 0 || len(Endpoint) == 0 {
+		return "", nil
+	}
+
+	jsonBody, err := json.Marshal(item)
+	if err != nil {
+		return "", err
+	}
+
+	resp, err := http.Post(Endpoint, "application/json", bytes.NewReader(jsonBody))
+	if err != nil {
+		// If something goes wrong it really does not matter
+		return "", nil
+	}
+	defer func() {
+		io.Copy(ioutil.Discard, resp.Body)
+		resp.Body.Close()
+	}()
+
+	if resp.StatusCode != http.StatusOK {
+		// If something goes wrong it really does not matter
+		return "", nil
+	}
+
+	// Extract UUID from JSON response
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", nil
+	}
+	success := rollbarSuccess{}
+	json.Unmarshal(body, &success)
+
+	return success.Result["uuid"], nil
+}
+
+// errorClass returns a class name for an error (eg.  "ErrUnexpectedEOF"). For
+// string errors, it returns an Adler-32 checksum of the error string.
+func errorClass(err error) string {
+	class := reflect.TypeOf(err).String()
+	if class == "" {
+		return "panic"
+	} else if class == "*errors.errorString" {
+		checksum := adler32.Checksum([]byte(err.Error()))
+		return fmt.Sprintf("{%x}", checksum)
+	} else {
+		return strings.TrimPrefix(class, "*")
+	}
+}
--- a/vendor/github.com/jesseduffield/roll/stack.go
+++ b/vendor/github.com/jesseduffield/roll/stack.go
@@ -0,0 +1,98 @@
+package roll
+
+import (
+	"fmt"
+	"hash/crc32"
+	"os"
+	"runtime"
+	"strings"
+)
+
+var (
+	knownFilePathPatterns = []string{
+		"github.com/",
+		"code.google.com/",
+		"bitbucket.org/",
+		"launchpad.net/",
+		"gopkg.in/",
+	}
+)
+
+func getCallers(skip int) (pc []uintptr) {
+	pc = make([]uintptr, 1000)
+	i := runtime.Callers(skip+1, pc)
+	return pc[0:i]
+}
+
+// -- rollbarFrames
+
+type rollbarFrame struct {
+	Filename string `json:"filename"`
+	Method   string `json:"method"`
+	Line     int    `json:"lineno"`
+}
+
+type rollbarFrames []rollbarFrame
+
+// buildRollbarFrames takes a slice of function pointers and returns a Rollbar
+// API payload containing the filename, method name, and line number of each
+// function.
+func buildRollbarFrames(callers []uintptr) (frames rollbarFrames) {
+	frames = rollbarFrames{}
+
+	// 2016-08-24 - runtime.CallersFrames was added in Go 1.7, which should
+	// replace the following code when roll is able to require Go 1.7+.
+	for _, caller := range callers {
+		frame := rollbarFrame{
+			Filename: "???",
+			Method:   "???",
+		}
+		if fn := runtime.FuncForPC(caller); fn != nil {
+			name, line := fn.FileLine(caller)
+			frame.Filename = scrubFile(name)
+			frame.Line = line
+			frame.Method = scrubFunction(fn.Name())
+		}
+		frames = append(frames, frame)
+	}
+
+	return frames
+}
+
+// fingerprint returns a checksum that uniquely identifies a stacktrace by the
+// filename, method name, and line number of every frame in the stack.
+func (f rollbarFrames) fingerprint() string {
+	hash := crc32.NewIEEE()
+	for _, frame := range f {
+		fmt.Fprintf(hash, "%s%s%d", frame.Filename, frame.Method, frame.Line)
+	}
+	return fmt.Sprintf("%x", hash.Sum32())
+}
+
+// -- Helpers
+
+// scrubFile removes unneeded information from the path of a source file. This
+// makes them shorter in Rollbar UI as well as making them the same, regardless
+// of the machine the code was compiled on.
+//
+// Example:
+//   /home/foo/go/src/github.com/stvp/roll/rollbar.go -> github.com/stvp/roll/rollbar.go
+func scrubFile(s string) string {
+	var i int
+	for _, pattern := range knownFilePathPatterns {
+		i = strings.Index(s, pattern)
+		if i != -1 {
+			return s[i:]
+		}
+	}
+	return s
+}
+
+// scrubFunction removes unneeded information from the full name of a function.
+//
+// Example:
+//   github.com/stvp/roll.getCallers -> roll.getCallers
+func scrubFunction(name string) string {
+	end := strings.LastIndex(name, string(os.PathSeparator))
+	return name[end+1 : len(name)]
+}
--- a/vendor/github.com/jesseduffield/rollrus/LICENSE
+++ b/vendor/github.com/jesseduffield/rollrus/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright © Heroku 2014 - 2015
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/vendor/github.com/jesseduffield/rollrus/README.md
+++ b/vendor/github.com/jesseduffield/rollrus/README.md
@@ -0,0 +1,15 @@
+[![Build Status](https://travis-ci.org/heroku/rollrus.svg?branch=master)](https://travis-ci.org/heroku/rollrus)&nbsp;[![GoDoc](https://godoc.org/github.com/heroku/rollrus?status.svg)](https://godoc.org/github.com/heroku/rollrus)
+
+# What
+
+Rollrus is what happens when [Logrus](https://github.com/sirupsen/logrus) meets [Roll](https://github.com/stvp/roll).
+
+When a .Error, .Fatal or .Panic logging function is called, report the details to rollbar via a Logrus hook.
+
+Delivery is synchronous to help ensure that logs are delivered.
+
+If the error includes a [`StackTrace`](https://godoc.org/github.com/pkg/errors#StackTrace), that `StackTrace` is reported to rollbar.
+
+# Usage
+
+Examples available in the [tests](https://github.com/heroku/rollrus/blob/master/rollrus_test.go) or on [GoDoc](https://godoc.org/github.com/heroku/rollrus).
--- a/vendor/github.com/jesseduffield/rollrus/go.mod
+++ b/vendor/github.com/jesseduffield/rollrus/go.mod
@@ -0,0 +1,7 @@
+module github.com/jesseduffield/rollrus
+
+require (
+	github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00
+	github.com/pkg/errors v0.8.1
+	github.com/sirupsen/logrus v1.3.0
+)
--- a/vendor/github.com/jesseduffield/rollrus/go.sum
+++ b/vendor/github.com/jesseduffield/rollrus/go.sum
@@ -0,0 +1,19 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/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/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/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
--- a/vendor/github.com/jesseduffield/rollrus/rollrus.go
+++ b/vendor/github.com/jesseduffield/rollrus/rollrus.go
@@ -0,0 +1,287 @@
+// Package rollrus combines github.com/jesseduffield/roll with github.com/sirupsen/logrus
+// via logrus.Hook mechanism, so that whenever logrus' logger.Error/f(),
+// logger.Fatal/f() or logger.Panic/f() are used the messages are
+// intercepted and sent to rollbar.
+//
+// Using SetupLogging should suffice for basic use cases that use the logrus
+// singleton logger.
+//
+// More custom uses are supported by creating a new Hook with NewHook and
+// registering that hook with the logrus Logger of choice.
+//
+// The levels can be customized with the WithLevels OptionFunc.
+//
+// Specific errors can be ignored with the WithIgnoredErrors OptionFunc. This is
+// useful for ignoring errors such as context.Canceled.
+//
+// See the Examples in the tests for more usage.
+package rollrus
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/jesseduffield/roll"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+)
+
+var defaultTriggerLevels = []logrus.Level{
+	logrus.ErrorLevel,
+	logrus.FatalLevel,
+	logrus.PanicLevel,
+}
+
+// Hook is a wrapper for the rollbar Client and is usable as a logrus.Hook.
+type Hook struct {
+	roll.Client
+	triggers        []logrus.Level
+	ignoredErrors   []error
+	ignoreErrorFunc func(error) bool
+	ignoreFunc      func(error, map[string]string) bool
+
+	// only used for tests to verify whether or not a report happened.
+	reported bool
+}
+
+// OptionFunc that can be passed to NewHook.
+type OptionFunc func(*Hook)
+
+// wellKnownErrorFields are the names of the fields to be checked for values of
+// type `error`, in priority order.
+var wellKnownErrorFields = []string{
+	logrus.ErrorKey, "err",
+}
+
+// WithLevels is an OptionFunc that customizes the log.Levels the hook will
+// report on.
+func WithLevels(levels ...logrus.Level) OptionFunc {
+	return func(h *Hook) {
+		h.triggers = levels
+	}
+}
+
+// WithMinLevel is an OptionFunc that customizes the log.Levels the hook will
+// report on by selecting all levels more severe than the one provided.
+func WithMinLevel(level logrus.Level) OptionFunc {
+	var levels []logrus.Level
+	for _, l := range logrus.AllLevels {
+		if l <= level {
+			levels = append(levels, l)
+		}
+	}
+
+	return func(h *Hook) {
+		h.triggers = levels
+	}
+}
+
+// WithIgnoredErrors is an OptionFunc that whitelists certain errors to prevent
+// them from firing. See https://golang.org/ref/spec#Comparison_operators
+func WithIgnoredErrors(errors ...error) OptionFunc {
+	return func(h *Hook) {
+		h.ignoredErrors = append(h.ignoredErrors, errors...)
+	}
+}
+
+// WithIgnoreErrorFunc is an OptionFunc that receives the error that is about
+// to be logged and returns true/false if it wants to fire a rollbar alert for.
+func WithIgnoreErrorFunc(fn func(error) bool) OptionFunc {
+	return func(h *Hook) {
+		h.ignoreErrorFunc = fn
+	}
+}
+
+// WithIgnoreFunc is an OptionFunc that receives the error and custom fields that are about
+// to be logged and returns true/false if it wants to fire a rollbar alert for.
+func WithIgnoreFunc(fn func(err error, fields map[string]string) bool) OptionFunc {
+	return func(h *Hook) {
+		h.ignoreFunc = fn
+	}
+}
+
+// NewHook creates a hook that is intended for use with your own logrus.Logger
+// instance. Uses the defualt report levels defined in wellKnownErrorFields.
+func NewHook(token string, env string, opts ...OptionFunc) *Hook {
+	h := NewHookForLevels(token, env, defaultTriggerLevels)
+
+	for _, o := range opts {
+		o(h)
+	}
+
+	return h
+}
+
+// NewHookForLevels provided by the caller. Otherwise works like NewHook.
+func NewHookForLevels(token string, env string, levels []logrus.Level) *Hook {
+	return &Hook{
+		Client:          roll.New(token, env),
+		triggers:        levels,
+		ignoredErrors:   make([]error, 0),
+		ignoreErrorFunc: func(error) bool { return false },
+		ignoreFunc:      func(error, map[string]string) bool { return false },
+	}
+}
+
+// SetupLogging for use on Heroku. If token is not an empty string a rollbar
+// hook is added with the environment set to env. The log formatter is set to a
+// TextFormatter with timestamps disabled.
+func SetupLogging(token, env string) {
+	setupLogging(token, env, defaultTriggerLevels)
+}
+
+// SetupLoggingForLevels works like SetupLogging, but allows you to
+// set the levels on which to trigger this hook.
+func SetupLoggingForLevels(token, env string, levels []logrus.Level) {
+	setupLogging(token, env, levels)
+}
+
+func setupLogging(token, env string, levels []logrus.Level) {
+	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true})
+
+	if token != "" {
+		logrus.AddHook(NewHookForLevels(token, env, levels))
+	}
+}
+
+// ReportPanic attempts to report the panic to rollbar using the provided
+// client and then re-panic. If it can't report the panic it will print an
+// error to stderr.
+func (r *Hook) ReportPanic() {
+	if p := recover(); p != nil {
+		if _, err := r.Client.Critical(fmt.Errorf("panic: %q", p), nil); err != nil {
+			fmt.Fprintf(os.Stderr, "reporting_panic=false err=%q\n", err)
+		}
+		panic(p)
+	}
+}
+
+// ReportPanic attempts to report the panic to rollbar if the token is set
+func ReportPanic(token, env string) {
+	if token != "" {
+		h := &Hook{Client: roll.New(token, env)}
+		h.ReportPanic()
+	}
+}
+
+// Levels returns the logrus log.Levels that this hook handles
+func (r *Hook) Levels() []logrus.Level {
+	if r.triggers == nil {
+		return defaultTriggerLevels
+	}
+	return r.triggers
+}
+
+// Fire the hook. This is called by Logrus for entries that match the levels
+// returned by Levels().
+func (r *Hook) Fire(entry *logrus.Entry) error {
+	trace, cause := extractError(entry)
+	for _, ie := range r.ignoredErrors {
+		if ie == cause {
+			return nil
+		}
+	}
+
+	if r.ignoreErrorFunc(cause) {
+		return nil
+	}
+
+	m := convertFields(entry.Data)
+	if _, exists := m["time"]; !exists {
+		m["time"] = entry.Time.Format(time.RFC3339)
+	}
+
+	if r.ignoreFunc(cause, m) {
+		return nil
+	}
+
+	return r.report(entry, cause, m, trace)
+}
+
+func (r *Hook) report(entry *logrus.Entry, cause error, m map[string]string, trace []uintptr) (err error) {
+	hasTrace := len(trace) > 0
+	level := entry.Level
+
+	r.reported = true
+
+	switch {
+	case hasTrace && level == logrus.FatalLevel:
+		_, err = r.Client.CriticalStack(cause, trace, m)
+	case hasTrace && level == logrus.PanicLevel:
+		_, err = r.Client.CriticalStack(cause, trace, m)
+	case hasTrace && level == logrus.ErrorLevel:
+		_, err = r.Client.ErrorStack(cause, trace, m)
+	case hasTrace && level == logrus.WarnLevel:
+		_, err = r.Client.WarningStack(cause, trace, m)
+	case level == logrus.FatalLevel || level == logrus.PanicLevel:
+		_, err = r.Client.Critical(cause, m)
+	case level == logrus.ErrorLevel:
+		_, err = r.Client.Error(cause, m)
+	case level == logrus.WarnLevel:
+		_, err = r.Client.Warning(cause, m)
+	case level == logrus.InfoLevel:
+		_, err = r.Client.Info(entry.Message, m)
+	case level == logrus.DebugLevel:
+		_, err = r.Client.Debug(entry.Message, m)
+	}
+	return err
+}
+
+// convertFields converts from log.Fields to map[string]string so that we can
+// report extra fields to Rollbar
+func convertFields(fields logrus.Fields) map[string]string {
+	m := make(map[string]string)
+	for k, v := range fields {
+		switch t := v.(type) {
+		case time.Time:
+			m[k] = t.Format(time.RFC3339)
+		default:
+			if s, ok := v.(fmt.Stringer); ok {
+				m[k] = s.String()
+			} else {
+				m[k] = fmt.Sprintf("%+v", t)
+			}
+		}
+	}
+
+	return m
+}
+
+// extractError attempts to extract an error from a well known field, err or error
+func extractError(entry *logrus.Entry) ([]uintptr, error) {
+	var trace []uintptr
+	fields := entry.Data
+
+	type stackTracer interface {
+		StackTrace() errors.StackTrace
+	}
+
+	for _, f := range wellKnownErrorFields {
+		e, ok := fields[f]
+		if !ok {
+			continue
+		}
+		err, ok := e.(error)
+		if !ok {
+			continue
+		}
+
+		cause := errors.Cause(err)
+		tracer, ok := err.(stackTracer)
+		if ok {
+			return copyStackTrace(tracer.StackTrace()), cause
+		}
+		return trace, cause
+	}
+
+	// when no error found, default to the logged message.
+	return trace, fmt.Errorf(entry.Message)
+}
+
+func copyStackTrace(trace errors.StackTrace) (out []uintptr) {
+	for _, frame := range trace {
+		out = append(out, uintptr(frame))
+	}
+	return
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Duffield	2df78b257b	don't pass single commands directly to RunCommand (or equivalent function) when it contains percentages. This is a really strange one. It's a linting warning in my editor and it doesn't stop me from compiling, but it breaks `go test`. A basic file to reproduce what I'm talking about: package main import "fmt" func main() { notSprintf("test %s") // compiler complains here thinking %s needs a corresponding argument } func notSprintf(formatStr string, formatArgs ...interface{}) string { if formatArgs != nil { return formatStr } return fmt.Sprintf(formatStr, formatArgs...) }	2019-11-21 21:59:25 +11:00
Jesse Duffield	85017d43a7	fix specs	2019-11-21 21:51:35 +11:00
Jesse Duffield	33fbe2d5c5	couple of things to clean up after rebasing onto master	2019-11-21 21:17:31 +11:00
Jesse Duffield	890fd2a511	give RunCommand the same input signature as fmt.Sprintf	2019-11-21 21:16:05 +11:00
Jesse Duffield	16a08da10d	add tags panel	2019-11-21 21:16:05 +11:00
Jesse Duffield	0a04dacb06	allow editing remotes	2019-11-21 21:15:49 +11:00
Jesse Duffield	150aa76923	require double clicking menu items so you know what you're clicking	2019-11-21 21:15:49 +11:00
Jesse Duffield	03d838980a	refactor confirmation prompt code	2019-11-21 21:15:49 +11:00
Jesse Duffield	05c179bfd1	better handling of click events in list views	2019-11-21 21:15:49 +11:00
Jesse Duffield	b19866545e	support setting upstream	2019-11-21 21:15:49 +11:00
Jesse Duffield	a2077bec48	better fast forward	2019-11-21 21:15:49 +11:00
Jesse Duffield	cb68452afd	make upstream branch display more lenient on git errors	2019-11-21 21:15:49 +11:00
Jesse Duffield	57c0fc24de	support rebasing onto remote branch	2019-11-21 21:15:49 +11:00
Jesse Duffield	2feb187a6c	support deleting remote branches	2019-11-21 21:15:49 +11:00
Jesse Duffield	cb9aa60830	ensure we switch tabs when switching context	2019-11-21 21:15:49 +11:00
Jesse Duffield	25177dfd2b	support merging remote branches into checked out branch	2019-11-21 21:15:49 +11:00
Jesse Duffield	f864eb1e65	support detached heads when showing the selected branch	2019-11-21 21:15:49 +11:00
Jesse Duffield	65f3073e7e	support adding/removing remotes	2019-11-21 21:15:49 +11:00
Jesse Duffield	ff75984796	split RemoteBranch out from Branch	2019-11-21 21:15:49 +11:00
Jesse Duffield	089c55a0b3	get branches with git for-each-ref	2019-11-21 21:15:27 +11:00
Jesse Duffield	620e49b8e3	only refresh branches panel on focus lost when in the local-branches context	2019-11-21 21:15:27 +11:00
Jesse Duffield	3b7e4cf2e6	support viewing a remote branch	2019-11-21 21:15:27 +11:00
Jesse Duffield	73ad5ec13c	support navigating remotes view	2019-11-21 21:15:05 +11:00
Jesse Duffield	7296a6bff4	remove redundant logging	2019-11-21 21:15:05 +11:00
Jesse Duffield	5aed1c0499	allow changing tabs with [ and ]	2019-11-21 21:15:05 +11:00
Jesse Duffield	03ceb0b1ba	get remote branches when getting remotes	2019-11-21 21:15:05 +11:00
Jesse Duffield	3ea79ef4e1	trying to use gogit with branches from remotes	2019-11-21 21:15:05 +11:00
Jesse Duffield	fdb2880075	extract out some logic for list views	2019-11-21 21:15:05 +11:00
Jesse Duffield	404001be8a	add contexts to views	2019-11-21 21:15:05 +11:00
Jesse Duffield	15c64d4bd8	bump gocui to get contexts on keybindings	2019-11-21 21:12:50 +11:00
Jesse Duffield	331616a5e8	add remotes context to branches view	2019-11-21 21:11:56 +11:00
Jesse Duffield	82b11bafef	add remote model	2019-11-21 21:11:12 +11:00