bump version to v0.1.68

leave bump commits out of release notes
2018-08-18 17:13:29 +10:00 · 2018-08-18 17:13:12 +10:00
377 changed files with 981 additions and 75375 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,73 +1,26 @@
+# Golang CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
  build:
    docker:
-      - image: circleci/golang:1.11
+      # specify the version
+      - image: circleci/golang:1.9
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    #### TEMPLATE_NOTE: go expects specific checkout path representing url
+    #### expecting it in the form of
+    ####   /go/src/github.com/circleci/go-tool
+    ####   /go/src/bitbucket.org/circleci/go-tool
    working_directory: /go/src/github.com/jesseduffield/lazygit
    steps:
      - checkout
-      - run:
-          name: Ensure go.mod file is up to date
-          command: |
-            export GO111MODULE=on
-            rm go.sum
-            mv go.mod /tmp/
-            go mod init
-            export GO111MODULE=auto

-            if [ $(diff /tmp/go.mod go.mod|wc -l) -gt 0 ]; then
-              diff /tmp/go.mod go.mod
-              exit 1;
-            fi
-      - run:
-          name: Run gofmt -s
-          command: |
-            if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
-             find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
-             exit 1;
-            fi
-      - restore_cache:
-          keys:
-            - pkg-cache-{{ checksum "Gopkg.lock" }}-v3
-      - run:
-          name: Run tests
-          command: |
-            ./test.sh
-      - run:
-          name: Compile project on every platform
-          command: |
-            go get github.com/mitchellh/gox
-            gox -parallel 10 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"
-      - run:
-          name: Push on codecov result
-          command: |
-            bash <(curl -s https://codecov.io/bash)
-      - save_cache:
-          key: pkg-cache-{{ checksum "Gopkg.lock" }}-v3
-          paths:
-            - ~/.cache/go-build
-
-  release:
-    docker:
-      - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/jesseduffield/lazygit
-    steps:
-      - checkout
-      - run:
-          name: Run gorelease
-          command: |
-            curl -sL https://git.io/goreleaser | bash
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - build
-  release:
-    jobs:
-      - release:
-          filters:
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*/
-            branches:
-              ignore: /.*/
+      # specify any bash command here prefixed with `run: `
+      - run: go test -v ./...
+      - run: bash <(curl -s https://codecov.io/bash)
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,7 +23,6 @@ If applicable, add screenshots to help explain your problem.
 **Desktop (please complete the following information):**
 - OS: [e.g. Windows]
 - Lazygit Version [e.g. v0.1.45]
- - The last commit id if you built project from sources (run : ```git-rev parse HEAD```)

 **Additional context**
 Add any other context about the problem here.
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,7 @@
-# Please do not add personal files
-
-# Logs
-*.log
-
-# Hidden
-.*
-
-# TODO
-TODO.*
-
-# Notes
-*.notes
-
-# Tests
+development.log
+commands.log
+extra/lgit.rb
+notes/go.notes
+TODO.notes
+TODO.md
 test/repos/repo
-coverage.txt
-
-# Binaries
-lazygit
-
-# Exceptions
-!.gitignore
-!.goreleaser.yml
-!.circleci/
-!.github/
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,9 +13,8 @@ builds:
      - arm
      - arm64
      - 386
-    # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
    ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease
+      - -s -w -X main.version={{.Version}} -X main.tag={{.Tag}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X "main.goos={{.Os}} -X "main.arch={{.Arch}} -X "main.arm={{.Arm}}"

 archive:
  replacements:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,10 +15,9 @@ welcome your pull requests:
 1. Fork the repo and create your branch from `master`.
 2. If you've added code that should be tested, add tests.
 3. If you've added code that need documentation, update the documentation.
-4. Make sure your code follows the [effective go](https://golang.org/doc/effective_go.html) guidelines as much as possible.
-5. Be sure to test your modifications.
-6. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-7. Issue that pull request!
+4. Be sure to test your modifications.
+5. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+6. Issue that pull request!

 ## Code of conduct
 Please note by participating in this project, you agree to abide by the [code of conduct].
--- a/13
+++ b/13
@@ -1,13 +0,0 @@
-# run with:
-# docker build -t lazygit .
-# docker run -it lazygit:latest
-
-FROM golang:alpine
-
-RUN apk add -U git xdg-utils
-
-ADD . /go/src/github.com/jesseduffield/lazygit
-
-RUN go install github.com/jesseduffield/lazygit
-
-WORKDIR /go/src/github.com/jesseduffield/lazygit
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,52 +2,12 @@


 [[projects]]
-  digest = "1:e24ea5dbc89fbab51635ee32e5be4f61a9267cae20788efcae4c07efb4abec99"
-  name = "github.com/aws/aws-sdk-go"
-  packages = [
-    "aws",
-    "aws/awserr",
-    "aws/awsutil",
-    "aws/client",
-    "aws/client/metadata",
-    "aws/corehandlers",
-    "aws/credentials",
-    "aws/credentials/ec2rolecreds",
-    "aws/credentials/endpointcreds",
-    "aws/credentials/stscreds",
-    "aws/csm",
-    "aws/defaults",
-    "aws/ec2metadata",
-    "aws/endpoints",
-    "aws/request",
-    "aws/session",
-    "aws/signer/v4",
-    "internal/sdkio",
-    "internal/sdkrand",
-    "internal/sdkuri",
-    "internal/shareddefaults",
-    "private/protocol",
-    "private/protocol/eventstream",
-    "private/protocol/eventstream/eventstreamapi",
-    "private/protocol/query",
-    "private/protocol/query/queryutil",
-    "private/protocol/rest",
-    "private/protocol/restxml",
-    "private/protocol/xml/xmlutil",
-    "service/s3",
-    "service/sts",
-  ]
+  digest = "1:b2339e83ce9b5c4f79405f949429a7f68a9a904fed903c672aac1e7ceb7f5f02"
+  name = "github.com/Sirupsen/logrus"
+  packages = ["."]
  pruneopts = "NUT"
-  revision = "4324bc9d8865bdb3e6aa86ec7772ca1272d2750e"
-  version = "v1.15.21"
-
-[[projects]]
-  branch = "master"
-  digest = "1:37011b20a70e205b93ebea5287e1afa5618db54bf3998c36ff5a8e4b146a170a"
-  name = "github.com/bgentry/go-netrc"
-  packages = ["netrc"]
-  pruneopts = "NUT"
-  revision = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"
+  revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
+  version = "v1.0.6"

 [[projects]]
  branch = "master"
@@ -96,14 +56,6 @@
  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
  version = "v1.4.7"

-[[projects]]
-  digest = "1:74d9b0a7b4107b41e0ade759fac64502876f82d29fb23d77b3dd24b194ee3dd5"
-  name = "github.com/go-ini/ini"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "5cf292cae48347c2490ac1a58fe36735fb78df7e"
-  version = "v1.38.2"
-
 [[projects]]
  branch = "master"
  digest = "1:4a8ed9b8cf22bd03bee5d74179fa06a282e4a73b6de949f7a865ff56cd2537e0"
@@ -112,38 +64,6 @@
  pruneopts = "NUT"
  revision = "604e922904d35e97f98a774db7881f049cd8d970"

-[[projects]]
-  branch = "master"
-  digest = "1:a5d940c38bf56f121721bfa747c66356df387cb9d5318c570c6d4170aab62862"
-  name = "github.com/hashicorp/go-cleanhttp"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b634d733abf079dc191d359e5a8d31479f1795d00e656f8a018a459571046266"
-  name = "github.com/hashicorp/go-getter"
-  packages = ["helper/url"]
-  pruneopts = "NUT"
-  revision = "4bda8fa99001c61db3cad96b421d4c12a81f256d"
-
-[[projects]]
-  branch = "master"
-  digest = "1:fbab03227343a0285fc74a68dd2ff46cda7edecbbe5a3e98d2cecd00cc67b217"
-  name = "github.com/hashicorp/go-safetemp"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "b1a1dbde6fdc11e3ae79efd9039009e22d4ae240"
-
-[[projects]]
-  digest = "1:0b06ffe0c0764e413a6738e3f045d6bb14117359aef80a09f8c60fbff2ecad6b"
-  name = "github.com/hashicorp/go-version"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "b5a281d3160aa11950a6182bd9a9dc2cb1e02d50"
-  version = "v1.0.0"
-
 [[projects]]
  branch = "master"
  digest = "1:11c6c696067d3127ecf332b10f89394d386d9083f82baf71f40f2da31841a009"
@@ -163,14 +83,6 @@
  pruneopts = "NUT"
  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"

-[[projects]]
-  branch = "master"
-  digest = "1:d457d39e88f678ed14ac29517c3d74927a48dbc6a9f073fa241cf364a68cbe5c"
-  name = "github.com/heroku/rollrus"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "fc0cef2ff331aebb24cd4e9ded7e20650f3d7006"
-
 [[projects]]
  branch = "master"
  digest = "1:62fe3a7ea2050ecbd753a71889026f83d73329337ada66325cbafd5dea5f713d"
@@ -181,42 +93,11 @@

 [[projects]]
  branch = "master"
-  digest = "1:490643e333b848f3d6ab772c21082d706663dcf4a3c0fbe9a4b4ef7b205ce6c7"
-  name = "github.com/jesseduffield/go-getter"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "906e15686e6309ff310c1c10463ab53287c3a678"
-
-[[projects]]
-  branch = "master"
-  digest = "1:66bb9b4a5abb704642fccba52a84a7f7feef2d9623f87b700e52a6695044723f"
+  digest = "1:c9a848b0484a72da2dae28957b4f67501fe27fa38bc73f4713e454353c0a4a60"
  name = "github.com/jesseduffield/gocui"
  packages = ["."]
  pruneopts = "NUT"
-  revision = "03e26ff3f1de2c1bc2205113c3aba661312eee00"
-
-[[projects]]
-  branch = "master"
-  digest = "1:3ab130f65766f5b7cc944d557df31c6a007ec017151705ec1e1b8719f2689021"
-  name = "github.com/jesseduffield/termbox-go"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "1e272ff78dcb4c448870f464fda1cdcf2bf0b3dd"
-
-[[projects]]
-  digest = "1:ac6d01547ec4f7f673311b4663909269bfb8249952de3279799289467837c3cc"
-  name = "github.com/jmespath/go-jmespath"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "0b12d6b5"
-
-[[projects]]
-  branch = "master"
-  digest = "1:263f9b0a0bcbfff9d5e7d9f2aa11f53995d98214fe0fb97e429e7a5f4534a0f9"
-  name = "github.com/kardianos/osext"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
+  revision = "432b7f6215f81ef1aaa1b2d9b69887822923cf79"

 [[projects]]
  digest = "1:8021af4dcbd531ae89433c8c3a6520e51064114aaf8eb1724c3cf911c497c9ba"
@@ -274,14 +155,6 @@
  pruneopts = "NUT"
  revision = "58046073cbffe2f25d425fe1331102f55cf719de"

-[[projects]]
-  branch = "master"
-  digest = "1:18b773b92ac82a451c1276bd2776c1e55ce057ee202691ab33c8d6690efcc048"
-  name = "github.com/mitchellh/go-testing-interface"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28"
-
 [[projects]]
  branch = "master"
  digest = "1:5fe20cfe4ef484c237cec9f947b2a6fa90bad4b8610fd014f0e4211e13d82d5d"
@@ -302,6 +175,14 @@
  revision = "a16b91a3ba80db3a2301c70d1d302d42251c9079"
  version = "v2.0.0-beta.5"

+[[projects]]
+  branch = "master"
+  digest = "1:34d9354c2c5d916c05864327553047df59fc10e86ff1f408e4136eba0a25a5ec"
+  name = "github.com/nsf/termbox-go"
+  packages = ["."]
+  pruneopts = "NUT"
+  revision = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"
+
 [[projects]]
  digest = "1:cf254277d898b713195cc6b4a3fac8bf738b9f1121625df27843b52b267eec6c"
  name = "github.com/pelletier/go-buffruneio"
@@ -318,22 +199,6 @@
  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
  version = "v1.2.0"

-[[projects]]
-  digest = "1:5cf3f025cbee5951a4ee961de067c8a89fc95a5adabead774f82822efabab121"
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  pruneopts = "NUT"
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
 [[projects]]
  digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04"
  name = "github.com/sergi/go-diff"
@@ -343,20 +208,13 @@
  version = "v1.0.0"

 [[projects]]
+  branch = "master"
  digest = "1:41618aee8828e62dfe62d44f579c06892d0e98907d1c6d5bcd83bfe8536ec5a3"
  name = "github.com/shibukawa/configdir"
  packages = ["."]
  pruneopts = "NUT"
  revision = "e180dbdc8da04c4fa04272e875ce64949f38bd3e"

-[[projects]]
-  digest = "1:b2339e83ce9b5c4f79405f949429a7f68a9a904fed903c672aac1e7ceb7f5f02"
-  name = "github.com/sirupsen/logrus"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
-  version = "v1.0.6"
-
 [[projects]]
  digest = "1:330e9062b308ac597e28485699c02223bd052437a6eed32a173c9227dcb9d95a"
  name = "github.com/spf13/afero"
@@ -400,14 +258,6 @@
  revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"
  version = "v1.1.0"

-[[projects]]
-  branch = "master"
-  digest = "1:0e9a5ac14bcc11f205031a671b28c7e05cb88b2ebbe06f383c1ab0b2c12c7cb5"
-  name = "github.com/spkg/bom"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "59b7046e48ad6bac800c5e1dd5142282cbfcf154"
-
 [[projects]]
  digest = "1:ccca1dcd18bc54e23b517a3c5babeff2e3924a7d8fc1932162225876cfe4bfb0"
  name = "github.com/src-d/gcfg"
@@ -421,22 +271,6 @@
  revision = "f187355171c936ac84a82793659ebb4936bc1c23"
  version = "v1.3.0"

-[[projects]]
-  digest = "1:bacb8b590716ab7c33f2277240972c9582d389593ee8d66fc10074e0508b8126"
-  name = "github.com/stretchr/testify"
-  packages = ["assert"]
-  pruneopts = "NUT"
-  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
-  version = "v1.2.2"
-
-[[projects]]
-  branch = "master"
-  digest = "1:e42372d3f4921ec35df07f9b23239631e9d28580f7c1edcca212bc6daddc68fe"
-  name = "github.com/stvp/roll"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "3627a5cbeaeaa68023abd02bb8687925265f2f63"
-
 [[projects]]
  digest = "1:cd5ffc5bda4e0296ab3e4de90dbb415259c78e45e7fab13694b14cde8ab74541"
  name = "github.com/tcnksm/go-gitconfig"
@@ -445,19 +279,6 @@
  revision = "d154598bacbf4501c095a309753c5d4af66caa81"
  version = "v0.1.2"

-[[projects]]
-  digest = "1:07e8742c479bab0066149ad02a710024154e76874fd0a2dba002d87702725825"
-  name = "github.com/ulikunitz/xz"
-  packages = [
-    ".",
-    "internal/hash",
-    "internal/xlog",
-    "lzma",
-  ]
-  pruneopts = "NUT"
-  revision = "0c6b41e72360850ca4f98dc341fd999726ea007f"
-  version = "v0.5.4"
-
 [[projects]]
  digest = "1:3148cb3478c26a92b4c1a18abb9428234b281e278af6267840721a24b6cbc6a3"
  name = "github.com/xanzy/ssh-agent"
@@ -610,25 +431,20 @@
  analyzer-name = "dep"
  analyzer-version = 1
  input-imports = [
+    "github.com/Sirupsen/logrus",
    "github.com/cloudfoundry/jibber_jabber",
+    "github.com/davecgh/go-spew/spew",
    "github.com/fatih/color",
    "github.com/golang-collections/collections/stack",
-    "github.com/heroku/rollrus",
-    "github.com/jesseduffield/go-getter",
    "github.com/jesseduffield/gocui",
-    "github.com/kardianos/osext",
    "github.com/mgutz/str",
    "github.com/nicksnyder/go-i18n/v2/i18n",
    "github.com/shibukawa/configdir",
-    "github.com/sirupsen/logrus",
    "github.com/spf13/viper",
-    "github.com/spkg/bom",
-    "github.com/stretchr/testify/assert",
    "github.com/tcnksm/go-gitconfig",
    "golang.org/x/text/language",
    "gopkg.in/src-d/go-git.v4",
    "gopkg.in/src-d/go-git.v4/plumbing",
-    "gopkg.in/yaml.v2",
  ]
  solver-name = "gps-cdcl"
  solver-version = 1
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -40,7 +40,3 @@
 [[constraint]]
  name = "gopkg.in/src-d/go-git.v4"
  revision = "43d17e14b714665ab5bc2ecc220b6740779d733f"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spkg/bom"
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# lazygit [![CircleCI](https://circleci.com/gh/jesseduffield/lazygit.svg?style=svg)](https://circleci.com/gh/jesseduffield/lazygit) [![codecov](https://codecov.io/gh/jesseduffield/lazygit/branch/master/graph/badge.svg)](https://codecov.io/gh/jesseduffield/lazygit) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![GolangCI](https://golangci.com/badges/github.com/jesseduffield/lazygit.svg)](https://golangci.com) [![GoDoc](https://godoc.org/github.com/jesseduffield/lazygit?status.svg)](http://godoc.org/github.com/jesseduffield/lazygit) [![GitHub tag](https://img.shields.io/github/tag/jesseduffield/lazygit.svg)]()
+# lazygit [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit)

 A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui "gocui") library.

@@ -7,7 +7,7 @@ too stubborn to use Sourcetree because you'll never forgive Atlassian for making
 Jira? This is the app for you!


-![Gif](/docs/resources/lazygit-example.gif)
+![Gif](https://image.ibb.co/mmeXho/optimisedgif.gif)

  * [Installation](https://github.com/jesseduffield/lazygit#installation)
  * [Usage](https://github.com/jesseduffield/lazygit#usage),
@@ -90,7 +90,7 @@ whichever rc file you're using).

  * Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY).
  * List of keybindings
-[here](/docs/Keybindings.md).
+[here](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md).

 ## Cool features
  * Adding files easily
@@ -101,10 +101,10 @@ whichever rc file you're using).
  * Squash down and rename commits

 ### Resolving merge conflicts
-![Gif](/docs/resources/resolving-merge-conflicts.gif)
+![Gif](https://image.ibb.co/iyxUTT/shortermerging.gif)

 ### Viewing commit diffs
-![Viewing Commit Diffs](/docs/resources/viewing-commit-diffs.png)
+![Viewing Commit Diffs](https://image.ibb.co/gPD02o/capture.png)

 ## Milestones
 - [x] Easy Installation (homebrew, release binaries)
@@ -119,12 +119,7 @@ whichever rc file you're using).
 We love your input! Please check out the [contributing guide](CONTRIBUTING.md).
 For contributor discussion about things not better discussed here in the repo, join the slack channel

-[![Slack](/docs/resources/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/enQtNDE3MjIwNTYyMDA0LTM3Yjk3NzdiYzhhNTA1YjM4Y2M4MWNmNDBkOTI0YTE4YjQ1ZmI2YWRhZTgwNjg2YzhhYjg3NDBlMmQyMTI5N2M)
-
-## Donate
-If you would like to support the development of lazygit, please donate
-
-[![Donate](https://d1iczxrky3cnb2.cloudfront.net/button-medium-blue.png)](https://donorbox.org/lazygit)
+[![Slack](/files/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/enQtNDE3MjIwNTYyMDA0LTM3Yjk3NzdiYzhhNTA1YjM4Y2M4MWNmNDBkOTI0YTE4YjQ1ZmI2YWRhZTgwNjg2YzhhYjg3NDBlMmQyMTI5N2M)

 ## Work in progress
 This is still a work in progress so there's still bugs to iron out and as this
@@ -136,7 +131,3 @@ feel free to [raise an issue](https://github.com/jesseduffield/lazygit/issues)/[
 If you want to see what I (Jesse) am up to in terms of development, follow me on
 [twitter](https://twitter.com/DuffieldJesse) or watch me program on
 [twitch](https://www.twitch.tv/jesseduffield).
-
-## Alternatives
-If you find that lazygit doesn't quite satisfy your requirements, these may be a better fit:
- [tig](https://github.com/jonas/tig)
--- a/1
+++ b/1
@@ -0,0 +1 @@
+v0.1.68
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -14,45 +14,10 @@
        - white
      optionsTextColor:
        - blue
-    commitLength:
-      show: true
-  update:
-    method: prompt # can be: prompt | background | never
-    days: 14 # how often an update is checked for
-  reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined'
-  confirmOnQuit: false
-```
-
-## Platform Defaults:
-
-### Windows:
-
-```
+  git:
+    # stuff relating to git
  os:
-    openCommand: 'cmd /c "start "" {{filename}}"'
-```
-
-### Linux:
-
-```
-  os:
-    openCommand: 'sh -c "xdg-open {{filename}} >/dev/null"'
-```
-
-### OSX:
-
-```
-  os:
-    openCommand: 'open {{filename}}'
-```
-
-### Recommended Config Values:
-
-for users of VSCode
-
-```
-  os:
-    openCommand: 'code -r {{filename}}'
+    # stuff relating to the OS
 ```

 ## Color Attributes:
@@ -72,7 +37,3 @@ The available attributes are:
 - bold
 - reverse # useful for high-contrast
 - underline
-
-## Example Coloring:
-
-![border example](/docs/resources/colored-border-example.png)
--- a/docs/Keybindings.md
+++ b/docs/Keybindings.md
@@ -22,7 +22,6 @@

 <pre>
  <kbd>space</kbd>:    toggle staged
-  <kbd>a</kbd>:        stage/unstage all
  <kbd>c</kbd>:        commit changes
  <kbd>shift</kbd>+<kbd>C</kbd>: commit using git editor
  <kbd>shift</kbd>+<kbd>S</kbd>: stash files
@@ -34,7 +33,6 @@
  <kbd>i</kbd>:        add to .gitignore
  <kbd>d</kbd>:        delete if untracked checkout if tracked (aka go away)
  <kbd>shift</kbd>+<kbd>R</kbd>: refresh files
-  <kbd>shift</kbd>+<kbd>A</kbd>: abort merge
 </pre>

 ## Branches Panel:
@@ -46,7 +44,6 @@
  <kbd>c</kbd>:       checkout by name
  <kbd>n</kbd>:       new branch
  <kbd>d</kbd>:       delete branch
-  <kbd>D</kbd>:       force delete branch
 </pre>

 ## Commits Panel:
@@ -54,7 +51,6 @@
 <pre>
  <kbd>s</kbd>:       squash down (only available for topmost commit)
  <kbd>r</kbd>:       rename commit
-  <kbd>shift</kbd>+<kbd>R</kbd>: rename commit using git editor
  <kbd>g</kbd>:       reset to this commit
 </pre>

--- a/docs/resources/colored-border-example.png
+++ b/docs/resources/colored-border-example.png
--- a/docs/resources/lazygit-example.gif
+++ b/docs/resources/lazygit-example.gif
--- a/docs/resources/resolving-merge-conflicts.gif
+++ b/docs/resources/resolving-merge-conflicts.gif
--- a/docs/resources/viewing-commit-diffs.png
+++ b/docs/resources/viewing-commit-diffs.png
--- a/docs/resources/slack_rgb.png
+++ b/docs/resources/slack_rgb.png
--- a/go.mod
+++ b/go.mod
@@ -1,62 +0,0 @@
-module github.com/jesseduffield/lazygit
-
-require (
-	github.com/aws/aws-sdk-go v1.15.21
-	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d
-	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
-	github.com/davecgh/go-spew v1.1.0
-	github.com/emirpasic/gods v1.9.0
-	github.com/fatih/color v1.7.0
-	github.com/fsnotify/fsnotify v1.4.7
-	github.com/go-ini/ini v1.38.2
-	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
-	github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186
-	github.com/hashicorp/go-getter v0.0.0-20180809191950-4bda8fa99001
-	github.com/hashicorp/go-safetemp v0.0.0-20180326211150-b1a1dbde6fdc
-	github.com/hashicorp/go-version v1.0.0
-	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
-	github.com/heroku/rollrus v0.0.0-20180515183152-fc0cef2ff331
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
-	github.com/jesseduffield/go-getter v0.0.0-20180822080847-906e15686e63
-	github.com/jesseduffield/gocui v0.0.0-20180921065632-03e26ff3f1de
-	github.com/jesseduffield/termbox-go v0.0.0-20180919093808-1e272ff78dcb
-	github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8
-	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1
-	github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55
-	github.com/magiconair/properties v1.8.0
-	github.com/mattn/go-colorable v0.0.9
-	github.com/mattn/go-isatty v0.0.3
-	github.com/mattn/go-runewidth v0.0.2
-	github.com/mgutz/str v1.2.0
-	github.com/mitchellh/go-homedir v0.0.0-20180801233206-58046073cbff
-	github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77
-	github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699
-	github.com/nicksnyder/go-i18n v0.0.0-20180803040939-a16b91a3ba80
-	github.com/pelletier/go-buffruneio v0.2.0
-	github.com/pelletier/go-toml v1.2.0
-	github.com/pkg/errors v0.8.0
-	github.com/pmezard/go-difflib v1.0.0
-	github.com/sergi/go-diff v1.0.0
-	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0
-	github.com/sirupsen/logrus v1.0.6
-	github.com/spf13/afero v1.1.1
-	github.com/spf13/cast v1.2.0
-	github.com/spf13/jwalterweatherman v0.0.0-20180814060501-14d3d4c51834
-	github.com/spf13/pflag v1.0.2
-	github.com/spf13/viper v1.1.0
-	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
-	github.com/src-d/gcfg v1.3.0
-	github.com/stretchr/testify v1.2.2
-	github.com/stvp/roll v0.0.0-20170522205222-3627a5cbeaea
-	github.com/tcnksm/go-gitconfig v0.1.2
-	github.com/ulikunitz/xz v0.5.4
-	github.com/xanzy/ssh-agent v0.2.0
-	golang.org/x/crypto v0.0.0-20180808211826-de0752318171
-	golang.org/x/net v0.0.0-20180811021610-c39426892332
-	golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0
-	golang.org/x/text v0.3.0
-	gopkg.in/src-d/go-billy.v4 v4.2.0
-	gopkg.in/src-d/go-git.v4 v4.0.0-20180807092216-43d17e14b714
-	gopkg.in/warnings.v0 v0.1.2
-	gopkg.in/yaml.v2 v2.2.1
-)
--- a/go.sum
+++ b/go.sum
@@ -1,119 +0,0 @@
-github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/aws/aws-sdk-go v1.15.21 h1:STLvc6RrpycslC1NRtTvt/YSgDkIGCTrB9K9vE5R2oQ=
-github.com/aws/aws-sdk-go v1.15.21/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
-github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
-github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
-github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo=
-github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-ini/ini v1.38.2 h1:6Hl/z3p3iFkA0dlDfzYxuFuUGD+kaweypF6btsR2/Q4=
-github.com/go-ini/ini v1.38.2/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4=
-github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU=
-github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186 h1:URgjUo+bs1KwatoNbwG0uCO4dHN4r1jsp4a5AGgHRjo=
-github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-getter v0.0.0-20180809191950-4bda8fa99001 h1:MFPzqpPED05pFyGjNPJEC2sXM6EHTzFyvX+0s0JoZ48=
-github.com/hashicorp/go-getter v0.0.0-20180809191950-4bda8fa99001/go.mod h1:6rdJFnhkXnzGOJbvkrdv4t9nLwKcVA+tmbQeUlkIzrU=
-github.com/hashicorp/go-safetemp v0.0.0-20180326211150-b1a1dbde6fdc h1:wAa9fGALVHfjYxZuXRnmuJG2CnwRpJYOTvY6YdErAh0=
-github.com/hashicorp/go-safetemp v0.0.0-20180326211150-b1a1dbde6fdc/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
-github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8=
-github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce h1:xdsDDbiBDQTKASoGEZ+pEmF1OnWuu8AQ9I8iNbHNeno=
-github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
-github.com/heroku/rollrus v0.0.0-20180515183152-fc0cef2ff331 h1:qio0y/sQdhbHRA3cmgczo04MaSV2zw+n46G1owvgWIk=
-github.com/heroku/rollrus v0.0.0-20180515183152-fc0cef2ff331/go.mod h1:BT+PgT529opmb6mcUY+Fg0IwVRRmwqFyavEMU17GnBg=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
-github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jesseduffield/go-getter v0.0.0-20180822080847-906e15686e63 h1:Nrr/yUxNjXWYK0B3IqcFlYh1ICnesJDB4ogcfOVc5Ns=
-github.com/jesseduffield/go-getter v0.0.0-20180822080847-906e15686e63/go.mod h1:fNqjRf+4XnTo2PrGN1JRb79b/BeoHwP4lU00f39SQY0=
-github.com/jesseduffield/gocui v0.0.0-20180919095827-4fca348422d8 h1:XxX+IqNOFDh1PnU4eZDzUomoKbuKCvwyEm5an/IxLQU=
-github.com/jesseduffield/gocui v0.0.0-20180919095827-4fca348422d8/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
-github.com/jesseduffield/termbox-go v0.0.0-20180919093808-1e272ff78dcb h1:cFHYEWpQEfzFZVKiKZytCUX4UwQixKSw0kd3WhluPsY=
-github.com/jesseduffield/termbox-go v0.0.0-20180919093808-1e272ff78dcb/go.mod h1:anMibpZtqNxjDbxrcDEAwSdaJ37vyUeM1f/M4uekib4=
-github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
-github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
-github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 h1:S38dC4mEwxdw/U41+97VWdbun8mTcTjwg5Ujfg8QPME=
-github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
-github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o=
-github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
-github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
-github.com/mitchellh/go-homedir v0.0.0-20180801233206-58046073cbff h1:jM4Eo4qMmmcqePS3u6X2lcEELtVuXWkWJIS/pRI3oSk=
-github.com/mitchellh/go-homedir v0.0.0-20180801233206-58046073cbff/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 h1:KXZJFdun9knAVAR8tg/aHJEr5DgtcbqyvzacK+CDCaI=
-github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/nicksnyder/go-i18n v0.0.0-20180803040939-a16b91a3ba80 h1:7ory6RlsEkeK89iyV7Imz3sVz8YHeSw29w3PehpCWC0=
-github.com/nicksnyder/go-i18n v0.0.0-20180803040939-a16b91a3ba80/go.mod h1:e4Di5xjP9oTVrC6y3C7C0HoSYXjSbhh/dU0eUV32nB4=
-github.com/nicksnyder/go-i18n/v2 v2.0.0-beta.5 h1:/TjjTS4kg7vC+05gD0LE4+97f/+PRFICnK/7wJPk7kE=
-github.com/nicksnyder/go-i18n/v2 v2.0.0-beta.5/go.mod h1:4Opqa6/HIv0lhG3WRAkqzO0afezkRhxXI0P8EJkqeRU=
-github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
-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/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 h1:Xuk8ma/ibJ1fOy4Ee11vHhUFHQNpHhrBneOCNHVXS5w=
-github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0/go.mod h1:7AwjWCpdPhkSmNAgUv5C7EJ4AbmjEB3r047r3DXWu3Y=
-github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s=
-github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/spf13/afero v1.1.1 h1:Lt3ihYMlE+lreX1GS4Qw4ZsNpYQLxIXKBTEOXm3nt6I=
-github.com/spf13/afero v1.1.1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg=
-github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
-github.com/spf13/jwalterweatherman v0.0.0-20180814060501-14d3d4c51834 h1:kJI9pPzfsULT/72wy7mxkRQZPtKWgFdCA2RTGZ4v8/E=
-github.com/spf13/jwalterweatherman v0.0.0-20180814060501-14d3d4c51834/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc=
-github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/viper v1.1.0 h1:V7OZpY8i3C1x/pDmU0zNNlfVoDz112fSYvtWMjjS3f4=
-github.com/spf13/viper v1.1.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
-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.3.0 h1:2BEDr8r0I0b8h/fOqwtxCEiq2HJu8n2JGZJQFGXWLjg=
-github.com/src-d/gcfg v1.3.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stvp/roll v0.0.0-20170522205222-3627a5cbeaea h1:jysxIKov/4GJ33wI2aRvuIK7yBwB28E5almlgDLPRpM=
-github.com/stvp/roll v0.0.0-20170522205222-3627a5cbeaea/go.mod h1:Ffmqrj3nXIMIjeA4uW3Qjj0Ud9eDoTG0fu4JxyAr/tE=
-github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw=
-github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
-github.com/ulikunitz/xz v0.5.4 h1:zATC2OoZ8H1TZll3FpbX+ikwmadbO699PE06cIkm9oU=
-github.com/ulikunitz/xz v0.5.4/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro=
-github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8=
-golang.org/x/crypto v0.0.0-20180808211826-de0752318171 h1:vYogbvSFj2YXcjQxFHu/rASSOt9sLytpCaSkiwQ135I=
-golang.org/x/crypto v0.0.0-20180808211826-de0752318171/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/net v0.0.0-20180811021610-c39426892332 h1:efGso+ep0DjyCBJPjvoz0HI6UldX4Md2F1rZFe1ir0E=
-golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0 h1:8H8QZJ30plJyIVj60H3lr8TZGIq2Fh3Cyrs/ZNg1foU=
-golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/src-d/go-billy.v4 v4.2.0 h1:VGbrP1EsYxtvVPEiHui+4//imr4E5MGEFLx66bQtusg=
-gopkg.in/src-d/go-billy.v4 v4.2.0/go.mod h1:ZHSF0JP+7oD97194otDUCD7Ofbk63+xFcfWP5bT6h+Q=
-gopkg.in/src-d/go-git.v4 v4.0.0-20180807092216-43d17e14b714 h1:+wM2BGgQ1znCKBexOB4OrGVSDw8mtKNUSq3wqxZhi/k=
-gopkg.in/src-d/go-git.v4 v4.0.0-20180807092216-43d17e14b714/go.mod h1:CzbUWqMn4pvmvndg3gnh5iZFmSsbhyhUWdI0IQ60AQo=
-gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/main.go
+++ b/main.go
@@ -3,22 +3,22 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
+	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"

 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
 )

 var (
-	commit      string
-	version     = "unversioned"
-	date        string
-	buildSource = "unknown"
+	commit  string
+	version = "unversioned"
+	date    string
+	goos    string
+	arch    string
+	arm     string

-	configFlag    = flag.Bool("config", false, "Print the current default config")
 	debuggingFlag = flag.Bool("debug", false, "a boolean")
 	versionFlag   = flag.Bool("v", false, "Print the current version")
 )
@@ -28,27 +28,34 @@ func projectPath(path string) string {
 	return filepath.FromSlash(gopath + "/src/github.com/jesseduffield/lazygit/" + path)
 }

+// when building the binary, `version` is set as a compile-time variable, along
+// with `date` and `commit`. If this program has been opened directly via go,
+// we will populate the `version` with VERSION in the lazygit root directory
+func fallbackVersion() string {
+	path := projectPath("VERSION")
+	byteVersion, err := ioutil.ReadFile(path)
+	if err != nil {
+		return "unversioned"
+	}
+	return string(byteVersion)
+}
+
 func main() {
 	flag.Parse()
+	if version == "unversioned" {
+		version = fallbackVersion()
+	}
 	if *versionFlag {
-		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s\n", commit, date, buildSource, version, runtime.GOOS, runtime.GOARCH)
+		fmt.Printf("commit=%s, build date=%s, version=%s, os=%s, arch=%s, arm=%s\n", commit, date, version, goos, arch, arm)
 		os.Exit(0)
 	}
-
-	if *configFlag {
-		fmt.Printf("%s\n", config.GetDefaultConfig())
-		os.Exit(0)
-	}
-	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, buildSource, debuggingFlag)
+	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, debuggingFlag)
 	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	app, err := app.Setup(appConfig)
-	if err != nil {
-		app.Log.Error(err.Error())
-		log.Fatal(err.Error())
+		panic(err)
 	}

+	app, err := app.NewApp(appConfig)
+	app.Log.Info(err)
+	app.GitCommand.SetupGit()
 	app.Gui.RunWithSubprocesses()
 }
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -5,13 +5,11 @@ import (
 	"io/ioutil"
 	"os"

-	"github.com/heroku/rollrus"
+	"github.com/Sirupsen/logrus"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/updates"
-	"github.com/sirupsen/logrus"
 )

 // App struct
@@ -19,22 +17,19 @@ type App struct {
 	closers []io.Closer

 	Config     config.AppConfigurer
-	Log        *logrus.Entry
+	Log        *logrus.Logger
 	OSCommand  *commands.OSCommand
 	GitCommand *commands.GitCommand
 	Gui        *gui.Gui
 	Tr         *i18n.Localizer
-	Updater    *updates.Updater // may only need this on the Gui
 }

-func newProductionLogger(config config.AppConfigurer) *logrus.Logger {
-	log := logrus.New()
-	log.Out = ioutil.Discard
-	return log
-}
-
-func newDevelopmentLogger() *logrus.Logger {
+func newLogger(config config.AppConfigurer) *logrus.Logger {
 	log := logrus.New()
+	if !config.GetDebug() {
+		log.Out = ioutil.Discard
+		return log
+	}
 	file, err := os.OpenFile("development.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	if err != nil {
 		panic("unable to log to file") // TODO: don't panic (also, remove this call to the `panic` function)
@@ -43,51 +38,31 @@ func newDevelopmentLogger() *logrus.Logger {
 	return log
 }

-func newLogger(config config.AppConfigurer) *logrus.Entry {
-	var log *logrus.Logger
-	environment := "production"
-	if config.GetDebug() {
-		environment = "development"
-		log = newDevelopmentLogger()
-	} else {
-		log = newProductionLogger(config)
-	}
-	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(),
-		"commit":    config.GetCommit(),
-		"buildDate": config.GetBuildDate(),
-	})
-}
-
-// Setup bootstrap a new application
-func Setup(config config.AppConfigurer) (*App, error) {
+// NewApp retruns a new applications
+func NewApp(config config.AppConfigurer) (*App, error) {
 	app := &App{
 		closers: []io.Closer{},
 		Config:  config,
 	}
 	var err error
 	app.Log = newLogger(config)
-	app.OSCommand = commands.NewOSCommand(app.Log, config)
-
-	app.Tr = i18n.NewLocalizer(app.Log)
-
-	app.Updater, err = updates.NewUpdater(app.Log, config, app.OSCommand, app.Tr)
+	app.OSCommand, err = commands.NewOSCommand(app.Log)
 	if err != nil {
-		return app, err
+		return nil, err
 	}
-	app.GitCommand, err = commands.NewGitCommand(app.Log, app.OSCommand, app.Tr)
+
+	app.Tr, err = i18n.NewLocalizer(app.Log)
 	if err != nil {
-		return app, err
+		return nil, err
 	}
-	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater)
+
+	app.GitCommand, err = commands.NewGitCommand(app.Log, app.OSCommand)
 	if err != nil {
-		return app, err
+		return nil, err
+	}
+	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config)
+	if err != nil {
+		return nil, err
 	}
 	return app, nil
 }
--- a/pkg/commands/branch.go
+++ b/pkg/commands/branch.go
@@ -14,9 +14,9 @@ type Branch struct {
 	Recency string
 }

-// GetDisplayStrings returns the dispaly string of branch
-func (b *Branch) GetDisplayStrings() []string {
-	return []string{b.Recency, utils.ColoredString(b.Name, b.GetColor())}
+// GetDisplayString returns the dispaly string of branch
+func (b *Branch) GetDisplayString() string {
+	return utils.WithPadding(b.Recency, 4) + utils.ColoredString(b.Name, b.GetColor())
 }

 // GetColor branch color
--- a/pkg/commands/commit.go
+++ b/pkg/commands/commit.go
@@ -1,30 +0,0 @@
-package commands
-
-import (
-	"github.com/fatih/color"
-)
-
-// Commit : A git commit
-type Commit struct {
-	Sha           string
-	Name          string
-	Pushed        bool
-	Merged        bool
-	DisplayString string
-}
-
-func (c *Commit) GetDisplayStrings() []string {
-	red := color.New(color.FgRed)
-	yellow := color.New(color.FgGreen)
-	green := color.New(color.FgYellow)
-	white := color.New(color.FgWhite)
-
-	shaColor := yellow
-	if c.Pushed {
-		shaColor = red
-	} else if !c.Merged {
-		shaColor = green
-	}
-
-	return []string{shaColor.Sprint(c.Sha), white.Sprint(c.Name)}
-}
--- a/pkg/commands/file.go
+++ b/pkg/commands/file.go
@@ -1,36 +0,0 @@
-package commands
-
-import "github.com/fatih/color"
-
-// File : A file from git status
-// duplicating this for now
-type File struct {
-	Name               string
-	HasStagedChanges   bool
-	HasUnstagedChanges bool
-	Tracked            bool
-	Deleted            bool
-	HasMergeConflicts  bool
-	DisplayString      string
-	Type               string // one of 'file', 'directory', and 'other'
-}
-
-// GetDisplayStrings returns the display string of a file
-func (f *File) GetDisplayStrings() []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
@@ -7,116 +7,49 @@ import (
 	"os/exec"
 	"strings"

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

-func verifyInGitRepo(runCmd func(string) error) error {
-	return runCmd("git status")
-}
-
-func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
-	for {
-		f, err := stat(".git")
-
-		if err == nil && f.IsDir() {
-			return nil
-		}
-
-		if !os.IsNotExist(err) {
-			return err
-		}
-
-		if err = chdir(".."); err != nil {
-			return err
-		}
-	}
-}
-
-func setupRepositoryAndWorktree(openGitRepository func(string) (*gogit.Repository, error), sLocalize func(string) string) (repository *gogit.Repository, worktree *gogit.Worktree, err error) {
-	repository, err = openGitRepository(".")
-
-	if err != nil {
-		if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
-			return nil, nil, errors.New(sLocalize("GitconfigParseErr"))
-		}
-
-		return
-	}
-
-	worktree, err = repository.Worktree()
-
-	if err != nil {
-		return
-	}
-
-	return
-}
-
 // GitCommand is our main git interface
 type GitCommand struct {
-	Log                *logrus.Entry
-	OSCommand          *OSCommand
-	Worktree           *gogit.Worktree
-	Repo               *gogit.Repository
-	Tr                 *i18n.Localizer
-	getGlobalGitConfig func(string) (string, error)
-	getLocalGitConfig  func(string) (string, error)
-	removeFile         func(string) error
+	Log       *logrus.Logger
+	OSCommand *OSCommand
+	Worktree  *gogit.Worktree
+	Repo      *gogit.Repository
 }

 // NewGitCommand it runs git commands
-func NewGitCommand(log *logrus.Entry, osCommand *OSCommand, tr *i18n.Localizer) (*GitCommand, error) {
-	var worktree *gogit.Worktree
-	var repo *gogit.Repository
-
-	fs := []func() error{
-		func() error {
-			return verifyInGitRepo(osCommand.RunCommand)
-		},
-		func() error {
-			return navigateToRepoRootDirectory(os.Stat, os.Chdir)
-		},
-		func() error {
-			var err error
-			repo, worktree, err = setupRepositoryAndWorktree(gogit.PlainOpen, tr.SLocalize)
-			return err
-		},
+func NewGitCommand(log *logrus.Logger, osCommand *OSCommand) (*GitCommand, error) {
+	gitCommand := &GitCommand{
+		Log:       log,
+		OSCommand: osCommand,
 	}
+	return gitCommand, nil
+}

-	for _, f := range fs {
-		if err := f(); err != nil {
-			return nil, err
-		}
-	}
-
-	return &GitCommand{
-		Log:                log,
-		OSCommand:          osCommand,
-		Tr:                 tr,
-		Worktree:           worktree,
-		Repo:               repo,
-		getGlobalGitConfig: gitconfig.Global,
-		getLocalGitConfig:  gitconfig.Local,
-		removeFile:         os.RemoveAll,
-	}, nil
+// SetupGit sets git repo up
+func (c *GitCommand) SetupGit() {
+	c.verifyInGitRepo()
+	c.navigateToRepoRootDirectory()
+	c.setupWorktree()
 }

 // GetStashEntries stash entryies
-func (c *GitCommand) GetStashEntries() []*StashEntry {
+func (c *GitCommand) GetStashEntries() []StashEntry {
+	stashEntries := make([]StashEntry, 0)
 	rawString, _ := c.OSCommand.RunCommandWithOutput("git stash list --pretty='%gs'")
-	stashEntries := []*StashEntry{}
 	for i, line := range utils.SplitLines(rawString) {
 		stashEntries = append(stashEntries, stashEntryFromLine(line, i))
 	}
 	return stashEntries
 }

-func stashEntryFromLine(line string, index int) *StashEntry {
-	return &StashEntry{
+func stashEntryFromLine(line string, index int) StashEntry {
+	return StashEntry{
 		Name:          line,
 		Index:         index,
 		DisplayString: line,
@@ -128,29 +61,35 @@ func (c *GitCommand) GetStashEntryDiff(index int) (string, error) {
 	return c.OSCommand.RunCommandWithOutput("git stash show -p --color stash@{" + fmt.Sprint(index) + "}")
 }

+func includes(array []string, str string) bool {
+	for _, arrayStr := range array {
+		if arrayStr == str {
+			return true
+		}
+	}
+	return false
+}
+
 // GetStatusFiles git status files
-func (c *GitCommand) GetStatusFiles() []*File {
+func (c *GitCommand) GetStatusFiles() []File {
 	statusOutput, _ := c.GitStatus()
 	statusStrings := utils.SplitLines(statusOutput)
-	files := []*File{}
+	files := make([]File, 0)

 	for _, statusString := range statusStrings {
 		change := statusString[0:2]
 		stagedChange := change[0:1]
 		unstagedChange := statusString[1:2]
-		filename := c.OSCommand.Unquote(statusString[3:])
-		_, untracked := map[string]bool{"??": true, "A ": true, "AM": true}[change]
-		_, hasNoStagedChanges := map[string]bool{" ": true, "U": true, "?": true}[stagedChange]
-
-		file := &File{
+		filename := statusString[3:]
+		tracked := !includes([]string{"??", "A "}, change)
+		file := File{
 			Name:               filename,
 			DisplayString:      statusString,
-			HasStagedChanges:   !hasNoStagedChanges,
+			HasStagedChanges:   !includes([]string{" ", "U", "?"}, stagedChange),
 			HasUnstagedChanges: unstagedChange != " ",
-			Tracked:            !untracked,
+			Tracked:            tracked,
 			Deleted:            unstagedChange == "D" || stagedChange == "D",
 			HasMergeConflicts:  change == "UU",
-			Type:               c.OSCommand.FileType(filename),
 		}
 		files = append(files, file)
 	}
@@ -160,25 +99,25 @@ func (c *GitCommand) GetStatusFiles() []*File {

 // StashDo modify stash
 func (c *GitCommand) StashDo(index int, method string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git stash %s stash@{%d}", method, index))
+	return c.OSCommand.RunCommand("git stash " + method + " stash@{" + fmt.Sprint(index) + "}")
 }

 // StashSave save stash
 // TODO: before calling this, check if there is anything to save
 func (c *GitCommand) StashSave(message string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git stash save %s", c.OSCommand.Quote(message)))
+	return c.OSCommand.RunCommand("git stash save " + c.OSCommand.Quote(message))
 }

 // MergeStatusFiles merge status files
-func (c *GitCommand) MergeStatusFiles(oldFiles, newFiles []*File) []*File {
+func (c *GitCommand) MergeStatusFiles(oldFiles, newFiles []File) []File {
 	if len(oldFiles) == 0 {
 		return newFiles
 	}

-	appendedIndexes := []int{}
+	appendedIndexes := make([]int, 0)

 	// retain position of files we already could see
-	result := []*File{}
+	result := make([]File, 0)
 	for _, oldFile := range oldFiles {
 		for newIndex, newFile := range newFiles {
 			if oldFile.Name == newFile.Name {
@@ -199,13 +138,11 @@ func (c *GitCommand) MergeStatusFiles(oldFiles, newFiles []*File) []*File {
 	return result
 }

-func includesInt(list []int, a int) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
+func (c *GitCommand) verifyInGitRepo() {
+	if output, err := c.OSCommand.RunCommandWithOutput("git status"); err != nil {
+		fmt.Println(output)
+		os.Exit(1)
 	}
-	return false
 }

 // GetBranchName branch name
@@ -213,6 +150,29 @@ func (c *GitCommand) GetBranchName() (string, error) {
 	return c.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
 }

+func (c *GitCommand) navigateToRepoRootDirectory() {
+	_, err := os.Stat(".git")
+	for os.IsNotExist(err) {
+		c.Log.Debug("going up a directory to find the root")
+		os.Chdir("..")
+		_, err = os.Stat(".git")
+	}
+}
+
+func (c *GitCommand) setupWorktree() {
+	r, err := gogit.PlainOpen(".")
+	if err != nil {
+		panic(err)
+	}
+	c.Repo = r
+
+	w, err := r.Worktree()
+	if err != nil {
+		panic(err)
+	}
+	c.Worktree = w
+}
+
 // ResetHard does the equivalent of `git reset --hard HEAD`
 func (c *GitCommand) ResetHard() error {
 	return c.Worktree.Reset(&gogit.ResetOptions{Mode: gogit.HardReset})
@@ -221,11 +181,11 @@ func (c *GitCommand) ResetHard() error {
 // UpstreamDifferenceCount checks how many pushables/pullables there are for the
 // current branch
 func (c *GitCommand) UpstreamDifferenceCount() (string, string) {
-	pushableCount, err := c.OSCommand.RunCommandWithOutput("git rev-list @{u}..HEAD --count")
+	pushableCount, err := c.OSCommand.RunCommandWithOutput("git rev-list @{u}..head --count")
 	if err != nil {
 		return "?", "?"
 	}
-	pullableCount, err := c.OSCommand.RunCommandWithOutput("git rev-list HEAD..@{u} --count")
+	pullableCount, err := c.OSCommand.RunCommandWithOutput("git rev-list head..@{u} --count")
 	if err != nil {
 		return "?", "?"
 	}
@@ -233,23 +193,18 @@ func (c *GitCommand) UpstreamDifferenceCount() (string, string) {
 }

 // GetCommitsToPush Returns the sha's of the commits that have not yet been pushed
-// to the remote branch of the current branch, a map is returned to ease look up
-func (c *GitCommand) GetCommitsToPush() map[string]bool {
-	pushables := map[string]bool{}
-	o, err := c.OSCommand.RunCommandWithOutput("git rev-list @{u}..HEAD --abbrev-commit")
+// to the remote branch of the current branch
+func (c *GitCommand) GetCommitsToPush() []string {
+	pushables, err := c.OSCommand.RunCommandWithOutput("git rev-list @{u}..head --abbrev-commit")
 	if err != nil {
-		return pushables
+		return make([]string, 0)
 	}
-	for _, p := range utils.SplitLines(o) {
-		pushables[p] = true
-	}
-
-	return pushables
+	return utils.SplitLines(pushables)
 }

 // RenameCommit renames the topmost commit with the given name
 func (c *GitCommand) RenameCommit(name string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git commit --allow-empty --amend -m %s", c.OSCommand.Quote(name)))
+	return c.OSCommand.RunCommand("git commit --allow-empty --amend -m " + c.OSCommand.Quote(name))
 }

 // Fetch fetch git repo
@@ -259,31 +214,17 @@ func (c *GitCommand) Fetch() error {

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

 // NewBranch create new branch
 func (c *GitCommand) NewBranch(name string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git checkout -b %s", name))
-}
-
-func (c *GitCommand) CurrentBranchName() (string, error) {
-	output, err := c.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
-	if err != nil {
-		return "", err
-	}
-	return utils.TrimTrailingNewline(output), nil
+	return c.OSCommand.RunCommand("git checkout -b " + name)
 }

 // DeleteBranch delete branch
-func (c *GitCommand) DeleteBranch(branch string, force bool) error {
-	command := "git branch -d"
-
-	if force {
-		command = "git branch -D"
-	}
-
-	return c.OSCommand.RunCommand(fmt.Sprintf("%s %s", command, branch))
+func (c *GitCommand) DeleteBranch(branch string) error {
+	return c.OSCommand.RunCommand("git branch -d " + branch)
 }

 // ListStash list stash
@@ -293,7 +234,7 @@ func (c *GitCommand) ListStash() (string, error) {

 // Merge merge
 func (c *GitCommand) Merge(branchName string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git merge --no-edit %s", branchName))
+	return c.OSCommand.RunCommand("git merge --no-edit " + branchName)
 }

 // AbortMerge abort merge
@@ -301,114 +242,103 @@ func (c *GitCommand) AbortMerge() error {
 	return c.OSCommand.RunCommand("git merge --abort")
 }

-// usingGpg tells us whether the user has gpg enabled so that we can know
+// UsingGpg tells us whether the user has gpg enabled so that we can know
 // whether we need to run a subprocess to allow them to enter their password
-func (c *GitCommand) usingGpg() bool {
-	gpgsign, _ := c.getLocalGitConfig("commit.gpgsign")
+func (c *GitCommand) UsingGpg() bool {
+	gpgsign, _ := gitconfig.Global("commit.gpgsign")
 	if gpgsign == "" {
-		gpgsign, _ = c.getGlobalGitConfig("commit.gpgsign")
+		gpgsign, _ = gitconfig.Local("commit.gpgsign")
 	}
-	value := strings.ToLower(gpgsign)
-
-	return value == "true" || value == "1" || value == "yes" || value == "on"
+	if gpgsign == "" {
+		return false
+	}
+	return true
 }

-// Commit commits to git
-func (c *GitCommand) Commit(message string, amend bool) (*exec.Cmd, error) {
-	amendParam := ""
-	if amend {
-		amendParam = " --amend"
+// Commit commit to git
+func (c *GitCommand) Commit(g *gocui.Gui, message string) (*exec.Cmd, error) {
+	command := "git commit -m " + c.OSCommand.Quote(message)
+	if c.UsingGpg() {
+		return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command)
 	}
-	command := fmt.Sprintf("git commit%s -m %s", amendParam, c.OSCommand.Quote(message))
-	if c.usingGpg() {
-		return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command), nil
-	}
-
 	return nil, c.OSCommand.RunCommand(command)
 }

-// Pull pulls from repo
+// Pull pull from repo
 func (c *GitCommand) Pull() error {
 	return c.OSCommand.RunCommand("git pull --no-edit")
 }

-// Push pushes to a branch
-func (c *GitCommand) Push(branchName string, force bool) error {
-	forceFlag := ""
-	if force {
-		forceFlag = "--force-with-lease "
-	}
-
-	return c.OSCommand.RunCommand(fmt.Sprintf("git push %s -u origin %s", forceFlag, branchName))
+// Push push to a branch
+func (c *GitCommand) Push(branchName string) error {
+	return c.OSCommand.RunCommand("git push -u origin " + branchName)
 }

 // SquashPreviousTwoCommits squashes a commit down to the one below it
 // retaining the message of the higher commit
 func (c *GitCommand) SquashPreviousTwoCommits(message string) error {
 	// TODO: test this
-	if err := c.OSCommand.RunCommand("git reset --soft HEAD^"); err != nil {
+	err := c.OSCommand.RunCommand("git reset --soft HEAD^")
+	if err != nil {
 		return err
 	}
 	// TODO: if password is required, we need to return a subprocess
-	return c.OSCommand.RunCommand(fmt.Sprintf("git commit --amend -m %s", c.OSCommand.Quote(message)))
+	return c.OSCommand.RunCommand("git commit --amend -m " + c.OSCommand.Quote(message))
 }

 // SquashFixupCommit squashes a 'FIXUP' commit into the commit beneath it,
 // retaining the commit message of the lower commit
 func (c *GitCommand) SquashFixupCommit(branchName string, shaValue string) error {
+	var err error
 	commands := []string{
-		fmt.Sprintf("git checkout -q %s", shaValue),
-		fmt.Sprintf("git reset --soft %s^", shaValue),
-		fmt.Sprintf("git commit --amend -C %s^", shaValue),
-		fmt.Sprintf("git rebase --onto HEAD %s %s", shaValue, branchName),
+		"git checkout -q " + shaValue,
+		"git reset --soft " + shaValue + "^",
+		"git commit --amend -C " + shaValue + "^",
+		"git rebase --onto HEAD " + shaValue + " " + branchName,
 	}
+	ret := ""
 	for _, command := range commands {
 		c.Log.Info(command)
-
-		if output, err := c.OSCommand.RunCommandWithOutput(command); err != nil {
-			ret := output
-			// We are already in an error state here so we're just going to append
-			// the output of these commands
-			output, _ := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git branch -d %s", shaValue))
-			ret += output
-			output, _ = c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git checkout %s", branchName))
-			ret += output
-
+		output, err := c.OSCommand.RunCommandWithOutput(command)
+		ret += output
+		if err != nil {
 			c.Log.Info(ret)
-			return errors.New(ret)
+			break
 		}
 	}
-
+	if err != nil {
+		// We are already in an error state here so we're just going to append
+		// the output of these commands
+		output, _ := c.OSCommand.RunCommandWithOutput("git branch -d " + shaValue)
+		ret += output
+		output, _ = c.OSCommand.RunCommandWithOutput("git checkout " + branchName)
+		ret += output
+	}
+	if err != nil {
+		return errors.New(ret)
+	}
 	return nil
 }

-// CatFile obtains the content of a file
-func (c *GitCommand) CatFile(fileName string) (string, error) {
-	return c.OSCommand.RunCommandWithOutput(fmt.Sprintf("cat %s", c.OSCommand.Quote(fileName)))
+// CatFile obtain the contents of a file
+func (c *GitCommand) CatFile(file string) (string, error) {
+	return c.OSCommand.RunCommandWithOutput("cat " + file)
 }

 // StageFile stages a file
-func (c *GitCommand) StageFile(fileName string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git add %s", c.OSCommand.Quote(fileName)))
-}
-
-// StageAll stages all files
-func (c *GitCommand) StageAll() error {
-	return c.OSCommand.RunCommand("git add -A")
-}
-
-// UnstageAll stages all files
-func (c *GitCommand) UnstageAll() error {
-	return c.OSCommand.RunCommand("git reset")
+func (c *GitCommand) StageFile(file string) error {
+	return c.OSCommand.RunCommand("git add " + c.OSCommand.Quote(file))
 }

 // UnStageFile unstages a file
-func (c *GitCommand) UnStageFile(fileName string, tracked bool) error {
-	command := "git rm --cached %s"
+func (c *GitCommand) UnStageFile(file string, tracked bool) error {
+	var command string
 	if tracked {
-		command = "git reset HEAD %s"
+		command = "git reset HEAD "
+	} else {
+		command = "git rm --cached "
 	}
-	return c.OSCommand.RunCommand(fmt.Sprintf(command, c.OSCommand.Quote(fileName)))
+	return c.OSCommand.RunCommand(command + file)
 }

 // GitStatus returns the plaintext short status of the repo
@@ -426,18 +356,13 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
 }

 // RemoveFile directly
-func (c *GitCommand) RemoveFile(file *File) error {
+func (c *GitCommand) RemoveFile(file File) error {
 	// if the file isn't tracked, we assume you want to delete it
-	if file.HasStagedChanges {
-		if err := c.OSCommand.RunCommand(fmt.Sprintf("git reset -- %s", file.Name)); err != nil {
-			return err
-		}
-	}
 	if !file.Tracked {
-		return c.removeFile(file.Name)
+		return os.RemoveAll(file.Name)
 	}
 	// if the file is tracked, we assume you want to just check it out
-	return c.OSCommand.RunCommand(fmt.Sprintf("git checkout -- %s", file.Name))
+	return c.OSCommand.RunCommand("git checkout " + file.Name)
 }

 // Checkout checks out a branch, with --force if you set the force arg to true
@@ -446,89 +371,75 @@ func (c *GitCommand) Checkout(branch string, force bool) error {
 	if force {
 		forceArg = "--force "
 	}
-	return c.OSCommand.RunCommand(fmt.Sprintf("git checkout %s %s", forceArg, branch))
+	return c.OSCommand.RunCommand("git checkout " + forceArg + branch)
 }

 // AddPatch prepares a subprocess for adding a patch by patch
 // this will eventually be swapped out for a better solution inside the Gui
-func (c *GitCommand) AddPatch(filename string) *exec.Cmd {
+func (c *GitCommand) AddPatch(filename string) (*exec.Cmd, error) {
 	return c.OSCommand.PrepareSubProcess("git", "add", "--patch", filename)
 }

 // PrepareCommitSubProcess prepares a subprocess for `git commit`
-func (c *GitCommand) PrepareCommitSubProcess() *exec.Cmd {
+func (c *GitCommand) PrepareCommitSubProcess() (*exec.Cmd, error) {
 	return c.OSCommand.PrepareSubProcess("git", "commit")
 }

-// PrepareCommitAmendSubProcess prepares a subprocess for `git commit --amend --allow-empty`
-func (c *GitCommand) PrepareCommitAmendSubProcess() *exec.Cmd {
-	return c.OSCommand.PrepareSubProcess("git", "commit", "--amend", "--allow-empty")
-}
-
 // GetBranchGraph gets the color-formatted graph of the log for the given branch
 // Currently it limits the result to 100 commits, but when we get async stuff
 // working we can do lazy loading
 func (c *GitCommand) GetBranchGraph(branchName string) (string, error) {
-	return c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium -100 %s", branchName))
+	return c.OSCommand.RunCommandWithOutput("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium -100 " + branchName)
 }

-func (c *GitCommand) getMergeBase() (string, error) {
-	currentBranch, err := c.CurrentBranchName()
-	if err != nil {
-		return "", err
+// Map (from https://gobyexample.com/collection-functions)
+func Map(vs []string, f func(string) string) []string {
+	vsm := make([]string, len(vs))
+	for i, v := range vs {
+		vsm[i] = f(v)
 	}
+	return vsm
+}

-	baseBranch := "master"
-	if strings.HasPrefix(currentBranch, "feature/") {
-		baseBranch = "develop"
+func includesString(list []string, a string) bool {
+	for _, b := range list {
+		if b == a {
+			return true
+		}
 	}
+	return false
+}

-	output, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git merge-base HEAD %s", baseBranch))
-	if err != nil {
-		// swallowing error because it's not a big deal; probably because there are no commits yet
-		c.Log.Error(err)
+// not sure how to genericise this because []interface{} doesn't accept e.g.
+// []int arguments
+func includesInt(list []int, a int) bool {
+	for _, b := range list {
+		if b == a {
+			return true
+		}
 	}
-	return output, nil
+	return false
 }

 // GetCommits obtains the commits of the current branch
-func (c *GitCommand) GetCommits() ([]*Commit, error) {
+func (c *GitCommand) GetCommits() []Commit {
 	pushables := c.GetCommitsToPush()
 	log := c.GetLog()
-
-	lines := utils.SplitLines(log)
-	commits := make([]*Commit, len(lines))
+	commits := make([]Commit, 0)
 	// now we can split it up and turn it into commits
-	for i, line := range lines {
+	lines := utils.SplitLines(log)
+	for _, line := range lines {
 		splitLine := strings.Split(line, " ")
 		sha := splitLine[0]
-		_, pushed := pushables[sha]
-		commits[i] = &Commit{
+		pushed := includesString(pushables, sha)
+		commits = append(commits, Commit{
 			Sha:           sha,
 			Name:          strings.Join(splitLine[1:], " "),
 			Pushed:        pushed,
 			DisplayString: strings.Join(splitLine, " "),
-		}
+		})
 	}
-	return c.setCommitMergedStatuses(commits)
-}
-
-func (c *GitCommand) setCommitMergedStatuses(commits []*Commit) ([]*Commit, error) {
-	ancestor, err := c.getMergeBase()
-	if err != nil {
-		return nil, err
-	}
-	if ancestor == "" {
-		return commits, nil
-	}
-	passedAncestor := false
-	for i, commit := range commits {
-		if strings.HasPrefix(ancestor, commit.Sha) {
-			passedAncestor = true
-		}
-		commits[i].Merged = passedAncestor
-	}
-	return commits, nil
+	return commits
 }

 // GetLog gets the git log (currently limited to 30 commits for performance
@@ -541,32 +452,44 @@ func (c *GitCommand) GetLog() string {
 		// assume if there is an error there are no commits yet for this branch
 		return ""
 	}
-
 	return result
 }

 // Ignore adds a file to the gitignore for the repo
-func (c *GitCommand) Ignore(filename string) error {
-	return c.OSCommand.AppendLineToFile(".gitignore", filename)
+func (c *GitCommand) Ignore(filename string) {
+	if _, err := c.OSCommand.RunDirectCommand("echo '" + filename + "' >> .gitignore"); err != nil {
+		panic(err)
+	}
 }

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

 // Diff returns the diff of a file
-func (c *GitCommand) Diff(file *File) string {
+func (c *GitCommand) Diff(file File) string {
 	cachedArg := ""
-	trackedArg := "--"
-	fileName := c.OSCommand.Quote(file.Name)
+	fileName := file.Name
 	if file.HasStagedChanges && !file.HasUnstagedChanges {
 		cachedArg = "--cached"
+	} else {
+		// if the file is staged and has spaces in it, it comes pre-quoted
+		fileName = c.OSCommand.Quote(fileName)
 	}
+	deletedArg := ""
+	if file.Deleted {
+		deletedArg = "--"
+	}
+	trackedArg := ""
 	if !file.Tracked && !file.HasStagedChanges {
 		trackedArg = "--no-index /dev/null"
 	}
-	command := fmt.Sprintf("git diff --color %s %s %s", cachedArg, trackedArg, fileName)
+	command := fmt.Sprintf("%s %s %s %s %s", "git diff --color ", cachedArg, deletedArg, trackedArg, fileName)

 	// for now we assume an error means the file was deleted
 	s, _ := c.OSCommand.RunCommandWithOutput(command)
--- a/pkg/commands/git_structs.go
+++ b/pkg/commands/git_structs.go
@@ -1,5 +1,32 @@
 package commands

+// File : A staged/unstaged file
+// TODO: decide whether to give all of these the Git prefix
+type File struct {
+	Name               string
+	HasStagedChanges   bool
+	HasUnstagedChanges bool
+	Tracked            bool
+	Deleted            bool
+	HasMergeConflicts  bool
+	DisplayString      string
+}
+
+// Commit : A git commit
+type Commit struct {
+	Sha           string
+	Name          string
+	Pushed        bool
+	DisplayString string
+}
+
+// StashEntry : A git stash entry
+type StashEntry struct {
+	Index         int
+	Name          string
+	DisplayString string
+}
+
 // Conflict : A git conflict with a start middle and end corresponding to line
 // numbers in the file where the conflict bars appear
 type Conflict struct {
--- a/pkg/commands/git_test.go
+++ b/pkg/commands/git_test.go
--- a/pkg/commands/os.go
+++ b/pkg/commands/os.go
@@ -4,47 +4,38 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"

-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/davecgh/go-spew/spew"

 	"github.com/mgutz/str"

-	"github.com/sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 	gitconfig "github.com/tcnksm/go-gitconfig"
 )

 // Platform stores the os state
 type Platform struct {
-	os                   string
-	shell                string
-	shellArg             string
-	escapedQuote         string
-	openCommand          string
-	fallbackEscapedQuote string
+	os           string
+	shell        string
+	shellArg     string
+	escapedQuote string
 }

 // OSCommand holds all the os commands
 type OSCommand struct {
-	Log                *logrus.Entry
-	Platform           *Platform
-	Config             config.AppConfigurer
-	command            func(string, ...string) *exec.Cmd
-	getGlobalGitConfig func(string) (string, error)
-	getenv             func(string) string
+	Log      *logrus.Logger
+	Platform *Platform
 }

 // NewOSCommand os command runner
-func NewOSCommand(log *logrus.Entry, config config.AppConfigurer) *OSCommand {
-	return &OSCommand{
-		Log:                log,
-		Platform:           getPlatform(),
-		Config:             config,
-		command:            exec.Command,
-		getGlobalGitConfig: gitconfig.Global,
-		getenv:             os.Getenv,
+func NewOSCommand(log *logrus.Logger) (*OSCommand, error) {
+	osCommand := &OSCommand{
+		Log:      log,
+		Platform: getPlatform(),
 	}
+	return osCommand, nil
 }

 // RunCommandWithOutput wrapper around commands returning their output and error
@@ -52,9 +43,8 @@ func (c *OSCommand) RunCommandWithOutput(command string) (string, error) {
 	c.Log.WithField("command", command).Info("RunCommand")
 	splitCmd := str.ToArgv(command)
 	c.Log.Info(splitCmd)
-	return sanitisedCommandOutput(
-		c.command(splitCmd[0], splitCmd[1:]...).CombinedOutput(),
-	)
+	cmdOut, err := exec.Command(splitCmd[0], splitCmd[1:]...).CombinedOutput()
+	return sanitisedCommandOutput(cmdOut, err)
 }

 // RunCommand runs a command and just returns the error
@@ -63,26 +53,16 @@ func (c *OSCommand) RunCommand(command string) error {
 	return err
 }

-// FileType tells us if the file is a file, directory or other
-func (c *OSCommand) FileType(path string) string {
-	fileInfo, err := os.Stat(path)
-	if err != nil {
-		return "other"
-	}
-	if fileInfo.IsDir() {
-		return "directory"
-	}
-	return "file"
-}
-
 // RunDirectCommand wrapper around direct commands
 func (c *OSCommand) RunDirectCommand(command string) (string, error) {
 	c.Log.WithField("command", command).Info("RunDirectCommand")
+	args := str.ToArgv(c.Platform.shellArg + " " + command)
+	c.Log.Info(spew.Sdump(args))

-	return sanitisedCommandOutput(
-		c.command(c.Platform.shell, c.Platform.shellArg, command).
-			CombinedOutput(),
-	)
+	cmdOut, err := exec.
+		Command(c.Platform.shell, args...).
+		CombinedOutput()
+	return sanitisedCommandOutput(cmdOut, err)
 }

 func sanitisedCommandOutput(output []byte, err error) (string, error) {
@@ -90,36 +70,80 @@ func sanitisedCommandOutput(output []byte, err error) (string, error) {
 	if err != nil {
 		// errors like 'exit status 1' are not very useful so we'll create an error
 		// from the combined output
-		if outputString == "" {
-			return "", err
-		}
 		return outputString, errors.New(outputString)
 	}
 	return outputString, nil
 }

-// OpenFile opens a file with the given
-func (c *OSCommand) OpenFile(filename string) error {
-	commandTemplate := c.Config.GetUserConfig().GetString("os.openCommand")
-	templateValues := map[string]string{
-		"filename": c.Quote(filename),
+func getPlatform() *Platform {
+	switch runtime.GOOS {
+	case "windows":
+		return &Platform{
+			os:           "windows",
+			shell:        "cmd",
+			shellArg:     "/c",
+			escapedQuote: "\\\"",
+		}
+	default:
+		return &Platform{
+			os:           runtime.GOOS,
+			shell:        "bash",
+			shellArg:     "-c",
+			escapedQuote: "\"",
+		}
 	}
+}

-	command := utils.ResolvePlaceholderString(commandTemplate, templateValues)
-	err := c.RunCommand(command)
-	return err
+// GetOpenCommand get open command
+func (c *OSCommand) GetOpenCommand() (string, string, error) {
+	//NextStep open equivalents: xdg-open (linux), cygstart (cygwin), open (OSX)
+	trailMap := map[string]string{
+		"xdg-open": " &>/dev/null &",
+		"cygstart": "",
+		"open":     "",
+	}
+	for name, trail := range trailMap {
+		if err := c.RunCommand("which " + name); err == nil {
+			return name, trail, nil
+		}
+	}
+	return "", "", errors.New("Unsure what command to use to open this file")
+}
+
+// VsCodeOpenFile opens the file in code, with the -r flag to open in the
+// current window
+// each of these open files needs to have the same function signature because
+// they're being passed as arguments into another function,
+// but only editFile actually returns a *exec.Cmd
+func (c *OSCommand) VsCodeOpenFile(filename string) (*exec.Cmd, error) {
+	return nil, c.RunCommand("code -r " + filename)
+}
+
+// SublimeOpenFile opens the filein sublime
+// may be deprecated in the future
+func (c *OSCommand) SublimeOpenFile(filename string) (*exec.Cmd, error) {
+	return nil, c.RunCommand("subl " + filename)
+}
+
+// OpenFile opens a file with the given
+func (c *OSCommand) OpenFile(filename string) (*exec.Cmd, error) {
+	cmdName, cmdTrail, err := c.GetOpenCommand()
+	if err != nil {
+		return nil, err
+	}
+	err = c.RunCommand(cmdName + " " + c.Quote(filename) + cmdTrail) // TODO: test on linux
+	return nil, err
 }

 // EditFile opens a file in a subprocess using whatever editor is available,
 // falling back to core.editor, VISUAL, EDITOR, then vi
 func (c *OSCommand) EditFile(filename string) (*exec.Cmd, error) {
-	editor, _ := c.getGlobalGitConfig("core.editor")
-
+	editor, _ := gitconfig.Global("core.editor")
 	if editor == "" {
-		editor = c.getenv("VISUAL")
+		editor = os.Getenv("VISUAL")
 	}
 	if editor == "" {
-		editor = c.getenv("EDITOR")
+		editor = os.Getenv("EDITOR")
 	}
 	if editor == "" {
 		if err := c.RunCommand("which vi"); err == nil {
@@ -129,39 +153,17 @@ func (c *OSCommand) EditFile(filename string) (*exec.Cmd, error) {
 	if editor == "" {
 		return nil, errors.New("No editor defined in $VISUAL, $EDITOR, or git config")
 	}
-
-	return c.PrepareSubProcess(editor, filename), nil
+	return c.PrepareSubProcess(editor, filename)
 }

 // PrepareSubProcess iniPrepareSubProcessrocess then tells the Gui to switch to it
-func (c *OSCommand) PrepareSubProcess(cmdName string, commandArgs ...string) *exec.Cmd {
-	return c.command(cmdName, commandArgs...)
+func (c *OSCommand) PrepareSubProcess(cmdName string, commandArgs ...string) (*exec.Cmd, error) {
+	subprocess := exec.Command(cmdName, commandArgs...)
+	return subprocess, nil
 }

 // Quote wraps a message in platform-specific quotation marks
 func (c *OSCommand) Quote(message string) string {
 	message = strings.Replace(message, "`", "\\`", -1)
-	escapedQuote := c.Platform.escapedQuote
-	if strings.Contains(message, c.Platform.escapedQuote) {
-		escapedQuote = c.Platform.fallbackEscapedQuote
-	}
-	return escapedQuote + message + escapedQuote
-}
-
-// Unquote removes wrapping quotations marks if they are present
-// this is needed for removing quotes from staged filenames with spaces
-func (c *OSCommand) Unquote(message string) string {
-	return strings.Replace(message, `"`, "", -1)
-}
-
-// AppendLineToFile adds a new line in file
-func (c *OSCommand) AppendLineToFile(filename, line string) error {
-	f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = f.WriteString("\n" + line)
-	return err
+	return c.Platform.escapedQuote + message + c.Platform.escapedQuote
 }
--- a/pkg/commands/os_default_platform.go
+++ b/pkg/commands/os_default_platform.go
@@ -1,18 +0,0 @@
-// +build !windows
-
-package commands
-
-import (
-	"runtime"
-)
-
-func getPlatform() *Platform {
-	return &Platform{
-		os:                   runtime.GOOS,
-		shell:                "bash",
-		shellArg:             "-c",
-		escapedQuote:         "'",
-		openCommand:          "open {{filename}}",
-		fallbackEscapedQuote: "\"",
-	}
-}
--- a/pkg/commands/os_test.go
+++ b/pkg/commands/os_test.go
@@ -1,359 +1,16 @@
 package commands

-import (
-	"os"
-	"os/exec"
-	"testing"
+import "testing"

-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
-	yaml "gopkg.in/yaml.v2"
-)
-
-func newDummyOSCommand() *OSCommand {
-	return NewOSCommand(newDummyLog(), newDummyAppConfig())
-}
-
-func newDummyAppConfig() *config.AppConfig {
-	appConfig := &config.AppConfig{
-		Name:        "lazygit",
-		Version:     "unversioned",
-		Commit:      "",
-		BuildDate:   "",
-		Debug:       false,
-		BuildSource: "",
-		UserConfig:  viper.New(),
+func TestQuote(t *testing.T) {
+	osCommand := &OSCommand{
+		Log:      nil,
+		Platform: getPlatform(),
 	}
-	_ = yaml.Unmarshal([]byte{}, appConfig.AppState)
-	return appConfig
-}
-
-func TestOSCommandRunCommandWithOutput(t *testing.T) {
-	type scenario struct {
-		command string
-		test    func(string, error)
-	}
-
-	scenarios := []scenario{
-		{
-			"echo -n '123'",
-			func(output string, err error) {
-				assert.NoError(t, err)
-				assert.EqualValues(t, "123", output)
-			},
-		},
-		{
-			"rmdir unexisting-folder",
-			func(output string, err error) {
-				assert.Regexp(t, "rmdir.*unexisting-folder.*", err.Error())
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s.test(newDummyOSCommand().RunCommandWithOutput(s.command))
-	}
-}
-
-func TestOSCommandRunCommand(t *testing.T) {
-	type scenario struct {
-		command string
-		test    func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"rmdir unexisting-folder",
-			func(err error) {
-				assert.Regexp(t, "rmdir.*unexisting-folder.*", err.Error())
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s.test(newDummyOSCommand().RunCommand(s.command))
-	}
-}
-
-func TestOSCommandOpenFile(t *testing.T) {
-	type scenario struct {
-		filename string
-		command  func(string, ...string) *exec.Cmd
-		test     func(error)
-	}
-
-	scenarios := []scenario{
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				return exec.Command("exit", "1")
-			},
-			func(err error) {
-				assert.Error(t, err)
-			},
-		},
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				assert.Equal(t, "open", name)
-				assert.Equal(t, []string{"test"}, arg)
-				return exec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"filename with spaces",
-			func(name string, arg ...string) *exec.Cmd {
-				assert.Equal(t, "open", name)
-				assert.Equal(t, []string{"filename with spaces"}, arg)
-				return exec.Command("echo")
-			},
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		OSCmd := newDummyOSCommand()
-		OSCmd.command = s.command
-		OSCmd.Config.GetUserConfig().Set("os.openCommand", "open {{filename}}")
-
-		s.test(OSCmd.OpenFile(s.filename))
-	}
-}
-
-func TestOSCommandEditFile(t *testing.T) {
-	type scenario struct {
-		filename           string
-		command            func(string, ...string) *exec.Cmd
-		getenv             func(string) string
-		getGlobalGitConfig func(string) (string, error)
-		test               func(*exec.Cmd, error)
-	}
-
-	scenarios := []scenario{
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				return exec.Command("exit", "1")
-			},
-			func(env string) string {
-				return ""
-			},
-			func(cf string) (string, error) {
-				return "", nil
-			},
-			func(cmd *exec.Cmd, err error) {
-				assert.EqualError(t, err, "No editor defined in $VISUAL, $EDITOR, or git config")
-			},
-		},
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				if name == "which" {
-					return exec.Command("exit", "1")
-				}
-
-				assert.EqualValues(t, "nano", name)
-
-				return nil
-			},
-			func(env string) string {
-				return ""
-			},
-			func(cf string) (string, error) {
-				return "nano", nil
-			},
-			func(cmd *exec.Cmd, err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				if name == "which" {
-					return exec.Command("exit", "1")
-				}
-
-				assert.EqualValues(t, "nano", name)
-
-				return nil
-			},
-			func(env string) string {
-				if env == "VISUAL" {
-					return "nano"
-				}
-
-				return ""
-			},
-			func(cf string) (string, error) {
-				return "", nil
-			},
-			func(cmd *exec.Cmd, err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				if name == "which" {
-					return exec.Command("exit", "1")
-				}
-
-				assert.EqualValues(t, "emacs", name)
-
-				return nil
-			},
-			func(env string) string {
-				if env == "EDITOR" {
-					return "emacs"
-				}
-
-				return ""
-			},
-			func(cf string) (string, error) {
-				return "", nil
-			},
-			func(cmd *exec.Cmd, err error) {
-				assert.NoError(t, err)
-			},
-		},
-		{
-			"test",
-			func(name string, arg ...string) *exec.Cmd {
-				if name == "which" {
-					return exec.Command("echo")
-				}
-
-				assert.EqualValues(t, "vi", name)
-
-				return nil
-			},
-			func(env string) string {
-				return ""
-			},
-			func(cf string) (string, error) {
-				return "", nil
-			},
-			func(cmd *exec.Cmd, err error) {
-				assert.NoError(t, err)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		OSCmd := newDummyOSCommand()
-		OSCmd.command = s.command
-		OSCmd.getGlobalGitConfig = s.getGlobalGitConfig
-		OSCmd.getenv = s.getenv
-
-		s.test(OSCmd.EditFile(s.filename))
-	}
-}
-
-func TestOSCommandQuote(t *testing.T) {
-	osCommand := newDummyOSCommand()
-
-	actual := osCommand.Quote("hello `test`")
-
+	test := "hello `test`"
 	expected := osCommand.Platform.escapedQuote + "hello \\`test\\`" + osCommand.Platform.escapedQuote
-
-	assert.EqualValues(t, expected, actual)
-}
-
-// TestOSCommandQuoteSingleQuote tests the quote function with ' quotes explicitly for Linux
-func TestOSCommandQuoteSingleQuote(t *testing.T) {
-	osCommand := newDummyOSCommand()
-
-	osCommand.Platform.os = "linux"
-
-	actual := osCommand.Quote("hello 'test'")
-
-	expected := osCommand.Platform.fallbackEscapedQuote + "hello 'test'" + osCommand.Platform.fallbackEscapedQuote
-
-	assert.EqualValues(t, expected, actual)
-}
-
-// TestOSCommandQuoteSingleQuote tests the quote function with " quotes explicitly for Linux
-func TestOSCommandQuoteDoubleQuote(t *testing.T) {
-	osCommand := newDummyOSCommand()
-
-	osCommand.Platform.os = "linux"
-
-	actual := osCommand.Quote(`hello "test"`)
-
-	expected := osCommand.Platform.escapedQuote + "hello \"test\"" + osCommand.Platform.escapedQuote
-
-	assert.EqualValues(t, expected, actual)
-}
-
-func TestOSCommandUnquote(t *testing.T) {
-	osCommand := newDummyOSCommand()
-
-	actual := osCommand.Unquote(`hello "test"`)
-
-	expected := "hello test"
-
-	assert.EqualValues(t, expected, actual)
-}
-
-func TestOSCommandFileType(t *testing.T) {
-	type scenario struct {
-		path  string
-		setup func()
-		test  func(string)
-	}
-
-	scenarios := []scenario{
-		{
-			"testFile",
-			func() {
-				if _, err := os.Create("testFile"); err != nil {
-					panic(err)
-				}
-			},
-			func(output string) {
-				assert.EqualValues(t, "file", output)
-			},
-		},
-		{
-			"file with spaces",
-			func() {
-				if _, err := os.Create("file with spaces"); err != nil {
-					panic(err)
-				}
-			},
-			func(output string) {
-				assert.EqualValues(t, "file", output)
-			},
-		},
-		{
-			"testDirectory",
-			func() {
-				if err := os.Mkdir("testDirectory", 0644); err != nil {
-					panic(err)
-				}
-			},
-			func(output string) {
-				assert.EqualValues(t, "directory", output)
-			},
-		},
-		{
-			"nonExistant",
-			func() {},
-			func(output string) {
-				assert.EqualValues(t, "other", output)
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s.setup()
-		s.test(newDummyOSCommand().FileType(s.path))
-		_ = os.RemoveAll(s.path)
+	test = osCommand.Quote(test)
+	if test != expected {
+		t.Error("Expected " + expected + ", got " + test)
 	}
 }
--- a/pkg/commands/os_windows.go
+++ b/pkg/commands/os_windows.go
@@ -1,11 +0,0 @@
-package commands
-
-func getPlatform() *Platform {
-	return &Platform{
-		os:                   "windows",
-		shell:                "cmd",
-		shellArg:             "/c",
-		escapedQuote:         `\"`,
-		fallbackEscapedQuote: "\\'",
-	}
-}
--- a/pkg/commands/stash_entry.go
+++ b/pkg/commands/stash_entry.go
@@ -1,13 +0,0 @@
-package commands
-
-// StashEntry : A git stash entry
-type StashEntry struct {
-	Index         int
-	Name          string
-	DisplayString string
-}
-
-// GetDisplayStrings returns the dispaly string of branch
-func (s *StashEntry) GetDisplayStrings() []string {
-	return []string{s.DisplayString}
-}
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -2,24 +2,19 @@ package config

 import (
 	"bytes"
-	"io/ioutil"
-	"path/filepath"

 	"github.com/shibukawa/configdir"
 	"github.com/spf13/viper"
-	yaml "gopkg.in/yaml.v2"
 )

 // AppConfig contains the base configuration fields required for lazygit.
 type AppConfig struct {
-	Debug       bool   `long:"debug" env:"DEBUG" default:"false"`
-	Version     string `long:"version" env:"VERSION" default:"unversioned"`
-	Commit      string `long:"commit" env:"COMMIT"`
-	BuildDate   string `long:"build-date" env:"BUILD_DATE"`
-	Name        string `long:"name" env:"NAME" default:"lazygit"`
-	BuildSource string `long:"build-source" env:"BUILD_SOURCE" default:""`
-	UserConfig  *viper.Viper
-	AppState    *AppState
+	Debug      bool   `long:"debug" env:"DEBUG" default:"false"`
+	Version    string `long:"version" env:"VERSION" default:"unversioned"`
+	Commit     string `long:"commit" env:"COMMIT"`
+	BuildDate  string `long:"build-date" env:"BUILD_DATE"`
+	Name       string `long:"name" env:"NAME" default:"lazygit"`
+	UserConfig *viper.Viper
 }

 // AppConfigurer interface allows individual app config structs to inherit Fields
@@ -30,36 +25,25 @@ type AppConfigurer interface {
 	GetCommit() string
 	GetBuildDate() string
 	GetName() string
-	GetBuildSource() string
 	GetUserConfig() *viper.Viper
-	GetAppState() *AppState
-	WriteToUserConfig(string, string) error
-	SaveAppState() error
-	LoadAppState() error
+	InsertToUserConfig(string, string) error
 }

 // NewAppConfig makes a new app config
-func NewAppConfig(name, version, commit, date string, buildSource string, debuggingFlag *bool) (*AppConfig, error) {
-	userConfig, err := LoadConfig("config", true)
+func NewAppConfig(name, version, commit, date string, debuggingFlag *bool) (*AppConfig, error) {
+	userConfig, err := LoadUserConfig()
 	if err != nil {
-		return nil, err
+		panic(err)
 	}

 	appConfig := &AppConfig{
-		Name:        "lazygit",
-		Version:     version,
-		Commit:      commit,
-		BuildDate:   date,
-		Debug:       *debuggingFlag,
-		BuildSource: buildSource,
-		UserConfig:  userConfig,
-		AppState:    &AppState{},
+		Name:       "lazygit",
+		Version:    version,
+		Commit:     commit,
+		BuildDate:  date,
+		Debug:      *debuggingFlag,
+		UserConfig: userConfig,
 	}
-
-	if err := appConfig.LoadAppState(); err != nil {
-		return nil, err
-	}
-
 	return appConfig, nil
 }

@@ -88,161 +72,97 @@ func (c *AppConfig) GetName() string {
 	return c.Name
 }

-// GetBuildSource returns the source of the build. For builds from goreleaser
-// this will be binaryBuild
-func (c *AppConfig) GetBuildSource() string {
-	return c.BuildSource
-}
-
 // GetUserConfig returns the user config
 func (c *AppConfig) GetUserConfig() *viper.Viper {
 	return c.UserConfig
 }

-// GetAppState returns the app state
-func (c *AppConfig) GetAppState() *AppState {
-	return c.AppState
-}
-
-func newViper(filename string) (*viper.Viper, error) {
+func newViper() (*viper.Viper, error) {
 	v := viper.New()
 	v.SetConfigType("yaml")
-	v.SetConfigName(filename)
+	v.SetConfigName("config")
 	return v, nil
 }

-// LoadConfig gets the user's config
-func LoadConfig(filename string, withDefaults bool) (*viper.Viper, error) {
-	v, err := newViper(filename)
+// LoadUserConfig gets the user's config
+func LoadUserConfig() (*viper.Viper, error) {
+	v, err := newViper()
 	if err != nil {
+		panic(err)
+	}
+	if err = LoadDefaultConfig(v); err != nil {
 		return nil, err
 	}
-	if withDefaults {
-		if err = LoadDefaults(v, GetDefaultConfig()); err != nil {
-			return nil, err
-		}
-		if err = LoadDefaults(v, GetPlatformDefaultConfig()); err != nil {
-			return nil, err
-		}
-	}
-	if err = LoadAndMergeFile(v, filename+".yml"); err != nil {
+	if err = LoadUserConfigFromFile(v); err != nil {
 		return nil, err
 	}
 	return v, nil
 }

-// LoadDefaults loads in the defaults defined in this file
-func LoadDefaults(v *viper.Viper, defaults []byte) error {
-	return v.MergeConfig(bytes.NewBuffer(defaults))
+// LoadDefaultConfig loads in the defaults defined in this file
+func LoadDefaultConfig(v *viper.Viper) error {
+	defaults := getDefaultConfig()
+	return v.ReadConfig(bytes.NewBuffer(defaults))
 }

-func prepareConfigFile(filename string) (string, error) {
+// LoadUserConfigFromFile Loads the user config from their config file, creating
+// the file as an empty config if it does not exist
+func LoadUserConfigFromFile(v *viper.Viper) error {
 	// chucking my name there is not for vanity purposes, the xdg spec (and that
 	// function) requires a vendor name. May as well line up with github
 	configDirs := configdir.New("jesseduffield", "lazygit")
-	folder := configDirs.QueryFolderContainsFile(filename)
+	folder := configDirs.QueryFolderContainsFile("config.yml")
 	if folder == nil {
-		// create the file as empty
+		// create the file as an empty config and load it
 		folders := configDirs.QueryFolders(configdir.Global)
-		if err := folders[0].WriteFile(filename, []byte{}); err != nil {
-			return "", err
+		if err := folders[0].WriteFile("config.yml", []byte{}); err != nil {
+			return err
 		}
-		folder = configDirs.QueryFolderContainsFile(filename)
+		folder = configDirs.QueryFolderContainsFile("config.yml")
 	}
-	return filepath.Join(folder.Path, filename), nil
+	v.AddConfigPath(folder.Path)
+	if err := v.MergeInConfig(); err != nil {
+		return err
+	}
+	return nil
 }

-// LoadAndMergeFile Loads the config/state file, creating
-// the file as an empty one if it does not exist
-func LoadAndMergeFile(v *viper.Viper, filename string) error {
-	configPath, err := prepareConfigFile(filename)
+// InsertToUserConfig adds a key/value pair to the user's config and saves it
+func (c *AppConfig) InsertToUserConfig(key, value string) error {
+	// making a new viper object so that we're not writing any defaults back
+	// to the user's config file
+	v, err := newViper()
 	if err != nil {
 		return err
 	}
-
-	v.AddConfigPath(filepath.Dir(configPath))
-	return v.MergeInConfig()
-}
-
-// WriteToUserConfig adds a key/value pair to the user's config and saves it
-func (c *AppConfig) WriteToUserConfig(key, value string) error {
-	// reloading the user config directly (without defaults) so that we're not
-	// writing any defaults back to the user's config
-	v, err := LoadConfig("config", false)
-	if err != nil {
+	if err = LoadUserConfigFromFile(v); err != nil {
 		return err
 	}
-
 	v.Set(key, value)
-	return v.WriteConfig()
-}
-
-// SaveAppState marhsalls the AppState struct and writes it to the disk
-func (c *AppConfig) SaveAppState() error {
-	marshalledAppState, err := yaml.Marshal(c.AppState)
-	if err != nil {
+	if err := v.WriteConfig(); err != nil {
 		return err
 	}
-
-	filepath, err := prepareConfigFile("state.yml")
-	if err != nil {
-		return err
-	}
-
-	return ioutil.WriteFile(filepath, marshalledAppState, 0644)
+	return nil
 }

-// LoadAppState loads recorded AppState from file
-func (c *AppConfig) LoadAppState() error {
-	filepath, err := prepareConfigFile("state.yml")
-	if err != nil {
-		return err
-	}
-	appStateBytes, err := ioutil.ReadFile(filepath)
-	if err != nil {
-		return err
-	}
-	if len(appStateBytes) == 0 {
-		return yaml.Unmarshal(getDefaultAppState(), c.AppState)
-	}
-	return yaml.Unmarshal(appStateBytes, c.AppState)
-}
-
-// GetDefaultConfig returns the application default configuration
-func GetDefaultConfig() []byte {
-	return []byte(
-		`gui:
-  ## stuff relating to the UI
-  scrollHeight: 2
-  theme:
-    activeBorderColor:
-      - white
-      - bold
-    inactiveBorderColor:
-      - white
-    optionsTextColor:
-      - blue
-  commitLength:
-    show: true
-update:
-  method: prompt # can be: prompt | background | never
-  days: 14 # how often a update is checked for
-reporting: 'undetermined' # one of: 'on' | 'off' | 'undetermined'
-confirmOnQuit: false
-`)
-}
-
-// AppState stores data between runs of the app like when the last update check
-// was performed and which other repos have been checked out
-type AppState struct {
-	LastUpdateCheck int64
-	RecentRepos     []string
-}
-
-func getDefaultAppState() []byte {
+func getDefaultConfig() []byte {
 	return []byte(`
-  lastUpdateCheck: 0
-  recentRepos: []
+  gui:
+    ## stuff relating to the UI
+    scrollHeight: 2
+    theme:
+      activeBorderColor:
+        - white
+        - bold
+      inactiveBorderColor:
+        - white
+      optionsTextColor:
+        - blue
+  git:
+    # stuff relating to git
+  os:
+    # stuff relating to the OS
+
 `)
 }

--- a/pkg/config/config_default_platform.go
+++ b/pkg/config/config_default_platform.go
@@ -1,10 +0,0 @@
-// +build !windows,!linux
-
-package config
-
-// GetPlatformDefaultConfig gets the defaults for the platform
-func GetPlatformDefaultConfig() []byte {
-	return []byte(
-		`os:
-  openCommand: 'open {{filename}}'`)
-}
--- a/pkg/config/config_linux.go
+++ b/pkg/config/config_linux.go
@@ -1,8 +0,0 @@
-package config
-
-// GetPlatformDefaultConfig gets the defaults for the platform
-func GetPlatformDefaultConfig() []byte {
-	return []byte(
-		`os:
-  openCommand: 'sh -c "xdg-open {{filename}} >/dev/null"'`)
-}
--- a/pkg/config/config_windows.go
+++ b/pkg/config/config_windows.go
@@ -1,8 +0,0 @@
-package config
-
-// GetPlatformDefaultConfig gets the defaults for the platform
-func GetPlatformDefaultConfig() []byte {
-	return []byte(
-		`os:
-  openCommand: 'cmd /c "start "" {{filename}}"'`)
-}
--- a/pkg/git/branch_list_builder.go
+++ b/pkg/git/branch_list_builder.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/utils"

-	"github.com/sirupsen/logrus"
+	"github.com/Sirupsen/logrus"

 	"gopkg.in/src-d/go-git.v4/plumbing"
 )
@@ -22,19 +22,19 @@ import (

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

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

-func (b *BranchListBuilder) obtainCurrentBranch() *commands.Branch {
+func (b *BranchListBuilder) obtainCurrentBranch() commands.Branch {
 	// I used go-git for this, but that breaks if you've just done a git init,
 	// even though you're on 'master'
 	branchName, err := b.GitCommand.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
@@ -44,11 +44,11 @@ func (b *BranchListBuilder) obtainCurrentBranch() *commands.Branch {
 			panic(err.Error())
 		}
 	}
-	return &commands.Branch{Name: strings.TrimSpace(branchName), Recency: "  *"}
+	return commands.Branch{Name: strings.TrimSpace(branchName), Recency: "  *"}
 }

-func (b *BranchListBuilder) obtainReflogBranches() []*commands.Branch {
-	branches := make([]*commands.Branch, 0)
+func (b *BranchListBuilder) obtainReflogBranches() []commands.Branch {
+	branches := make([]commands.Branch, 0)
 	rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput("git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD")
 	if err != nil {
 		return branches
@@ -58,14 +58,14 @@ func (b *BranchListBuilder) obtainReflogBranches() []*commands.Branch {
 	for _, line := range branchLines {
 		timeNumber, timeUnit, branchName := branchInfoFromLine(line)
 		timeUnit = abbreviatedTimeUnit(timeUnit)
-		branch := &commands.Branch{Name: branchName, Recency: timeNumber + timeUnit}
+		branch := commands.Branch{Name: branchName, Recency: timeNumber + timeUnit}
 		branches = append(branches, branch)
 	}
 	return branches
 }

-func (b *BranchListBuilder) obtainSafeBranches() []*commands.Branch {
-	branches := make([]*commands.Branch, 0)
+func (b *BranchListBuilder) obtainSafeBranches() []commands.Branch {
+	branches := make([]commands.Branch, 0)

 	bIter, err := b.GitCommand.Repo.Branches()
 	if err != nil {
@@ -73,14 +73,14 @@ func (b *BranchListBuilder) obtainSafeBranches() []*commands.Branch {
 	}
 	err = bIter.ForEach(func(b *plumbing.Reference) error {
 		name := b.Name().Short()
-		branches = append(branches, &commands.Branch{Name: name})
+		branches = append(branches, commands.Branch{Name: name})
 		return nil
 	})

 	return branches
 }

-func (b *BranchListBuilder) appendNewBranches(finalBranches, newBranches, existingBranches []*commands.Branch, included bool) []*commands.Branch {
+func (b *BranchListBuilder) appendNewBranches(finalBranches, newBranches, existingBranches []commands.Branch, included bool) []commands.Branch {
 	for _, newBranch := range newBranches {
 		if included == branchIncluded(newBranch.Name, existingBranches) {
 			finalBranches = append(finalBranches, newBranch)
@@ -89,7 +89,7 @@ func (b *BranchListBuilder) appendNewBranches(finalBranches, newBranches, existi
 	return finalBranches
 }

-func sanitisedReflogName(reflogBranch *commands.Branch, safeBranches []*commands.Branch) string {
+func sanitisedReflogName(reflogBranch commands.Branch, safeBranches []commands.Branch) string {
 	for _, safeBranch := range safeBranches {
 		if strings.ToLower(safeBranch.Name) == strings.ToLower(reflogBranch.Name) {
 			return safeBranch.Name
@@ -99,15 +99,15 @@ func sanitisedReflogName(reflogBranch *commands.Branch, safeBranches []*commands
 }

 // Build the list of branches for the current repo
-func (b *BranchListBuilder) Build() []*commands.Branch {
-	branches := make([]*commands.Branch, 0)
+func (b *BranchListBuilder) Build() []commands.Branch {
+	branches := make([]commands.Branch, 0)
 	head := b.obtainCurrentBranch()
 	safeBranches := b.obtainSafeBranches()
 	if len(safeBranches) == 0 {
 		return append(branches, head)
 	}
 	reflogBranches := b.obtainReflogBranches()
-	reflogBranches = uniqueByName(append([]*commands.Branch{head}, reflogBranches...))
+	reflogBranches = uniqueByName(append([]commands.Branch{head}, reflogBranches...))
 	for i, reflogBranch := range reflogBranches {
 		reflogBranches[i].Name = sanitisedReflogName(reflogBranch, safeBranches)
 	}
@@ -118,7 +118,7 @@ func (b *BranchListBuilder) Build() []*commands.Branch {
 	return branches
 }

-func branchIncluded(branchName string, branches []*commands.Branch) bool {
+func branchIncluded(branchName string, branches []commands.Branch) bool {
 	for _, existingBranch := range branches {
 		if strings.ToLower(existingBranch.Name) == strings.ToLower(branchName) {
 			return true
@@ -127,8 +127,8 @@ func branchIncluded(branchName string, branches []*commands.Branch) bool {
 	return false
 }

-func uniqueByName(branches []*commands.Branch) []*commands.Branch {
-	finalBranches := make([]*commands.Branch, 0)
+func uniqueByName(branches []commands.Branch) []commands.Branch {
+	finalBranches := make([]commands.Branch, 0)
 	for _, branch := range branches {
 		if branchIncluded(branch.Name, finalBranches) {
 			continue
--- a/pkg/gui/app_status_manager.go
+++ b/pkg/gui/app_status_manager.go
@@ -1,44 +0,0 @@
-package gui
-
-import "github.com/jesseduffield/lazygit/pkg/utils"
-
-type appStatus struct {
-	name       string
-	statusType string
-	duration   int
-}
-
-type statusManager struct {
-	statuses []appStatus
-}
-
-func (m *statusManager) removeStatus(name string) {
-	newStatuses := []appStatus{}
-	for _, status := range m.statuses {
-		if status.name != name {
-			newStatuses = append(newStatuses, status)
-		}
-	}
-	m.statuses = newStatuses
-}
-
-func (m *statusManager) addWaitingStatus(name string) {
-	m.removeStatus(name)
-	newStatus := appStatus{
-		name:       name,
-		statusType: "waiting",
-		duration:   0,
-	}
-	m.statuses = append([]appStatus{newStatus}, m.statuses...)
-}
-
-func (m *statusManager) getStatusString() string {
-	if len(m.statuses) == 0 {
-		return ""
-	}
-	topStatus := m.statuses[0]
-	if topStatus.statusType == "waiting" {
-		return topStatus.name + " " + utils.Loader()
-	}
-	return topStatus.name
-}
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -7,15 +7,14 @@ import (
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/git"
-	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 func (gui *Gui) handleBranchPress(g *gocui.Gui, v *gocui.View) error {
-	index := gui.getItemPosition(gui.getBranchesView(g))
+	index := gui.getItemPosition(v)
 	if index == 0 {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("AlreadyCheckedOutBranch"))
 	}
-	branch := gui.getSelectedBranch(gui.getBranchesView(g))
+	branch := gui.getSelectedBranch(v)
 	if err := gui.GitCommand.Checkout(branch.Name, false); err != nil {
 		gui.createErrorPanel(g, err.Error())
 	}
@@ -63,34 +62,20 @@ func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleDeleteBranch(g *gocui.Gui, v *gocui.View) error {
-	return gui.deleteBranch(g, v, false)
-}
-
-func (gui *Gui) handleForceDeleteBranch(g *gocui.Gui, v *gocui.View) error {
-	return gui.deleteBranch(g, v, true)
-}
-
-func (gui *Gui) deleteBranch(g *gocui.Gui, v *gocui.View, force bool) error {
 	checkedOutBranch := gui.State.Branches[0]
 	selectedBranch := gui.getSelectedBranch(v)
 	if checkedOutBranch.Name == selectedBranch.Name {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantDeleteCheckOutBranch"))
 	}
-	title := gui.Tr.SLocalize("DeleteBranch")
-	var messageId string
-	if force {
-		messageId = "ForceDeleteBranchMessage"
-	} else {
-		messageId = "DeleteBranchMessage"
-	}
 	message := gui.Tr.TemplateLocalize(
-		messageId,
+		"DeleteBranchMessage",
 		Teml{
 			"selectedBranchName": selectedBranch.Name,
 		},
 	)
+	title := gui.Tr.SLocalize("DeleteBranch")
 	return gui.createConfirmationPanel(g, v, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.DeleteBranch(selectedBranch.Name, force); err != nil {
+		if err := gui.GitCommand.DeleteBranch(selectedBranch.Name); err != nil {
 			return gui.createErrorPanel(g, err.Error())
 		}
 		return gui.refreshSidePanels(g)
@@ -110,13 +95,21 @@ func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
 	return nil
 }

-func (gui *Gui) getSelectedBranch(v *gocui.View) *commands.Branch {
+func (gui *Gui) getSelectedBranch(v *gocui.View) commands.Branch {
 	lineNumber := gui.getItemPosition(v)
 	return gui.State.Branches[lineNumber]
 }

 func (gui *Gui) renderBranchesOptions(g *gocui.Gui) error {
-	return gui.renderGlobalOptions(g)
+	return gui.renderOptionsMap(g, map[string]string{
+		"space":   gui.Tr.SLocalize("checkout"),
+		"f":       gui.Tr.SLocalize("forceCheckout"),
+		"m":       gui.Tr.SLocalize("merge"),
+		"c":       gui.Tr.SLocalize("checkoutByName"),
+		"n":       gui.Tr.SLocalize("newBranch"),
+		"d":       gui.Tr.SLocalize("deleteBranch"),
+		"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
+	})
 }

 // may want to standardise how these select methods work
@@ -152,15 +145,10 @@ func (gui *Gui) refreshBranches(g *gocui.Gui) error {
 			return err
 		}
 		gui.State.Branches = builder.Build()
-
 		v.Clear()
-		list, err := utils.RenderList(gui.State.Branches)
-		if err != nil {
-			return err
+		for _, branch := range gui.State.Branches {
+			fmt.Fprintln(v, branch.GetDisplayString())
 		}
-
-		fmt.Fprint(v, list)
-
 		gui.resetOrigin(v)
 		return gui.refreshStatus(g)
 	})
--- a/pkg/gui/commit_message_panel.go
+++ b/pkg/gui/commit_message_panel.go
@@ -1,9 +1,6 @@
 package gui

 import (
-	"strconv"
-	"strings"
-
 	"github.com/jesseduffield/gocui"
 )

@@ -12,7 +9,7 @@ func (gui *Gui) handleCommitConfirm(g *gocui.Gui, v *gocui.View) error {
 	if message == "" {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CommitWithoutMessageErr"))
 	}
-	sub, err := gui.GitCommand.Commit(message, false)
+	sub, err := gui.GitCommand.Commit(g, message)
 	if err != nil {
 		// TODO need to find a way to send through this error
 		if err != gui.Errors.ErrSubProcess {
@@ -36,11 +33,21 @@ func (gui *Gui) handleCommitClose(g *gocui.Gui, v *gocui.View) error {
 	return gui.switchFocus(g, v, gui.getFilesView(g))
 }

-func (gui *Gui) handleCommitFocused(g *gocui.Gui, v *gocui.View) error {
-	if _, err := g.SetViewOnTop("commitMessage"); err != nil {
-		return err
+func (gui *Gui) handleNewlineCommitMessage(g *gocui.Gui, v *gocui.View) error {
+	// resising ahead of time so that the top line doesn't get hidden to make
+	// room for the cursor on the second line
+	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, v.Buffer())
+	if _, err := g.SetView("commitMessage", x0, y0, x1, y1+1, 0); err != nil {
+		if err != gocui.ErrUnknownView {
+			return err
+		}
 	}

+	v.EditNewLine()
+	return nil
+}
+
+func (gui *Gui) handleCommitFocused(g *gocui.Gui, v *gocui.View) error {
 	message := gui.Tr.TemplateLocalize(
 		"CloseConfirm",
 		Teml{
@@ -50,42 +57,3 @@ func (gui *Gui) handleCommitFocused(g *gocui.Gui, v *gocui.View) error {
 	)
 	return gui.renderString(g, "options", message)
 }
-
-func (gui *Gui) simpleEditor(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
-	default:
-		v.EditWrite(ch)
-	}
-
-	gui.RenderCommitLength()
-}
-
-func (gui *Gui) getBufferLength(view *gocui.View) string {
-	return " " + strconv.Itoa(strings.Count(view.Buffer(), "")-1) + " "
-}
-
-func (gui *Gui) RenderCommitLength() {
-	if !gui.Config.GetUserConfig().GetBool("gui.commitLength.show") {
-		return
-	}
-	v := gui.getCommitMessageView(gui.g)
-	v.Subtitle = gui.getBufferLength(v)
-}
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -2,34 +2,33 @@ package gui

 import (
 	"errors"
-	"fmt"

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

 func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 	g.Update(func(*gocui.Gui) error {
-		commits, err := gui.GitCommand.GetCommits()
-		if err != nil {
-			return err
-		}
-
-		gui.State.Commits = commits
+		gui.State.Commits = gui.GitCommand.GetCommits()
 		v, err := g.View("commits")
 		if err != nil {
-			return err
+			panic(err)
 		}
-
 		v.Clear()
-
-		list, err := utils.RenderList(gui.State.Commits)
-		if err != nil {
-			return err
+		red := color.New(color.FgRed)
+		yellow := color.New(color.FgYellow)
+		white := color.New(color.FgWhite)
+		shaColor := white
+		for _, commit := range gui.State.Commits {
+			if commit.Pushed {
+				shaColor = red
+			} else {
+				shaColor = yellow
+			}
+			shaColor.Fprint(v, commit.Sha+" ")
+			white.Fprintln(v, commit.Name)
 		}
-		fmt.Fprint(v, list)
-
 		gui.refreshStatus(g)
 		if g.CurrentView().Name() == "commits" {
 			gui.handleCommitSelect(g, v)
@@ -60,7 +59,13 @@ func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error
 }

 func (gui *Gui) renderCommitsOptions(g *gocui.Gui) error {
-	return gui.renderGlobalOptions(g)
+	return gui.renderOptionsMap(g, map[string]string{
+		"s":       gui.Tr.SLocalize("squashDown"),
+		"r":       gui.Tr.SLocalize("rename"),
+		"g":       gui.Tr.SLocalize("resetToThisCommit"),
+		"f":       gui.Tr.SLocalize("fixupCommit"),
+		"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
+	})
 }

 func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
@@ -69,15 +74,12 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 	}
 	commit, err := gui.getSelectedCommit(g)
 	if err != nil {
-		if err.Error() != gui.Tr.SLocalize("NoCommitsThisBranch") {
+		if err != errors.New(gui.Tr.SLocalize("NoCommitsThisBranch")) {
 			return err
 		}
 		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}
-	commitText, err := gui.GitCommand.Show(commit.Sha)
-	if err != nil {
-		return err
-	}
+	commitText := gui.GitCommand.Show(commit.Sha)
 	return gui.renderString(g, "main", commitText)
 }

@@ -103,7 +105,7 @@ func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
 }

 // TODO: move to files panel
-func (gui *Gui) anyUnStagedChanges(files []*commands.File) bool {
+func (gui *Gui) anyUnStagedChanges(files []commands.File) bool {
 	for _, file := range files {
 		if file.Tracked && file.HasUnstagedChanges {
 			return true
@@ -138,10 +140,10 @@ func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
-	if gui.getItemPosition(gui.getCommitsView(g)) != 0 {
+	if gui.getItemPosition(v) != 0 {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("OnlyRenameTopCommit"))
 	}
-	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("renameCommit"), func(g *gocui.Gui, v *gocui.View) error {
+	gui.createPromptPanel(g, v, gui.Tr.SLocalize("RenameCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.RenameCommit(v.Buffer()); err != nil {
 			return gui.createErrorPanel(g, err.Error())
 		}
@@ -150,28 +152,16 @@ func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
 		}
 		return gui.handleCommitSelect(g, v)
 	})
-}
-
-func (gui *Gui) handleRenameCommitEditor(g *gocui.Gui, v *gocui.View) error {
-	if gui.getItemPosition(gui.getCommitsView(g)) != 0 {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("OnlyRenameTopCommit"))
-	}
-
-	gui.SubProcess = gui.GitCommand.PrepareCommitAmendSubProcess()
-	g.Update(func(g *gocui.Gui) error {
-		return gui.Errors.ErrSubProcess
-	})
-
 	return nil
 }

-func (gui *Gui) getSelectedCommit(g *gocui.Gui) (*commands.Commit, error) {
+func (gui *Gui) getSelectedCommit(g *gocui.Gui) (commands.Commit, error) {
 	v, err := g.View("commits")
 	if err != nil {
 		panic(err)
 	}
 	if len(gui.State.Commits) == 0 {
-		return &commands.Commit{}, errors.New(gui.Tr.SLocalize("NoCommitsThisBranch"))
+		return commands.Commit{}, errors.New(gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}
 	lineNumber := gui.getItemPosition(v)
 	if lineNumber > len(gui.State.Commits)-1 {
--- a/pkg/gui/confirmation_panel.go
+++ b/pkg/gui/confirmation_panel.go
@@ -11,13 +11,14 @@ import (

 	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )

 func (gui *Gui) wrappedConfirmationFunction(function func(*gocui.Gui, *gocui.View) error) func(*gocui.Gui, *gocui.View) error {
 	return func(g *gocui.Gui, v *gocui.View) error {
 		if function != nil {
 			if err := function(g, v); err != nil {
-				return err
+				panic(err)
 			}
 		}
 		return gui.closeConfirmationPrompt(g)
@@ -57,30 +58,20 @@ func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, prompt string) (int

 func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, handleConfirm func(*gocui.Gui, *gocui.View) error) error {
 	gui.onNewPopupPanel()
-	confirmationView, err := gui.prepareConfirmationPanel(currentView, title, "")
-	if err != nil {
-		return err
-	}
-	confirmationView.Editable = true
-	return gui.setKeyBindings(g, handleConfirm, nil)
-}
-
-func (gui *Gui) prepareConfirmationPanel(currentView *gocui.View, title, prompt string) (*gocui.View, error) {
-	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, prompt)
-	confirmationView, err := gui.g.SetView("confirmation", x0, y0, x1, y1, 0)
-	if err != nil {
+	// only need to fit one line
+	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, "")
+	if confirmationView, err := g.SetView("confirmation", x0, y0, x1, y1, 0); err != nil {
 		if err != gocui.ErrUnknownView {
-			return nil, err
+			return err
 		}
+
+		confirmationView.Editable = true
 		confirmationView.Title = title
 		confirmationView.FgColor = gocui.ColorWhite
+		gui.switchFocus(g, currentView, confirmationView)
+		return gui.setKeyBindings(g, handleConfirm, nil)
 	}
-	confirmationView.Clear()
-
-	if err := gui.switchFocus(gui.g, currentView, confirmationView); err != nil {
-		return nil, err
-	}
-	return confirmationView, nil
+	return nil
 }

 func (gui *Gui) onNewPopupPanel() {
@@ -102,19 +93,36 @@ func (gui *Gui) createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, t
 				gui.Log.Error(errMessage)
 			}
 		}
-		confirmationView, err := gui.prepareConfirmationPanel(currentView, title, prompt)
-		if err != nil {
-			return err
+		x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, prompt)
+		if confirmationView, err := g.SetView("confirmation", x0, y0, x1, y1, 0); err != nil {
+			if err != gocui.ErrUnknownView {
+				return err
+			}
+			confirmationView.Title = title
+			confirmationView.FgColor = gocui.ColorWhite
+			gui.renderString(g, "confirmation", prompt)
+			gui.switchFocus(g, currentView, confirmationView)
+			return gui.setKeyBindings(g, handleConfirm, handleClose)
 		}
-		confirmationView.Editable = false
-		if err := gui.renderString(g, "confirmation", prompt); err != nil {
-			return err
-		}
-		return gui.setKeyBindings(g, handleConfirm, handleClose)
+		return nil
 	})
 	return nil
 }

+func (gui *Gui) handleNewline(g *gocui.Gui, v *gocui.View) error {
+	// resising ahead of time so that the top line doesn't get hidden to make
+	// room for the cursor on the second line
+	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, v.Buffer())
+	if _, err := g.SetView("confirmation", x0, y0, x1, y1+1, 0); err != nil {
+		if err != gocui.ErrUnknownView {
+			return err
+		}
+	}
+
+	v.EditNewLine()
+	return nil
+}
+
 func (gui *Gui) setKeyBindings(g *gocui.Gui, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
 	actions := gui.Tr.TemplateLocalize(
 		"CloseConfirm",
@@ -123,10 +131,11 @@ func (gui *Gui) setKeyBindings(g *gocui.Gui, handleConfirm, handleClose func(*go
 			"keyBindConfirm": "enter",
 		},
 	)
-	if err := gui.renderString(g, "options", actions); err != nil {
+	gui.renderString(g, "options", actions)
+	if err := g.SetKeybinding("confirmation", gocui.KeyEnter, gocui.ModNone, gui.wrappedConfirmationFunction(handleConfirm)); err != nil {
 		return err
 	}
-	if err := g.SetKeybinding("confirmation", gocui.KeyEnter, gocui.ModNone, gui.wrappedConfirmationFunction(handleConfirm)); err != nil {
+	if err := g.SetKeybinding("confirmation", gocui.KeyTab, gocui.ModNone, gui.handleNewline); err != nil {
 		return err
 	}
 	return g.SetKeybinding("confirmation", gocui.KeyEsc, gocui.ModNone, gui.wrappedConfirmationFunction(handleClose))
@@ -137,9 +146,22 @@ func (gui *Gui) createMessagePanel(g *gocui.Gui, currentView *gocui.View, title,
 }

 func (gui *Gui) createErrorPanel(g *gocui.Gui, message string) error {
-	gui.Log.Error(message)
 	currentView := g.CurrentView()
 	colorFunction := color.New(color.FgRed).SprintFunc()
 	coloredMessage := colorFunction(strings.TrimSpace(message))
 	return gui.createConfirmationPanel(g, currentView, gui.Tr.SLocalize("Error"), coloredMessage, nil, nil)
 }
+
+func (gui *Gui) resizePopupPanel(g *gocui.Gui, v *gocui.View) error {
+	// If the confirmation panel is already displayed, just resize the width,
+	// otherwise continue
+	content := utils.TrimTrailingNewline(v.Buffer())
+	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, content)
+	vx0, vy0, vx1, vy1 := v.Dimensions()
+	if vx0 == x0 && vy0 == y0 && vx1 == x1 && vy1 == y1 {
+		return nil
+	}
+	gui.Log.Info(gui.Tr.SLocalize("resizingPopupPanel"))
+	_, err := g.SetView(v.Name(), x0, y0, x1, y1, 0)
+	return err
+}
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -7,17 +7,17 @@ import (

 	// "strings"

-	"fmt"
+	"os/exec"
 	"strings"

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

-func (gui *Gui) stagedFiles() []*commands.File {
+func (gui *Gui) stagedFiles() []commands.File {
 	files := gui.State.Files
-	result := make([]*commands.File, 0)
+	result := make([]commands.File, 0)
 	for _, file := range files {
 		if file.HasStagedChanges {
 			result = append(result, file)
@@ -26,9 +26,9 @@ func (gui *Gui) stagedFiles() []*commands.File {
 	return result
 }

-func (gui *Gui) trackedFiles() []*commands.File {
+func (gui *Gui) trackedFiles() []commands.File {
 	files := gui.State.Files
-	result := make([]*commands.File, 0)
+	result := make([]commands.File, 0)
 	for _, file := range files {
 		if file.Tracked {
 			result = append(result, file)
@@ -71,33 +71,6 @@ func (gui *Gui) handleFilePress(g *gocui.Gui, v *gocui.View) error {
 	return gui.handleFileSelect(g, v)
 }

-func (gui *Gui) allFilesStaged() bool {
-	for _, file := range gui.State.Files {
-		if file.HasUnstagedChanges {
-			return false
-		}
-	}
-	return true
-}
-
-func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
-	var err error
-	if gui.allFilesStaged() {
-		err = gui.GitCommand.UnstageAll()
-	} else {
-		err = gui.GitCommand.StageAll()
-	}
-	if err != nil {
-		_ = gui.createErrorPanel(g, err.Error())
-	}
-
-	if err := gui.refreshFiles(g); err != nil {
-		return err
-	}
-
-	return gui.handleFileSelect(g, v)
-}
-
 func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {
 	file, err := gui.getSelectedFile(g)
 	if err != nil {
@@ -112,14 +85,17 @@ func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {
 	if !file.Tracked {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CannotGitAdd"))
 	}
-
-	gui.SubProcess = gui.GitCommand.AddPatch(file.Name)
+	sub, err := gui.GitCommand.AddPatch(file.Name)
+	if err != nil {
+		return err
+	}
+	gui.SubProcess = sub
 	return gui.Errors.ErrSubProcess
 }

-func (gui *Gui) getSelectedFile(g *gocui.Gui) (*commands.File, error) {
+func (gui *Gui) getSelectedFile(g *gocui.Gui) (commands.File, error) {
 	if len(gui.State.Files) == 0 {
-		return &commands.File{}, gui.Errors.ErrNoFiles
+		return commands.File{}, gui.Errors.ErrNoFiles
 	}
 	filesView, err := g.View("files")
 	if err != nil {
@@ -152,7 +128,7 @@ func (gui *Gui) handleFileRemove(g *gocui.Gui, v *gocui.View) error {
 	)
 	return gui.createConfirmationPanel(g, v, strings.Title(deleteVerb)+" file", message, func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.RemoveFile(file); err != nil {
-			return err
+			panic(err)
 		}
 		return gui.refreshFiles(g)
 	}, nil)
@@ -166,14 +142,35 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
 	if file.Tracked {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantIgnoreTrackFiles"))
 	}
-	if err := gui.GitCommand.Ignore(file.Name); err != nil {
-		return gui.createErrorPanel(g, err.Error())
-	}
+	gui.GitCommand.Ignore(file.Name)
 	return gui.refreshFiles(g)
 }

 func (gui *Gui) renderfilesOptions(g *gocui.Gui, file *commands.File) error {
-	return gui.renderGlobalOptions(g)
+	optionsMap := map[string]string{
+		"← → ↑ ↓":   gui.Tr.SLocalize("navigate"),
+		"S":         gui.Tr.SLocalize("stashFiles"),
+		"c":         gui.Tr.SLocalize("CommitChanges"),
+		"o":         gui.Tr.SLocalize("open"),
+		"i":         gui.Tr.SLocalize("ignore"),
+		"d":         gui.Tr.SLocalize("delete"),
+		"space":     gui.Tr.SLocalize("toggleStaged"),
+		"R":         gui.Tr.SLocalize("refresh"),
+		"t":         gui.Tr.SLocalize("addPatch"),
+		"e":         gui.Tr.SLocalize("edit"),
+		"PgUp/PgDn": gui.Tr.SLocalize("scroll"),
+	}
+	if gui.State.HasMergeConflicts {
+		optionsMap["a"] = gui.Tr.SLocalize("abortMerge")
+		optionsMap["m"] = gui.Tr.SLocalize("resolveMergeConflicts")
+	}
+	if file == nil {
+		return gui.renderOptionsMap(g, optionsMap)
+	}
+	if file.Tracked {
+		optionsMap["d"] = gui.Tr.SLocalize("checkout")
+	}
+	return gui.renderOptionsMap(g, optionsMap)
 }

 func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error {
@@ -185,9 +182,7 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error {
 		gui.renderString(g, "main", gui.Tr.SLocalize("NoChangedFiles"))
 		return gui.renderfilesOptions(g, nil)
 	}
-	if err := gui.renderfilesOptions(g, file); err != nil {
-		return err
-	}
+	gui.renderfilesOptions(g, &file)
 	var content string
 	if file.HasMergeConflicts {
 		return gui.refreshMergePanel(g)
@@ -205,34 +200,11 @@ func (gui *Gui) handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
 	g.Update(func(g *gocui.Gui) error {
 		g.SetViewOnTop("commitMessage")
 		gui.switchFocus(g, filesView, commitMessageView)
-		gui.RenderCommitLength()
 		return nil
 	})
 	return nil
 }

-func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) error {
-	if len(gui.stagedFiles()) == 0 && !gui.State.HasMergeConflicts {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoStagedFilesToCommit"))
-	}
-	title := strings.Title(gui.Tr.SLocalize("AmendLastCommit"))
-	question := gui.Tr.SLocalize("SureToAmend")
-
-	if len(gui.State.Commits) == 0 {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoCommitToAmend"))
-	}
-
-	return gui.createConfirmationPanel(g, filesView, title, question, func(g *gocui.Gui, v *gocui.View) error {
-		lastCommitMsg := gui.State.Commits[0].Name
-		_, err := gui.GitCommand.Commit(lastCommitMsg, true)
-		if err != nil {
-			return gui.createErrorPanel(g, err.Error())
-		}
-
-		return gui.refreshSidePanels(g)
-	}, nil)
-}
-
 // handleCommitEditorPress - handle when the user wants to commit changes via
 // their editor rather than via the popup panel
 func (gui *Gui) handleCommitEditorPress(g *gocui.Gui, filesView *gocui.View) error {
@@ -244,17 +216,23 @@ func (gui *Gui) handleCommitEditorPress(g *gocui.Gui, filesView *gocui.View) err
 }

 // PrepareSubProcess - prepare a subprocess for execution and tell the gui to switch to it
-func (gui *Gui) PrepareSubProcess(g *gocui.Gui, commands ...string) {
-	gui.SubProcess = gui.GitCommand.PrepareCommitSubProcess()
+func (gui *Gui) PrepareSubProcess(g *gocui.Gui, commands ...string) error {
+	sub, err := gui.GitCommand.PrepareCommitSubProcess()
+	if err != nil {
+		return err
+	}
+	gui.SubProcess = sub
 	g.Update(func(g *gocui.Gui) error {
 		return gui.Errors.ErrSubProcess
 	})
+	return nil
 }

-func (gui *Gui) editFile(filename string) error {
-	sub, err := gui.OSCommand.EditFile(filename)
+func (gui *Gui) genericFileOpen(g *gocui.Gui, v *gocui.View, filename string, open func(string) (*exec.Cmd, error)) error {
+
+	sub, err := open(filename)
 	if err != nil {
-		return gui.createErrorPanel(gui.g, err.Error())
+		return gui.createErrorPanel(g, err.Error())
 	}
 	if sub != nil {
 		gui.SubProcess = sub
@@ -268,8 +246,7 @@ func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
 	if err != nil {
 		return err
 	}
-
-	return gui.editFile(file.Name)
+	return gui.genericFileOpen(g, v, file.Name, gui.OSCommand.EditFile)
 }

 func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
@@ -277,7 +254,23 @@ func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
 	if err != nil {
 		return err
 	}
-	return gui.openFile(file.Name)
+	return gui.genericFileOpen(g, v, file.Name, gui.OSCommand.OpenFile)
+}
+
+func (gui *Gui) handleSublimeFileOpen(g *gocui.Gui, v *gocui.View) error {
+	file, err := gui.getSelectedFile(g)
+	if err != nil {
+		return err
+	}
+	return gui.genericFileOpen(g, v, file.Name, gui.OSCommand.SublimeOpenFile)
+}
+
+func (gui *Gui) handleVsCodeFileOpen(g *gocui.Gui, v *gocui.View) error {
+	file, err := gui.getSelectedFile(g)
+	if err != nil {
+		return err
+	}
+	return gui.genericFileOpen(g, v, file.Name, gui.OSCommand.VsCodeOpenFile)
 }

 func (gui *Gui) handleRefreshFiles(g *gocui.Gui, v *gocui.View) error {
@@ -300,6 +293,24 @@ func (gui *Gui) updateHasMergeConflictStatus() error {
 	return nil
 }

+func (gui *Gui) renderFile(file commands.File, filesView *gocui.View) {
+	// potentially inefficient to be instantiating these color
+	// objects with each render
+	red := color.New(color.FgRed)
+	green := color.New(color.FgGreen)
+	if !file.Tracked && !file.HasStagedChanges {
+		red.Fprintln(filesView, file.DisplayString)
+		return
+	}
+	green.Fprint(filesView, file.DisplayString[0:1])
+	red.Fprint(filesView, file.DisplayString[1:3])
+	if file.HasUnstagedChanges {
+		red.Fprintln(filesView, file.Name)
+	} else {
+		green.Fprintln(filesView, file.Name)
+	}
+}
+
 func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {
 	item, err := gui.getSelectedFile(g)
 	if err != nil {
@@ -308,13 +319,9 @@ func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {
 		}
 		return "", gui.renderString(g, "main", gui.Tr.SLocalize("NoFilesDisplay"))
 	}
-	if item.Type != "file" {
-		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.renderString(g, "main", err.Error())
+		panic(err)
 	}
 	return cat, nil
 }
@@ -325,14 +332,10 @@ func (gui *Gui) refreshFiles(g *gocui.Gui) error {
 		return err
 	}
 	gui.refreshStateFiles()
-
 	filesView.Clear()
-	list, err := utils.RenderList(gui.State.Files)
-	if err != nil {
-		return err
+	for _, file := range gui.State.Files {
+		gui.renderFile(file, filesView)
 	}
-	fmt.Fprint(filesView, list)
-
 	gui.correctCursor(filesView)
 	if filesView == g.CurrentView() {
 		gui.handleFileSelect(g, filesView)
@@ -355,35 +358,21 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
 	return nil
 }

-func (gui *Gui) pushWithForceFlag(currentView *gocui.View, force bool) error {
-	if err := gui.createMessagePanel(gui.g, currentView, "", gui.Tr.SLocalize("PushWait")); err != nil {
-		return err
-	}
+func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
+	gui.createMessagePanel(g, v, "", gui.Tr.SLocalize("PushWait"))
 	go func() {
 		branchName := gui.State.Branches[0].Name
-		if err := gui.GitCommand.Push(branchName, force); err != nil {
-			_ = gui.createErrorPanel(gui.g, err.Error())
+		if err := gui.GitCommand.Push(branchName); err != nil {
+			gui.createErrorPanel(g, err.Error())
 		} else {
-			_ = gui.closeConfirmationPrompt(gui.g)
-			_ = gui.refreshCommits(gui.g)
-			_ = gui.refreshStatus(gui.g)
+			gui.closeConfirmationPrompt(g)
+			gui.refreshCommits(g)
+			gui.refreshStatus(g)
 		}
 	}()
 	return nil
 }

-func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
-	// if we have pullables we'll ask if the user wants to force push
-	_, pullables := gui.GitCommand.UpstreamDifferenceCount()
-	if pullables == "?" || pullables == "0" {
-		return gui.pushWithForceFlag(v, false)
-	}
-	err := gui.createConfirmationPanel(g, nil, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-		return gui.pushWithForceFlag(v, true)
-	}, nil)
-	return err
-}
-
 func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
 	mergeView, err := g.View("main")
 	if err != nil {
@@ -420,10 +409,3 @@ func (gui *Gui) handleResetHard(g *gocui.Gui, v *gocui.View) error {
 		return gui.refreshFiles(g)
 	}, nil)
 }
-
-func (gui *Gui) openFile(filename string) error {
-	if err := gui.OSCommand.OpenFile(filename); err != nil {
-		return gui.createErrorPanel(gui.g, err.Error())
-	}
-	return nil
-}
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -15,14 +15,12 @@ import (

 	// "strings"

+	"github.com/Sirupsen/logrus"
 	"github.com/golang-collections/collections/stack"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/updates"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/sirupsen/logrus"
 )

 // OverlappingEdges determines if panel edges overlap
@@ -33,7 +31,6 @@ var OverlappingEdges = false
 type SentinelErrors struct {
 	ErrSubProcess error
 	ErrNoFiles    error
-	ErrSwitchRepo error
 }

 // GenerateSentinelErrors makes the sentinel errors for the gui. We're defining it here
@@ -50,7 +47,6 @@ func (gui *Gui) GenerateSentinelErrors() {
 	gui.Errors = SentinelErrors{
 		ErrSubProcess: errors.New(gui.Tr.SLocalize("RunningSubprocess")),
 		ErrNoFiles:    errors.New(gui.Tr.SLocalize("NoChangedFiles")),
-		ErrSwitchRepo: errors.New("switching repo"),
 	}
 }

@@ -59,24 +55,22 @@ 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
+	g          *gocui.Gui
+	Log        *logrus.Logger
+	GitCommand *commands.GitCommand
+	OSCommand  *commands.OSCommand
+	SubProcess *exec.Cmd
+	State      guiState
+	Config     config.AppConfigurer
+	Tr         *i18n.Localizer
+	Errors     SentinelErrors
 }

 type guiState struct {
-	Files             []*commands.File
-	Branches          []*commands.Branch
-	Commits           []*commands.Commit
-	StashEntries      []*commands.StashEntry
+	Files             []commands.File
+	Branches          []commands.Branch
+	Commits           []commands.Commit
+	StashEntries      []commands.StashEntry
 	PreviousView      string
 	HasMergeConflicts bool
 	ConflictIndex     int
@@ -84,17 +78,15 @@ type guiState struct {
 	Conflicts         []commands.Conflict
 	EditHistory       *stack.Stack
 	Platform          commands.Platform
-	Updating          bool
 }

 // NewGui builds a new gui handler
-func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, config config.AppConfigurer, updater *updates.Updater) (*Gui, error) {
-
+func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, config config.AppConfigurer) (*Gui, error) {
 	initialState := guiState{
-		Files:         make([]*commands.File, 0),
+		Files:         make([]commands.File, 0),
 		PreviousView:  "files",
-		Commits:       make([]*commands.Commit, 0),
-		StashEntries:  make([]*commands.StashEntry, 0),
+		Commits:       make([]commands.Commit, 0),
+		StashEntries:  make([]commands.StashEntry, 0),
 		ConflictIndex: 0,
 		ConflictTop:   true,
 		Conflicts:     make([]commands.Conflict, 0),
@@ -103,14 +95,12 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 	}

 	gui := &Gui{
-		Log:           log,
-		GitCommand:    gitCommand,
-		OSCommand:     oSCommand,
-		State:         initialState,
-		Config:        config,
-		Tr:            tr,
-		Updater:       updater,
-		statusManager: &statusManager{},
+		Log:        log,
+		GitCommand: gitCommand,
+		OSCommand:  oSCommand,
+		State:      initialState,
+		Config:     config,
+		Tr:         tr,
 	}

 	gui.GenerateSentinelErrors()
@@ -151,21 +141,14 @@ func max(a, b int) int {
 func (gui *Gui) layout(g *gocui.Gui) error {
 	g.Highlight = true
 	width, height := g.Size()
-	version := gui.Config.GetVersion()
 	leftSideWidth := width / 3
 	statusFilesBoundary := 2
 	filesBranchesBoundary := 2 * height / 5   // height - 20
 	commitsBranchesBoundary := 3 * height / 5 // height - 10
 	commitsStashBoundary := height - 5        // height - 5
-	optionsVersionBoundary := width - max(len(version), 1)
 	minimumHeight := 16
 	minimumWidth := 10
-
-	appStatus := gui.statusManager.getStatusString()
-	appStatusOptionsBoundary := 0
-	if appStatus != "" {
-		appStatusOptionsBoundary = len(appStatus) + 2
-	}
+	version := gui.Config.GetVersion()

 	panelSpacing := 1
 	if OverlappingEdges {
@@ -244,7 +227,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		v.FgColor = gocui.ColorWhite
 	}

-	if v, err := g.SetView("options", appStatusOptionsBoundary-1, optionsTop, optionsVersionBoundary-1, optionsTop+2, 0); err != nil {
+	if v, err := g.SetView("options", -1, optionsTop, width-len(version)-2, optionsTop+2, 0); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -256,7 +239,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {

 	if gui.getCommitMessageView(g) == nil {
 		// doesn't matter where this view starts because it will be hidden
-		if commitMessageView, err := g.SetView("commitMessage", 0, 0, width/2, height/2, 0); err != nil {
+		if commitMessageView, err := g.SetView("commitMessage", 0, 0, width, height, 0); err != nil {
 			if err != gocui.ErrUnknownView {
 				return err
 			}
@@ -264,23 +247,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			commitMessageView.Title = gui.Tr.SLocalize("CommitMessage")
 			commitMessageView.FgColor = gocui.ColorWhite
 			commitMessageView.Editable = true
-			commitMessageView.Editor = gocui.EditorFunc(gui.simpleEditor)
 		}
 	}

-	if appStatusView, err := g.SetView("appStatus", -1, optionsTop, width, optionsTop+2, 0); err != nil {
-		if err != gocui.ErrUnknownView {
-			return err
-		}
-		appStatusView.BgColor = gocui.ColorDefault
-		appStatusView.FgColor = gocui.ColorCyan
-		appStatusView.Frame = false
-		if _, err := g.SetViewOnBottom("appStatus"); err != nil {
-			return err
-		}
-	}
-
-	if v, err := g.SetView("version", optionsVersionBoundary-1, optionsTop, width, optionsTop+2, 0); err != nil {
+	if v, err := g.SetView("version", width-len(version)-1, optionsTop, width, optionsTop+2, 0); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -291,13 +261,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}

-		// these are only called once (it's a place to put all the things you want
-		// to happen on startup after the screen is first rendered)
-		gui.Updater.CheckForNewUpdate(gui.onBackgroundUpdateCheckFinish, false)
-		if err := gui.updateRecentRepoList(); err != nil {
-			return err
-		}
-
+		// these are only called once
 		gui.handleFileSelect(g, filesView)
 		gui.refreshFiles(g)
 		gui.refreshBranches(g)
@@ -306,23 +270,11 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err := gui.switchFocus(g, nil, filesView); err != nil {
 			return err
 		}
-
-		if gui.Config.GetUserConfig().GetString("reporting") == "undetermined" {
-			if err := gui.promptAnonymousReporting(); err != nil {
-				return err
-			}
-		}
 	}

-	return gui.resizeCurrentPopupPanel(g)
-}
+	gui.resizePopupPanels(g)

-func (gui *Gui) promptAnonymousReporting() error {
-	return gui.createConfirmationPanel(gui.g, nil, gui.Tr.SLocalize("AnonymousReportingTitle"), gui.Tr.SLocalize("AnonymousReportingPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-		return gui.Config.WriteToUserConfig("reporting", "on")
-	}, func(g *gocui.Gui, v *gocui.View) error {
-		return gui.Config.WriteToUserConfig("reporting", "off")
-	})
+	return nil
 }

 func (gui *Gui) fetch(g *gocui.Gui) error {
@@ -332,35 +284,16 @@ func (gui *Gui) fetch(g *gocui.Gui) error {
 }

 func (gui *Gui) updateLoader(g *gocui.Gui) error {
-	if view, _ := g.View("confirmation"); view != nil {
-		content := gui.trimmedContent(view)
+	if confirmationView, _ := g.View("confirmation"); confirmationView != nil {
+		content := gui.trimmedContent(confirmationView)
 		if strings.Contains(content, "...") {
 			staticContent := strings.Split(content, "...")[0] + "..."
-			if err := gui.renderString(g, "confirmation", staticContent+" "+utils.Loader()); err != nil {
-				return err
-			}
+			gui.renderString(g, "confirmation", staticContent+" "+gui.loader())
 		}
 	}
 	return nil
 }

-func (gui *Gui) renderAppStatus(g *gocui.Gui) error {
-	appStatus := gui.statusManager.getStatusString()
-	if appStatus != "" {
-		return gui.renderString(gui.g, "appStatus", appStatus)
-	}
-	return nil
-}
-
-func (gui *Gui) renderGlobalOptions(g *gocui.Gui) error {
-	return gui.renderOptionsMap(g, map[string]string{
-		"PgUp/PgDn": gui.Tr.SLocalize("scroll"),
-		"← → ↑ ↓":   gui.Tr.SLocalize("navigate"),
-		"esc/q":     gui.Tr.SLocalize("close"),
-		"x":         gui.Tr.SLocalize("menu"),
-	})
-}
-
 func (gui *Gui) goEvery(g *gocui.Gui, interval time.Duration, function func(*gocui.Gui) error) {
 	go func() {
 		for range time.Tick(interval) {
@@ -369,6 +302,14 @@ func (gui *Gui) goEvery(g *gocui.Gui, interval time.Duration, function func(*goc
 	}()
 }

+func (gui *Gui) resizePopupPanels(g *gocui.Gui) error {
+	v := g.CurrentView()
+	if v.Name() == "commitMessage" || v.Name() == "confirmation" {
+		return gui.resizePopupPanel(g, v)
+	}
+	return nil
+}
+
 // Run setup the gui with keybindings and start the mainloop
 func (gui *Gui) Run() error {
 	g, err := gocui.NewGui(gocui.OutputNormal, OverlappingEdges)
@@ -385,8 +326,7 @@ func (gui *Gui) Run() error {

 	gui.goEvery(g, time.Second*60, gui.fetch)
 	gui.goEvery(g, time.Second*10, gui.refreshFiles)
-	gui.goEvery(g, time.Millisecond*50, gui.updateLoader)
-	gui.goEvery(g, time.Millisecond*50, gui.renderAppStatus)
+	gui.goEvery(g, time.Millisecond*10, gui.updateLoader)

 	g.SetManagerFunc(gui.layout)

@@ -406,8 +346,6 @@ func (gui *Gui) RunWithSubprocesses() {
 		if err := gui.Run(); err != nil {
 			if err == gocui.ErrQuit {
 				break
-			} else if err == gui.Errors.ErrSwitchRepo {
-				continue
 			} else if err == gui.Errors.ErrSubProcess {
 				gui.SubProcess.Stdin = os.Stdin
 				gui.SubProcess.Stdout = os.Stdout
@@ -425,13 +363,5 @@ func (gui *Gui) RunWithSubprocesses() {
 }

 func (gui *Gui) quit(g *gocui.Gui, v *gocui.View) error {
-	if gui.State.Updating {
-		return gui.createUpdateQuitConfirmation(g, v)
-	}
-	if gui.Config.GetUserConfig().GetBool("confirmOnQuit") {
-		return gui.createConfirmationPanel(g, v, "", gui.Tr.SLocalize("ConfirmQuit"), func(g *gocui.Gui, v *gocui.View) error {
-			return gocui.ErrQuit
-		}, nil)
-	}
 	return gocui.ErrQuit
 }
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -1,394 +1,79 @@
 package gui

-import (
-	"github.com/jesseduffield/gocui"
-)
+import "github.com/jesseduffield/gocui"

 // Binding - a keybinding mapping a key and modifier to a handler. The keypress
 // is only handled if the given view has focus, or handled globally if the view
 // is ""
 type Binding struct {
-	ViewName    string
-	Handler     func(*gocui.Gui, *gocui.View) error
-	Key         interface{} // FIXME: find out how to get `gocui.Key | rune`
-	Modifier    gocui.Modifier
-	KeyReadable string
-	Description string
+	ViewName string
+	Handler  func(*gocui.Gui, *gocui.View) error
+	Key      interface{} // FIXME: find out how to get `gocui.Key | rune`
+	Modifier gocui.Modifier
 }

-// GetDisplayStrings returns the display string of a file
-func (b *Binding) GetDisplayStrings() []string {
-	return []string{b.GetKey(), b.Description}
-}
-
-func (b *Binding) GetKey() string {
-	r, ok := b.Key.(rune)
-	key := ""
-
-	if ok {
-		key = string(r)
-	} else if b.KeyReadable != "" {
-		key = b.KeyReadable
-	}
-
-	return key
-}
-
-func (gui *Gui) GetKeybindings() []*Binding {
-	bindings := []*Binding{
-		{
-			ViewName: "",
-			Key:      'q',
-			Modifier: gocui.ModNone,
-			Handler:  gui.quit,
-		}, {
-			ViewName: "",
-			Key:      gocui.KeyCtrlC,
-			Modifier: gocui.ModNone,
-			Handler:  gui.quit,
-		}, {
-			ViewName: "",
-			Key:      gocui.KeyEsc,
-			Modifier: gocui.ModNone,
-			Handler:  gui.quit,
-		}, {
-			ViewName: "",
-			Key:      gocui.KeyPgup,
-			Modifier: gocui.ModNone,
-			Handler:  gui.scrollUpMain,
-		}, {
-			ViewName: "",
-			Key:      gocui.KeyPgdn,
-			Modifier: gocui.ModNone,
-			Handler:  gui.scrollDownMain,
-		}, {
-			ViewName: "",
-			Key:      gocui.KeyCtrlU,
-			Modifier: gocui.ModNone,
-			Handler:  gui.scrollUpMain,
-		}, {
-			ViewName: "",
-			Key:      gocui.KeyCtrlD,
-			Modifier: gocui.ModNone,
-			Handler:  gui.scrollDownMain,
-		}, {
-			ViewName:    "",
-			Key:         'P',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.pushFiles,
-			Description: gui.Tr.SLocalize("push"),
-		}, {
-			ViewName:    "",
-			Key:         'p',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.pullFiles,
-			Description: gui.Tr.SLocalize("pull"),
-		}, {
-			ViewName:    "",
-			Key:         'R',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleRefresh,
-			Description: gui.Tr.SLocalize("refresh"),
-		}, {
-			ViewName: "",
-			Key:      'x',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleCreateOptionsMenu,
-		}, {
-			ViewName:    "status",
-			Key:         'e',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleEditConfig,
-			Description: gui.Tr.SLocalize("EditConfig"),
-		}, {
-			ViewName:    "status",
-			Key:         'o',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleOpenConfig,
-			Description: gui.Tr.SLocalize("OpenConfig"),
-		}, {
-			ViewName:    "status",
-			Key:         'u',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCheckForUpdate,
-			Description: gui.Tr.SLocalize("checkForUpdate"),
-		}, {
-			ViewName:    "status",
-			Key:         's',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCreateRecentReposMenu,
-			Description: gui.Tr.SLocalize("SwitchRepo"),
-		},
-		{
-			ViewName:    "files",
-			Key:         'c',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCommitPress,
-			Description: gui.Tr.SLocalize("CommitChanges"),
-		}, {
-			ViewName:    "files",
-			Key:         'A',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleAmendCommitPress,
-			Description: gui.Tr.SLocalize("AmendLastCommit"),
-		}, {
-			ViewName:    "files",
-			Key:         'C',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCommitEditorPress,
-			Description: gui.Tr.SLocalize("CommitChangesWithEditor"),
-		}, {
-			ViewName:    "files",
-			Key:         gocui.KeySpace,
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleFilePress,
-			KeyReadable: "space",
-			Description: gui.Tr.SLocalize("toggleStaged"),
-		}, {
-			ViewName:    "files",
-			Key:         'd',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleFileRemove,
-			Description: gui.Tr.SLocalize("removeFile"),
-		}, {
-			ViewName:    "files",
-			Key:         'm',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleSwitchToMerge,
-			Description: gui.Tr.SLocalize("resolveMergeConflicts"),
-		}, {
-			ViewName:    "files",
-			Key:         'e',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleFileEdit,
-			Description: gui.Tr.SLocalize("editFile"),
-		}, {
-			ViewName:    "files",
-			Key:         'o',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleFileOpen,
-			Description: gui.Tr.SLocalize("openFile"),
-		}, {
-			ViewName:    "files",
-			Key:         'i',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleIgnoreFile,
-			Description: gui.Tr.SLocalize("ignoreFile"),
-		}, {
-			ViewName:    "files",
-			Key:         'r',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleRefreshFiles,
-			Description: gui.Tr.SLocalize("refreshFiles"),
-		}, {
-			ViewName:    "files",
-			Key:         'S',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleStashSave,
-			Description: gui.Tr.SLocalize("stashFiles"),
-		}, {
-			ViewName:    "files",
-			Key:         'M',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleAbortMerge,
-			Description: gui.Tr.SLocalize("abortMerge"),
-		}, {
-			ViewName:    "files",
-			Key:         'a',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleStageAll,
-			Description: gui.Tr.SLocalize("toggleStagedAll"),
-		}, {
-			ViewName:    "files",
-			Key:         't',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleAddPatch,
-			Description: gui.Tr.SLocalize("addPatch"),
-		}, {
-			ViewName:    "files",
-			Key:         'D',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleResetHard,
-			Description: gui.Tr.SLocalize("resetHard"),
-		}, {
-			ViewName: "main",
-			Key:      gocui.KeyEsc,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleEscapeMerge,
-		}, {
-			ViewName: "main",
-			Key:      gocui.KeySpace,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePickHunk,
-		}, {
-			ViewName: "main",
-			Key:      'b',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePickBothHunks,
-		}, {
-			ViewName: "main",
-			Key:      gocui.KeyArrowLeft,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectPrevConflict,
-		}, {
-			ViewName: "main",
-			Key:      gocui.KeyArrowRight,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectNextConflict,
-		}, {
-			ViewName: "main",
-			Key:      gocui.KeyArrowUp,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectTop,
-		}, {
-			ViewName: "main",
-			Key:      gocui.KeyArrowDown,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectBottom,
-		}, {
-			ViewName: "main",
-			Key:      'h',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectPrevConflict,
-		}, {
-			ViewName: "main",
-			Key:      'l',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectNextConflict,
-		}, {
-			ViewName: "main",
-			Key:      'k',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectTop,
-		}, {
-			ViewName: "main",
-			Key:      'j',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleSelectBottom,
-		}, {
-			ViewName: "main",
-			Key:      'z',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePopFileSnapshot,
-		}, {
-			ViewName:    "branches",
-			Key:         gocui.KeySpace,
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleBranchPress,
-			KeyReadable: "space",
-			Description: gui.Tr.SLocalize("checkout"),
-		}, {
-			ViewName:    "branches",
-			Key:         'c',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCheckoutByName,
-			Description: gui.Tr.SLocalize("checkoutByName"),
-		}, {
-			ViewName:    "branches",
-			Key:         'F',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleForceCheckout,
-			Description: gui.Tr.SLocalize("forceCheckout"),
-		}, {
-			ViewName:    "branches",
-			Key:         'n',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleNewBranch,
-			Description: gui.Tr.SLocalize("newBranch"),
-		}, {
-			ViewName:    "branches",
-			Key:         'd',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleDeleteBranch,
-			Description: gui.Tr.SLocalize("deleteBranch"),
-		}, {
-			ViewName:    "branches",
-			Key:         'D',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleForceDeleteBranch,
-			Description: gui.Tr.SLocalize("forceDeleteBranch"),
-		}, {
-			ViewName:    "branches",
-			Key:         'm',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleMerge,
-			Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"),
-		}, {
-			ViewName:    "commits",
-			Key:         's',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCommitSquashDown,
-			Description: gui.Tr.SLocalize("squashDown"),
-		}, {
-			ViewName:    "commits",
-			Key:         'r',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleRenameCommit,
-			Description: gui.Tr.SLocalize("renameCommit"),
-		}, {
-			ViewName:    "commits",
-			Key:         'R',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleRenameCommitEditor,
-			Description: gui.Tr.SLocalize("renameCommitEditor"),
-		}, {
-			ViewName:    "commits",
-			Key:         'g',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleResetToCommit,
-			Description: gui.Tr.SLocalize("resetToThisCommit"),
-		}, {
-			ViewName:    "commits",
-			Key:         'f',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleCommitFixup,
-			Description: gui.Tr.SLocalize("fixupCommit"),
-		}, {
-			ViewName:    "stash",
-			Key:         gocui.KeySpace,
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleStashApply,
-			KeyReadable: "space",
-			Description: gui.Tr.SLocalize("apply"),
-		}, {
-			ViewName:    "stash",
-			Key:         'g',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleStashPop,
-			Description: gui.Tr.SLocalize("pop"),
-		}, {
-			ViewName:    "stash",
-			Key:         'd',
-			Modifier:    gocui.ModNone,
-			Handler:     gui.handleStashDrop,
-			Description: gui.Tr.SLocalize("drop"),
-		}, {
-			ViewName: "commitMessage",
-			Key:      gocui.KeyEnter,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleCommitConfirm,
-		}, {
-			ViewName: "commitMessage",
-			Key:      gocui.KeyEsc,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleCommitClose,
-		}, {
-			ViewName: "menu",
-			Key:      gocui.KeyEsc,
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleMenuClose,
-		}, {
-			ViewName: "menu",
-			Key:      'q',
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleMenuClose,
-		},
+func (gui *Gui) keybindings(g *gocui.Gui) error {
+	bindings := []Binding{
+		{ViewName: "", Key: 'q', Modifier: gocui.ModNone, Handler: gui.quit},
+		{ViewName: "", Key: gocui.KeyCtrlC, Modifier: gocui.ModNone, Handler: gui.quit},
+		{ViewName: "", Key: gocui.KeyPgup, Modifier: gocui.ModNone, Handler: gui.scrollUpMain},
+		{ViewName: "", Key: gocui.KeyPgdn, Modifier: gocui.ModNone, Handler: gui.scrollDownMain},
+		{ViewName: "", Key: gocui.KeyCtrlU, Modifier: gocui.ModNone, Handler: gui.scrollUpMain},
+		{ViewName: "", Key: gocui.KeyCtrlD, Modifier: gocui.ModNone, Handler: gui.scrollDownMain},
+		{ViewName: "", Key: 'P', Modifier: gocui.ModNone, Handler: gui.pushFiles},
+		{ViewName: "", Key: 'p', Modifier: gocui.ModNone, Handler: gui.pullFiles},
+		{ViewName: "", Key: 'R', Modifier: gocui.ModNone, Handler: gui.handleRefresh},
+		{ViewName: "status", Key: 'e', Modifier: gocui.ModNone, Handler: gui.handleEditConfig},
+		{ViewName: "status", Key: 'o', Modifier: gocui.ModNone, Handler: gui.handleOpenConfig},
+		{ViewName: "files", Key: 'c', Modifier: gocui.ModNone, Handler: gui.handleCommitPress},
+		{ViewName: "files", Key: 'C', Modifier: gocui.ModNone, Handler: gui.handleCommitEditorPress},
+		{ViewName: "files", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: gui.handleFilePress},
+		{ViewName: "files", Key: 'd', Modifier: gocui.ModNone, Handler: gui.handleFileRemove},
+		{ViewName: "files", Key: 'm', Modifier: gocui.ModNone, Handler: gui.handleSwitchToMerge},
+		{ViewName: "files", Key: 'e', Modifier: gocui.ModNone, Handler: gui.handleFileEdit},
+		{ViewName: "files", Key: 'o', Modifier: gocui.ModNone, Handler: gui.handleFileOpen},
+		{ViewName: "files", Key: 's', Modifier: gocui.ModNone, Handler: gui.handleSublimeFileOpen},
+		{ViewName: "files", Key: 'v', Modifier: gocui.ModNone, Handler: gui.handleVsCodeFileOpen},
+		{ViewName: "files", Key: 'i', Modifier: gocui.ModNone, Handler: gui.handleIgnoreFile},
+		{ViewName: "files", Key: 'r', Modifier: gocui.ModNone, Handler: gui.handleRefreshFiles},
+		{ViewName: "files", Key: 'S', Modifier: gocui.ModNone, Handler: gui.handleStashSave},
+		{ViewName: "files", Key: 'a', Modifier: gocui.ModNone, Handler: gui.handleAbortMerge},
+		{ViewName: "files", Key: 't', Modifier: gocui.ModNone, Handler: gui.handleAddPatch},
+		{ViewName: "files", Key: 'D', Modifier: gocui.ModNone, Handler: gui.handleResetHard},
+		{ViewName: "main", Key: gocui.KeyEsc, Modifier: gocui.ModNone, Handler: gui.handleEscapeMerge},
+		{ViewName: "main", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: gui.handlePickHunk},
+		{ViewName: "main", Key: 'b', Modifier: gocui.ModNone, Handler: gui.handlePickBothHunks},
+		{ViewName: "main", Key: gocui.KeyArrowLeft, Modifier: gocui.ModNone, Handler: gui.handleSelectPrevConflict},
+		{ViewName: "main", Key: gocui.KeyArrowRight, Modifier: gocui.ModNone, Handler: gui.handleSelectNextConflict},
+		{ViewName: "main", Key: gocui.KeyArrowUp, Modifier: gocui.ModNone, Handler: gui.handleSelectTop},
+		{ViewName: "main", Key: gocui.KeyArrowDown, Modifier: gocui.ModNone, Handler: gui.handleSelectBottom},
+		{ViewName: "main", Key: 'h', Modifier: gocui.ModNone, Handler: gui.handleSelectPrevConflict},
+		{ViewName: "main", Key: 'l', Modifier: gocui.ModNone, Handler: gui.handleSelectNextConflict},
+		{ViewName: "main", Key: 'k', Modifier: gocui.ModNone, Handler: gui.handleSelectTop},
+		{ViewName: "main", Key: 'j', Modifier: gocui.ModNone, Handler: gui.handleSelectBottom},
+		{ViewName: "main", Key: 'z', Modifier: gocui.ModNone, Handler: gui.handlePopFileSnapshot},
+		{ViewName: "branches", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: gui.handleBranchPress},
+		{ViewName: "branches", Key: 'c', Modifier: gocui.ModNone, Handler: gui.handleCheckoutByName},
+		{ViewName: "branches", Key: 'F', Modifier: gocui.ModNone, Handler: gui.handleForceCheckout},
+		{ViewName: "branches", Key: 'n', Modifier: gocui.ModNone, Handler: gui.handleNewBranch},
+		{ViewName: "branches", Key: 'd', Modifier: gocui.ModNone, Handler: gui.handleDeleteBranch},
+		{ViewName: "branches", Key: 'm', Modifier: gocui.ModNone, Handler: gui.handleMerge},
+		{ViewName: "commits", Key: 's', Modifier: gocui.ModNone, Handler: gui.handleCommitSquashDown},
+		{ViewName: "commits", Key: 'r', Modifier: gocui.ModNone, Handler: gui.handleRenameCommit},
+		{ViewName: "commits", Key: 'g', Modifier: gocui.ModNone, Handler: gui.handleResetToCommit},
+		{ViewName: "commits", Key: 'f', Modifier: gocui.ModNone, Handler: gui.handleCommitFixup},
+		{ViewName: "stash", Key: gocui.KeySpace, Modifier: gocui.ModNone, Handler: gui.handleStashApply},
+		{ViewName: "stash", Key: 'g', Modifier: gocui.ModNone, Handler: gui.handleStashPop},
+		{ViewName: "stash", Key: 'd', Modifier: gocui.ModNone, Handler: gui.handleStashDrop},
+		{ViewName: "commitMessage", Key: gocui.KeyEnter, Modifier: gocui.ModNone, Handler: gui.handleCommitConfirm},
+		{ViewName: "commitMessage", Key: gocui.KeyEsc, Modifier: gocui.ModNone, Handler: gui.handleCommitClose},
+		{ViewName: "commitMessage", Key: gocui.KeyTab, Modifier: gocui.ModNone, Handler: gui.handleNewlineCommitMessage},
 	}

 	// Would make these keybindings global but that interferes with editing
 	// input in the confirmation panel
-	for _, viewName := range []string{"status", "files", "branches", "commits", "stash", "menu"} {
-		bindings = append(bindings, []*Binding{
+	for _, viewName := range []string{"status", "files", "branches", "commits", "stash"} {
+		bindings = append(bindings, []Binding{
 			{ViewName: viewName, Key: gocui.KeyTab, Modifier: gocui.ModNone, Handler: gui.nextView},
 			{ViewName: viewName, Key: gocui.KeyArrowLeft, Modifier: gocui.ModNone, Handler: gui.previousView},
 			{ViewName: viewName, Key: gocui.KeyArrowRight, Modifier: gocui.ModNone, Handler: gui.nextView},
@@ -401,12 +86,6 @@ func (gui *Gui) GetKeybindings() []*Binding {
 		}...)
 	}

-	return bindings
-}
-
-func (gui *Gui) keybindings(g *gocui.Gui) error {
-	bindings := gui.GetKeybindings()
-
 	for _, binding := range bindings {
 		if err := g.SetKeybinding(binding.ViewName, binding.Key, binding.Modifier, binding.Handler); err != nil {
 			return err
--- a/pkg/gui/menu_panel.go
+++ b/pkg/gui/menu_panel.go
@@ -1,71 +0,0 @@
-package gui
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error {
-	// doing nothing for now
-	// but it is needed for switch in newLineFocused
-	return nil
-}
-
-func (gui *Gui) renderMenuOptions(g *gocui.Gui) error {
-	optionsMap := map[string]string{
-		"esc/q": gui.Tr.SLocalize("close"),
-		"↑ ↓":   gui.Tr.SLocalize("navigate"),
-		"space": gui.Tr.SLocalize("execute"),
-	}
-	return gui.renderOptionsMap(g, optionsMap)
-}
-
-func (gui *Gui) handleMenuClose(g *gocui.Gui, v *gocui.View) error {
-	if err := g.DeleteKeybinding("menu", gocui.KeySpace, gocui.ModNone); err != nil {
-		return err
-	}
-	err := g.DeleteView("menu")
-	if err != nil {
-		return err
-	}
-	return gui.returnFocus(g, v)
-}
-
-func (gui *Gui) createMenu(items interface{}, handlePress func(int) error) error {
-	list, err := utils.RenderList(items)
-	if err != nil {
-		return err
-	}
-
-	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, list)
-	menuView, _ := gui.g.SetView("menu", x0, y0, x1, y1, 0)
-	menuView.Title = strings.Title(gui.Tr.SLocalize("menu"))
-	menuView.FgColor = gocui.ColorWhite
-	menuView.Clear()
-	fmt.Fprint(menuView, list)
-
-	if err := gui.renderMenuOptions(gui.g); err != nil {
-		return err
-	}
-
-	wrappedHandlePress := func(g *gocui.Gui, v *gocui.View) error {
-		lineNumber := gui.getItemPosition(v)
-		return handlePress(lineNumber)
-	}
-
-	if err := gui.g.SetKeybinding("menu", gocui.KeySpace, gocui.ModNone, wrappedHandlePress); err != nil {
-		return err
-	}
-
-	gui.g.Update(func(g *gocui.Gui) error {
-		if _, err := g.SetViewOnTop("menu"); err != nil {
-			return err
-		}
-		currentView := gui.g.CurrentView()
-		return gui.switchFocus(gui.g, currentView, menuView)
-	})
-	return nil
-}
--- a/pkg/gui/merge_panel.go
+++ b/pkg/gui/merge_panel.go
@@ -180,9 +180,6 @@ func (gui *Gui) refreshMergePanel(g *gocui.Gui) error {
 	if err != nil {
 		return err
 	}
-	if cat == "" {
-		return nil
-	}
 	gui.State.Conflicts, err = gui.findConflicts(cat)
 	if err != nil {
 		return err
--- a/pkg/gui/options_menu_panel.go
+++ b/pkg/gui/options_menu_panel.go
@@ -1,51 +0,0 @@
-package gui
-
-import (
-	"errors"
-
-	"github.com/jesseduffield/gocui"
-)
-
-func (gui *Gui) getBindings(v *gocui.View) []*Binding {
-	var (
-		bindingsGlobal, bindingsPanel []*Binding
-	)
-
-	bindings := gui.GetKeybindings()
-
-	for _, binding := range bindings {
-		if binding.GetKey() != "" && binding.Description != "" {
-			switch binding.ViewName {
-			case "":
-				bindingsGlobal = append(bindingsGlobal, binding)
-			case v.Name():
-				bindingsPanel = append(bindingsPanel, binding)
-			}
-		}
-	}
-
-	// append dummy element to have a separator between
-	// panel and global keybindings
-	bindingsPanel = append(bindingsPanel, &Binding{})
-	return append(bindingsPanel, bindingsGlobal...)
-}
-
-func (gui *Gui) handleCreateOptionsMenu(g *gocui.Gui, v *gocui.View) error {
-	bindings := gui.getBindings(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(bindings, handleMenuPress)
-}
--- a/pkg/gui/recent_repos_panel.go
+++ b/pkg/gui/recent_repos_panel.go
@@ -1,69 +0,0 @@
-package gui
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/fatih/color"
-	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-type recentRepo struct {
-	path string
-}
-
-func (r *recentRepo) GetDisplayStrings() []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)
-	// we won't show the current repo hence the -1
-	recentRepos := make([]*recentRepo, reposCount-1)
-	for i, path := range recentRepoPaths[1:reposCount] {
-		recentRepos[i] = &recentRepo{path: path}
-	}
-
-	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)
-		if err != nil {
-			return err
-		}
-		gui.GitCommand = newGitCommand
-		return gui.Errors.ErrSwitchRepo
-	}
-
-	return gui.createMenu(recentRepos, handleMenuPress)
-}
-
-// updateRecentRepoList registers the fact that we opened lazygit in this repo,
-// so that we can open the same repo via the 'recent repos' menu
-func (gui *Gui) updateRecentRepoList() error {
-	recentRepos := gui.Config.GetAppState().RecentRepos
-	currentRepo, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	gui.Config.GetAppState().RecentRepos = newRecentReposList(recentRepos, currentRepo)
-	return gui.Config.SaveAppState()
-}
-
-func newRecentReposList(recentRepos []string, currentRepo string) []string {
-	newRepos := []string{currentRepo}
-	for _, repo := range recentRepos {
-		if repo != currentRepo {
-			newRepos = append(newRepos, repo)
-		}
-	}
-	return newRepos
-}
--- a/pkg/gui/stash_panel.go
+++ b/pkg/gui/stash_panel.go
@@ -5,7 +5,6 @@ import (

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

 func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {
@@ -15,14 +14,10 @@ func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {
 			panic(err)
 		}
 		gui.State.StashEntries = gui.GitCommand.GetStashEntries()
-
 		v.Clear()
-		list, err := utils.RenderList(gui.State.StashEntries)
-		if err != nil {
-			return err
+		for _, stashEntry := range gui.State.StashEntries {
+			fmt.Fprintln(v, stashEntry.DisplayString)
 		}
-		fmt.Fprint(v, list)
-
 		return gui.resetOrigin(v)
 	})
 	return nil
@@ -32,13 +27,17 @@ func (gui *Gui) getSelectedStashEntry(v *gocui.View) *commands.StashEntry {
 	if len(gui.State.StashEntries) == 0 {
 		return nil
 	}
-	stashView, _ := gui.g.View("stash")
-	lineNumber := gui.getItemPosition(stashView)
-	return gui.State.StashEntries[lineNumber]
+	lineNumber := gui.getItemPosition(v)
+	return &gui.State.StashEntries[lineNumber]
 }

 func (gui *Gui) renderStashOptions(g *gocui.Gui) error {
-	return gui.renderGlobalOptions(g)
+	return gui.renderOptionsMap(g, map[string]string{
+		"space":   gui.Tr.SLocalize("apply"),
+		"g":       gui.Tr.SLocalize("pop"),
+		"d":       gui.Tr.SLocalize("drop"),
+		"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
+	})
 }

 func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -2,7 +2,6 @@ package gui

 import (
 	"fmt"
-	"strings"

 	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
@@ -43,25 +42,21 @@ func (gui *Gui) refreshStatus(g *gocui.Gui) error {
 }

 func (gui *Gui) renderStatusOptions(g *gocui.Gui) error {
-	return gui.renderGlobalOptions(g)
-}
-
-func (gui *Gui) handleCheckForUpdate(g *gocui.Gui, v *gocui.View) error {
-	gui.Updater.CheckForNewUpdate(gui.onUserUpdateCheckFinish, true)
-	return gui.createMessagePanel(gui.g, v, "", gui.Tr.SLocalize("CheckingForUpdates"))
+	return gui.renderOptionsMap(g, map[string]string{
+		"o": gui.Tr.SLocalize("OpenConfig"),
+		"e": gui.Tr.SLocalize("EditConfig"),
+	})
 }

 func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
-	dashboardString := strings.Join(
-		[]string{
-			lazygitTitle(),
-			"Copyright (c) 2018 Jesse Duffield",
-			"Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md",
-			"Config Options: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md",
-			"Tutorial: https://www.youtube.com/watch?v=VDXvbHZYeKY",
-			"Raise an Issue: https://github.com/jesseduffield/lazygit/issues",
-			"Buy Jesse a coffee: https://donorbox.org/lazygit",
-		}, "\n\n")
+	dashboardString := fmt.Sprintf(
+		"%s\n\n%s\n\n%s\n\n%s\n\n%s",
+		lazygitTitle(),
+		"Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md",
+		"Config Options: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md",
+		"Tutorial: https://www.youtube.com/watch?v=VDXvbHZYeKY",
+		"Raise an Issue: https://github.com/jesseduffield/lazygit/issues",
+	)

 	if err := gui.renderString(g, "main", dashboardString); err != nil {
 		return err
@@ -70,12 +65,13 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleOpenConfig(g *gocui.Gui, v *gocui.View) error {
-	return gui.openFile(gui.Config.GetUserConfig().ConfigFileUsed())
+	filename := gui.Config.GetUserConfig().ConfigFileUsed()
+	return gui.genericFileOpen(g, v, filename, gui.OSCommand.OpenFile)
 }

 func (gui *Gui) handleEditConfig(g *gocui.Gui, v *gocui.View) error {
 	filename := gui.Config.GetUserConfig().ConfigFileUsed()
-	return gui.editFile(filename)
+	return gui.genericFileOpen(g, v, filename, gui.OSCommand.EditFile)
 }

 func lazygitTitle() string {
--- a/pkg/gui/updates.go
+++ b/pkg/gui/updates.go
@@ -1,65 +0,0 @@
-package gui
-
-import "github.com/jesseduffield/gocui"
-
-func (gui *Gui) showUpdatePrompt(newVersion string) error {
-	title := "New version available!"
-	message := "Download latest version? (enter/esc)"
-	currentView := gui.g.CurrentView()
-	return gui.createConfirmationPanel(gui.g, currentView, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		gui.startUpdating(newVersion)
-		return nil
-	}, nil)
-}
-
-func (gui *Gui) onUserUpdateCheckFinish(newVersion string, err error) error {
-	if err != nil {
-		return gui.createErrorPanel(gui.g, err.Error())
-	}
-	if newVersion == "" {
-		return gui.createErrorPanel(gui.g, "New version not found")
-	}
-	return gui.showUpdatePrompt(newVersion)
-}
-
-func (gui *Gui) onBackgroundUpdateCheckFinish(newVersion string, err error) error {
-	if err != nil {
-		// ignoring the error for now so that I'm not annoying users
-		gui.Log.Error(err.Error())
-		return nil
-	}
-	if newVersion == "" {
-		return nil
-	}
-	if gui.Config.GetUserConfig().Get("update.method") == "background" {
-		gui.startUpdating(newVersion)
-		return nil
-	}
-	return gui.showUpdatePrompt(newVersion)
-}
-
-func (gui *Gui) startUpdating(newVersion string) {
-	gui.State.Updating = true
-	gui.statusManager.addWaitingStatus("updating")
-	gui.Updater.Update(newVersion, gui.onUpdateFinish)
-}
-
-func (gui *Gui) onUpdateFinish(err error) error {
-	gui.State.Updating = false
-	gui.statusManager.removeStatus("updating")
-	if err := gui.renderString(gui.g, "appStatus", ""); err != nil {
-		return err
-	}
-	if err != nil {
-		return gui.createErrorPanel(gui.g, "Update failed: "+err.Error())
-	}
-	return nil
-}
-
-func (gui *Gui) createUpdateQuitConfirmation(g *gocui.Gui, v *gocui.View) error {
-	title := "Currently Updating"
-	message := "An update is in progress. Are you sure you want to quit?"
-	return gui.createConfirmationPanel(gui.g, v, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		return gocui.ErrQuit
-	}, nil)
-}
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"time"

 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/spkg/bom"
 )

 var cyclableViews = []string{"status", "files", "branches", "commits", "stash"}
@@ -82,8 +81,6 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 	mainView.SetOrigin(0, 0)

 	switch v.Name() {
-	case "menu":
-		return gui.handleMenuSelect(g, v)
 	case "status":
 		return gui.handleStatusSelect(g, v)
 	case "files":
@@ -111,11 +108,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error {
 	previousView, err := g.View(gui.State.PreviousView)
 	if err != nil {
-		// always fall back to files view if there's no 'previous' view stored
-		previousView, err = g.View("files")
-		if err != nil {
-			gui.Log.Error(err)
-		}
+		panic(err)
 	}
 	return gui.switchFocus(g, v, previousView)
 }
@@ -133,15 +126,8 @@ func (gui *Gui) switchFocus(g *gocui.Gui, oldView, newView *gocui.View) error {
 			},
 		)
 		gui.Log.Info(message)
-
-		// second class panels should never have focus restored to them because
-		// once they lose focus they are effectively 'destroyed'
-		secondClassPanels := []string{"confirmation", "menu"}
-		if !utils.IncludesString(secondClassPanels, oldView.Name()) {
-			gui.State.PreviousView = oldView.Name()
-		}
+		gui.State.PreviousView = oldView.Name()
 	}
-
 	newView.Highlight = true
 	message := gui.Tr.TemplateLocalize(
 		"newFocusedViewIs",
@@ -154,7 +140,6 @@ func (gui *Gui) switchFocus(g *gocui.Gui, oldView, newView *gocui.View) error {
 		return err
 	}
 	g.Cursor = newView.Editable
-
 	return gui.newLineFocused(g, newView)
 }

@@ -167,6 +152,7 @@ func (gui *Gui) getItemPosition(v *gocui.View) int {

 func (gui *Gui) cursorUp(g *gocui.Gui, v *gocui.View) error {
 	// swallowing cursor movements in main
+	// TODO: pull this out
 	if v == nil || v.Name() == "main" {
 		return nil
 	}
@@ -185,28 +171,19 @@ func (gui *Gui) cursorUp(g *gocui.Gui, v *gocui.View) error {

 func (gui *Gui) cursorDown(g *gocui.Gui, v *gocui.View) error {
 	// swallowing cursor movements in main
+	// TODO: pull this out
 	if v == nil || v.Name() == "main" {
 		return nil
 	}
 	cx, cy := v.Cursor()
 	ox, oy := v.Origin()
-	ly := v.LinesHeight() - 1
-	_, height := v.Size()
-	maxY := height - 1
-
-	// if we are at the end we just return
-	if cy+oy == ly {
+	if cy+oy >= len(v.BufferLines())-2 {
 		return nil
 	}
-
-	var err error
-	if cy < maxY {
-		err = v.SetCursor(cx, cy+1)
-	} else {
-		err = v.SetOrigin(ox, oy+1)
-	}
-	if err != nil {
-		return err
+	if err := v.SetCursor(cx, cy+1); err != nil {
+		if err := v.SetOrigin(ox, oy+1); err != nil {
+			return err
+		}
 	}

 	gui.newLineFocused(g, v)
@@ -223,19 +200,10 @@ 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) correctCursor(v *gocui.View) error {
 	cx, cy := v.Cursor()
-	ox, oy := v.Origin()
-	_, height := v.Size()
-	maxY := height - 1
-	ly := v.LinesHeight() - 1
-	if oy+cy <= ly {
-		return nil
-	}
-	newCy := utils.Min(ly, maxY)
-	if err := v.SetCursor(cx, newCy); err != nil {
-		return err
-	}
-	if err := v.SetOrigin(ox, ly-newCy); err != nil {
-		return err
+	_, oy := v.Origin()
+	lineCount := len(v.BufferLines()) - 2
+	if cy >= lineCount-oy {
+		return v.SetCursor(cx, lineCount-oy)
 	}
 	return nil
 }
@@ -249,9 +217,7 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error {
 			return nil
 		}
 		v.Clear()
-		output := string(bom.Clean([]byte(s)))
-		output = utils.NormalizeLinefeeds(output)
-		fmt.Fprint(v, output)
+		fmt.Fprint(v, s)
 		v.Wrap = true
 		return nil
 	})
@@ -271,8 +237,15 @@ func (gui *Gui) renderOptionsMap(g *gocui.Gui, optionsMap map[string]string) err
 	return gui.renderString(g, "options", gui.optionsMapToString(optionsMap))
 }

+func (gui *Gui) loader() string {
+	characters := "|/-\\"
+	now := time.Now()
+	nanos := now.UnixNano()
+	index := nanos / 50000000 % int64(len(characters))
+	return characters[index : index+1]
+}
+
 // TODO: refactor properly
-// i'm so sorry but had to add this getBranchesView
 func (gui *Gui) getFilesView(g *gocui.Gui) *gocui.View {
 	v, _ := g.View("files")
 	return v
@@ -288,11 +261,6 @@ func (gui *Gui) getCommitMessageView(g *gocui.Gui) *gocui.View {
 	return v
 }

-func (gui *Gui) getBranchesView(g *gocui.Gui) *gocui.View {
-	v, _ := g.View("branches")
-	return v
-}
-
 func (gui *Gui) trimmedContent(v *gocui.View) string {
 	return strings.TrimSpace(v.Buffer())
 }
@@ -301,25 +269,3 @@ func (gui *Gui) currentViewName(g *gocui.Gui) string {
 	currentView := g.CurrentView()
 	return currentView.Name()
 }
-
-func (gui *Gui) resizeCurrentPopupPanel(g *gocui.Gui) error {
-	v := g.CurrentView()
-	if v.Name() == "commitMessage" || v.Name() == "confirmation" {
-		return gui.resizePopupPanel(g, v)
-	}
-	return nil
-}
-
-func (gui *Gui) resizePopupPanel(g *gocui.Gui, v *gocui.View) error {
-	// If the confirmation panel is already displayed, just resize the width,
-	// otherwise continue
-	content := v.Buffer()
-	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(g, content)
-	vx0, vy0, vx1, vy1 := v.Dimensions()
-	if vx0 == x0 && vy0 == y0 && vx1 == x1 && vy1 == y1 {
-		return nil
-	}
-	gui.Log.Info(gui.Tr.SLocalize("resizingPopupPanel"))
-	_, err := g.SetView(v.Name(), x0, y0, x1, y1, 0)
-	return err
-}
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -6,10 +6,10 @@ import (
 )

 // addDutch will add all dutch translations
-func addDutch(i18nObject *i18n.Bundle) error {
+func addDutch(i18nObject *i18n.Bundle) {

 	// add the translations
-	return i18nObject.AddMessages(language.Dutch,
+	i18nObject.AddMessages(language.Dutch,
 		&i18n.Message{
 			ID:    "NotEnoughSpace",
 			Other: "Niet genoeg ruimte om de panelen te renderen",
@@ -34,33 +34,12 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CommitChanges",
 			Other: "Commit Veranderingen",
-		}, &i18n.Message{
-			ID:    "AmendLastCommit",
-			Other: "wijzig laatste commit",
-		}, &i18n.Message{
-			ID:    "SureToAmend",
-			Other: "Weet je zeker dat je de laatste commit wilt wijzigen? U kunt het commit-bericht wijzigen vanuit het commits-paneel.",
-		}, &i18n.Message{
-			ID:    "NoCommitToAmend",
-			Other: "Er is geen verplichting om te wijzigen.",
-		}, &i18n.Message{
-			ID:    "CommitChangesWithEditor",
-			Other: "commit Veranderingen met de git editor",
 		}, &i18n.Message{
 			ID:    "StatusTitle",
 			Other: "Status",
-		}, &i18n.Message{
-			ID:    "GlobalTitle",
-			Other: "Global",
 		}, &i18n.Message{
 			ID:    "navigate",
 			Other: "navigeer",
-		}, &i18n.Message{
-			ID:    "menu",
-			Other: "menu",
-		}, &i18n.Message{
-			ID:    "execute",
-			Other: "uitvoeren",
 		}, &i18n.Message{
 			ID:    "stashFiles",
 			Other: "stash-bestanden",
@@ -76,9 +55,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "toggleStaged",
 			Other: "toggle staged",
-		}, &i18n.Message{
-			ID:    "toggleStagedAll",
-			Other: "toggle staged alle",
 		}, &i18n.Message{
 			ID:    "refresh",
 			Other: "verversen",
@@ -87,7 +63,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "verandering toevoegen",
 		}, &i18n.Message{
 			ID:    "edit",
-			Other: "verander",
+			Other: "veranderen",
 		}, &i18n.Message{
 			ID:    "scroll",
 			Other: "scroll",
@@ -156,10 +132,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "Verwijder branch",
 		}, &i18n.Message{
 			ID:    "DeleteBranchMessage",
-			Other: "Weet je zeker dat je branch {{.selectedBranchName}} wil verwijderen?",
-		}, &i18n.Message{
-			ID:    "ForceDeleteBranchMessage",
-			Other: "Weet je zeker dat je branch {{.selectedBranchName}} geforceerd wil verwijderen?",
+			Other: "Weet je zeker dat je {{.selectedBranchName}} branch wil verwijderen?",
 		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
 			Other: "Je kan niet een branch in zichzelf mergen",
@@ -178,9 +151,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "deleteBranch",
 			Other: "verwijder branch",
-		}, &i18n.Message{
-			ID:    "forceDeleteBranch",
-			Other: "verwijder branch (forceer)",
 		}, &i18n.Message{
 			ID:    "NoBranchesThisRepo",
 			Other: "Geen branches voor deze repo",
@@ -193,9 +163,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CloseConfirm",
 			Other: "{{.keyBindClose}}: Sluiten, {{.keyBindConfirm}}: Bevestigen",
-		}, &i18n.Message{
-			ID:    "close",
-			Other: "sluiten",
 		}, &i18n.Message{
 			ID:    "SureResetThisCommit",
 			Other: "Weet je het zeker dat je wil resetten naar deze commit?",
@@ -236,11 +203,8 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "OnlyRenameTopCommit",
 			Other: "Je kan alleen de bovenste commit hernoemen",
 		}, &i18n.Message{
-			ID:    "renameCommit",
-			Other: "hernoem commit",
-		}, &i18n.Message{
-			ID:    "renameCommitEditor",
-			Other: "rename commit with editor",
+			ID:    "RenameCommit",
+			Other: "Hernoem Commit",
 		}, &i18n.Message{
 			ID:    "PotentialErrInGetselectedCommit",
 			Other: "Er is mogelijk een error in getSelected Commit (geen match tussen ui en state)",
@@ -322,63 +286,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "MergeAborted",
 			Other: "Merge afgebroken",
-		}, &i18n.Message{
-			ID:    "OpenConfig",
-			Other: "open config file",
-		}, &i18n.Message{
-			ID:    "EditConfig",
-			Other: "verander config file",
-		}, &i18n.Message{
-			ID:    "ForcePush",
-			Other: "Forceer push",
-		}, &i18n.Message{
-			ID:    "ForcePushPrompt",
-			Other: "Jou branch is afgeweken van de remote branch. Druk 'esc' om te anuleren, of 'enter' om geforceert te pushen.",
-		}, &i18n.Message{
-			ID:    "checkForUpdate",
-			Other: "check voor updates",
-		}, &i18n.Message{
-			ID:    "CheckingForUpdates",
-			Other: "checken voor updates...",
-		}, &i18n.Message{
-			ID:    "OnLatestVersionErr",
-			Other: "Je hebt al de laatste versie",
-		}, &i18n.Message{
-			ID:    "MajorVersionErr",
-			Other: "Nieuwe versie ({{.newVersion}}) is niet teruggaand compatibele vergeleken met de huidige versie ({{.currentVersion}})",
-		}, &i18n.Message{
-			ID:    "CouldNotFindBinaryErr",
-			Other: "Kon geen binary vinden op {{.url}}",
-		}, &i18n.Message{
-			ID:    "AnonymousReportingTitle",
-			Other: "Help maak lazygit beter",
-		}, &i18n.Message{
-			ID:    "AnonymousReportingPrompt",
-			Other: "Zou je anonieme data rapportage willen aanzetten om lazygit beter te kunnen maken? (enter/esc)",
-		}, &i18n.Message{
-			ID:    "removeFile",
-			Other: `Verwijder als untracked / uitchecken wordt gevolgd (ga weg)`,
-		}, &i18n.Message{
-			ID:    "editFile",
-			Other: `verander bestand`,
-		}, &i18n.Message{
-			ID:    "openFile",
-			Other: `open bestand`,
-		}, &i18n.Message{
-			ID:    "ignoreFile",
-			Other: `voeg toe aan .gitignore`,
-		}, &i18n.Message{
-			ID:    "refreshFiles",
-			Other: `refresh bestanden`,
-		}, &i18n.Message{
-			ID:    "resetHard",
-			Other: `harde reset`,
-		}, &i18n.Message{
-			ID:    "mergeIntoCurrentBranch",
-			Other: `merge in met huidige checked out branch`,
-		}, &i18n.Message{
-			ID:    "ConfirmQuit",
-			Other: `Weet je zeker dat je dit programma wil sluiten?`,
 		},
 	)
 }
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -15,9 +15,9 @@ import (
 	"golang.org/x/text/language"
 )

-func addEnglish(i18nObject *i18n.Bundle) error {
+func addEnglish(i18nObject *i18n.Bundle) {

-	return i18nObject.AddMessages(language.English,
+	i18nObject.AddMessages(language.English,
 		&i18n.Message{
 			ID:    "NotEnoughSpace",
 			Other: "Not enough space to render panels",
@@ -42,33 +42,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CommitChanges",
 			Other: "commit changes",
-		}, &i18n.Message{
-			ID:    "AmendLastCommit",
-			Other: "amend last commit",
-		}, &i18n.Message{
-			ID:    "SureToAmend",
-			Other: "Are you sure you want to amend last commit? You can change commit message from commits panel.",
-		}, &i18n.Message{
-			ID:    "NoCommitToAmend",
-			Other: "There's no commit to amend.",
-		}, &i18n.Message{
-			ID:    "CommitChangesWithEditor",
-			Other: "commit changes using git editor",
 		}, &i18n.Message{
 			ID:    "StatusTitle",
 			Other: "Status",
-		}, &i18n.Message{
-			ID:    "GlobalTitle",
-			Other: "Global",
 		}, &i18n.Message{
 			ID:    "navigate",
 			Other: "navigate",
-		}, &i18n.Message{
-			ID:    "menu",
-			Other: "menu",
-		}, &i18n.Message{
-			ID:    "execute",
-			Other: "execute",
 		}, &i18n.Message{
 			ID:    "stashFiles",
 			Other: "stash files",
@@ -84,18 +63,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "toggleStaged",
 			Other: "toggle staged",
-		}, &i18n.Message{
-			ID:    "toggleStagedAll",
-			Other: "stage/unstage all",
 		}, &i18n.Message{
 			ID:    "refresh",
 			Other: "refresh",
-		}, &i18n.Message{
-			ID:    "push",
-			Other: "push",
-		}, &i18n.Message{
-			ID:    "pull",
-			Other: "pull",
 		}, &i18n.Message{
 			ID:    "addPatch",
 			Other: "add patch",
@@ -132,9 +102,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "NoFilesDisplay",
 			Other: "No file to display",
-		}, &i18n.Message{
-			ID:    "NotAFile",
-			Other: "Not a file",
 		}, &i18n.Message{
 			ID:    "PullWait",
 			Other: "Pulling...",
@@ -173,10 +140,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: "Delete Branch",
 		}, &i18n.Message{
 			ID:    "DeleteBranchMessage",
-			Other: "Are you sure you want to delete the branch {{.selectedBranchName}}?",
-		}, &i18n.Message{
-			ID:    "ForceDeleteBranchMessage",
-			Other: "Are you sure you want to force delete the branch {{.selectedBranchName}}?",
+			Other: "Are you sure you want delete the branch {{.selectedBranchName}} ?",
 		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
 			Other: "You cannot merge a branch into itself",
@@ -195,9 +159,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "deleteBranch",
 			Other: "delete branch",
-		}, &i18n.Message{
-			ID:    "forceDeleteBranch",
-			Other: "delete branch (force)",
 		}, &i18n.Message{
 			ID:    "NoBranchesThisRepo",
 			Other: "No branches for this repo",
@@ -210,9 +171,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CloseConfirm",
 			Other: "{{.keyBindClose}}: close, {{.keyBindConfirm}}: confirm",
-		}, &i18n.Message{
-			ID:    "close",
-			Other: "close",
 		}, &i18n.Message{
 			ID:    "SureResetThisCommit",
 			Other: "Are you sure you want to reset to this commit?",
@@ -253,11 +211,8 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "OnlyRenameTopCommit",
 			Other: "Can only rename topmost commit",
 		}, &i18n.Message{
-			ID:    "renameCommit",
-			Other: "rename commit",
-		}, &i18n.Message{
-			ID:    "renameCommitEditor",
-			Other: "rename commit with editor",
+			ID:    "RenameCommit",
+			Other: "Rename Commit",
 		}, &i18n.Message{
 			ID:    "PotentialErrInGetselectedCommit",
 			Other: "potential error in getSelected Commit (mismatched ui and state)",
@@ -345,63 +300,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "EditConfig",
 			Other: "edit config file",
-		}, &i18n.Message{
-			ID:    "ForcePush",
-			Other: "Force push",
-		}, &i18n.Message{
-			ID:    "ForcePushPrompt",
-			Other: "Your branch has diverged from the remote branch. Press 'esc' to cancel, or 'enter' to force push.",
-		}, &i18n.Message{
-			ID:    "checkForUpdate",
-			Other: "check for update",
-		}, &i18n.Message{
-			ID:    "CheckingForUpdates",
-			Other: "Checking for updates...",
-		}, &i18n.Message{
-			ID:    "OnLatestVersionErr",
-			Other: "You already have the latest version",
-		}, &i18n.Message{
-			ID:    "MajorVersionErr",
-			Other: "New version ({{.newVersion}}) has non-backwards compatible changes compared to the current version ({{.currentVersion}})",
-		}, &i18n.Message{
-			ID:    "CouldNotFindBinaryErr",
-			Other: "Could not find any binary at {{.url}}",
-		}, &i18n.Message{
-			ID:    "AnonymousReportingTitle",
-			Other: "Help make lazygit better",
-		}, &i18n.Message{
-			ID:    "AnonymousReportingPrompt",
-			Other: "Would you like to enable anonymous reporting data to help improve lazygit? (enter/esc)",
-		}, &i18n.Message{
-			ID:    "GitconfigParseErr",
-			Other: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`,
-		}, &i18n.Message{
-			ID:    "removeFile",
-			Other: `delete if untracked / checkout if tracked`,
-		}, &i18n.Message{
-			ID:    "editFile",
-			Other: `edit file`,
-		}, &i18n.Message{
-			ID:    "openFile",
-			Other: `open file`,
-		}, &i18n.Message{
-			ID:    "ignoreFile",
-			Other: `add to .gitignore`,
-		}, &i18n.Message{
-			ID:    "refreshFiles",
-			Other: `refresh files`,
-		}, &i18n.Message{
-			ID:    "resetHard",
-			Other: `reset hard`,
-		}, &i18n.Message{
-			ID:    "mergeIntoCurrentBranch",
-			Other: `merge into currently checked out branch`,
-		}, &i18n.Message{
-			ID:    "ConfirmQuit",
-			Other: `Are you sure you want to quit?`,
-		}, &i18n.Message{
-			ID:    "SwitchRepo",
-			Other: `switch to a recent repo`,
 		},
 	)
 }
--- a/pkg/i18n/i18n.go
+++ b/pkg/i18n/i18n.go
@@ -1,9 +1,9 @@
 package i18n

 import (
+	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/jibber_jabber"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"github.com/sirupsen/logrus"
 	"golang.org/x/text/language"
 )

@@ -14,16 +14,34 @@ type Teml map[string]interface{}
 type Localizer struct {
 	i18nLocalizer *i18n.Localizer
 	language      string
-	Log           *logrus.Entry
+	Log           *logrus.Logger
 }

 // NewLocalizer creates a new Localizer
-func NewLocalizer(log *logrus.Entry) *Localizer {
-	userLang := detectLanguage(jibber_jabber.DetectLanguage)
+func NewLocalizer(log *logrus.Logger) (*Localizer, error) {

+	// detect the user's language
+	userLang, err := jibber_jabber.DetectLanguage()
+	if err != nil {
+		return nil, err
+	}
 	log.Info("language: " + userLang)

-	return setupLocalizer(log, userLang)
+	// create a i18n bundle that can be used to add translations and other things
+	i18nBundle := &i18n.Bundle{DefaultLanguage: language.English}
+
+	addBundles(i18nBundle)
+
+	// return the new localizer that can be used to translate text
+	i18nLocalizer := i18n.NewLocalizer(i18nBundle, userLang)
+
+	localizer := &Localizer{
+		i18nLocalizer: i18nLocalizer,
+		language:      userLang,
+		Log:           log,
+	}
+
+	return localizer, nil
 }

 // Localize handels the translations
@@ -60,43 +78,7 @@ func (l *Localizer) GetLanguage() string {
 }

 // add translation file(s)
-func addBundles(log *logrus.Entry, i18nBundle *i18n.Bundle) {
-	fs := []func(*i18n.Bundle) error{
-		addPolish,
-		addDutch,
-		addEnglish,
-	}
-
-	for _, f := range fs {
-		if err := f(i18nBundle); err != nil {
-			log.Fatal(err)
-
-		}
-	}
-}
-
-// detectLanguage extracts user language from environment
-func detectLanguage(langDetector func() (string, error)) string {
-	if userLang, err := langDetector(); err == nil {
-		return userLang
-	}
-
-	return "C"
-}
-
-// setupLocalizer creates a new localizer using given userLang
-func setupLocalizer(log *logrus.Entry, userLang string) *Localizer {
-	// create a i18n bundle that can be used to add translations and other things
-	i18nBundle := &i18n.Bundle{DefaultLanguage: language.English}
-
-	addBundles(log, i18nBundle)
-
-	// return the new localizer that can be used to translate text
-	i18nLocalizer := i18n.NewLocalizer(i18nBundle, userLang)
-
-	return &Localizer{
-		i18nLocalizer: i18nLocalizer,
-		language:      userLang,
-		Log:           log,
-	}
+func addBundles(i18nBundle *i18n.Bundle) {
+	addDutch(i18nBundle)
+	addEnglish(i18nBundle)
 }
--- a/pkg/i18n/i18n_test.go
+++ b/pkg/i18n/i18n_test.go
@@ -1,87 +0,0 @@
-package i18n
-
-import (
-	"fmt"
-	"io/ioutil"
-	"testing"
-
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-func getDummyLog() *logrus.Entry {
-	log := logrus.New()
-	log.Out = ioutil.Discard
-	return log.WithField("test", "test")
-}
-func TestNewLocalizer(t *testing.T) {
-	assert.NotNil(t, NewLocalizer(getDummyLog()))
-}
-
-func TestDetectLanguage(t *testing.T) {
-	type scenario struct {
-		langDetector func() (string, error)
-		expected     string
-	}
-
-	scenarios := []scenario{
-		{
-			func() (string, error) {
-				return "", fmt.Errorf("An error occurred")
-			},
-			"C",
-		},
-		{
-			func() (string, error) {
-				return "en", nil
-			},
-			"en",
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, detectLanguage(s.langDetector))
-	}
-}
-
-func TestLocalizer(t *testing.T) {
-	type scenario struct {
-		userLang string
-		test     func(*Localizer)
-	}
-
-	scenarios := []scenario{
-		{
-			"C",
-			func(l *Localizer) {
-				assert.EqualValues(t, "C", l.GetLanguage())
-				assert.Equal(t, "Diff", l.Localize(&i18n.LocalizeConfig{
-					DefaultMessage: &i18n.Message{
-						ID: "DiffTitle",
-					},
-				}))
-				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
-				assert.Equal(t, "Are you sure you want to delete the branch test?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
-			},
-		},
-		{
-			"nl",
-			func(l *Localizer) {
-				assert.EqualValues(t, "nl", l.GetLanguage())
-				assert.Equal(t, "Diff", l.Localize(&i18n.LocalizeConfig{
-					DefaultMessage: &i18n.Message{
-						ID: "DiffTitle",
-					},
-				}))
-				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
-				assert.Equal(t, "Weet je zeker dat je branch test wil verwijderen?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		s.test(setupLocalizer(getDummyLog(), s.userLang))
-	}
-}
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -1,382 +0,0 @@
-package i18n
-
-import (
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"golang.org/x/text/language"
-)
-
-func addPolish(i18nObject *i18n.Bundle) error {
-
-	return i18nObject.AddMessages(language.Polish,
-		&i18n.Message{
-			ID:    "NotEnoughSpace",
-			Other: "Za mało miejsca do wyświetlenia paneli",
-		}, &i18n.Message{
-			ID:    "DiffTitle",
-			Other: "Różnice",
-		}, &i18n.Message{
-			ID:    "FilesTitle",
-			Other: "Pliki",
-		}, &i18n.Message{
-			ID:    "BranchesTitle",
-			Other: "Gałęzie",
-		}, &i18n.Message{
-			ID:    "CommitsTitle",
-			Other: "Commity",
-		}, &i18n.Message{
-			ID:    "StashTitle",
-			Other: "Schowek",
-		}, &i18n.Message{
-			ID:    "CommitMessage",
-			Other: "Wiadomość commita",
-		}, &i18n.Message{
-			ID:    "CommitChanges",
-			Other: "commituj zmiany",
-		}, &i18n.Message{
-			ID:    "AmendLastCommit",
-			Other: "zmień ostatnie zatwierdzenie",
-		}, &i18n.Message{
-			ID:    "SureToAmend",
-			Other: "Czy na pewno chcesz zmienić ostatnie zatwierdzenie? Możesz zmienić komunikat zatwierdzenia z panelu zatwierdzeń.",
-		}, &i18n.Message{
-			ID:    "NoCommitToAmend",
-			Other: "Nie ma zobowiązania do zmiany.",
-		}, &i18n.Message{
-			ID:    "CommitChangesWithEditor",
-			Other: "commituj zmiany używając edytora z gita",
-		}, &i18n.Message{
-			ID:    "StatusTitle",
-			Other: "Status",
-		}, &i18n.Message{
-			ID:    "GlobalTitle",
-			Other: "Globalne",
-		}, &i18n.Message{
-			ID:    "navigate",
-			Other: "nawiguj",
-		}, &i18n.Message{
-			ID:    "menu",
-			Other: "menu",
-		}, &i18n.Message{
-			ID:    "execute",
-			Other: "wykonaj",
-		}, &i18n.Message{
-			ID:    "stashFiles",
-			Other: "przechowaj pliki",
-		}, &i18n.Message{
-			ID:    "open",
-			Other: "otwórz",
-		}, &i18n.Message{
-			ID:    "ignore",
-			Other: "ignoruj",
-		}, &i18n.Message{
-			ID:    "delete",
-			Other: "usuń",
-		}, &i18n.Message{
-			ID:    "toggleStaged",
-			Other: "przełącz zatwierdzenie",
-		}, &i18n.Message{
-			ID:    "toggleStagedAll",
-			Other: "przełącz wszystkie zatwierdzenia",
-		}, &i18n.Message{
-			ID:    "refresh",
-			Other: "odśwież",
-		}, &i18n.Message{
-			ID:    "addPatch",
-			Other: "dodaj łatkę",
-		}, &i18n.Message{
-			ID:    "edit",
-			Other: "edytuj",
-		}, &i18n.Message{
-			ID:    "scroll",
-			Other: "przewiń",
-		}, &i18n.Message{
-			ID:    "abortMerge",
-			Other: "o scalaniu",
-		}, &i18n.Message{
-			ID:    "resolveMergeConflicts",
-			Other: "rozwiąż konflikty scalania",
-		}, &i18n.Message{
-			ID:    "checkout",
-			Other: "przełącz",
-		}, &i18n.Message{
-			ID:    "NoChangedFiles",
-			Other: "Brak zmienionych plików",
-		}, &i18n.Message{
-			ID:    "FileHasNoUnstagedChanges",
-			Other: "Plik nie zawiera żadnych nieopublikowanych zmian do dodania",
-		}, &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",
-		}, &i18n.Message{
-			ID:    "NoFilesDisplay",
-			Other: "Brak pliku do wyświetlenia",
-		}, &i18n.Message{
-			ID:    "PullWait",
-			Other: "Wciąganie zmian...",
-		}, &i18n.Message{
-			ID:    "PushWait",
-			Other: "Wypychanie zmian...",
-		}, &i18n.Message{
-			ID:    "FileNoMergeCons",
-			Other: "Ten plik nie powoduje konfliktów scalania",
-		}, &i18n.Message{
-			ID:    "SureResetHardHead",
-			Other: "Jesteś pewny, że chcesz wykonać `reset --hard HEAD`? Możesz stracić wprowadzone zmiany",
-		}, &i18n.Message{
-			ID:    "SureTo",
-			Other: "Jesteś pewny, że chcesz {{.deleteVerb}} {{.fileName}} (stracisz swoje wprowadzone zmiany)?",
-		}, &i18n.Message{
-			ID:    "AlreadyCheckedOutBranch",
-			Other: "Już przęłączono na tą gałąź",
-		}, &i18n.Message{
-			ID:    "SureForceCheckout",
-			Other: "Jesteś pewny, że chcesz wymusić przełączenie? Stracisz wszystkie lokalne zmiany",
-		}, &i18n.Message{
-			ID:    "ForceCheckoutBranch",
-			Other: "Wymuś przełączenie gałęzi",
-		}, &i18n.Message{
-			ID:    "BranchName",
-			Other: "Nazwa gałęzi",
-		}, &i18n.Message{
-			ID:    "NewBranchNameBranchOff",
-			Other: "Nazwa nowej gałęzi (gałąź na bazie {{.branchName}})",
-		}, &i18n.Message{
-			ID:    "CantDeleteCheckOutBranch",
-			Other: "Nie możesz usunąć obecnej przełączonej gałęzi!",
-		}, &i18n.Message{
-			ID:    "DeleteBranch",
-			Other: "Usuń gałąź",
-		}, &i18n.Message{
-			ID:    "DeleteBranchMessage",
-			Other: "Jesteś pewien, że chcesz usunąć gałąź {{.selectedBranchName}} ?",
-		}, &i18n.Message{
-			ID:    "ForceDeleteBranchMessage",
-			Other: "Na pewno wymusić usunięcie gałęzi {{.selectedBranchName}}?",
-		}, &i18n.Message{
-			ID:    "CantMergeBranchIntoItself",
-			Other: "Nie możesz scalić gałęzi do samej siebie",
-		}, &i18n.Message{
-			ID:    "forceCheckout",
-			Other: "wymuś przełączenie",
-		}, &i18n.Message{
-			ID:    "merge",
-			Other: "scal",
-		}, &i18n.Message{
-			ID:    "checkoutByName",
-			Other: "przełącz używając nazwy",
-		}, &i18n.Message{
-			ID:    "newBranch",
-			Other: "nowa gałąź",
-		}, &i18n.Message{
-			ID:    "deleteBranch",
-			Other: "usuń gałąź",
-		}, &i18n.Message{
-			ID:    "forceDeleteBranch",
-			Other: "usuń gałąź (wymuś)",
-		}, &i18n.Message{
-			ID:    "NoBranchesThisRepo",
-			Other: "Brak gałęzi dla tego repozytorium",
-		}, &i18n.Message{
-			ID:    "NoTrackingThisBranch",
-			Other: "Brak śledzenia dla tej gałęzi",
-		}, &i18n.Message{
-			ID:    "CommitWithoutMessageErr",
-			Other: "Nie możesz commitować bez podania wiadomości",
-		}, &i18n.Message{
-			ID:    "CloseConfirm",
-			Other: "{{.keyBindClose}}: zamknij, {{.keyBindConfirm}}: potwierdź",
-		}, &i18n.Message{
-			ID:    "close",
-			Other: "zamknij",
-		}, &i18n.Message{
-			ID:    "SureResetThisCommit",
-			Other: "Jesteś pewny, że chcesz zresetować ten commit?",
-		}, &i18n.Message{
-			ID:    "ResetToCommit",
-			Other: "Zresetuj, aby commitować",
-		}, &i18n.Message{
-			ID:    "squashDown",
-			Other: "ściśnij w dół",
-		}, &i18n.Message{
-			ID:    "rename",
-			Other: "przemianuj",
-		}, &i18n.Message{
-			ID:    "resetToThisCommit",
-			Other: "zresetuj do tego commita",
-		}, &i18n.Message{
-			ID:    "fixupCommit",
-			Other: "napraw commit",
-		}, &i18n.Message{
-			ID:    "NoCommitsThisBranch",
-			Other: "Brak commitów dla tej gałęzi",
-		}, &i18n.Message{
-			ID:    "OnlySquashTopmostCommit",
-			Other: "Można tylko ścisnąć najwyższy commit",
-		}, &i18n.Message{
-			ID:    "YouNoCommitsToSquash",
-			Other: "Nie masz commitów do ściśnięcia",
-		}, &i18n.Message{
-			ID:    "CantFixupWhileUnstagedChanges",
-			Other: "Nie można wykonać naprawy, kiedy istnieją niezatwierdzone zmiany",
-		}, &i18n.Message{
-			ID:    "Fixup",
-			Other: "Napraw",
-		}, &i18n.Message{
-			ID:    "SureFixupThisCommit",
-			Other: "Jesteś pewny, ze chcesz naprawić ten commit? Commit poniżej zostanie ściśnięty w górę wraz z tym",
-		}, &i18n.Message{
-			ID:    "OnlyRenameTopCommit",
-			Other: "Można przmianować tylko najwyższy commit",
-		}, &i18n.Message{
-			ID:    "renameCommit",
-			Other: "przemianuj commit",
-		}, &i18n.Message{
-			ID:    "renameCommitEditor",
-			Other: "przemianuj commit w edytorze",
-		}, &i18n.Message{
-			ID:    "PotentialErrInGetselectedCommit",
-			Other: "potencjalny błąd w getSelected Commit (niedopasowane ui i stan)",
-		}, &i18n.Message{
-			ID:    "NoCommitsThisBranch",
-			Other: "Brak commitów dla tej gałęzi",
-		}, &i18n.Message{
-			ID:    "Error",
-			Other: "Błąd",
-		}, &i18n.Message{
-			ID:    "resizingPopupPanel",
-			Other: "skalowanie wyskakującego panelu",
-		}, &i18n.Message{
-			ID:    "RunningSubprocess",
-			Other: "uruchomiony podproces",
-		}, &i18n.Message{
-			ID:    "selectHunk",
-			Other: "wybierz kawałek",
-		}, &i18n.Message{
-			ID:    "navigateConflicts",
-			Other: "nawiguj konflikty",
-		}, &i18n.Message{
-			ID:    "pickHunk",
-			Other: "wybierz kawałek",
-		}, &i18n.Message{
-			ID:    "pickBothHunks",
-			Other: "wybierz oba kawałki",
-		}, &i18n.Message{
-			ID:    "undo",
-			Other: "cofnij",
-		}, &i18n.Message{
-			ID:    "pop",
-			Other: "wyciągnij",
-		}, &i18n.Message{
-			ID:    "drop",
-			Other: "porzuć",
-		}, &i18n.Message{
-			ID:    "apply",
-			Other: "zastosuj",
-		}, &i18n.Message{
-			ID:    "NoStashEntries",
-			Other: "Brak pozycji w schowku",
-		}, &i18n.Message{
-			ID:    "StashDrop",
-			Other: "Porzuć schowek",
-		}, &i18n.Message{
-			ID:    "SureDropStashEntry",
-			Other: "Jesteś pewny, że chcesz porzucić tę pozycję w schowku?",
-		}, &i18n.Message{
-			ID:    "NoStashTo",
-			Other: "Brak schowka dla {{.method}}",
-		}, &i18n.Message{
-			ID:    "NoTrackedStagedFilesStash",
-			Other: "Nie masz śledzonych/zatwierdzonych plików do przechowania",
-		}, &i18n.Message{
-			ID:    "StashChanges",
-			Other: "Przechowaj zmiany",
-		}, &i18n.Message{
-			ID:    "IssntListOfViews",
-			Other: "{{.name}} nie jest na liście widoków",
-		}, &i18n.Message{
-			ID:    "NoViewMachingNewLineFocusedSwitchStatement",
-			Other: "Brak widoku pasującego do instrukcji przełączania newLineFocused",
-		}, &i18n.Message{
-			ID:    "settingPreviewsViewTo",
-			Other: "ustawianie poprzedniego widoku na: {{.oldViewName}}",
-		}, &i18n.Message{
-			ID:    "newFocusedViewIs",
-			Other: "nowy skupiony widok to {{.newFocusedView}}",
-		}, &i18n.Message{
-			ID:    "CantCloseConfirmationPrompt",
-			Other: "Nie można zamknąć monitu potwierdzenia: {{.error}}",
-		}, &i18n.Message{
-			ID:    "NoChangedFiles",
-			Other: "Brak zmienionych plików",
-		}, &i18n.Message{
-			ID:    "ClearFilePanel",
-			Other: "Wyczyść panel plików",
-		}, &i18n.Message{
-			ID:    "MergeAborted",
-			Other: "Scalanie anulowane",
-		}, &i18n.Message{
-			ID:    "OpenConfig",
-			Other: "otwórz plik konfiguracyjny",
-		}, &i18n.Message{
-			ID:    "EditConfig",
-			Other: "edytuj plik konfiguracyjny",
-		}, &i18n.Message{
-			ID:    "ForcePush",
-			Other: "Wymuś wypchnięcie",
-		}, &i18n.Message{
-			ID:    "ForcePushPrompt",
-			Other: "Twoja gałąź rozeszła się z gałęzią zdalną. Wciśnij 'esc' aby anulować lub 'enter' aby wymusić wypchnięcie.",
-		}, &i18n.Message{
-			ID:    "checkForUpdate",
-			Other: "sprawdź aktualizacje",
-		}, &i18n.Message{
-			ID:    "CheckingForUpdates",
-			Other: "Sprawdzanie aktualizacji...",
-		}, &i18n.Message{
-			ID:    "OnLatestVersionErr",
-			Other: "Już posiadasz najnowszą wersję",
-		}, &i18n.Message{
-			ID:    "MajorVersionErr",
-			Other: "Nowa wersja ({{.newVersion}}) posiada niekompatybilne zmiany w porównaniu do obecnej wersji ({{.currentVersion}})",
-		}, &i18n.Message{
-			ID:    "CouldNotFindBinaryErr",
-			Other: "Nie można znaleźć pliku binarnego w {{.url}}",
-		}, &i18n.Message{
-			ID:    "AnonymousReportingTitle",
-			Other: "Help make lazygit better",
-		}, &i18n.Message{
-			ID:    "AnonymousReportingPrompt",
-			Other: "Włączyć anonimowe raportowanie błędów w celu pomocy w usprawnianiu lazygita (enter/esc)?",
-		}, &i18n.Message{
-			ID:    "removeFile",
-			Other: `usuń jeśli nie śledzony / przełącz jeśli śledzony`,
-		}, &i18n.Message{
-			ID:    "editFile",
-			Other: `edytuj plik`,
-		}, &i18n.Message{
-			ID:    "openFile",
-			Other: `otwórz plik`,
-		}, &i18n.Message{
-			ID:    "ignoreFile",
-			Other: `dodaj do .gitignore`,
-		}, &i18n.Message{
-			ID:    "refreshFiles",
-			Other: `odśwież pliki`,
-		}, &i18n.Message{
-			ID:    "resetHard",
-			Other: `zresetuj twardo`,
-		}, &i18n.Message{
-			ID:    "mergeIntoCurrentBranch",
-			Other: `scal do obecnej gałęzi`,
-		}, &i18n.Message{
-			ID:    "ConfirmQuit",
-			Other: `Na pewno chcesz wyjść z programu?`,
-		},
-	)
-}
--- a/pkg/test/test.go
+++ b/pkg/test/test.go
@@ -1,31 +0,0 @@
-package test
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"path/filepath"
-
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// GenerateRepo generates a repo from test/repos and changes the directory to be
-// inside the newly made repo
-func GenerateRepo(filename string) error {
-	reposDir := "/test/repos/"
-	testPath := utils.GetProjectRoot() + reposDir
-
-	// workaround for debian packaging
-	if _, err := os.Stat(testPath); os.IsNotExist(err) {
-		cwd, _ := os.Getwd()
-		testPath = filepath.Dir(filepath.Dir(cwd)) + reposDir
-	}
-	if err := os.Chdir(testPath); err != nil {
-		return err
-	}
-	if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil {
-		return errors.New(string(output))
-	}
-
-	return os.Chdir(testPath + "repo")
-}
--- a/pkg/updates/updates.go
+++ b/pkg/updates/updates.go
@@ -1,314 +0,0 @@
-package updates
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/kardianos/osext"
-
-	getter "github.com/jesseduffield/go-getter"
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/sirupsen/logrus"
-)
-
-// Updater checks for updates and does updates
-type Updater struct {
-	Log       *logrus.Entry
-	Config    config.AppConfigurer
-	OSCommand *commands.OSCommand
-	Tr        *i18n.Localizer
-}
-
-// Updaterer implements the check and update methods
-type Updaterer interface {
-	CheckForNewUpdate()
-	Update()
-}
-
-var (
-	projectUrl = "https://github.com/jesseduffield/lazygit"
-)
-
-// NewUpdater creates a new updater
-func NewUpdater(log *logrus.Entry, config config.AppConfigurer, osCommand *commands.OSCommand, tr *i18n.Localizer) (*Updater, error) {
-	contextLogger := log.WithField("context", "updates")
-
-	updater := &Updater{
-		Log:       contextLogger,
-		Config:    config,
-		OSCommand: osCommand,
-		Tr:        tr,
-	}
-	return updater, nil
-}
-
-func (u *Updater) getLatestVersionNumber() (string, error) {
-	req, err := http.NewRequest("GET", projectUrl+"/releases/latest", nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Accept", "application/json")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	byt := []byte(body)
-	var dat map[string]interface{}
-	if err := json.Unmarshal(byt, &dat); err != nil {
-		return "", err
-	}
-	return dat["tag_name"].(string), nil
-}
-
-// RecordLastUpdateCheck records last time an update check was performed
-func (u *Updater) RecordLastUpdateCheck() error {
-	u.Config.GetAppState().LastUpdateCheck = time.Now().Unix()
-	return u.Config.SaveAppState()
-}
-
-// expecting version to be of the form `v12.34.56`
-func (u *Updater) majorVersionDiffers(oldVersion, newVersion string) bool {
-	if oldVersion == "unversioned" {
-		return false
-	}
-	oldVersion = strings.TrimPrefix(oldVersion, "v")
-	newVersion = strings.TrimPrefix(newVersion, "v")
-	return strings.Split(oldVersion, ".")[0] != strings.Split(newVersion, ".")[0]
-}
-
-func (u *Updater) checkForNewUpdate() (string, error) {
-	u.Log.Info("Checking for an updated version")
-	currentVersion := u.Config.GetVersion()
-	if err := u.RecordLastUpdateCheck(); err != nil {
-		return "", err
-	}
-
-	newVersion, err := u.getLatestVersionNumber()
-	if err != nil {
-		return "", err
-	}
-	u.Log.Info("Current version is " + currentVersion)
-	u.Log.Info("New version is " + newVersion)
-
-	if newVersion == currentVersion {
-		return "", errors.New(u.Tr.SLocalize("OnLatestVersionErr"))
-	}
-
-	if u.majorVersionDiffers(currentVersion, newVersion) {
-		errMessage := u.Tr.TemplateLocalize(
-			"MajorVersionErr",
-			i18n.Teml{
-				"newVersion":     newVersion,
-				"currentVersion": currentVersion,
-			},
-		)
-		return "", errors.New(errMessage)
-	}
-
-	rawUrl, err := u.getBinaryUrl(newVersion)
-	if err != nil {
-		return "", err
-	}
-	u.Log.Info("Checking for resource at url " + rawUrl)
-	if !u.verifyResourceFound(rawUrl) {
-		errMessage := u.Tr.TemplateLocalize(
-			"CouldNotFindBinaryErr",
-			i18n.Teml{
-				"url": rawUrl,
-			},
-		)
-		return "", errors.New(errMessage)
-	}
-	u.Log.Info("Verified resource is available, ready to update")
-
-	return newVersion, nil
-}
-
-// CheckForNewUpdate checks if there is an available update
-func (u *Updater) CheckForNewUpdate(onFinish func(string, error) error, userRequested bool) {
-	if !userRequested && u.skipUpdateCheck() {
-		return
-	}
-
-	go func() {
-		newVersion, err := u.checkForNewUpdate()
-		if err = onFinish(newVersion, err); err != nil {
-			u.Log.Error(err)
-		}
-	}()
-}
-
-func (u *Updater) skipUpdateCheck() bool {
-	// will remove the check for windows after adding a manifest file asking for
-	// the required permissions
-	if runtime.GOOS == "windows" {
-		u.Log.Info("Updating is currently not supported for windows until we can fix permission issues")
-		return true
-	}
-
-	if u.Config.GetVersion() == "unversioned" {
-		u.Log.Info("Current version is not built from an official release so we won't check for an update")
-		return true
-	}
-
-	if u.Config.GetBuildSource() != "buildBinary" {
-		u.Log.Info("Binary is not built with the buildBinary flag so we won't check for an update")
-		return true
-	}
-
-	userConfig := u.Config.GetUserConfig()
-	if userConfig.Get("update.method") == "never" {
-		u.Log.Info("Update method is set to never so we won't check for an update")
-		return true
-	}
-
-	currentTimestamp := time.Now().Unix()
-	lastUpdateCheck := u.Config.GetAppState().LastUpdateCheck
-	days := userConfig.GetInt64("update.days")
-
-	if (currentTimestamp-lastUpdateCheck)/(60*60*24) < days {
-		u.Log.Info("Last update was too recent so we won't check for an update")
-		return true
-	}
-
-	return false
-}
-
-func (u *Updater) mappedOs(os string) string {
-	osMap := map[string]string{
-		"darwin":  "Darwin",
-		"linux":   "Linux",
-		"windows": "Windows",
-	}
-	result, found := osMap[os]
-	if found {
-		return result
-	}
-	return os
-}
-
-func (u *Updater) mappedArch(arch string) string {
-	archMap := map[string]string{
-		"386":   "32-bit",
-		"amd64": "x86_64",
-	}
-	result, found := archMap[arch]
-	if found {
-		return result
-	}
-	return arch
-}
-
-// example: https://github.com/jesseduffield/lazygit/releases/download/v0.1.73/lazygit_0.1.73_Darwin_x86_64.tar.gz
-func (u *Updater) getBinaryUrl(newVersion string) (string, error) {
-	extension := "tar.gz"
-	if runtime.GOOS == "windows" {
-		extension = "zip"
-	}
-	url := fmt.Sprintf(
-		"%s/releases/download/%s/lazygit_%s_%s_%s.%s",
-		projectUrl,
-		newVersion,
-		newVersion[1:],
-		u.mappedOs(runtime.GOOS),
-		u.mappedArch(runtime.GOARCH),
-		extension,
-	)
-	u.Log.Info("url for latest release is " + url)
-	return url, nil
-}
-
-// Update downloads the latest binary and replaces the current binary with it
-func (u *Updater) Update(newVersion string, onFinish func(error) error) {
-	go func() {
-		err := u.update(newVersion)
-		if err = onFinish(err); err != nil {
-			u.Log.Error(err)
-		}
-	}()
-}
-
-func (u *Updater) update(newVersion string) error {
-	rawUrl, err := u.getBinaryUrl(newVersion)
-	if err != nil {
-		return err
-	}
-	u.Log.Info("updating with url " + rawUrl)
-	return u.downloadAndInstall(rawUrl)
-}
-
-func (u *Updater) downloadAndInstall(rawUrl string) error {
-	url, err := url.Parse(rawUrl)
-	if err != nil {
-		return err
-	}
-
-	g := new(getter.HttpGetter)
-	tempDir, err := ioutil.TempDir("", "lazygit")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(tempDir)
-	u.Log.Info("temp directory is " + tempDir)
-
-	// Get it!
-	if err := g.Get(tempDir, url); err != nil {
-		return err
-	}
-
-	// get the path of the current binary
-	binaryPath, err := osext.Executable()
-	if err != nil {
-		return err
-	}
-	u.Log.Info("binary path is " + binaryPath)
-
-	binaryName := filepath.Base(binaryPath)
-	u.Log.Info("binary name is " + binaryName)
-
-	// Verify the main file exists
-	tempPath := filepath.Join(tempDir, binaryName)
-	u.Log.Info("temp path to binary is " + tempPath)
-	if _, err := os.Stat(tempPath); err != nil {
-		return err
-	}
-
-	// swap out the old binary for the new one
-	err = os.Rename(tempPath, binaryPath)
-	if err != nil {
-		return err
-	}
-	u.Log.Info("update complete!")
-
-	return nil
-}
-
-func (u *Updater) verifyResourceFound(rawUrl string) bool {
-	resp, err := http.Head(rawUrl)
-	if err != nil {
-		return false
-	}
-	defer resp.Body.Close()
-	u.Log.Info("Received status code ", resp.StatusCode)
-	// 403 means the resource is there (not going to bother adding extra request headers)
-	// 404 means its not
-	return resp.StatusCode == 403
-}
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -1,14 +1,11 @@
 package utils

 import (
-	"errors"
 	"fmt"
 	"log"
 	"os"
 	"path/filepath"
-	"reflect"
 	"strings"
-	"time"

 	"github.com/fatih/color"
 )
@@ -66,151 +63,3 @@ func TrimTrailingNewline(str string) string {
 	}
 	return str
 }
-
-// NormalizeLinefeeds - Removes all Windows and Mac style line feeds
-func NormalizeLinefeeds(str string) string {
-	str = strings.Replace(str, "\r\n", "\n", -1)
-	str = strings.Replace(str, "\r", "", -1)
-	return str
-}
-
-// GetProjectRoot returns the path to the root of the project. Only to be used
-// in testing contexts, as with binaries it's unlikely this path will exist on
-// the machine
-func GetProjectRoot() string {
-	dir, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-	return strings.Split(dir, "lazygit")[0] + "lazygit"
-}
-
-// Loader dumps a string to be displayed as a loader
-func Loader() string {
-	characters := "|/-\\"
-	now := time.Now()
-	nanos := now.UnixNano()
-	index := nanos / 50000000 % int64(len(characters))
-	return characters[index : index+1]
-}
-
-// ResolvePlaceholderString populates a template with values
-func ResolvePlaceholderString(str string, arguments map[string]string) string {
-	for key, value := range arguments {
-		str = strings.Replace(str, "{{"+key+"}}", value, -1)
-	}
-	return str
-}
-
-// Min returns the minimum of two integers
-func Min(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}
-
-type Displayable interface {
-	GetDisplayStrings() []string
-}
-
-// 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{}) (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)
-}
-
-// 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) (string, error) {
-	if len(items) == 0 {
-		return "", nil
-	}
-
-	stringArrays := getDisplayStringArrays(items)
-
-	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
-}
-
-func getPadWidths(stringArrays [][]string) []int {
-	if len(stringArrays[0]) <= 1 {
-		return []int{}
-	}
-	padWidths := make([]int, len(stringArrays[0])-1)
-	for i := range padWidths {
-		for _, strings := range stringArrays {
-			if len(strings[i]) > padWidths[i] {
-				padWidths[i] = len(strings[i])
-			}
-		}
-	}
-	return padWidths
-}
-
-func getPaddedDisplayStrings(stringArrays [][]string, padWidths []int) []string {
-	paddedDisplayStrings := make([]string, len(stringArrays))
-	for i, stringArray := range stringArrays {
-		if len(stringArray) == 0 {
-			continue
-		}
-		for j, padWidth := range padWidths {
-			paddedDisplayStrings[i] += WithPadding(stringArray[j], padWidth) + " "
-		}
-		paddedDisplayStrings[i] += stringArray[len(padWidths)]
-	}
-	return paddedDisplayStrings
-}
-
-// displayArraysAligned returns true if every string array returned from our
-// list of displayables has the same length
-func displayArraysAligned(stringArrays [][]string) bool {
-	for _, strings := range stringArrays {
-		if len(strings) != len(stringArrays[0]) {
-			return false
-		}
-	}
-	return true
-}
-
-func getDisplayStringArrays(displayables []Displayable) [][]string {
-	stringArrays := make([][]string, len(displayables))
-	for i, item := range displayables {
-		stringArrays[i] = item.GetDisplayStrings()
-	}
-	return stringArrays
-}
-
-// IncludesString if the list contains the string
-func IncludesString(list []string, a string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
--- a/pkg/utils/utils_test.go
+++ b/pkg/utils/utils_test.go
@@ -1,413 +0,0 @@
-package utils
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSplitLines(t *testing.T) {
-	type scenario struct {
-		multilineString string
-		expected        []string
-	}
-
-	scenarios := []scenario{
-		{
-			"",
-			[]string{},
-		},
-		{
-			"\n",
-			[]string{},
-		},
-		{
-			"hello world !\nhello universe !\n",
-			[]string{
-				"hello world !",
-				"hello universe !",
-			},
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, SplitLines(s.multilineString))
-	}
-}
-
-func TestWithPadding(t *testing.T) {
-	type scenario struct {
-		str      string
-		padding  int
-		expected string
-	}
-
-	scenarios := []scenario{
-		{
-			"hello world !",
-			1,
-			"hello world !",
-		},
-		{
-			"hello world !",
-			14,
-			"hello world ! ",
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, WithPadding(s.str, s.padding))
-	}
-}
-
-func TestTrimTrailingNewline(t *testing.T) {
-	type scenario struct {
-		str      string
-		expected string
-	}
-
-	scenarios := []scenario{
-		{
-			"hello world !\n",
-			"hello world !",
-		},
-		{
-			"hello world !",
-			"hello world !",
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, TrimTrailingNewline(s.str))
-	}
-}
-
-func TestNormalizeLinefeeds(t *testing.T) {
-	type scenario struct {
-		byteArray []byte
-		expected  []byte
-	}
-	var scenarios = []scenario{
-		{
-			// \r\n
-			[]byte{97, 115, 100, 102, 13, 10},
-			[]byte{97, 115, 100, 102, 10},
-		},
-		{
-			// bash\r\nblah
-			[]byte{97, 115, 100, 102, 13, 10, 97, 115, 100, 102},
-			[]byte{97, 115, 100, 102, 10, 97, 115, 100, 102},
-		},
-		{
-			// \r
-			[]byte{97, 115, 100, 102, 13},
-			[]byte{97, 115, 100, 102},
-		},
-		{
-			// \n
-			[]byte{97, 115, 100, 102, 10},
-			[]byte{97, 115, 100, 102, 10},
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, string(s.expected), NormalizeLinefeeds(string(s.byteArray)))
-	}
-}
-
-func TestResolvePlaceholderString(t *testing.T) {
-	type scenario struct {
-		templateString string
-		arguments      map[string]string
-		expected       string
-	}
-
-	scenarios := []scenario{
-		{
-			"",
-			map[string]string{},
-			"",
-		},
-		{
-			"hello",
-			map[string]string{},
-			"hello",
-		},
-		{
-			"hello {{arg}}",
-			map[string]string{},
-			"hello {{arg}}",
-		},
-		{
-			"hello {{arg}}",
-			map[string]string{"arg": "there"},
-			"hello there",
-		},
-		{
-			"hello",
-			map[string]string{"arg": "there"},
-			"hello",
-		},
-		{
-			"{{nothing}}",
-			map[string]string{"nothing": ""},
-			"",
-		},
-		{
-			"{{}} {{ this }} { should not throw}} an {{{{}}}} error",
-			map[string]string{
-				"blah": "blah",
-				"this": "won't match",
-			},
-			"{{}} {{ this }} { should not throw}} an {{{{}}}} error",
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, string(s.expected), ResolvePlaceholderString(s.templateString, s.arguments))
-	}
-}
-
-func TestDisplayArraysAligned(t *testing.T) {
-	type scenario struct {
-		input    [][]string
-		expected bool
-	}
-
-	scenarios := []scenario{
-		{
-			[][]string{{"", ""}, {"", ""}},
-			true,
-		},
-		{
-			[][]string{{""}, {"", ""}},
-			false,
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, displayArraysAligned(s.input))
-	}
-}
-
-type myDisplayable struct {
-	strings []string
-}
-
-type myStruct struct{}
-
-func (d *myDisplayable) GetDisplayStrings() []string {
-	return d.strings
-}
-
-func TestGetDisplayStringArrays(t *testing.T) {
-	type scenario struct {
-		input    []Displayable
-		expected [][]string
-	}
-
-	scenarios := []scenario{
-		{
-			[]Displayable{
-				Displayable(&myDisplayable{[]string{"a", "b"}}),
-				Displayable(&myDisplayable{[]string{"c", "d"}}),
-			},
-			[][]string{{"a", "b"}, {"c", "d"}},
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, getDisplayStringArrays(s.input))
-	}
-}
-
-func TestRenderDisplayableList(t *testing.T) {
-	type scenario struct {
-		input          []Displayable
-		expectedString string
-		expectedError  error
-	}
-
-	scenarios := []scenario{
-		{
-			[]Displayable{
-				Displayable(&myDisplayable{[]string{}}),
-				Displayable(&myDisplayable{[]string{}}),
-			},
-			"\n",
-			nil,
-		},
-		{
-			[]Displayable{
-				Displayable(&myDisplayable{[]string{"aa", "b"}}),
-				Displayable(&myDisplayable{[]string{"c", "d"}}),
-			},
-			"aa b\nc  d",
-			nil,
-		},
-		{
-			[]Displayable{
-				Displayable(&myDisplayable{[]string{"a"}}),
-				Displayable(&myDisplayable{[]string{"b", "c"}}),
-			},
-			"",
-			errors.New("Each item must return the same number of strings to display"),
-		},
-	}
-
-	for _, s := range scenarios {
-		str, err := renderDisplayableList(s.input)
-		assert.EqualValues(t, s.expectedString, str)
-		assert.EqualValues(t, s.expectedError, err)
-	}
-}
-
-func TestRenderList(t *testing.T) {
-	type scenario struct {
-		input          interface{}
-		expectedString string
-		expectedError  error
-	}
-
-	scenarios := []scenario{
-		{
-			[]*myDisplayable{
-				{[]string{"aa", "b"}},
-				{[]string{"c", "d"}},
-			},
-			"aa b\nc  d",
-			nil,
-		},
-		{
-			[]*myStruct{
-				{},
-				{},
-			},
-			"",
-			errors.New("item does not implement the Displayable interface"),
-		},
-		{
-			&myStruct{},
-			"",
-			errors.New("RenderList given a non-slice type"),
-		},
-	}
-
-	for _, s := range scenarios {
-		str, err := RenderList(s.input)
-		assert.EqualValues(t, s.expectedString, str)
-		assert.EqualValues(t, s.expectedError, err)
-	}
-}
-
-func TestGetPaddedDisplayStrings(t *testing.T) {
-	type scenario struct {
-		stringArrays [][]string
-		padWidths    []int
-		expected     []string
-	}
-
-	scenarios := []scenario{
-		{
-			[][]string{{"a", "b"}, {"c", "d"}},
-			[]int{1},
-			[]string{"a b", "c d"},
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, getPaddedDisplayStrings(s.stringArrays, s.padWidths))
-	}
-}
-
-func TestGetPadWidths(t *testing.T) {
-	type scenario struct {
-		stringArrays [][]string
-		expected     []int
-	}
-
-	scenarios := []scenario{
-		{
-			[][]string{{""}, {""}},
-			[]int{},
-		},
-		{
-			[][]string{{"a"}, {""}},
-			[]int{},
-		},
-		{
-			[][]string{{"aa", "b", "ccc"}, {"c", "d", "e"}},
-			[]int{2, 1},
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, getPadWidths(s.stringArrays))
-	}
-}
-
-func TestMin(t *testing.T) {
-	type scenario struct {
-		a        int
-		b        int
-		expected int
-	}
-
-	scenarios := []scenario{
-		{
-			1,
-			1,
-			1,
-		},
-		{
-			1,
-			2,
-			1,
-		},
-		{
-			2,
-			1,
-			1,
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, Min(s.a, s.b))
-	}
-}
-
-func TestIncludesString(t *testing.T) {
-	type scenario struct {
-		list     []string
-		element  string
-		expected bool
-	}
-
-	scenarios := []scenario{
-		{
-			[]string{"a", "b"},
-			"a",
-			true,
-		},
-		{
-			[]string{"a", "b"},
-			"c",
-			false,
-		},
-		{
-			[]string{"a", "b"},
-			"",
-			false,
-		},
-		{
-			[]string{""},
-			"",
-			true,
-		},
-	}
-
-	for _, s := range scenarios {
-		assert.EqualValues(t, s.expected, IncludesString(s.list, s.element))
-	}
-}
--- a/scripts/generate_cheatsheet.go
+++ b/scripts/generate_cheatsheet.go
@@ -1,54 +0,0 @@
-// run:
-//   LANG=en go run generate_cheatsheet.go
-// to generate Keybindings_en.md file in current directory
-// change LANG to generate cheatsheet in different language (if supported)
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/app"
-	"github.com/jesseduffield/lazygit/pkg/config"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-func main() {
-	appConfig, _ := config.NewAppConfig("", "", "", "", "", new(bool))
-	a, _ := app.NewApp(appConfig)
-	lang := a.Tr.GetLanguage()
-	name := "Keybindings_" + lang + ".md"
-	bindings := a.Gui.GetKeybindings()
-	padWidth := a.Gui.GetMaxKeyLength(bindings)
-	file, _ := os.Create(name)
-	current := "v"
-	content := ""
-	title := ""
-
-	file.WriteString("# Lazygit " + a.Tr.SLocalize("menu"))
-
-	for _, binding := range bindings {
-		if key := a.Gui.GetKey(binding); key != "" && (binding.Description != "" || key == "x") {
-			if binding.ViewName != current {
-				current = binding.ViewName
-				if current == "" {
-					title = a.Tr.SLocalize("GlobalTitle")
-				} else {
-					title = a.Tr.SLocalize(strings.Title(current) + "Title")
-				}
-				content = fmt.Sprintf("</pre>\n\n## %s\n<pre>\n", title)
-				file.WriteString(content)
-			}
-			// workaround to include menu keybinding in cheatsheet
-			// could not add this Description field directly to keybindings.go,
-			// because then menu key would be displayed in menu itself and that is undesirable
-			if key == "x" {
-				binding.Description = a.Tr.SLocalize("menu")
-			}
-			content = fmt.Sprintf("\t<kbd>%s</kbd>%s  %s\n", key, strings.TrimPrefix(utils.WithPadding(key, padWidth), key), binding.Description)
-			file.WriteString(content)
-		}
-	}
-}
--- a/test.sh
+++ b/test.sh
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-echo "" > coverage.txt
-
-for d in $( find ./* -maxdepth 10 ! -path "./vendor*" ! -path "./.git*" ! -path "./scripts*" -type d); do
-    if ls $d/*.go &> /dev/null; then
-        go test -v -race -coverprofile=profile.out -covermode=atomic $d
-        if [ -f profile.out ]; then
-            cat profile.out >> coverage.txt
-            rm profile.out
-        fi
-    fi
-done
--- a/test/repos/bom.sh
+++ b/test/repos/bom.sh
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -ex; rm -rf repo; mkdir repo; cd repo
-
-git init
-
-cat <<EOT >> windowslf.txt
-asdf
-asdf
-EOT
-
-cat <<EOT >> linuxlf.txt
-asdf
-asdf
-EOT
-
-cat <<EOT >> bomtest.txt
-A,B,C,D,E
-F,G,H,I,J
-K,L,M,N,O
-P,Q,R,S,T
-U,V,W,X,Y
-Z,1,2,3,4
-EOT
--- a/test/repos/case_insensitive_checkouts.sh
+++ b/test/repos/case_insensitive_checkouts.sh
@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo

 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-

 touch foo
 git add foo
--- a/test/repos/gpg.sh
+++ b/test/repos/gpg.sh
@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo

 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-

 git config gpg.program $(which gpg)
 git config user.signingkey E304229F # test key
--- a/test/repos/lots_of_commits.sh
+++ b/test/repos/lots_of_commits.sh
@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo

 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-

 i=2
 end=100
--- a/test/repos/merge_conflict.sh
+++ b/test/repos/merge_conflict.sh
@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo

 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-

 function add_spacing {
  for i in {1..60}
@@ -13,15 +10,9 @@ function add_spacing {
  done
 }

-mkdir directory
-echo "test1" > directory/file
-echo "test1" > directory/file2
-
-
 echo "Here is a story that has been told throuhg the ages" >> file1

 git add file1
-git add directory
 git commit -m "first commit"

 git checkout -b develop
@@ -30,11 +21,6 @@ echo "once upon a time there was a dog" >> file1
 add_spacing file1
 echo "once upon a time there was another dog" >> file1
 git add file1
-
-echo "test2" > directory/file
-echo "test2" > directory/file2
-git add directory
-
 git commit -m "first commit on develop"

 git checkout master
@@ -43,11 +29,6 @@ echo "once upon a time there was a cat" >> file1
 add_spacing file1
 echo "once upon a time there was another cat" >> file1
 git add file1
-
-echo "test3" > directory/file
-echo "test3" > directory/file2
-git add directory
-
 git commit -m "first commit on develop"

 git merge develop # should have a merge conflict here
--- a/test/repos/pre_commit_hook.sh
+++ b/test/repos/pre_commit_hook.sh
@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo

 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 cp ../extras/pre-commit .git/hooks/pre-commit
 chmod +x .git/hooks/pre-commit

--- a/test/repos/unicode_characters.sh
+++ b/test/repos/unicode_characters.sh
@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo

 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-

 # Add some ansi, unicode, zero width joiner caracters
 cat <<EOT >> charstest.txt
@@ -15,8 +12,9 @@ ZWJ       https://en.wikipedia.org/wiki/Zero-width_joiner / https://unicode.org/
 UNICODE   ☆ 🤓 え 术
 EOT
 git add charstest.txt
-git commit -m "Test chars Œ¥ƒ👶👨‍👦☆ 🤓 え 术👩‍💻👩🏻‍💻👩🏽‍💻👩🏼‍💻👩🏾‍💻👩🏿‍💻👨‍💻👨🏻‍💻👨🏼‍💻👨🏽‍💻👨🏾‍💻👨🏿‍💻 commit"
+git commit -m "Test chars Œ¥ƒ👶👨‍👦☆ 🤓 え 术 commit"
 echo "我喜歡編碼" >> charstest.txt
 echo "நான் குறியீடு விரும்புகிறேன்" >> charstest.txt
 git add charstest.txt
 git commit -m "Test chars 我喜歡編碼 நான் குறியீடு விரும்புகிறேன் commit"
+
--- a/vendor/github.com/Sirupsen/logrus/LICENSE
+++ b/vendor/github.com/Sirupsen/logrus/LICENSE
--- a/vendor/github.com/Sirupsen/logrus/alt_exit.go
+++ b/vendor/github.com/Sirupsen/logrus/alt_exit.go
--- a/vendor/github.com/Sirupsen/logrus/doc.go
+++ b/vendor/github.com/Sirupsen/logrus/doc.go
--- a/vendor/github.com/Sirupsen/logrus/entry.go
+++ b/vendor/github.com/Sirupsen/logrus/entry.go
--- a/vendor/github.com/Sirupsen/logrus/exported.go
+++ b/vendor/github.com/Sirupsen/logrus/exported.go
--- a/vendor/github.com/Sirupsen/logrus/formatter.go
+++ b/vendor/github.com/Sirupsen/logrus/formatter.go
--- a/vendor/github.com/Sirupsen/logrus/hooks.go
+++ b/vendor/github.com/Sirupsen/logrus/hooks.go
--- a/vendor/github.com/Sirupsen/logrus/json_formatter.go
+++ b/vendor/github.com/Sirupsen/logrus/json_formatter.go
--- a/vendor/github.com/Sirupsen/logrus/logger.go
+++ b/vendor/github.com/Sirupsen/logrus/logger.go
--- a/vendor/github.com/Sirupsen/logrus/logrus.go
+++ b/vendor/github.com/Sirupsen/logrus/logrus.go
--- a/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
--- a/vendor/github.com/Sirupsen/logrus/terminal_check_appengine.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_check_appengine.go
--- a/vendor/github.com/Sirupsen/logrus/terminal_check_notappengine.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_check_notappengine.go
--- a/vendor/github.com/Sirupsen/logrus/terminal_linux.go
+++ b/vendor/github.com/Sirupsen/logrus/terminal_linux.go
--- a/vendor/github.com/Sirupsen/logrus/text_formatter.go
+++ b/vendor/github.com/Sirupsen/logrus/text_formatter.go
--- a/vendor/github.com/Sirupsen/logrus/writer.go
+++ b/vendor/github.com/Sirupsen/logrus/writer.go
--- a/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
+++ b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
+++ b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
@@ -1,3 +0,0 @@
-AWS SDK for Go
-Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
-Copyright 2014-2015 Stripe, Inc.
--- a/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
@@ -1,145 +0,0 @@
-// Package awserr represents API error interface accessors for the SDK.
-package awserr
-
-// An Error wraps lower level errors with code, message and an original error.
-// The underlying concrete error type may also satisfy other interfaces which
-// can be to used to obtain more specific information about the error.
-//
-// Calling Error() or String() will always include the full information about
-// an error based on its underlying type.
-//
-// Example:
-//
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if awsErr, ok := err.(awserr.Error); ok {
-//             // Get error details
-//             log.Println("Error:", awsErr.Code(), awsErr.Message())
-//
-//             // Prints out full error message, including original error if there was one.
-//             log.Println("Error:", awsErr.Error())
-//
-//             // Get original error
-//             if origErr := awsErr.OrigErr(); origErr != nil {
-//                 // operate on original error.
-//             }
-//         } else {
-//             fmt.Println(err.Error())
-//         }
-//     }
-//
-type Error interface {
-	// Satisfy the generic error interface.
-	error
-
-	// Returns the short phrase depicting the classification of the error.
-	Code() string
-
-	// Returns the error details message.
-	Message() string
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErr() error
-}
-
-// BatchError is a batch of errors which also wraps lower level errors with
-// code, message, and original errors. Calling Error() will include all errors
-// that occurred in the batch.
-//
-// Deprecated: Replaced with BatchedErrors. Only defined for backwards
-// compatibility.
-type BatchError interface {
-	// Satisfy the generic error interface.
-	error
-
-	// Returns the short phrase depicting the classification of the error.
-	Code() string
-
-	// Returns the error details message.
-	Message() string
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErrs() []error
-}
-
-// BatchedErrors is a batch of errors which also wraps lower level errors with
-// code, message, and original errors. Calling Error() will include all errors
-// that occurred in the batch.
-//
-// Replaces BatchError
-type BatchedErrors interface {
-	// Satisfy the base Error interface.
-	Error
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErrs() []error
-}
-
-// New returns an Error object described by the code, message, and origErr.
-//
-// If origErr satisfies the Error interface it will not be wrapped within a new
-// Error object and will instead be returned.
-func New(code, message string, origErr error) Error {
-	var errs []error
-	if origErr != nil {
-		errs = append(errs, origErr)
-	}
-	return newBaseError(code, message, errs)
-}
-
-// NewBatchError returns an BatchedErrors with a collection of errors as an
-// array of errors.
-func NewBatchError(code, message string, errs []error) BatchedErrors {
-	return newBaseError(code, message, errs)
-}
-
-// A RequestFailure is an interface to extract request failure information from
-// an Error such as the request ID of the failed request returned by a service.
-// RequestFailures may not always have a requestID value if the request failed
-// prior to reaching the service such as a connection error.
-//
-// Example:
-//
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if reqerr, ok := err.(RequestFailure); ok {
-//             log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
-//         } else {
-//             log.Println("Error:", err.Error())
-//         }
-//     }
-//
-// Combined with awserr.Error:
-//
-//    output, err := s3manage.Upload(svc, input, opts)
-//    if err != nil {
-//        if awsErr, ok := err.(awserr.Error); ok {
-//            // Generic AWS Error with Code, Message, and original error (if any)
-//            fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
-//
-//            if reqErr, ok := err.(awserr.RequestFailure); ok {
-//                // A service error occurred
-//                fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
-//            }
-//        } else {
-//            fmt.Println(err.Error())
-//        }
-//    }
-//
-type RequestFailure interface {
-	Error
-
-	// The status code of the HTTP response.
-	StatusCode() int
-
-	// The request ID returned by the service for a request failure. This will
-	// be empty if no request ID is available such as the request failed due
-	// to a connection error.
-	RequestID() string
-}
-
-// NewRequestFailure returns a new request error wrapper for the given Error
-// provided.
-func NewRequestFailure(err Error, statusCode int, reqID string) RequestFailure {
-	return newRequestError(err, statusCode, reqID)
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
@@ -1,194 +0,0 @@
-package awserr
-
-import "fmt"
-
-// SprintError returns a string of the formatted error code.
-//
-// Both extra and origErr are optional.  If they are included their lines
-// will be added, but if they are not included their lines will be ignored.
-func SprintError(code, message, extra string, origErr error) string {
-	msg := fmt.Sprintf("%s: %s", code, message)
-	if extra != "" {
-		msg = fmt.Sprintf("%s\n\t%s", msg, extra)
-	}
-	if origErr != nil {
-		msg = fmt.Sprintf("%s\ncaused by: %s", msg, origErr.Error())
-	}
-	return msg
-}
-
-// A baseError wraps the code and message which defines an error. It also
-// can be used to wrap an original error object.
-//
-// Should be used as the root for errors satisfying the awserr.Error. Also
-// for any error which does not fit into a specific error wrapper type.
-type baseError struct {
-	// Classification of error
-	code string
-
-	// Detailed information about error
-	message string
-
-	// Optional original error this error is based off of. Allows building
-	// chained errors.
-	errs []error
-}
-
-// newBaseError returns an error object for the code, message, and errors.
-//
-// code is a short no whitespace phrase depicting the classification of
-// the error that is being created.
-//
-// message is the free flow string containing detailed information about the
-// error.
-//
-// origErrs is the error objects which will be nested under the new errors to
-// be returned.
-func newBaseError(code, message string, origErrs []error) *baseError {
-	b := &baseError{
-		code:    code,
-		message: message,
-		errs:    origErrs,
-	}
-
-	return b
-}
-
-// Error returns the string representation of the error.
-//
-// See ErrorWithExtra for formatting.
-//
-// Satisfies the error interface.
-func (b baseError) Error() string {
-	size := len(b.errs)
-	if size > 0 {
-		return SprintError(b.code, b.message, "", errorList(b.errs))
-	}
-
-	return SprintError(b.code, b.message, "", nil)
-}
-
-// String returns the string representation of the error.
-// Alias for Error to satisfy the stringer interface.
-func (b baseError) String() string {
-	return b.Error()
-}
-
-// Code returns the short phrase depicting the classification of the error.
-func (b baseError) Code() string {
-	return b.code
-}
-
-// Message returns the error details message.
-func (b baseError) Message() string {
-	return b.message
-}
-
-// OrigErr returns the original error if one was set. Nil is returned if no
-// error was set. This only returns the first element in the list. If the full
-// list is needed, use BatchedErrors.
-func (b baseError) OrigErr() error {
-	switch len(b.errs) {
-	case 0:
-		return nil
-	case 1:
-		return b.errs[0]
-	default:
-		if err, ok := b.errs[0].(Error); ok {
-			return NewBatchError(err.Code(), err.Message(), b.errs[1:])
-		}
-		return NewBatchError("BatchedErrors",
-			"multiple errors occurred", b.errs)
-	}
-}
-
-// OrigErrs returns the original errors if one was set. An empty slice is
-// returned if no error was set.
-func (b baseError) OrigErrs() []error {
-	return b.errs
-}
-
-// So that the Error interface type can be included as an anonymous field
-// in the requestError struct and not conflict with the error.Error() method.
-type awsError Error
-
-// A requestError wraps a request or service error.
-//
-// Composed of baseError for code, message, and original error.
-type requestError struct {
-	awsError
-	statusCode int
-	requestID  string
-}
-
-// newRequestError returns a wrapped error with additional information for
-// request status code, and service requestID.
-//
-// Should be used to wrap all request which involve service requests. Even if
-// the request failed without a service response, but had an HTTP status code
-// that may be meaningful.
-//
-// Also wraps original errors via the baseError.
-func newRequestError(err Error, statusCode int, requestID string) *requestError {
-	return &requestError{
-		awsError:   err,
-		statusCode: statusCode,
-		requestID:  requestID,
-	}
-}
-
-// Error returns the string representation of the error.
-// Satisfies the error interface.
-func (r requestError) Error() string {
-	extra := fmt.Sprintf("status code: %d, request id: %s",
-		r.statusCode, r.requestID)
-	return SprintError(r.Code(), r.Message(), extra, r.OrigErr())
-}
-
-// String returns the string representation of the error.
-// Alias for Error to satisfy the stringer interface.
-func (r requestError) String() string {
-	return r.Error()
-}
-
-// StatusCode returns the wrapped status code for the error
-func (r requestError) StatusCode() int {
-	return r.statusCode
-}
-
-// RequestID returns the wrapped requestID
-func (r requestError) RequestID() string {
-	return r.requestID
-}
-
-// OrigErrs returns the original errors if one was set. An empty slice is
-// returned if no error was set.
-func (r requestError) OrigErrs() []error {
-	if b, ok := r.awsError.(BatchedErrors); ok {
-		return b.OrigErrs()
-	}
-	return []error{r.OrigErr()}
-}
-
-// An error list that satisfies the golang interface
-type errorList []error
-
-// Error returns the string representation of the error.
-//
-// Satisfies the error interface.
-func (e errorList) Error() string {
-	msg := ""
-	// How do we want to handle the array size being zero
-	if size := len(e); size > 0 {
-		for i := 0; i < size; i++ {
-			msg += fmt.Sprintf("%s", e[i].Error())
-			// We check the next index to see if it is within the slice.
-			// If it is, then we append a newline. We do this, because unit tests
-			// could be broken with the additional '\n'
-			if i+1 < size {
-				msg += "\n"
-			}
-		}
-	}
-	return msg
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
@@ -1,108 +0,0 @@
-package awsutil
-
-import (
-	"io"
-	"reflect"
-	"time"
-)
-
-// Copy deeply copies a src structure to dst. Useful for copying request and
-// response structures.
-//
-// Can copy between structs of different type, but will only copy fields which
-// are assignable, and exist in both structs. Fields which are not assignable,
-// or do not exist in both structs are ignored.
-func Copy(dst, src interface{}) {
-	dstval := reflect.ValueOf(dst)
-	if !dstval.IsValid() {
-		panic("Copy dst cannot be nil")
-	}
-
-	rcopy(dstval, reflect.ValueOf(src), true)
-}
-
-// CopyOf returns a copy of src while also allocating the memory for dst.
-// src must be a pointer type or this operation will fail.
-func CopyOf(src interface{}) (dst interface{}) {
-	dsti := reflect.New(reflect.TypeOf(src).Elem())
-	dst = dsti.Interface()
-	rcopy(dsti, reflect.ValueOf(src), true)
-	return
-}
-
-// rcopy performs a recursive copy of values from the source to destination.
-//
-// root is used to skip certain aspects of the copy which are not valid
-// for the root node of a object.
-func rcopy(dst, src reflect.Value, root bool) {
-	if !src.IsValid() {
-		return
-	}
-
-	switch src.Kind() {
-	case reflect.Ptr:
-		if _, ok := src.Interface().(io.Reader); ok {
-			if dst.Kind() == reflect.Ptr && dst.Elem().CanSet() {
-				dst.Elem().Set(src)
-			} else if dst.CanSet() {
-				dst.Set(src)
-			}
-		} else {
-			e := src.Type().Elem()
-			if dst.CanSet() && !src.IsNil() {
-				if _, ok := src.Interface().(*time.Time); !ok {
-					dst.Set(reflect.New(e))
-				} else {
-					tempValue := reflect.New(e)
-					tempValue.Elem().Set(src.Elem())
-					// Sets time.Time's unexported values
-					dst.Set(tempValue)
-				}
-			}
-			if src.Elem().IsValid() {
-				// Keep the current root state since the depth hasn't changed
-				rcopy(dst.Elem(), src.Elem(), root)
-			}
-		}
-	case reflect.Struct:
-		t := dst.Type()
-		for i := 0; i < t.NumField(); i++ {
-			name := t.Field(i).Name
-			srcVal := src.FieldByName(name)
-			dstVal := dst.FieldByName(name)
-			if srcVal.IsValid() && dstVal.CanSet() {
-				rcopy(dstVal, srcVal, false)
-			}
-		}
-	case reflect.Slice:
-		if src.IsNil() {
-			break
-		}
-
-		s := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
-		dst.Set(s)
-		for i := 0; i < src.Len(); i++ {
-			rcopy(dst.Index(i), src.Index(i), false)
-		}
-	case reflect.Map:
-		if src.IsNil() {
-			break
-		}
-
-		s := reflect.MakeMap(src.Type())
-		dst.Set(s)
-		for _, k := range src.MapKeys() {
-			v := src.MapIndex(k)
-			v2 := reflect.New(v.Type()).Elem()
-			rcopy(v2, v, false)
-			dst.SetMapIndex(k, v2)
-		}
-	default:
-		// Assign the value if possible. If its not assignable, the value would
-		// need to be converted and the impact of that may be unexpected, or is
-		// not compatible with the dst type.
-		if src.Type().AssignableTo(dst.Type()) {
-			dst.Set(src)
-		}
-	}
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
@@ -1,27 +0,0 @@
-package awsutil
-
-import (
-	"reflect"
-)
-
-// DeepEqual returns if the two values are deeply equal like reflect.DeepEqual.
-// In addition to this, this method will also dereference the input values if
-// possible so the DeepEqual performed will not fail if one parameter is a
-// pointer and the other is not.
-//
-// DeepEqual will not perform indirection of nested values of the input parameters.
-func DeepEqual(a, b interface{}) bool {
-	ra := reflect.Indirect(reflect.ValueOf(a))
-	rb := reflect.Indirect(reflect.ValueOf(b))
-
-	if raValid, rbValid := ra.IsValid(), rb.IsValid(); !raValid && !rbValid {
-		// If the elements are both nil, and of the same type the are equal
-		// If they are of different types they are not equal
-		return reflect.TypeOf(a) == reflect.TypeOf(b)
-	} else if raValid != rbValid {
-		// Both values must be valid to be equal
-		return false
-	}
-
-	return reflect.DeepEqual(ra.Interface(), rb.Interface())
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
@@ -1,222 +0,0 @@
-package awsutil
-
-import (
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/jmespath/go-jmespath"
-)
-
-var indexRe = regexp.MustCompile(`(.+)\[(-?\d+)?\]$`)
-
-// rValuesAtPath returns a slice of values found in value v. The values
-// in v are explored recursively so all nested values are collected.
-func rValuesAtPath(v interface{}, path string, createPath, caseSensitive, nilTerm bool) []reflect.Value {
-	pathparts := strings.Split(path, "||")
-	if len(pathparts) > 1 {
-		for _, pathpart := range pathparts {
-			vals := rValuesAtPath(v, pathpart, createPath, caseSensitive, nilTerm)
-			if len(vals) > 0 {
-				return vals
-			}
-		}
-		return nil
-	}
-
-	values := []reflect.Value{reflect.Indirect(reflect.ValueOf(v))}
-	components := strings.Split(path, ".")
-	for len(values) > 0 && len(components) > 0 {
-		var index *int64
-		var indexStar bool
-		c := strings.TrimSpace(components[0])
-		if c == "" { // no actual component, illegal syntax
-			return nil
-		} else if caseSensitive && c != "*" && strings.ToLower(c[0:1]) == c[0:1] {
-			// TODO normalize case for user
-			return nil // don't support unexported fields
-		}
-
-		// parse this component
-		if m := indexRe.FindStringSubmatch(c); m != nil {
-			c = m[1]
-			if m[2] == "" {
-				index = nil
-				indexStar = true
-			} else {
-				i, _ := strconv.ParseInt(m[2], 10, 32)
-				index = &i
-				indexStar = false
-			}
-		}
-
-		nextvals := []reflect.Value{}
-		for _, value := range values {
-			// pull component name out of struct member
-			if value.Kind() != reflect.Struct {
-				continue
-			}
-
-			if c == "*" { // pull all members
-				for i := 0; i < value.NumField(); i++ {
-					if f := reflect.Indirect(value.Field(i)); f.IsValid() {
-						nextvals = append(nextvals, f)
-					}
-				}
-				continue
-			}
-
-			value = value.FieldByNameFunc(func(name string) bool {
-				if c == name {
-					return true
-				} else if !caseSensitive && strings.ToLower(name) == strings.ToLower(c) {
-					return true
-				}
-				return false
-			})
-
-			if nilTerm && value.Kind() == reflect.Ptr && len(components[1:]) == 0 {
-				if !value.IsNil() {
-					value.Set(reflect.Zero(value.Type()))
-				}
-				return []reflect.Value{value}
-			}
-
-			if createPath && value.Kind() == reflect.Ptr && value.IsNil() {
-				// TODO if the value is the terminus it should not be created
-				// if the value to be set to its position is nil.
-				value.Set(reflect.New(value.Type().Elem()))
-				value = value.Elem()
-			} else {
-				value = reflect.Indirect(value)
-			}
-
-			if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
-				if !createPath && value.IsNil() {
-					value = reflect.ValueOf(nil)
-				}
-			}
-
-			if value.IsValid() {
-				nextvals = append(nextvals, value)
-			}
-		}
-		values = nextvals
-
-		if indexStar || index != nil {
-			nextvals = []reflect.Value{}
-			for _, valItem := range values {
-				value := reflect.Indirect(valItem)
-				if value.Kind() != reflect.Slice {
-					continue
-				}
-
-				if indexStar { // grab all indices
-					for i := 0; i < value.Len(); i++ {
-						idx := reflect.Indirect(value.Index(i))
-						if idx.IsValid() {
-							nextvals = append(nextvals, idx)
-						}
-					}
-					continue
-				}
-
-				// pull out index
-				i := int(*index)
-				if i >= value.Len() { // check out of bounds
-					if createPath {
-						// TODO resize slice
-					} else {
-						continue
-					}
-				} else if i < 0 { // support negative indexing
-					i = value.Len() + i
-				}
-				value = reflect.Indirect(value.Index(i))
-
-				if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
-					if !createPath && value.IsNil() {
-						value = reflect.ValueOf(nil)
-					}
-				}
-
-				if value.IsValid() {
-					nextvals = append(nextvals, value)
-				}
-			}
-			values = nextvals
-		}
-
-		components = components[1:]
-	}
-	return values
-}
-
-// ValuesAtPath returns a list of values at the case insensitive lexical
-// path inside of a structure.
-func ValuesAtPath(i interface{}, path string) ([]interface{}, error) {
-	result, err := jmespath.Search(path, i)
-	if err != nil {
-		return nil, err
-	}
-
-	v := reflect.ValueOf(result)
-	if !v.IsValid() || (v.Kind() == reflect.Ptr && v.IsNil()) {
-		return nil, nil
-	}
-	if s, ok := result.([]interface{}); ok {
-		return s, err
-	}
-	if v.Kind() == reflect.Map && v.Len() == 0 {
-		return nil, nil
-	}
-	if v.Kind() == reflect.Slice {
-		out := make([]interface{}, v.Len())
-		for i := 0; i < v.Len(); i++ {
-			out[i] = v.Index(i).Interface()
-		}
-		return out, nil
-	}
-
-	return []interface{}{result}, nil
-}
-
-// SetValueAtPath sets a value at the case insensitive lexical path inside
-// of a structure.
-func SetValueAtPath(i interface{}, path string, v interface{}) {
-	if rvals := rValuesAtPath(i, path, true, false, v == nil); rvals != nil {
-		for _, rval := range rvals {
-			if rval.Kind() == reflect.Ptr && rval.IsNil() {
-				continue
-			}
-			setValue(rval, v)
-		}
-	}
-}
-
-func setValue(dstVal reflect.Value, src interface{}) {
-	if dstVal.Kind() == reflect.Ptr {
-		dstVal = reflect.Indirect(dstVal)
-	}
-	srcVal := reflect.ValueOf(src)
-
-	if !srcVal.IsValid() { // src is literal nil
-		if dstVal.CanAddr() {
-			// Convert to pointer so that pointer's value can be nil'ed
-			//                     dstVal = dstVal.Addr()
-		}
-		dstVal.Set(reflect.Zero(dstVal.Type()))
-
-	} else if srcVal.Kind() == reflect.Ptr {
-		if srcVal.IsNil() {
-			srcVal = reflect.Zero(dstVal.Type())
-		} else {
-			srcVal = reflect.ValueOf(src).Elem()
-		}
-		dstVal.Set(srcVal)
-	} else {
-		dstVal.Set(srcVal)
-	}
-
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
@@ -1,113 +0,0 @@
-package awsutil
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-)
-
-// Prettify returns the string representation of a value.
-func Prettify(i interface{}) string {
-	var buf bytes.Buffer
-	prettify(reflect.ValueOf(i), 0, &buf)
-	return buf.String()
-}
-
-// prettify will recursively walk value v to build a textual
-// representation of the value.
-func prettify(v reflect.Value, indent int, buf *bytes.Buffer) {
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		strtype := v.Type().String()
-		if strtype == "time.Time" {
-			fmt.Fprintf(buf, "%s", v.Interface())
-			break
-		} else if strings.HasPrefix(strtype, "io.") {
-			buf.WriteString("<buffer>")
-			break
-		}
-
-		buf.WriteString("{\n")
-
-		names := []string{}
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			f := v.Field(i)
-			if name[0:1] == strings.ToLower(name[0:1]) {
-				continue // ignore unexported fields
-			}
-			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice || f.Kind() == reflect.Map) && f.IsNil() {
-				continue // ignore unset fields
-			}
-			names = append(names, name)
-		}
-
-		for i, n := range names {
-			val := v.FieldByName(n)
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(n + ": ")
-			prettify(val, indent+2, buf)
-
-			if i < len(names)-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	case reflect.Slice:
-		strtype := v.Type().String()
-		if strtype == "[]uint8" {
-			fmt.Fprintf(buf, "<binary> len %d", v.Len())
-			break
-		}
-
-		nl, id, id2 := "", "", ""
-		if v.Len() > 3 {
-			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
-		}
-		buf.WriteString("[" + nl)
-		for i := 0; i < v.Len(); i++ {
-			buf.WriteString(id2)
-			prettify(v.Index(i), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString("," + nl)
-			}
-		}
-
-		buf.WriteString(nl + id + "]")
-	case reflect.Map:
-		buf.WriteString("{\n")
-
-		for i, k := range v.MapKeys() {
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(k.String() + ": ")
-			prettify(v.MapIndex(k), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	default:
-		if !v.IsValid() {
-			fmt.Fprint(buf, "<invalid value>")
-			return
-		}
-		format := "%v"
-		switch v.Interface().(type) {
-		case string:
-			format = "%q"
-		case io.ReadSeeker, io.Reader:
-			format = "buffer(%p)"
-		}
-		fmt.Fprintf(buf, format, v.Interface())
-	}
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
@@ -1,89 +0,0 @@
-package awsutil
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// StringValue returns the string representation of a value.
-func StringValue(i interface{}) string {
-	var buf bytes.Buffer
-	stringValue(reflect.ValueOf(i), 0, &buf)
-	return buf.String()
-}
-
-func stringValue(v reflect.Value, indent int, buf *bytes.Buffer) {
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		buf.WriteString("{\n")
-
-		names := []string{}
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			f := v.Field(i)
-			if name[0:1] == strings.ToLower(name[0:1]) {
-				continue // ignore unexported fields
-			}
-			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice) && f.IsNil() {
-				continue // ignore unset fields
-			}
-			names = append(names, name)
-		}
-
-		for i, n := range names {
-			val := v.FieldByName(n)
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(n + ": ")
-			stringValue(val, indent+2, buf)
-
-			if i < len(names)-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	case reflect.Slice:
-		nl, id, id2 := "", "", ""
-		if v.Len() > 3 {
-			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
-		}
-		buf.WriteString("[" + nl)
-		for i := 0; i < v.Len(); i++ {
-			buf.WriteString(id2)
-			stringValue(v.Index(i), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString("," + nl)
-			}
-		}
-
-		buf.WriteString(nl + id + "]")
-	case reflect.Map:
-		buf.WriteString("{\n")
-
-		for i, k := range v.MapKeys() {
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(k.String() + ": ")
-			stringValue(v.MapIndex(k), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	default:
-		format := "%v"
-		switch v.Interface().(type) {
-		case string:
-			format = "%q"
-		}
-		fmt.Fprintf(buf, format, v.Interface())
-	}
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
@@ -1,96 +0,0 @@
-package client
-
-import (
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// A Config provides configuration to a service client instance.
-type Config struct {
-	Config        *aws.Config
-	Handlers      request.Handlers
-	Endpoint      string
-	SigningRegion string
-	SigningName   string
-
-	// States that the signing name did not come from a modeled source but
-	// was derived based on other data. Used by service client constructors
-	// to determine if the signin name can be overriden based on metadata the
-	// service has.
-	SigningNameDerived bool
-}
-
-// ConfigProvider provides a generic way for a service client to receive
-// the ClientConfig without circular dependencies.
-type ConfigProvider interface {
-	ClientConfig(serviceName string, cfgs ...*aws.Config) Config
-}
-
-// ConfigNoResolveEndpointProvider same as ConfigProvider except it will not
-// resolve the endpoint automatically. The service client's endpoint must be
-// provided via the aws.Config.Endpoint field.
-type ConfigNoResolveEndpointProvider interface {
-	ClientConfigNoResolveEndpoint(cfgs ...*aws.Config) Config
-}
-
-// A Client implements the base client request and response handling
-// used by all service clients.
-type Client struct {
-	request.Retryer
-	metadata.ClientInfo
-
-	Config   aws.Config
-	Handlers request.Handlers
-}
-
-// New will return a pointer to a new initialized service client.
-func New(cfg aws.Config, info metadata.ClientInfo, handlers request.Handlers, options ...func(*Client)) *Client {
-	svc := &Client{
-		Config:     cfg,
-		ClientInfo: info,
-		Handlers:   handlers.Copy(),
-	}
-
-	switch retryer, ok := cfg.Retryer.(request.Retryer); {
-	case ok:
-		svc.Retryer = retryer
-	case cfg.Retryer != nil && cfg.Logger != nil:
-		s := fmt.Sprintf("WARNING: %T does not implement request.Retryer; using DefaultRetryer instead", cfg.Retryer)
-		cfg.Logger.Log(s)
-		fallthrough
-	default:
-		maxRetries := aws.IntValue(cfg.MaxRetries)
-		if cfg.MaxRetries == nil || maxRetries == aws.UseServiceDefaultRetries {
-			maxRetries = 3
-		}
-		svc.Retryer = DefaultRetryer{NumMaxRetries: maxRetries}
-	}
-
-	svc.AddDebugHandlers()
-
-	for _, option := range options {
-		option(svc)
-	}
-
-	return svc
-}
-
-// NewRequest returns a new Request pointer for the service API
-// operation and parameters.
-func (c *Client) NewRequest(operation *request.Operation, params interface{}, data interface{}) *request.Request {
-	return request.New(c.Config, c.ClientInfo, c.Handlers, c.Retryer, operation, params, data)
-}
-
-// AddDebugHandlers injects debug logging handlers into the service to log request
-// debug information.
-func (c *Client) AddDebugHandlers() {
-	if !c.Config.LogLevel.AtLeast(aws.LogDebug) {
-		return
-	}
-
-	c.Handlers.Send.PushFrontNamed(LogHTTPRequestHandler)
-	c.Handlers.Send.PushBackNamed(LogHTTPResponseHandler)
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
@@ -1,116 +0,0 @@
-package client
-
-import (
-	"strconv"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/internal/sdkrand"
-)
-
-// DefaultRetryer implements basic retry logic using exponential backoff for
-// most services. If you want to implement custom retry logic, implement the
-// request.Retryer interface or create a structure type that composes this
-// struct and override the specific methods. For example, to override only
-// the MaxRetries method:
-//
-//		type retryer struct {
-//      client.DefaultRetryer
-//    }
-//
-//    // This implementation always has 100 max retries
-//    func (d retryer) MaxRetries() int { return 100 }
-type DefaultRetryer struct {
-	NumMaxRetries int
-}
-
-// MaxRetries returns the number of maximum returns the service will use to make
-// an individual API request.
-func (d DefaultRetryer) MaxRetries() int {
-	return d.NumMaxRetries
-}
-
-// RetryRules returns the delay duration before retrying this request again
-func (d DefaultRetryer) RetryRules(r *request.Request) time.Duration {
-	// Set the upper limit of delay in retrying at ~five minutes
-	minTime := 30
-	throttle := d.shouldThrottle(r)
-	if throttle {
-		if delay, ok := getRetryDelay(r); ok {
-			return delay
-		}
-
-		minTime = 500
-	}
-
-	retryCount := r.RetryCount
-	if throttle && retryCount > 8 {
-		retryCount = 8
-	} else if retryCount > 13 {
-		retryCount = 13
-	}
-
-	delay := (1 << uint(retryCount)) * (sdkrand.SeededRand.Intn(minTime) + minTime)
-	return time.Duration(delay) * time.Millisecond
-}
-
-// ShouldRetry returns true if the request should be retried.
-func (d DefaultRetryer) ShouldRetry(r *request.Request) bool {
-	// If one of the other handlers already set the retry state
-	// we don't want to override it based on the service's state
-	if r.Retryable != nil {
-		return *r.Retryable
-	}
-
-	if r.HTTPResponse.StatusCode >= 500 && r.HTTPResponse.StatusCode != 501 {
-		return true
-	}
-	return r.IsErrorRetryable() || d.shouldThrottle(r)
-}
-
-// ShouldThrottle returns true if the request should be throttled.
-func (d DefaultRetryer) shouldThrottle(r *request.Request) bool {
-	switch r.HTTPResponse.StatusCode {
-	case 429:
-	case 502:
-	case 503:
-	case 504:
-	default:
-		return r.IsErrorThrottle()
-	}
-
-	return true
-}
-
-// This will look in the Retry-After header, RFC 7231, for how long
-// it will wait before attempting another request
-func getRetryDelay(r *request.Request) (time.Duration, bool) {
-	if !canUseRetryAfterHeader(r) {
-		return 0, false
-	}
-
-	delayStr := r.HTTPResponse.Header.Get("Retry-After")
-	if len(delayStr) == 0 {
-		return 0, false
-	}
-
-	delay, err := strconv.Atoi(delayStr)
-	if err != nil {
-		return 0, false
-	}
-
-	return time.Duration(delay) * time.Second, true
-}
-
-// Will look at the status code to see if the retry header pertains to
-// the status code.
-func canUseRetryAfterHeader(r *request.Request) bool {
-	switch r.HTTPResponse.StatusCode {
-	case 429:
-	case 503:
-	default:
-		return false
-	}
-
-	return true
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
@@ -1,184 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http/httputil"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-const logReqMsg = `DEBUG: Request %s/%s Details:
---[ REQUEST POST-SIGN ]-----------------------------
-%s
-----------------------------------------------------`
-
-const logReqErrMsg = `DEBUG ERROR: Request %s/%s:
---[ REQUEST DUMP ERROR ]-----------------------------
-%s
------------------------------------------------------`
-
-type logWriter struct {
-	// Logger is what we will use to log the payload of a response.
-	Logger aws.Logger
-	// buf stores the contents of what has been read
-	buf *bytes.Buffer
-}
-
-func (logger *logWriter) Write(b []byte) (int, error) {
-	return logger.buf.Write(b)
-}
-
-type teeReaderCloser struct {
-	// io.Reader will be a tee reader that is used during logging.
-	// This structure will read from a body and write the contents to a logger.
-	io.Reader
-	// Source is used just to close when we are done reading.
-	Source io.ReadCloser
-}
-
-func (reader *teeReaderCloser) Close() error {
-	return reader.Source.Close()
-}
-
-// LogHTTPRequestHandler is a SDK request handler to log the HTTP request sent
-// to a service. Will include the HTTP request body if the LogLevel of the
-// request matches LogDebugWithHTTPBody.
-var LogHTTPRequestHandler = request.NamedHandler{
-	Name: "awssdk.client.LogRequest",
-	Fn:   logRequest,
-}
-
-func logRequest(r *request.Request) {
-	logBody := r.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody)
-	bodySeekable := aws.IsReaderSeekable(r.Body)
-
-	b, err := httputil.DumpRequestOut(r.HTTPRequest, logBody)
-	if err != nil {
-		r.Config.Logger.Log(fmt.Sprintf(logReqErrMsg,
-			r.ClientInfo.ServiceName, r.Operation.Name, err))
-		return
-	}
-
-	if logBody {
-		if !bodySeekable {
-			r.SetReaderBody(aws.ReadSeekCloser(r.HTTPRequest.Body))
-		}
-		// Reset the request body because dumpRequest will re-wrap the r.HTTPRequest's
-		// Body as a NoOpCloser and will not be reset after read by the HTTP
-		// client reader.
-		r.ResetBody()
-	}
-
-	r.Config.Logger.Log(fmt.Sprintf(logReqMsg,
-		r.ClientInfo.ServiceName, r.Operation.Name, string(b)))
-}
-
-// LogHTTPRequestHeaderHandler is a SDK request handler to log the HTTP request sent
-// to a service. Will only log the HTTP request's headers. The request payload
-// will not be read.
-var LogHTTPRequestHeaderHandler = request.NamedHandler{
-	Name: "awssdk.client.LogRequestHeader",
-	Fn:   logRequestHeader,
-}
-
-func logRequestHeader(r *request.Request) {
-	b, err := httputil.DumpRequestOut(r.HTTPRequest, false)
-	if err != nil {
-		r.Config.Logger.Log(fmt.Sprintf(logReqErrMsg,
-			r.ClientInfo.ServiceName, r.Operation.Name, err))
-		return
-	}
-
-	r.Config.Logger.Log(fmt.Sprintf(logReqMsg,
-		r.ClientInfo.ServiceName, r.Operation.Name, string(b)))
-}
-
-const logRespMsg = `DEBUG: Response %s/%s Details:
---[ RESPONSE ]--------------------------------------
-%s
-----------------------------------------------------`
-
-const logRespErrMsg = `DEBUG ERROR: Response %s/%s:
---[ RESPONSE DUMP ERROR ]-----------------------------
-%s
-----------------------------------------------------`
-
-// LogHTTPResponseHandler is a SDK request handler to log the HTTP response
-// received from a service. Will include the HTTP response body if the LogLevel
-// of the request matches LogDebugWithHTTPBody.
-var LogHTTPResponseHandler = request.NamedHandler{
-	Name: "awssdk.client.LogResponse",
-	Fn:   logResponse,
-}
-
-func logResponse(r *request.Request) {
-	lw := &logWriter{r.Config.Logger, bytes.NewBuffer(nil)}
-
-	logBody := r.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody)
-	if logBody {
-		r.HTTPResponse.Body = &teeReaderCloser{
-			Reader: io.TeeReader(r.HTTPResponse.Body, lw),
-			Source: r.HTTPResponse.Body,
-		}
-	}
-
-	handlerFn := func(req *request.Request) {
-		b, err := httputil.DumpResponse(req.HTTPResponse, false)
-		if err != nil {
-			lw.Logger.Log(fmt.Sprintf(logRespErrMsg,
-				req.ClientInfo.ServiceName, req.Operation.Name, err))
-			return
-		}
-
-		lw.Logger.Log(fmt.Sprintf(logRespMsg,
-			req.ClientInfo.ServiceName, req.Operation.Name, string(b)))
-
-		if logBody {
-			b, err := ioutil.ReadAll(lw.buf)
-			if err != nil {
-				lw.Logger.Log(fmt.Sprintf(logRespErrMsg,
-					req.ClientInfo.ServiceName, req.Operation.Name, err))
-				return
-			}
-
-			lw.Logger.Log(string(b))
-		}
-	}
-
-	const handlerName = "awsdk.client.LogResponse.ResponseBody"
-
-	r.Handlers.Unmarshal.SetBackNamed(request.NamedHandler{
-		Name: handlerName, Fn: handlerFn,
-	})
-	r.Handlers.UnmarshalError.SetBackNamed(request.NamedHandler{
-		Name: handlerName, Fn: handlerFn,
-	})
-}
-
-// LogHTTPResponseHeaderHandler is a SDK request handler to log the HTTP
-// response received from a service. Will only log the HTTP response's headers.
-// The response payload will not be read.
-var LogHTTPResponseHeaderHandler = request.NamedHandler{
-	Name: "awssdk.client.LogResponseHeader",
-	Fn:   logResponseHeader,
-}
-
-func logResponseHeader(r *request.Request) {
-	if r.Config.Logger == nil {
-		return
-	}
-
-	b, err := httputil.DumpResponse(r.HTTPResponse, false)
-	if err != nil {
-		r.Config.Logger.Log(fmt.Sprintf(logRespErrMsg,
-			r.ClientInfo.ServiceName, r.Operation.Name, err))
-		return
-	}
-
-	r.Config.Logger.Log(fmt.Sprintf(logRespMsg,
-		r.ClientInfo.ServiceName, r.Operation.Name, string(b)))
-}
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
@@ -1,13 +0,0 @@
-package metadata
-
-// ClientInfo wraps immutable data from the client.Client structure.
-type ClientInfo struct {
-	ServiceName   string
-	ServiceID     string
-	APIVersion    string
-	Endpoint      string
-	SigningName   string
-	SigningRegion string
-	JSONVersion   string
-	TargetPrefix  string
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Duffield	7dff573f0c	bump version to v0.1.68	2018-08-18 17:13:29 +10:00
Jesse Duffield	83c3de33ee	leave bump commits out of release notes	2018-08-18 17:13:12 +10:00