refresh side panels when resetting to upstream

By default, macs have 256 open files allowed by a given process.
This sucks when you end up with over 256 files modified in a repo
because after you've watched all of them, lots of other calls to
the command line will fail due to violating the limit.

Given there's no easy platform agnostic way to see what you've got
configured for how many files a process can have open, I'm going to
arbitrarily set the max to 200 and when we hit the limit we start
unwatching older files to make way for new ones.

WIP

.circleci/config.yml

@@ -2,23 +2,12 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.13
+    environment:
+      GO111MODULE: "on"
     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: |
@@ -28,28 +17,28 @@ jobs:
             fi
       - restore_cache:
           keys:
-            - pkg-cache-{{ checksum "Gopkg.lock" }}-v3
+            - pkg-cache-{{ checksum "go.sum" }}-v5
       - 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)
+      - run:
+          name: Compile project on every platform
+          command: |
+            go get github.com/mitchellh/gox
+            GOFLAGS=-mod=vendor gox -parallel 10 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"
       - save_cache:
-          key: pkg-cache-{{ checksum "Gopkg.lock" }}-v3
+          key: pkg-cache-{{ checksum "go.sum" }}-v5
           paths:
             - ~/.cache/go-build
 
   release:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.13
     working_directory: /go/src/github.com/jesseduffield/lazygit
     steps:
       - checkout

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/discussion.md

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
 
 ---
 

Dockerfile

@@ -2,12 +2,12 @@
 # docker build -t lazygit .
 # docker run -it lazygit:latest /bin/sh -l
 
-FROM golang:alpine
+FROM golang:1.13-alpine3.10
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY ./ .
-RUN CGO_ENABLED=0 GOOS=linux go build -o lazygit .
+RUN CGO_ENABLED=0 GOOS=linux go build
 
-FROM alpine:latest
+FROM alpine:3.10
 RUN apk add -U git xdg-utils
 WORKDIR /go/src/github.com/jesseduffield/lazygit/
 COPY --from=0 /go/src/github.com/jesseduffield/lazygit /go/src/github.com/jesseduffield/lazygit

Gopkg.lock

@@ -1,652 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[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",
-  ]
-  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"
-
-[[projects]]
-  branch = "master"
-  digest = "1:cd7ba2b29e93e2a8384e813dfc80ebb0f85d9214762e6ca89bb55a58092eab87"
-  name = "github.com/cloudfoundry/jibber_jabber"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "bcc4c8345a21301bf47c032ff42dd1aae2fe3027"
-
-[[projects]]
-  digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39"
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  pruneopts = "NUT"
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:de4a74b504df31145ffa8ca0c4edbffa2f3eb7f466753962184611b618fa5981"
-  name = "github.com/emirpasic/gods"
-  packages = [
-    "containers",
-    "lists",
-    "lists/arraylist",
-    "trees",
-    "trees/binaryheap",
-    "utils",
-  ]
-  pruneopts = "NUT"
-  revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46"
-  version = "v1.9.0"
-
-[[projects]]
-  digest = "1:ade392a843b2035effb4b4a2efa2c3bab3eb29b992e98bacf9c898b0ecb54e45"
-  name = "github.com/fatih/color"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
-  version = "v1.7.0"
-
-[[projects]]
-  digest = "1:1b91ae0dc69a41d4c2ed23ea5cffb721ea63f5037ca4b81e6d6771fbb8f45129"
-  name = "github.com/fsnotify/fsnotify"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  version = "v1.4.7"
-
-[[projects]]
-  digest = "1:ea1d5bfdb4ec5c2ee48c97865e6de1a28fa8c4849a3f56b27d521aa619038e06"
-  name = "github.com/go-errors/errors"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "a6af135bd4e28680facf08a3d206b454abc877a4"
-  version = "v1.0.1"
-
-[[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"
-  name = "github.com/golang-collections/collections"
-  packages = ["stack"]
-  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"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/printer",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token",
-  ]
-  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"
-  name = "github.com/jbenet/go-context"
-  packages = ["io"]
-  pruneopts = "NUT"
-  revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4"
-
-[[projects]]
-  branch = "master"
-  digest = "1:490643e333b848f3d6ab772c21082d706663dcf4a3c0fbe9a4b4ef7b205ce6c7"
-  name = "github.com/jesseduffield/go-getter"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "906e15686e6309ff310c1c10463ab53287c3a678"
-
-[[projects]]
-  branch = "master"
-  digest = "1:31a87f65dc451471f411d04742d2cb5ab79a699b8c73666b8fc29f47a8f43f7e"
-  name = "github.com/jesseduffield/gocui"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "b502ee11d6743144c86226ca0366adaed727214d"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a46c2f4863e5284ddb255c28750298e04bc8c0fc896bed6056e947673168b7be"
-  name = "github.com/jesseduffield/pty"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "02db52c7e406c7abec44c717a173c7715e4c1b62"
-
-[[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"
-
-[[projects]]
-  digest = "1:8021af4dcbd531ae89433c8c3a6520e51064114aaf8eb1724c3cf911c497c9ba"
-  name = "github.com/kevinburke/ssh_config"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "9fc7bb800b555d63157c65a904c86a2cc7b4e795"
-  version = "0.4"
-
-[[projects]]
-  digest = "1:d244f8666a838fe6ad70ec8fe77f50ebc29fdc3331a2729ba5886bef8435d10d"
-  name = "github.com/magiconair/properties"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "c2353362d570a7bfa228149c62842019201cfb71"
-  version = "v1.8.0"
-
-[[projects]]
-  digest = "1:08c231ec84231a7e23d67e4b58f975e1423695a32467a362ee55a803f9de8061"
-  name = "github.com/mattn/go-colorable"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-  version = "v0.0.9"
-
-[[projects]]
-  digest = "1:bc4f7eec3b7be8c6cb1f0af6c1e3333d5bb71072951aaaae2f05067b0803f287"
-  name = "github.com/mattn/go-isatty"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-  version = "v0.0.3"
-
-[[projects]]
-  digest = "1:cb591533458f6eb6e2c1065ff3eac6b50263d7847deb23fc9f79b25bc608970e"
-  name = "github.com/mattn/go-runewidth"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
-  version = "v0.0.2"
-
-[[projects]]
-  digest = "1:a25c9a6b41e100f4ce164db80260f2b687095ba9d8b46a1d6072d3686cc020db"
-  name = "github.com/mgutz/str"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "968bf66e3da857419e4f6e71b2d5c9ae95682dc4"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a4df73029d2c42fabcb6b41e327d2f87e685284ec03edf76921c267d9cfc9c23"
-  name = "github.com/mitchellh/go-homedir"
-  packages = ["."]
-  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"
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac"
-
-[[projects]]
-  digest = "1:2c34c77bf3ec848da26e48af58fc511ed52750961fa848399d122882b8890928"
-  name = "github.com/nicksnyder/go-i18n"
-  packages = [
-    "v2/i18n",
-    "v2/internal",
-    "v2/internal/plural",
-  ]
-  pruneopts = "NUT"
-  revision = "a16b91a3ba80db3a2301c70d1d302d42251c9079"
-  version = "v2.0.0-beta.5"
-
-[[projects]]
-  digest = "1:cf254277d898b713195cc6b4a3fac8bf738b9f1121625df27843b52b267eec6c"
-  name = "github.com/pelletier/go-buffruneio"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "c37440a7cf42ac63b919c752ca73a85067e05992"
-  version = "v0.2.0"
-
-[[projects]]
-  digest = "1:51ea800cff51752ff68e12e04106f5887b4daec6f9356721238c28019f0b42db"
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  pruneopts = "NUT"
-  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"
-  packages = ["diffmatchpatch"]
-  pruneopts = "NUT"
-  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
-  version = "v1.0.0"
-
-[[projects]]
-  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"
-  packages = [
-    ".",
-    "mem",
-  ]
-  pruneopts = "NUT"
-  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
-  version = "v1.1.1"
-
-[[projects]]
-  digest = "1:3fa7947ca83b98ae553590d993886e845a4bff19b7b007e869c6e0dd3b9da9cd"
-  name = "github.com/spf13/cast"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "8965335b8c7107321228e3e3702cab9832751bac"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f29f83301ed096daed24a90f4af591b7560cb14b9cc3e1827abbf04db7269ab5"
-  name = "github.com/spf13/jwalterweatherman"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"
-
-[[projects]]
-  digest = "1:e3707aeaccd2adc89eba6c062fec72116fe1fc1ba71097da85b4d8ae1668a675"
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "9a97c102cda95a86cec2345a6f09f55a939babf5"
-  version = "v1.0.2"
-
-[[projects]]
-  digest = "1:454979540e2a1582f375a17c106cf4e11e3bcac4baffb4af23e515c87f87de13"
-  name = "github.com/spf13/viper"
-  packages = ["."]
-  pruneopts = "NUT"
-  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"
-  packages = [
-    ".",
-    "scanner",
-    "token",
-    "types",
-  ]
-  pruneopts = "NUT"
-  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"
-  packages = ["."]
-  pruneopts = "NUT"
-  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"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"
-  version = "v0.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:dfcb1b2db354cafa48fc3cdafe4905a08bec4a9757919ab07155db0ca23855b4"
-  name = "golang.org/x/crypto"
-  packages = [
-    "cast5",
-    "curve25519",
-    "ed25519",
-    "ed25519/internal/edwards25519",
-    "internal/chacha20",
-    "internal/subtle",
-    "openpgp",
-    "openpgp/armor",
-    "openpgp/elgamal",
-    "openpgp/errors",
-    "openpgp/packet",
-    "openpgp/s2k",
-    "poly1305",
-    "ssh",
-    "ssh/agent",
-    "ssh/knownhosts",
-    "ssh/terminal",
-  ]
-  pruneopts = "NUT"
-  revision = "de0752318171da717af4ce24d0a2e8626afaeb11"
-
-[[projects]]
-  branch = "master"
-  digest = "1:76ee51c3f468493aff39dbacc401e8831fbb765104cbf613b89bef01cf4bad70"
-  name = "golang.org/x/net"
-  packages = ["context"]
-  pruneopts = "NUT"
-  revision = "c39426892332e1bb5ec0a434a079bf82f5d30c54"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ec76a40fbfda0c329ee58f4e3b14b4279a939efce89eca020e934e2e5234eddd"
-  name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows",
-  ]
-  pruneopts = "NUT"
-  revision = "98c5dad5d1a0e8a73845ecc8897d0bd56586511d"
-
-[[projects]]
-  digest = "1:a95288ef1ef4dfad6cba7fe30843e1683f71bc28c912ca1ba3f6a539d44db739"
-  name = "golang.org/x/text"
-  packages = [
-    "internal/gen",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "transform",
-    "unicode/cldr",
-    "unicode/norm",
-  ]
-  pruneopts = "NUT"
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
-  version = "v0.3.0"
-
-[[projects]]
-  digest = "1:47a697b155f5214ff14e68e39ce9c2e8d93e1fb035ae5ba7e247d044e0ce64e3"
-  name = "gopkg.in/src-d/go-billy.v4"
-  packages = [
-    ".",
-    "helper/chroot",
-    "helper/polyfill",
-    "osfs",
-    "util",
-  ]
-  pruneopts = "NUT"
-  revision = "83cf655d40b15b427014d7875d10850f96edba14"
-  version = "v4.2.0"
-
-[[projects]]
-  digest = "1:e66078da2bd6e53c72518d7f6ae0c3c8c7f34c0df12c39435ce34a6bce165525"
-  name = "gopkg.in/src-d/go-git.v4"
-  packages = [
-    ".",
-    "config",
-    "internal/revision",
-    "plumbing",
-    "plumbing/cache",
-    "plumbing/filemode",
-    "plumbing/format/config",
-    "plumbing/format/diff",
-    "plumbing/format/gitignore",
-    "plumbing/format/idxfile",
-    "plumbing/format/index",
-    "plumbing/format/objfile",
-    "plumbing/format/packfile",
-    "plumbing/format/pktline",
-    "plumbing/object",
-    "plumbing/protocol/packp",
-    "plumbing/protocol/packp/capability",
-    "plumbing/protocol/packp/sideband",
-    "plumbing/revlist",
-    "plumbing/storer",
-    "plumbing/transport",
-    "plumbing/transport/client",
-    "plumbing/transport/file",
-    "plumbing/transport/git",
-    "plumbing/transport/http",
-    "plumbing/transport/internal/common",
-    "plumbing/transport/server",
-    "plumbing/transport/ssh",
-    "storage",
-    "storage/filesystem",
-    "storage/filesystem/dotgit",
-    "storage/memory",
-    "utils/binary",
-    "utils/diff",
-    "utils/ioutil",
-    "utils/merkletrie",
-    "utils/merkletrie/filesystem",
-    "utils/merkletrie/index",
-    "utils/merkletrie/internal/frame",
-    "utils/merkletrie/noder",
-  ]
-  pruneopts = "NUT"
-  revision = "43d17e14b714665ab5bc2ecc220b6740779d733f"
-
-[[projects]]
-  digest = "1:b233ad4ec87ac916e7bf5e678e98a2cb9e8b52f6de6ad3e11834fc7a71b8e3bf"
-  name = "gopkg.in/warnings.v0"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b"
-  version = "v0.1.2"
-
-[[projects]]
-  digest = "1:7c95b35057a0ff2e19f707173cc1a947fa43a6eb5c4d300d196ece0334046082"
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-  version = "v2.2.1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/cloudfoundry/jibber_jabber",
-    "github.com/fatih/color",
-    "github.com/go-errors/errors",
-    "github.com/golang-collections/collections/stack",
-    "github.com/heroku/rollrus",
-    "github.com/jesseduffield/go-getter",
-    "github.com/jesseduffield/gocui",
-    "github.com/jesseduffield/pty",
-    "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

Gopkg.toml

@@ -1,50 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-
-[prune]
-  go-tests = true
-  unused-packages = true
-  non-go = true
-
-[[constraint]]
-  name = "github.com/fatih/color"
-  version = "1.7.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/golang-collections/collections"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/jesseduffield/gocui"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/jesseduffield/pty"
-
-[[constraint]]
-  name = "gopkg.in/src-d/go-git.v4"
-  revision = "43d17e14b714665ab5bc2ecc220b6740779d733f"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/spkg/bom"

README.md

@@ -1,36 +1,52 @@
 # 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)]()
 
-A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui "gocui") library.
+A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui 'gocui') library.
 
-Are YOU tired of typing every git command directly into the terminal, but you're
-too stubborn to use Sourcetree because you'll never forgive Atlassian for making
-Jira? This is the app for you!
+Rant time: You've heard it before, git is _powerful_, but what good is that power when everything is so damn hard to do? Interactive rebasing requires you to edit a goddamn TODO file in your editor? *Are you kidding me?* To stage part of a file you need to use a command line program stepping through each hunk and if a hunk can't be split down any further but contains code you don't want to stage, bad luck? *Are you KIDDING me?!* Sometimes you get asked to stash your changes when switching branches only to realise that after you switch and unstash that there weren't even any conflicts and it would have been fine to just checkout the branch directly? *YOU HAVE GOT TO BE KIDDING ME!* 
 
+If you're a mere mortal like me and you're tired of hearing how powerful git is when in your daily life it's a powerful pain in your ass, lazygit might be for you.
 
 ![Gif](/docs/resources/lazygit-example.gif)
 
-  * [Installation](https://github.com/jesseduffield/lazygit#installation)
-  * [Usage](https://github.com/jesseduffield/lazygit#usage),
-    [Keybindings](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md)
-  * [Cool Features](https://github.com/jesseduffield/lazygit#cool-features)
-  * [Contributing](https://github.com/jesseduffield/lazygit#contributing)
-  * [Video Tutorial](https://youtu.be/VDXvbHZYeKY)
-  * [Twitch Stream](https://www.twitch.tv/jesseduffield)
+- [Installation](https://github.com/jesseduffield/lazygit#installation)
+- [Usage](https://github.com/jesseduffield/lazygit#usage),
+  [Keybindings](/docs/keybindings)
+- [Cool Features](https://github.com/jesseduffield/lazygit#cool-features)
+- [Contributing](https://github.com/jesseduffield/lazygit#contributing)
+- [Video Tutorial](https://youtu.be/VDXvbHZYeKY)
+- [Rebase Magic Video Tutorial](https://youtu.be/4XaToVut_hs)
+- [Twitch Stream](https://www.twitch.tv/jesseduffield)
+
+[<img src="https://i.imgur.com/sVEktDn.png">](https://youtu.be/CPLdltN7wgE)
+
+Github Sponsors is matching all donations dollar-for-dollar for 12 months so if you're feeling generous consider [sponsoring me](https://github.com/sponsors/jesseduffield)
 
 ## Installation
 
 ### Homebrew
-```sh
-brew tap jesseduffield/lazygit
+Normally the lazygit formula can be found in the Homebrew core but we suggest you tap our formula to get the frequently updated one. It works with Linux, too.
+
+Tap:
+```
+brew install jesseduffield/lazygit/lazygit
+```
+
+Core:
+
+```
 brew install lazygit
 ```
 
+### MacPorts
+Latest version built from github releases.
+Tap:
+```
+sudo port install lazygit
+```
+
 ### Ubuntu
-Packages for Ubuntu 16.04, 18.04 and 18.10 are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
 
-**Release builds**
-
-Built from git tags. Supposed to be more stable.
+Packages for Ubuntu are available via [Launchpad PPA](https://launchpad.net/~lazygit-team).
 
 ```sh
 sudo add-apt-repository ppa:lazygit-team/release
@@ -38,17 +54,8 @@ sudo apt-get update
 sudo apt-get install lazygit
 ```
 
-**Daily builds**
-
-Built from master branch once in 24 hours (or more sometimes).
-
-```sh
-sudo add-apt-repository ppa:lazygit-team/daily
-sudo apt-get update
-sudo apt-get install lazygit
-```
-
 ### Void Linux
+
 Packages for Void Linux are available in the distro repo
 
 They follow upstream latest releases
@@ -58,91 +65,123 @@ sudo xbps-install -S lazygit
 ```
 
 ### Arch Linux
+
 Packages for Arch Linux are available via AUR (Arch User Repository).
 
 There are two packages. The stable one which is built with the latest release
 and the git version which builds from the most recent commit.
 
-  * Stable: https://aur.archlinux.org/packages/lazygit/
-  * Development: https://aur.archlinux.org/packages/lazygit-git/
+- Stable: https://aur.archlinux.org/packages/lazygit/
+- Development: https://aur.archlinux.org/packages/lazygit-git/
 
 Instruction of how to install AUR content can be found here:
 https://wiki.archlinux.org/index.php/Arch_User_Repository
 
+### Fedora and CentOS 7
+
+Packages for Fedora and CentOS 7 are available via [Copr](https://copr.fedorainfracloud.org/coprs/atim/lazygit/) (Cool Other Package Repo).
+
+```sh
+sudo dnf copr enable atim/lazygit -y
+sudo dnf install lazygit
+```
+
 ### Conda
+
 Released versions are available for different platforms, see https://anaconda.org/conda-forge/lazygit
+
 ```sh
 conda install -c conda-forge lazygit
 ```
 
 ### Binary Release (Windows/Linux/OSX)
+
 You can download a binary release [here](https://github.com/jesseduffield/lazygit/releases).
 
 ### Go
+
 ```sh
 go get github.com/jesseduffield/lazygit
 ```
 
 Please note:
 If you get an error claiming that lazygit cannot be found or is not defined, you
-may need to add `~/go/bin` to your $PATH (MacOS/Linux), or `%HOME%\go\bin`
+may need to add `~/go/bin` to your \$PATH (MacOS/Linux), or `%HOME%\go\bin`
 (Windows). Not to be mistaked for `C:\Go\bin` (which is for Go's own binaries,
 not apps like Lazygit).
 
 ## Usage
+
 Call `lazygit` in your terminal inside a git repository. If you want, you can
 also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or
 whichever rc file you're using).
 
-  * Basic video tutorial [here](https://youtu.be/VDXvbHZYeKY).
-  * List of keybindings
-[here](/docs/Keybindings.md).
+- Basic video tutorial [here](https://youtu.be/VDXvbHZYeKY).
+- Rebase Magic tutorial [here](https://youtu.be/4XaToVut_hs)
+- List of keybindings
+  [here](/docs/keybindings).
+  
+## Changing Directory On Exit
+
+If you change repos in lazygit and want your shell to change directory into that repo on exiting lazygit, add this to your `~/.zshrc` (or other rc file):
+```
+lg()
+{
+    export LAZYGIT_NEW_DIR_FILE=~/.lazygit/newdir
+
+    lazygit "$@"
+
+    if [ -f $LAZYGIT_NEW_DIR_FILE ]; then
+            cd "$(cat $LAZYGIT_NEW_DIR_FILE)"
+            rm -f $LAZYGIT_NEW_DIR_FILE > /dev/null
+    fi
+}
+```
+Then `source ~/.zshrc` and from now on when you call `lg` and exit you'll switch directories to whatever you were in inside lazyigt. To override this behaviour you can exit using `shift+Q` rather than just `q`.
 
 ## Cool features
-  * Adding files easily
-  * Resolving merge conflicts
-  * Easily check out recent branches
-  * Scroll through logs/diffs of branches/commits/stash
-  * Quick pushing/pulling
-  * Squash down and rename commits
+
+- Adding files easily
+- Resolving merge conflicts
+- Easily check out recent branches
+- Scroll through logs/diffs of branches/commits/stash
+- Quick pushing/pulling
+- Squash down and rename commits
 
 ### Resolving merge conflicts
+
 ![Gif](/docs/resources/resolving-merge-conflicts.gif)
 
-### Viewing commit diffs
-![Viewing Commit Diffs](/docs/resources/viewing-commit-diffs.png)
+### Interactive Rebasing
 
-## Milestones
-- [x] Easy Installation (homebrew, release binaries)
-- [ ] Configurable Keybindings
-- [ ] Configurable Color Themes
-- [ ] Spawning Subprocesses (help needed - have a look at https://github.com/jesseduffield/lazygit/pull/18)
-- [ ] Maintainability
-- [ ] Performance
-- [ ] i18n
+![Interactive Rebasing](/docs/resources/interactive-rebase.png)
 
 ## Contributing
+
 We love your input! Please check out the [contributing guide](CONTRIBUTING.md).
 For contributor discussion about things not better discussed here in the repo, join the slack channel
 
 [![Slack](/docs/resources/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/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)
+If you would like to support the development of lazygit, consider [sponsoring me](https://github.com/sponsors/jesseduffield) (github is matching all donations dollar-for-dollar for 12 months)
 
 ## Work in progress
+
 This is still a work in progress so there's still bugs to iron out and as this
 is my first project in Go the code could no doubt use an increase in quality,
 but I'll be improving on it whenever I find the time. If you have any feedback
 feel free to [raise an issue](https://github.com/jesseduffield/lazygit/issues)/[submit a PR](https://github.com/jesseduffield/lazygit/pulls).
 
 ## Social
+
 If you want to see what I (Jesse) am up to in terms of development, follow me on
 [twitter](https://twitter.com/DuffieldJesse) or watch me program on
 [twitch](https://www.twitch.tv/jesseduffield).
 
 ## Alternatives
+
 If you find that lazygit doesn't quite satisfy your requirements, these may be a better fit:
+
 - [tig](https://github.com/jonas/tig)

docs/Config.md

@@ -1,13 +1,16 @@
 # User Config:
 
+Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
+
 ## Default:
 
-```
+```yaml
   gui:
     # stuff relating to the UI
     scrollHeight: 2 # how many lines you scroll by
     scrollPastBottom: true # enable scrolling past the bottom
     theme:
+      lightTheme: false # For terminals with a light background
       activeBorderColor:
         - white
         - bold
@@ -17,36 +20,131 @@
         - blue
     commitLength:
       show: true
+    mouseEvents: true
   git:
     merging:
       # only applicable to unix users
       manualCommit: false
+    skipHookPrefix: WIP
+    autoFetch: 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
+  keybinding:
+    universal:
+      quit: 'q'
+      quit-alt1: '<c-c>' # alternative/alias of quit
+      return: '<esc>' # return to previous menu, will quit if there's nowhere to return
+      quitWithoutChangingDirectory: 'Q'
+      togglePanel: '<tab>' # goto the next panel
+      prevItem: '<up>' # go one line up
+      nextItem: '<down>' # go one line down
+      prevItem-alt: 'k' # go one line up
+      nextItem-alt: 'j' # go one line down
+      prevBlock: '<left>' # goto the previous block / panel
+      nextBlock: '<right>' # goto the next block / panel
+      prevBlock-alt: 'h' # goto the previous block / panel
+      nextBlock-alt: 'l' # goto the next block / panel
+      optionMenu: 'x' # show help menu
+      optionMenu-alt1: '?' # show help menu
+      select: '<space>'
+      goInto: '<enter>'
+      remove: 'd'
+      new: 'n'
+      edit: 'e'
+      openFile: 'o'
+      scrollUpMain: '<pgup>' # main panel scrool up
+      scrollDownMain: '<pgdown>' # main panel scrool down
+      scrollUpMain-alt1: 'K' # main panel scrool up
+      scrollDownMain-alt1: 'J' # main panel scrool down
+      scrollUpMain-alt2: '<c-u>' # main panel scrool up
+      scrollDownMain-alt2: '<c-d>' # main panel scrool down
+      executeCustomCommand: 'X'
+      createRebaseOptionsMenu: 'm'
+      pushFiles: 'P'
+      pullFiles: 'p'
+      refresh: 'R'
+      createPatchOptionsMenu: '<c-p>'
+      nextBranchTab: ']'
+      prevBranchTab: '['
+    status:
+      checkForUpdate: 'u'
+      recentRepos: '<enter>'
+    files:
+      commitChanges: 'c'
+      commitChangesWithoutHook: 'w' # commit changes without pre-commit hook
+      amendLastCommit: 'A'
+      commitChangesWithEditor: 'C'
+      ignoreFile: 'i'
+      refreshFiles: 'r'
+      stashAllChanges: 's'
+      viewStashOptions: 'S'
+      toggleStagedAll: 'a' # stage/unstage all
+      viewResetOptions: 'D'
+      fetch: 'f'
+    branches:
+      createPullRequest: 'o'
+      checkoutBranchByName: 'c'
+      forceCheckoutBranch: 'F'
+      rebaseBranch: 'r'
+      mergeIntoCurrentBranch: 'M'
+      viewGitFlowOptions: 'i'
+      fastForward: 'f' # fast-forward this branch from its upstream
+      pushTag: 'P'
+      setUpstream: 'u' # set as upstream of checked-out branch
+      fetchRemote: 'f'
+    commits:
+      squashDown: 's'
+      renameCommit: 'r'
+      renameCommitWithEditor: 'R'
+      viewResetOptions: 'g'
+      markCommitAsFixup: 'f'
+      createFixupCommit: 'F' # create fixup commit for this commit
+      squashAboveCommits: 'S'
+      moveDownCommit: '<c-j>' # move commit down one
+      moveUpCommit: '<c-k>' # move commit up one
+      amendToCommit: 'A'
+      pickCommit: 'p' # pick commit (when mid-rebase)
+      revertCommit: 't'
+      cherryPickCopy: 'c'
+      cherryPickCopyRange: 'C'
+      pasteCommits: 'v'
+      tagCommit: 'T'
+      toggleDiffCommit: 'h'
+      checkoutCommit: '<space>'
+    stash:
+      popStash: 'g'
+    commitFiles:
+      checkoutCommitFile: 'c'
+    main:
+      toggleDragSelect: 'v'
+      toggleDragSelect-alt: 'V'
+      toggleSelectHunk: 'a'
+      pickBothHunks: 'b'
+      undo: 'z'
 ```
 
 ## Platform Defaults:
 
 ### Windows:
 
-```
+```yaml
   os:
     openCommand: 'cmd /c "start "" {{filename}}"'
 ```
 
 ### Linux:
 
-```
+```yaml
   os:
     openCommand: 'sh -c "xdg-open {{filename}} >/dev/null"'
 ```
 
 ### OSX:
 
-```
+```yaml
   os:
     openCommand: 'open {{filename}}'
 ```
@@ -55,7 +153,7 @@
 
 for users of VSCode
 
-```
+```yaml
   os:
     openCommand: 'code -r {{filename}}'
 ```
@@ -78,6 +176,48 @@ The available attributes are:
 - reverse # useful for high-contrast
 - underline
 
+## Light terminal theme:
+
+If you have issues with a light terminal theme where you can't read / see the text add these settings
+
+```yaml
+  gui:
+    theme:
+      lightTheme: true
+      activeBorderColor:
+        - black
+        - bold
+      inactiveBorderColor:
+        - black
+```
+
 ## Example Coloring:
 
 ![border example](/docs/resources/colored-border-example.png)
+
+## Keybindings:
+For all possible keybinding options, check [Custom_Keybinding.md](https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybinding.md) <++>
+
+
+#### Example Keybindings For Colemak Users:
+```yaml
+  keybinding:
+    universal:
+      prevItem-alt: 'u'
+      nextItem-alt: 'e'
+      prevBlock-alt: 'n'
+      nextBlock-alt: 'i'
+      new: 'k'
+      edit: 'o'
+      openFile: 'O'
+      scrollUpMain-alt1: 'U'
+      scrollDownMain-alt1: 'E'
+      scrollUpMain-alt2: '<c-u>'
+      scrollDownMain-alt2: '<c-e>'
+    files:
+      ignoreFile: 'I'
+    commits:
+      moveDownCommit: '<c-e>'
+      moveUpCommit: '<c-u>'
+```
+

docs/Keybindings.md

@@ -1,85 +0,0 @@
-# Keybindings:
-
-## Global:
-
-<pre>
-  <kbd>←</kbd><kbd>→</kbd><kbd>↑</kbd><kbd>↓</kbd>/<kbd>h</kbd><kbd>j</kbd><kbd>k</kbd><kbd>l</kbd>:               navigate
-  <kbd>PgUp</kbd>/<kbd>PgDn</kbd> or <kbd>ctrl</kbd>+<kbd>u</kbd>/<kbd>ctrl</kbd>+<kbd>d</kbd>:   scroll diff panel
-                                     (for <kbd>PgUp</kbd> and <kbd>PgDn</kbd>, use <kbd>fn</kbd>+<kbd>up</kbd>/<kbd>fn</kbd>+<kbd>down</kbd> on osx)
-  <kbd>q</kbd>:                                quit
-  <kbd>p</kbd>:                                pull
-  <kbd>shift</kbd>+<kbd>P</kbd>:                         push
-</pre>
-
-## Status Panel:
-
-<pre>
-  <kbd>e</kbd>:        edit config file
-  <kbd>o</kbd>:        open config file
-</pre>
-
-## Files Panel:
-
-<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
-  <kbd>t</kbd>:        add patched (i.e. pick chunks of a file to add)
-  <kbd>o</kbd>:        open
-  <kbd>e</kbd>:        edit
-  <kbd>s</kbd>:        open in sublime (requires 'subl' command)
-  <kbd>v</kbd>:        open in vscode (requires 'code' command)
-  <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:
-
-<pre>
-  <kbd>space</kbd>:   checkout branch
-  <kbd>f</kbd>:       force checkout branch
-  <kbd>m</kbd>:       merge into currently checked out branch
-  <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:
-
-<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>
-
-## Stash Panel:
-
-<pre>
-  <kbd>space</kbd>:   apply
-  <kbd>g</kbd>:       pop
-  <kbd>d</kbd>:       drop
-</pre>
-
-## Popup Panel:
-
-<pre>
-  <kbd>esc</kbd>:     close/cancel
-  <kbd>enter</kbd>:   confirm
-  <kbd>tab</kbd>:     enter newline (if editing)
-</pre>
-
-## Resolving Merge Conflicts (Diff Panel):
-
-<pre>
-  <kbd>←</kbd><kbd>→</kbd>/<kbd>h</kbd><kbd>l</kbd>: navigate conflicts
-  <kbd>↑</kbd><kbd>↓</kbd>/<kbd>k</kbd><kbd>j</kbd>: select hunk
-  <kbd>space</kbd>:      pick hunk
-  <kbd>b</kbd>:         pick both hunks
-  <kbd>z</kbd>:         undo (only available while still inside diff panel)
-</pre>

docs/keybindings/Custom_Keybindings.md

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

docs/keybindings/Keybindings_en.md

@@ -4,6 +4,7 @@
 
 <pre>
   <kbd>m</kbd>: view merge/rebase options
+  <kbd>ctrl+p</kbd>: view custom patch options
   <kbd>P</kbd>: push
   <kbd>p</kbd>: pull
   <kbd>R</kbd>: refresh
@@ -22,21 +23,22 @@
 
 <pre>
   <kbd>c</kbd>: commit changes
+  <kbd>w</kbd>: commit changes without pre-commit hook
   <kbd>A</kbd>: amend last commit
   <kbd>C</kbd>: commit changes using git editor
   <kbd>space</kbd>: toggle staged
-  <kbd>d</kbd>: delete if untracked / checkout if tracked
+  <kbd>d</kbd>: view 'discard changes' options
   <kbd>e</kbd>: edit file
   <kbd>o</kbd>: open file
   <kbd>i</kbd>: add to .gitignore
   <kbd>r</kbd>: refresh files
   <kbd>S</kbd>: stash files
-  <kbd>s</kbd>: soft reset to last commit
   <kbd>a</kbd>: stage/unstage all
   <kbd>t</kbd>: add patch
-  <kbd>D</kbd>: reset hard and remove untracked files
+  <kbd>D</kbd>: view reset options
   <kbd>enter</kbd>: stage individual hunks/lines
   <kbd>f</kbd>: fetch
+  <kbd>X</kbd>: execute custom command
 </pre>
 
 ## Branches
@@ -61,9 +63,11 @@
   <kbd>R</kbd>: rename commit with editor
   <kbd>g</kbd>: reset to this commit
   <kbd>f</kbd>: fixup commit
+  <kbd>F</kbd>: create fixup commit for this commit
+  <kbd>S</kbd>: squash above commits
   <kbd>d</kbd>: delete commit
-  <kbd>J</kbd>: move commit down one
-  <kbd>K</kbd>: move commit up one
+  <kbd>ctrl+j</kbd>: move commit down one
+  <kbd>ctrl+k</kbd>: move commit up one
   <kbd>e</kbd>: edit commit
   <kbd>A</kbd>: amend commit with staged changes
   <kbd>p</kbd>: pick commit (when mid-rebase)
@@ -71,6 +75,8 @@
   <kbd>c</kbd>: copy commit (cherry-pick)
   <kbd>C</kbd>: copy commit range (cherry-pick)
   <kbd>v</kbd>: paste commits (cherry-pick)
+  <kbd>enter</kbd>: view commit's files
+  <kbd>space</kbd>: select commit to diff with another commit
 </pre>
 
 ## Stash
@@ -81,11 +87,20 @@
   <kbd>d</kbd>: drop
 </pre>
 
+## Commit files
+
+<pre>
+  <kbd>esc</kbd>: go back
+  <kbd>c</kbd>: checkout file
+  <kbd>d</kbd>: discard this commit's changes to this file
+  <kbd>o</kbd>: open file
+</pre>
+
 ## Main (Normal)
 
 <pre>
-  <kbd>PgDn</kbd>: scroll down
-  <kbd>PgUp</kbd>: scroll up
+  <kbd>PgDn</kbd>: scroll down (fn+up)
+  <kbd>PgUp</kbd>: scroll up (fn+down)
 </pre>
 
 ## Main (Staging)

docs/keybindings/Keybindings_nl.md

@@ -0,0 +1,128 @@
+# Lazygit menu
+
+## Global
+
+<pre>
+  <kbd>m</kbd>: bekijk merge/rebase opties
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
+  <kbd>R</kbd>: verversen
+</pre>
+
+## Status
+
+<pre>
+  <kbd>e</kbd>: verander config file
+  <kbd>o</kbd>: open config file
+  <kbd>u</kbd>: check voor updates
+  <kbd>s</kbd>: wissel naar een recente repo
+</pre>
+
+## Bestanden
+
+<pre>
+  <kbd>c</kbd>: Commit veranderingen
+  <kbd>w</kbd>: commit veranderingen zonder pre-commit hook
+  <kbd>A</kbd>: wijzig laatste commit
+  <kbd>C</kbd>: commit veranderingen met de git editor
+  <kbd>space</kbd>: toggle staged
+  <kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties
+  <kbd>e</kbd>: verander bestand
+  <kbd>o</kbd>: open bestand
+  <kbd>i</kbd>: voeg toe aan .gitignore
+  <kbd>r</kbd>: refresh bestanden
+  <kbd>S</kbd>: stash-bestanden
+  <kbd>a</kbd>: toggle staged alle
+  <kbd>t</kbd>: bewerkingen toevoegen
+  <kbd>D</kbd>: bekijk reset opties
+  <kbd>enter</kbd>: stage individuele hunks/lijnen
+  <kbd>f</kbd>: fetch
+  <kbd>X</kbd>: voor aangepast commando uit
+</pre>
+
+## Branches
+
+<pre>
+  <kbd>space</kbd>: uitchecken
+  <kbd>o</kbd>: maak een pull-aanvraag
+  <kbd>c</kbd>: uitchecken bij naam
+  <kbd>F</kbd>: forceer checkout
+  <kbd>n</kbd>: nieuwe branch
+  <kbd>d</kbd>: verwijder branch
+  <kbd>r</kbd>: rebase branch
+  <kbd>M</kbd>: merge in met huidige checked out branch
+  <kbd>f</kbd>: fast-forward this branch from its upstream
+</pre>
+
+## Commits
+
+<pre>
+  <kbd>s</kbd>: squash beneden
+  <kbd>r</kbd>: hernoem commit
+  <kbd>R</kbd>: rename commit with editor
+  <kbd>g</kbd>: reset naar deze commit
+  <kbd>f</kbd>: Fixup commit
+  <kbd>F</kbd>: creëer fixup commit voor deze commit
+  <kbd>S</kbd>: squash bovenstaande commits
+  <kbd>d</kbd>: verwijder commit
+  <kbd>ctrl+j</kbd>: verplaats commit 1 omlaag
+  <kbd>ctrl+k</kbd>: verplaats commit 1 omhoog
+  <kbd>e</kbd>: verander commit
+  <kbd>A</kbd>: wijzig commit met staged veranderingen
+  <kbd>p</kbd>: pick commit (when mid-rebase)
+  <kbd>t</kbd>: commit omgedaan maken
+  <kbd>c</kbd>: kopiëer commit (cherry-pick)
+  <kbd>C</kbd>: kopiëer commit reeks (cherry-pick)
+  <kbd>v</kbd>: plak commits (cherry-pick)
+  <kbd>enter</kbd>: bekijk gecommite bestanden
+  <kbd>space</kbd>: select commit to diff with another commit
+</pre>
+
+## Stash
+
+<pre>
+  <kbd>space</kbd>: toepassen
+  <kbd>g</kbd>: pop
+  <kbd>d</kbd>: drop
+</pre>
+
+## Commit bestanden
+
+<pre>
+  <kbd>esc</kbd>: ga terug
+  <kbd>c</kbd>: bestand uitchecken
+  <kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand
+  <kbd>o</kbd>: open bestand
+</pre>
+
+## Hoofd (Stage Lines/Hunks)
+
+<pre>
+  <kbd>esc</kbd>: ga terug naar het bestanden paneel
+  <kbd>▲</kbd>: selecteer de vorige lijn
+  <kbd>▼</kbd>: selecteer de volgende lijn
+  <kbd>◄</kbd>: selecteer de vorige hunk
+  <kbd>►</kbd>: selecteer de volgende hunk
+  <kbd>space</kbd>: stage lijn
+  <kbd>a</kbd>: stage hunk
+</pre>
+
+## Hoofd (Merging)
+
+<pre>
+  <kbd>esc</kbd>: ga terug naar het bestanden paneel
+  <kbd>space</kbd>: pick hunk
+  <kbd>b</kbd>: pick beide hunks
+  <kbd>◄</kbd>: selecteer voorgaand conflict
+  <kbd>►</kbd>: selecteer volgende conflict
+  <kbd>▲</kbd>: selecteer bovenste hunk
+  <kbd>▼</kbd>: selecteer onderste hunk
+  <kbd>z</kbd>: ongedaan maken
+</pre>
+
+## Hoofd (Normaal)
+
+<pre>
+  <kbd>PgDn</kbd>: scroll omlaag (fn+up)
+  <kbd>PgUp</kbd>: scroll omhoog (fn+down)
+</pre>

docs/keybindings/Keybindings_pl.md

@@ -0,0 +1,128 @@
+# Lazygit menu
+
+## Globalne
+
+<pre>
+  <kbd>m</kbd>: view merge/rebase options
+  <kbd>P</kbd>: push
+  <kbd>p</kbd>: pull
+  <kbd>R</kbd>: odśwież
+</pre>
+
+## Status
+
+<pre>
+  <kbd>e</kbd>: edytuj plik konfiguracyjny
+  <kbd>o</kbd>: otwórz plik konfiguracyjny
+  <kbd>u</kbd>: sprawdź aktualizacje
+  <kbd>s</kbd>: switch to a recent repo
+</pre>
+
+## Pliki
+
+<pre>
+  <kbd>c</kbd>: commituj zmiany
+  <kbd>w</kbd>: commit changes without pre-commit hook
+  <kbd>A</kbd>: zmień ostatnie zatwierdzenie
+  <kbd>C</kbd>: commituj zmiany używając edytora z gita
+  <kbd>space</kbd>: przełącz zatwierdzenie
+  <kbd>d</kbd>: view 'discard changes' options
+  <kbd>e</kbd>: edytuj plik
+  <kbd>o</kbd>: otwórz plik
+  <kbd>i</kbd>: dodaj do .gitignore
+  <kbd>r</kbd>: odśwież pliki
+  <kbd>S</kbd>: przechowaj pliki
+  <kbd>a</kbd>: przełącz wszystkie zatwierdzenia
+  <kbd>t</kbd>: dodaj łatkę
+  <kbd>D</kbd>: view reset options
+  <kbd>enter</kbd>: zatwierdź pojedyncze linie
+  <kbd>f</kbd>: fetch
+  <kbd>X</kbd>: execute custom command
+</pre>
+
+## Gałęzie
+
+<pre>
+  <kbd>space</kbd>: przełącz
+  <kbd>o</kbd>: utwórz żądanie wyciągnięcia
+  <kbd>c</kbd>: przełącz używając nazwy
+  <kbd>F</kbd>: wymuś przełączenie
+  <kbd>n</kbd>: nowa gałąź
+  <kbd>d</kbd>: usuń gałąź
+  <kbd>r</kbd>: rebase branch
+  <kbd>M</kbd>: scal do obecnej gałęzi
+  <kbd>f</kbd>: fast-forward this branch from its upstream
+</pre>
+
+## Commity
+
+<pre>
+  <kbd>s</kbd>: ściśnij w dół
+  <kbd>r</kbd>: przemianuj commit
+  <kbd>R</kbd>: przemianuj commit w edytorze
+  <kbd>g</kbd>: zresetuj do tego commita
+  <kbd>f</kbd>: napraw commit
+  <kbd>F</kbd>: create fixup commit for this commit
+  <kbd>S</kbd>: squash above commits
+  <kbd>d</kbd>: delete commit
+  <kbd>ctrl+j</kbd>: move commit down one
+  <kbd>ctrl+k</kbd>: move commit up one
+  <kbd>e</kbd>: edit commit
+  <kbd>A</kbd>: amend commit with staged changes
+  <kbd>p</kbd>: pick commit (when mid-rebase)
+  <kbd>t</kbd>: revert commit
+  <kbd>c</kbd>: copy commit (cherry-pick)
+  <kbd>C</kbd>: copy commit range (cherry-pick)
+  <kbd>v</kbd>: paste commits (cherry-pick)
+  <kbd>enter</kbd>: view commit's files
+  <kbd>space</kbd>: select commit to diff with another commit
+</pre>
+
+## Schowek
+
+<pre>
+  <kbd>space</kbd>: zastosuj
+  <kbd>g</kbd>: wyciągnij
+  <kbd>d</kbd>: porzuć
+</pre>
+
+## Commit files
+
+<pre>
+  <kbd>esc</kbd>: go back
+  <kbd>c</kbd>: checkout file
+  <kbd>d</kbd>: discard this commit's changes to this file
+  <kbd>o</kbd>: otwórz plik
+</pre>
+
+## Main (Normal)
+
+<pre>
+  <kbd>PgDn</kbd>: scroll down (fn+up)
+  <kbd>PgUp</kbd>: scroll up (fn+down)
+</pre>
+
+## Main (Zatwierdzanie)
+
+<pre>
+  <kbd>esc</kbd>: wróć do panelu plików
+  <kbd>▲</kbd>: select previous line
+  <kbd>▼</kbd>: select next line
+  <kbd>◄</kbd>: select previous hunk
+  <kbd>►</kbd>: select next hunk
+  <kbd>space</kbd>: zatwierdź linię
+  <kbd>a</kbd>: zatwierdź kawałek
+</pre>
+
+## Main (Merging)
+
+<pre>
+  <kbd>esc</kbd>: wróć do panelu plików
+  <kbd>space</kbd>: pick hunk
+  <kbd>b</kbd>: pick both hunks
+  <kbd>◄</kbd>: select previous conflict
+  <kbd>►</kbd>: select next conflict
+  <kbd>▲</kbd>: select top hunk
+  <kbd>▼</kbd>: select bottom hunk
+  <kbd>z</kbd>: undo
+</pre>

go.mod

@@ -1,64 +1,44 @@
 module github.com/jesseduffield/lazygit
 
+go 1.13
+
 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-errors/errors v1.0.1
-	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-20190303031804-b502ee11d674
-	github.com/jesseduffield/pty v0.0.0-20181218102224-02db52c7e406
-	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/golang/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/integrii/flaggy v1.4.0
+	github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532
+	github.com/jesseduffield/pty v1.2.1
+	github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7
+	github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e // indirect
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/mattn/go-colorable v0.1.4 // indirect
+	github.com/mattn/go-isatty v0.0.11 // indirect
+	github.com/mattn/go-runewidth v0.0.7
 	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/nicksnyder/go-i18n/v2 v2.0.3
+	github.com/onsi/ginkgo v1.10.3 // indirect
+	github.com/onsi/gomega v1.7.1 // indirect
+	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0
-	github.com/sirupsen/logrus v1.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/sirupsen/logrus v1.4.2
+	github.com/spf13/afero v1.2.2 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.6.1
 	github.com/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/stretchr/testify v1.4.0
 	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
+	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
+	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
+	golang.org/x/text v0.3.2
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/src-d/go-git.v4 v4.13.1
+	gopkg.in/yaml.v2 v2.2.7
 )

go.sum

@@ -1,121 +1,298 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 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/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 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/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 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/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM=
+github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
 github.com/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-20181209104758-fe55a32c8a4c h1:jEfh/vAtfF3pQ8xFhpYR/0S4iHo11VfaYelJmzZJm94=
-github.com/jesseduffield/gocui v0.0.0-20181209104758-fe55a32c8a4c/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
-github.com/jesseduffield/pty v0.0.0-20181218102224-02db52c7e406 h1:iYMH6h6SuWuBkIzRtymosE8NpSgTK0oRMfyTdVWgxzc=
-github.com/jesseduffield/pty v0.0.0-20181218102224-02db52c7e406/go.mod h1:7jlS40+UhOqkZJDIG1B/H21xnuET/+fvbbnHCa8wSIo=
-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/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532 h1:V1Lk2rm5/p27NjnlF2ezzkxDaisHNcveMNueSD7RYgs=
+github.com/jesseduffield/gocui v0.3.1-0.20191116013947-b13bda319532/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw=
+github.com/jesseduffield/pty v1.2.1 h1:7xYBiwNH0PpWqC8JmvrPq1a/ksNqyCavzWu9pbBGYWI=
+github.com/jesseduffield/pty v1.2.1/go.mod h1:7jlS40+UhOqkZJDIG1B/H21xnuET/+fvbbnHCa8wSIo=
+github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 h1:+JaOkfBNYQYlGD7dgru8mCwYNEc5tRRI8mThlVANhSM=
+github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00/go.mod h1:cWNQljQAWYBp4wchyGfql4q2jRNZXxiE1KhVQgz+JaM=
+github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 h1:CRD7bVjlGIiV+M0jlsa+XWpneW0KY0e7Y4z3GWb5S4o=
+github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7/go.mod h1:VspA3aTkEo0Q7TPCLmX1uHNP+Wb4iSDX09hmTRo1QYc=
+github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e h1:tth7wr6+sfSbdpRWWrwvLYyS56HyIRVfq0Qcl2h28wM=
+github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e/go.mod h1:anMibpZtqNxjDbxrcDEAwSdaJ37vyUeM1f/M4uekib4=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
+github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw=
 github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w=
-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.6 h1:SooTCzUOOs899x/M7gmSS+dgL+AUfSWqAcHLN3auCic=
-github.com/nicksnyder/go-i18n/v2 v2.0.0-beta.6/go.mod h1:4Opqa6/HIv0lhG3WRAkqzO0afezkRhxXI0P8EJkqeRU=
-github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nicksnyder/go-i18n/v2 v2.0.3 h1:ks/JkQiOEhhuF6jpNvx+Wih1NIiXzUnZeZVnJuI8R8M=
+github.com/nicksnyder/go-i18n/v2 v2.0.3/go.mod h1:oDab7q8XCYMRlcrBnaY/7B1eOectbvj6B1UPBT+p5jo=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4=
+github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/sergi/go-diff v1.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/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
+github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/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/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
+github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/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/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 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=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
+github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 h1:gSbV7h1NRL2G1xTg/owz62CST1oJBmxy4QpMMregXVQ=
+golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/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/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
+gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
+gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
+gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
+gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 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.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"log"
 	"os"
@@ -9,6 +8,7 @@ import (
 	"runtime"
 
 	"github.com/go-errors/errors"
+	"github.com/integrii/flaggy"
 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
 )
@@ -18,10 +18,6 @@ var (
 	version     = "unversioned"
 	date        string
 	buildSource = "unknown"
-
-	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")
 )
 
 func projectPath(path string) string {
@@ -30,17 +26,43 @@ func projectPath(path string) string {
 }
 
 func main() {
-	flag.Parse()
-	if *versionFlag {
+	flaggy.DefaultParser.ShowVersionWithVersionFlag = false
+
+	repoPath := "."
+	flaggy.String(&repoPath, "p", "path", "Path of git repo")
+
+	dump := ""
+	flaggy.AddPositionalValue(&dump, "gitargs", 1, false, "Todo file")
+	flaggy.DefaultParser.PositionalFlags[0].Hidden = true
+
+	versionFlag := false
+	flaggy.Bool(&versionFlag, "v", "version", "Print the current version")
+
+	debuggingFlag := false
+	flaggy.Bool(&debuggingFlag, "d", "debug", "Run in debug mode with logging")
+
+	configFlag := false
+	flaggy.Bool(&configFlag, "c", "config", "Print the current default config")
+
+	flaggy.Parse()
+
+	if versionFlag {
 		fmt.Printf("commit=%s, build date=%s, build source=%s, version=%s, os=%s, arch=%s\n", commit, date, buildSource, version, runtime.GOOS, runtime.GOARCH)
 		os.Exit(0)
 	}
 
-	if *configFlag {
+	if configFlag {
 		fmt.Printf("%s\n", config.GetDefaultConfig())
 		os.Exit(0)
 	}
-	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, buildSource, *debuggingFlag)
+
+	if repoPath != "." {
+		if err := os.Chdir(repoPath); err != nil {
+			log.Fatal(err.Error())
+		}
+	}
+
+	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, buildSource, debuggingFlag)
 	if err != nil {
 		log.Fatal(err.Error())
 	}
@@ -52,6 +74,9 @@ func main() {
 	}
 
 	if err != nil {
+		if errorMessage, known := app.KnownError(err); known {
+			log.Fatal(errorMessage)
+		}
 		newErr := errors.Wrap(err, 0)
 		stackTrace := newErr.ErrorStack()
 		app.Log.Error(stackTrace)

pkg/app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"bufio"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -8,12 +9,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/heroku/rollrus"
 	"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/jesseduffield/rollrus"
 	"github.com/shibukawa/configdir"
 	"github.com/sirupsen/logrus"
 )
@@ -32,9 +33,15 @@ type App struct {
 	ClientContext string
 }
 
+type errorMapping struct {
+	originalError string
+	newError      string
+}
+
 func newProductionLogger(config config.AppConfigurer) *logrus.Logger {
 	log := logrus.New()
 	log.Out = ioutil.Discard
+	log.SetLevel(logrus.ErrorLevel)
 	return log
 }
 
@@ -44,8 +51,18 @@ func globalConfigDir() string {
 	return configDir.Path
 }
 
+func getLogLevel() logrus.Level {
+	strLevel := os.Getenv("LOG_LEVEL")
+	level, err := logrus.ParseLevel(strLevel)
+	if err != nil {
+		return logrus.DebugLevel
+	}
+	return level
+}
+
 func newDevelopmentLogger(config config.AppConfigurer) *logrus.Logger {
 	log := logrus.New()
+	log.SetLevel(getLogLevel())
 	file, err := os.OpenFile(filepath.Join(globalConfigDir(), "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)
@@ -103,12 +120,13 @@ func NewApp(config config.AppConfigurer) (*App, error) {
 	if err != nil {
 		return app, err
 	}
+
+	if err := app.setupRepo(); err != nil {
+		return app, err
+	}
+
 	app.GitCommand, err = commands.NewGitCommand(app.Log, app.OSCommand, app.Tr, app.Config)
 	if err != nil {
-		if strings.Contains(err.Error(), "Not a git repository") {
-			fmt.Println("Not in a git repository. Use `git init` to create a new one")
-			os.Exit(1)
-		}
 		return app, err
 	}
 	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater)
@@ -118,6 +136,24 @@ func NewApp(config config.AppConfigurer) (*App, error) {
 	return app, nil
 }
 
+func (app *App) setupRepo() error {
+	// if we are not in a git repo, we ask if we want to `git init`
+	if err := app.OSCommand.RunCommand("git status"); err != nil {
+		if !strings.Contains(err.Error(), "Not a git repository") {
+			return err
+		}
+		fmt.Print(app.Tr.SLocalize("CreateRepo"))
+		response, _ := bufio.NewReader(os.Stdin).ReadString('\n')
+		if strings.Trim(response, " \n") != "y" {
+			os.Exit(1)
+		}
+		if err := app.OSCommand.RunCommand("git init"); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (app *App) Run() error {
 	if app.ClientContext == "INTERACTIVE_REBASE" {
 		return app.Rebase()
@@ -127,7 +163,8 @@ func (app *App) Run() error {
 		os.Exit(0)
 	}
 
-	return app.Gui.RunWithSubprocesses()
+	err := app.Gui.RunWithSubprocesses()
+	return err
 }
 
 // Rebase contains logic for when we've been run in demon mode, meaning we've
@@ -161,3 +198,22 @@ func (app *App) Close() error {
 	}
 	return nil
 }
+
+// KnownError takes an error and tells us whether it's an error that we know about where we can print a nicely formatted version of it rather than panicking with a stack trace
+func (app *App) KnownError(err error) (string, bool) {
+	errorMessage := err.Error()
+
+	mappings := []errorMapping{
+		{
+			originalError: "fatal: not a git repository (or any of the parent directories): .git",
+			newError:      app.Tr.SLocalize("notARepository"),
+		},
+	}
+
+	for _, mapping := range mappings {
+		if strings.Contains(errorMessage, mapping.originalError) {
+			return mapping.newError, true
+		}
+	}
+	return "", false
+}

pkg/commands/branch.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/jesseduffield/lazygit/pkg/theme"
+
 	"github.com/fatih/color"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -18,9 +20,9 @@ type Branch struct {
 	Selected  bool
 }
 
-// GetDisplayStrings returns the dispaly string of branch
+// GetDisplayStrings returns the display string of branch
 func (b *Branch) GetDisplayStrings(isFocused bool) []string {
-	displayName := utils.ColoredString(b.Name, b.GetColor())
+	displayName := utils.ColoredString(b.Name, GetBranchColor(b.Name))
 	if isFocused && b.Selected && b.Pushables != "" && b.Pullables != "" {
 		displayName = fmt.Sprintf("%s ↑%s↓%s", displayName, b.Pushables, b.Pullables)
 	}
@@ -28,9 +30,11 @@ func (b *Branch) GetDisplayStrings(isFocused bool) []string {
 	return []string{b.Recency, displayName}
 }
 
-// GetColor branch color
-func (b *Branch) GetColor() color.Attribute {
-	switch b.getType() {
+// GetBranchColor branch color
+func GetBranchColor(name string) color.Attribute {
+	branchType := strings.Split(name, "/")[0]
+
+	switch branchType {
 	case "feature":
 		return color.FgGreen
 	case "bugfix":
@@ -38,11 +42,6 @@ func (b *Branch) GetColor() color.Attribute {
 	case "hotfix":
 		return color.FgRed
 	default:
-		return color.FgWhite
+		return theme.DefaultTextColor
 	}
 }
-
-// expected to return feature/bugfix/hotfix or blank string
-func (b *Branch) getType() string {
-	return strings.Split(b.Name, "/")[0]
-}

pkg/commands/branch_list_builder.go

@@ -1,10 +1,9 @@
-package git
+package commands
 
 import (
 	"regexp"
 	"strings"
 
-	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 
 	"github.com/sirupsen/logrus"
@@ -26,29 +25,31 @@ import (
 // BranchListBuilder returns a list of Branch objects for the current repo
 type BranchListBuilder struct {
 	Log        *logrus.Entry
-	GitCommand *commands.GitCommand
+	GitCommand *GitCommand
 }
 
 // NewBranchListBuilder builds a new branch list builder
-func NewBranchListBuilder(log *logrus.Entry, gitCommand *commands.GitCommand) (*BranchListBuilder, error) {
+func NewBranchListBuilder(log *logrus.Entry, gitCommand *GitCommand) (*BranchListBuilder, error) {
 	return &BranchListBuilder{
 		Log:        log,
 		GitCommand: gitCommand,
 	}, nil
 }
 
-func (b *BranchListBuilder) obtainCurrentBranch() *commands.Branch {
+func (b *BranchListBuilder) obtainCurrentBranch() *Branch {
 	branchName, err := b.GitCommand.CurrentBranchName()
 	if err != nil {
 		panic(err.Error())
 	}
 
-	return &commands.Branch{Name: strings.TrimSpace(branchName)}
+	return &Branch{Name: strings.TrimSpace(branchName)}
 }
 
-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")
+func (b *BranchListBuilder) obtainReflogBranches() []*Branch {
+	branches := make([]*Branch, 0)
+	// if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string
+	unescaped := "git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD"
+	rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput(unescaped)
 	if err != nil {
 		return branches
 	}
@@ -57,29 +58,29 @@ 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 := &Branch{Name: branchName, Recency: timeNumber + timeUnit}
 		branches = append(branches, branch)
 	}
 	return uniqueByName(branches)
 }
 
-func (b *BranchListBuilder) obtainSafeBranches() []*commands.Branch {
-	branches := make([]*commands.Branch, 0)
+func (b *BranchListBuilder) obtainSafeBranches() []*Branch {
+	branches := make([]*Branch, 0)
 
 	bIter, err := b.GitCommand.Repo.Branches()
 	if err != nil {
 		panic(err)
 	}
-	err = bIter.ForEach(func(b *plumbing.Reference) error {
+	bIter.ForEach(func(b *plumbing.Reference) error {
 		name := b.Name().Short()
-		branches = append(branches, &commands.Branch{Name: name})
+		branches = append(branches, &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 []*Branch, included bool) []*Branch {
 	for _, newBranch := range newBranches {
 		if included == branchIncluded(newBranch.Name, existingBranches) {
 			finalBranches = append(finalBranches, newBranch)
@@ -88,7 +89,7 @@ func (b *BranchListBuilder) appendNewBranches(finalBranches, newBranches, existi
 	return finalBranches
 }
 
-func sanitisedReflogName(reflogBranch *commands.Branch, safeBranches []*commands.Branch) string {
+func sanitisedReflogName(reflogBranch *Branch, safeBranches []*Branch) string {
 	for _, safeBranch := range safeBranches {
 		if strings.ToLower(safeBranch.Name) == strings.ToLower(reflogBranch.Name) {
 			return safeBranch.Name
@@ -98,8 +99,8 @@ 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() []*Branch {
+	branches := make([]*Branch, 0)
 	head := b.obtainCurrentBranch()
 	safeBranches := b.obtainSafeBranches()
 
@@ -112,7 +113,7 @@ func (b *BranchListBuilder) Build() []*commands.Branch {
 	branches = b.appendNewBranches(branches, safeBranches, branches, false)
 
 	if len(branches) == 0 || branches[0].Name != head.Name {
-		branches = append([]*commands.Branch{head}, branches...)
+		branches = append([]*Branch{head}, branches...)
 	}
 
 	branches[0].Recency = "  *"
@@ -120,7 +121,7 @@ func (b *BranchListBuilder) Build() []*commands.Branch {
 	return branches
 }
 
-func branchIncluded(branchName string, branches []*commands.Branch) bool {
+func branchIncluded(branchName string, branches []*Branch) bool {
 	for _, existingBranch := range branches {
 		if strings.ToLower(existingBranch.Name) == strings.ToLower(branchName) {
 			return true
@@ -129,8 +130,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 []*Branch) []*Branch {
+	finalBranches := make([]*Branch, 0)
 	for _, branch := range branches {
 		if branchIncluded(branch.Name, finalBranches) {
 			continue

pkg/commands/commit.go

@@ -1,7 +1,10 @@
 package commands
 
 import (
+	"strings"
+
 	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
@@ -9,10 +12,11 @@ import (
 type Commit struct {
 	Sha           string
 	Name          string
-	Status        string // one of "unpushed", "pushed", "merged", or "rebasing"
+	Status        string // one of "unpushed", "pushed", "merged", "rebasing" or "selected"
 	DisplayString string
 	Action        string // one of "", "pick", "edit", "squash", "reword", "drop", "fixup"
 	Copied        bool   // to know if this commit is ready to be cherry-picked somewhere
+	Tags          []string
 }
 
 // GetDisplayStrings is a function.
@@ -22,7 +26,8 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
 	green := color.New(color.FgGreen)
 	blue := color.New(color.FgBlue)
 	cyan := color.New(color.FgCyan)
-	white := color.New(color.FgWhite)
+	defaultColor := color.New(theme.DefaultTextColor)
+	magenta := color.New(color.FgMagenta)
 
 	// for some reason, setting the background to blue pads out the other commits
 	// horizontally. For the sake of accessibility I'm considering this a feature,
@@ -39,8 +44,10 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
 		shaColor = green
 	case "rebasing":
 		shaColor = blue
+	case "selected":
+		shaColor = magenta
 	default:
-		shaColor = white
+		shaColor = defaultColor
 	}
 
 	if c.Copied {
@@ -48,9 +55,12 @@ func (c *Commit) GetDisplayStrings(isFocused bool) []string {
 	}
 
 	actionString := ""
+	tagString := ""
 	if c.Action != "" {
 		actionString = cyan.Sprint(utils.WithPadding(c.Action, 7)) + " "
+	} else if len(c.Tags) > 0 {
+		tagString = utils.ColoredString(strings.Join(c.Tags, " "), color.FgMagenta) + " "
 	}
 
-	return []string{shaColor.Sprint(c.Sha), actionString + white.Sprint(c.Name)}
+	return []string{shaColor.Sprint(c.Sha), actionString + tagString + defaultColor.Sprint(c.Name)}
 }

pkg/commands/commit_file.go

@@ -0,0 +1,42 @@
+package commands
+
+import (
+	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/theme"
+)
+
+// CommitFile : A git commit file
+type CommitFile struct {
+	Sha           string
+	Name          string
+	DisplayString string
+	Status        int // one of 'WHOLE' 'PART' 'NONE'
+}
+
+const (
+	// UNSELECTED is for when the commit file has not been added to the patch in any way
+	UNSELECTED = iota
+	// WHOLE is for when you want to add the whole diff of a file to the patch,
+	// including e.g. if it was deleted
+	WHOLE = iota
+	// PART is for when you're only talking about specific lines that have been modified
+	PART
+)
+
+// GetDisplayStrings is a function.
+func (f *CommitFile) GetDisplayStrings(isFocused bool) []string {
+	yellow := color.New(color.FgYellow)
+	green := color.New(color.FgGreen)
+	defaultColor := color.New(theme.DefaultTextColor)
+
+	var colour *color.Color
+	switch f.Status {
+	case UNSELECTED:
+		colour = defaultColor
+	case WHOLE:
+		colour = green
+	case PART:
+		colour = yellow
+	}
+	return []string{colour.Sprint(f.DisplayString)}
+}

pkg/commands/commit_list_builder.go

@@ -1,4 +1,4 @@
-package git
+package commands
 
 import (
 	"fmt"
@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/sirupsen/logrus"
@@ -27,27 +26,29 @@ import (
 // CommitListBuilder returns a list of Branch objects for the current repo
 type CommitListBuilder struct {
 	Log                 *logrus.Entry
-	GitCommand          *commands.GitCommand
-	OSCommand           *commands.OSCommand
+	GitCommand          *GitCommand
+	OSCommand           *OSCommand
 	Tr                  *i18n.Localizer
-	CherryPickedCommits []*commands.Commit
+	CherryPickedCommits []*Commit
+	DiffEntries         []*Commit
 }
 
 // NewCommitListBuilder builds a new commit list builder
-func NewCommitListBuilder(log *logrus.Entry, gitCommand *commands.GitCommand, osCommand *commands.OSCommand, tr *i18n.Localizer, cherryPickedCommits []*commands.Commit) (*CommitListBuilder, error) {
+func NewCommitListBuilder(log *logrus.Entry, gitCommand *GitCommand, osCommand *OSCommand, tr *i18n.Localizer, cherryPickedCommits []*Commit, diffEntries []*Commit) (*CommitListBuilder, error) {
 	return &CommitListBuilder{
 		Log:                 log,
 		GitCommand:          gitCommand,
 		OSCommand:           osCommand,
 		Tr:                  tr,
 		CherryPickedCommits: cherryPickedCommits,
+		DiffEntries:         diffEntries,
 	}, nil
 }
 
 // GetCommits obtains the commits of the current branch
-func (c *CommitListBuilder) GetCommits() ([]*commands.Commit, error) {
-	commits := []*commands.Commit{}
-	var rebasingCommits []*commands.Commit
+func (c *CommitListBuilder) GetCommits() ([]*Commit, error) {
+	commits := []*Commit{}
+	var rebasingCommits []*Commit
 	rebaseMode, err := c.GitCommand.RebaseMode()
 	if err != nil {
 		return nil, err
@@ -72,11 +73,12 @@ func (c *CommitListBuilder) GetCommits() ([]*commands.Commit, error) {
 		sha := splitLine[0]
 		_, unpushed := unpushedCommits[sha]
 		status := map[bool]string{true: "unpushed", false: "pushed"}[unpushed]
-		commits = append(commits, &commands.Commit{
+		commits = append(commits, &Commit{
 			Sha:           sha,
 			Name:          strings.Join(splitLine[1:], " "),
 			Status:        status,
 			DisplayString: strings.Join(splitLine, " "),
+			// TODO: add tags here
 		})
 	}
 	if rebaseMode != "" {
@@ -96,11 +98,19 @@ func (c *CommitListBuilder) GetCommits() ([]*commands.Commit, error) {
 		return nil, err
 	}
 
+	for _, commit := range commits {
+		for _, entry := range c.DiffEntries {
+			if entry.Sha == commit.Sha {
+				commit.Status = "selected"
+			}
+		}
+	}
+
 	return commits, nil
 }
 
 // getRebasingCommits obtains the commits that we're in the process of rebasing
-func (c *CommitListBuilder) getRebasingCommits(rebaseMode string) ([]*commands.Commit, error) {
+func (c *CommitListBuilder) getRebasingCommits(rebaseMode string) ([]*Commit, error) {
 	switch rebaseMode {
 	case "normal":
 		return c.getNormalRebasingCommits()
@@ -111,17 +121,17 @@ func (c *CommitListBuilder) getRebasingCommits(rebaseMode string) ([]*commands.C
 	}
 }
 
-func (c *CommitListBuilder) getNormalRebasingCommits() ([]*commands.Commit, error) {
+func (c *CommitListBuilder) getNormalRebasingCommits() ([]*Commit, error) {
 	rewrittenCount := 0
-	bytesContent, err := ioutil.ReadFile(".git/rebase-apply/rewritten")
+	bytesContent, err := ioutil.ReadFile(fmt.Sprintf("%s/rebase-apply/rewritten", c.GitCommand.DotGitDir))
 	if err == nil {
 		content := string(bytesContent)
 		rewrittenCount = len(strings.Split(content, "\n"))
 	}
 
 	// we know we're rebasing, so lets get all the files whose names have numbers
-	commits := []*commands.Commit{}
-	err = filepath.Walk(".git/rebase-apply", func(path string, f os.FileInfo, err error) error {
+	commits := []*Commit{}
+	err = filepath.Walk(fmt.Sprintf("%s/rebase-apply", c.GitCommand.DotGitDir), func(path string, f os.FileInfo, err error) error {
 		if rewrittenCount > 0 {
 			rewrittenCount--
 			return nil
@@ -142,7 +152,7 @@ func (c *CommitListBuilder) getNormalRebasingCommits() ([]*commands.Commit, erro
 		if err != nil {
 			return err
 		}
-		commits = append([]*commands.Commit{commit}, commits...)
+		commits = append([]*Commit{commit}, commits...)
 		return nil
 	})
 	if err != nil {
@@ -164,22 +174,22 @@ func (c *CommitListBuilder) getNormalRebasingCommits() ([]*commands.Commit, erro
 // getInteractiveRebasingCommits takes our git-rebase-todo and our git-rebase-todo.backup files
 // and extracts out the sha and names of commits that we still have to go
 // in the rebase:
-func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*commands.Commit, error) {
-	bytesContent, err := ioutil.ReadFile(".git/rebase-merge/git-rebase-todo")
+func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*Commit, error) {
+	bytesContent, err := ioutil.ReadFile(fmt.Sprintf("%s/rebase-merge/git-rebase-todo", c.GitCommand.DotGitDir))
 	if err != nil {
-		c.Log.Info(fmt.Sprintf("error occured reading git-rebase-todo: %s", err.Error()))
+		c.Log.Info(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error()))
 		// we assume an error means the file doesn't exist so we just return
 		return nil, nil
 	}
 
-	commits := []*commands.Commit{}
+	commits := []*Commit{}
 	lines := strings.Split(string(bytesContent), "\n")
 	for _, line := range lines {
 		if line == "" || line == "noop" {
 			return commits, nil
 		}
 		splitLine := strings.Split(line, " ")
-		commits = append([]*commands.Commit{{
+		commits = append([]*Commit{{
 			Sha:    splitLine[1][0:7],
 			Name:   strings.Join(splitLine[2:], " "),
 			Status: "rebasing",
@@ -195,18 +205,18 @@ func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*commands.Commit,
 // From: Lazygit Tester <test@example.com>
 // Date: Wed, 5 Dec 2018 21:03:23 +1100
 // Subject: second commit on master
-func (c *CommitListBuilder) commitFromPatch(content string) (*commands.Commit, error) {
+func (c *CommitListBuilder) commitFromPatch(content string) (*Commit, error) {
 	lines := strings.Split(content, "\n")
 	sha := strings.Split(lines[0], " ")[1][0:7]
 	name := strings.TrimPrefix(lines[3], "Subject: ")
-	return &commands.Commit{
+	return &Commit{
 		Sha:    sha,
 		Name:   name,
 		Status: "rebasing",
 	}, nil
 }
 
-func (c *CommitListBuilder) setCommitMergedStatuses(commits []*commands.Commit) ([]*commands.Commit, error) {
+func (c *CommitListBuilder) setCommitMergedStatuses(commits []*Commit) ([]*Commit, error) {
 	ancestor, err := c.getMergeBase()
 	if err != nil {
 		return nil, err
@@ -229,7 +239,7 @@ func (c *CommitListBuilder) setCommitMergedStatuses(commits []*commands.Commit)
 	return commits, nil
 }
 
-func (c *CommitListBuilder) setCommitCherryPickStatuses(commits []*commands.Commit) ([]*commands.Commit, error) {
+func (c *CommitListBuilder) setCommitCherryPickStatuses(commits []*Commit) ([]*Commit, error) {
 	for _, commit := range commits {
 		for _, cherryPickedCommit := range c.CherryPickedCommits {
 			if commit.Sha == cherryPickedCommit.Sha {
@@ -251,10 +261,8 @@ func (c *CommitListBuilder) getMergeBase() (string, error) {
 		baseBranch = "develop"
 	}
 
-	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
-	}
+	// swallowing error because it's not a big deal; probably because there are no commits yet
+	output, _ := c.OSCommand.RunCommandWithOutput("git merge-base HEAD %s", baseBranch)
 	return output, nil
 }
 

pkg/commands/commit_list_builder_test.go

@@ -1,24 +1,23 @@
-package git
+package commands
 
 import (
 	"os/exec"
 	"testing"
 
-	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/stretchr/testify/assert"
 )
 
 // NewDummyCommitListBuilder creates a new dummy CommitListBuilder for testing
 func NewDummyCommitListBuilder() *CommitListBuilder {
-	osCommand := commands.NewDummyOSCommand()
+	osCommand := NewDummyOSCommand()
 
 	return &CommitListBuilder{
-		Log:                 commands.NewDummyLog(),
-		GitCommand:          commands.NewDummyGitCommandWithOSCommand(osCommand),
+		Log:                 NewDummyLog(),
+		GitCommand:          NewDummyGitCommandWithOSCommand(osCommand),
 		OSCommand:           osCommand,
-		Tr:                  i18n.NewLocalizer(commands.NewDummyLog()),
-		CherryPickedCommits: []*commands.Commit{},
+		Tr:                  i18n.NewLocalizer(NewDummyLog()),
+		CherryPickedCommits: []*Commit{},
 	}
 }
 
@@ -199,7 +198,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 	type scenario struct {
 		testName string
 		command  func(string, ...string) *exec.Cmd
-		test     func([]*commands.Commit, error)
+		test     func([]*Commit, error)
 	}
 
 	scenarios := []scenario{
@@ -225,7 +224,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 
 				return nil
 			},
-			func(commits []*commands.Commit, err error) {
+			func(commits []*Commit, err error) {
 				assert.NoError(t, err)
 				assert.Len(t, commits, 0)
 			},
@@ -252,10 +251,10 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 
 				return nil
 			},
-			func(commits []*commands.Commit, err error) {
+			func(commits []*Commit, err error) {
 				assert.NoError(t, err)
 				assert.Len(t, commits, 2)
-				assert.EqualValues(t, []*commands.Commit{
+				assert.EqualValues(t, []*Commit{
 					{
 						Sha:           "8a2bb0e",
 						Name:          "commit 1",
@@ -290,6 +289,10 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
 					// here's where we are returning the error
 					return exec.Command("test")
+				case "branch":
+					assert.EqualValues(t, []string{"branch", "--contains"}, args)
+					// here too
+					return exec.Command("test")
 				case "rev-parse":
 					assert.EqualValues(t, []string{"rev-parse", "--short", "HEAD"}, args)
 					// here too
@@ -298,7 +301,7 @@ func TestCommitListBuilderGetCommits(t *testing.T) {
 
 				return nil
 			},
-			func(commits []*commands.Commit, err error) {
+			func(commits []*Commit, err error) {
 				assert.Error(t, err)
 				assert.Len(t, commits, 0)
 			},

pkg/commands/errors.go

@@ -0,0 +1,14 @@
+package commands
+
+import "github.com/go-errors/errors"
+
+// WrapError wraps an error for the sake of showing a stack trace at the top level
+// the go-errors package, for some reason, does not return nil when you try to wrap
+// a non-error, so we're just doing it here
+func WrapError(err error) error {
+	if err == nil {
+		return err
+	}
+
+	return errors.Wrap(err, 0)
+}

pkg/commands/exec_live_default.go

@@ -5,14 +5,12 @@ package commands
 import (
 	"bufio"
 	"bytes"
-	"os"
 	"strings"
 	"unicode/utf8"
 
 	"github.com/go-errors/errors"
 
 	"github.com/jesseduffield/pty"
-	"github.com/mgutz/str"
 )
 
 // RunCommandWithOutputLiveWrapper runs a command and return every word that gets written in stdout
@@ -20,10 +18,7 @@ import (
 // As return of output you need to give a string that will be written to stdin
 // NOTE: If the return data is empty it won't written anything to stdin
 func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(string) string) error {
-	splitCmd := str.ToArgv(command)
-	cmd := c.command(splitCmd[0], splitCmd[1:]...)
-
-	cmd.Env = os.Environ()
+	cmd := c.ExecutableFromString(command)
 	cmd.Env = append(cmd.Env, "LANG=en_US.UTF-8", "LC_ALL=en_US.UTF-8")
 
 	var stderr bytes.Buffer

pkg/commands/file.go

@@ -14,6 +14,7 @@ type File struct {
 	HasInlineMergeConflicts bool
 	DisplayString           string
 	Type                    string // one of 'file', 'directory', and 'other'
+	ShortStatus             string // e.g. 'AD', ' A', 'M ', '??'
 }
 
 // GetDisplayStrings returns the display string of a file

pkg/commands/git.go

@@ -5,7 +5,10 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"regexp"
 	"strings"
+	"time"
 
 	"github.com/mgutz/str"
 
@@ -19,24 +22,30 @@ import (
 	gogit "gopkg.in/src-d/go-git.v4"
 )
 
-func verifyInGitRepo(runCmd func(string) error) error {
+// this takes something like:
+// * (HEAD detached at 264fc6f5)
+//	remotes
+// and returns '264fc6f5' as the second match
+const CurrentBranchNameRegex = `(?m)^\*.*?([^ ]*?)\)?$`
+
+func verifyInGitRepo(runCmd func(string, ...interface{}) error) error {
 	return runCmd("git status")
 }
 
 func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
 	for {
-		f, err := stat(".git")
+		_, err := stat(".git")
 
-		if err == nil && f.IsDir() {
+		if err == nil {
 			return nil
 		}
 
 		if !os.IsNotExist(err) {
-			return errors.Wrap(err, 0)
+			return WrapError(err)
 		}
 
 		if err = chdir(".."); err != nil {
-			return errors.Wrap(err, 0)
+			return WrapError(err)
 		}
 	}
 }
@@ -63,15 +72,18 @@ func setupRepositoryAndWorktree(openGitRepository func(string) (*gogit.Repositor
 
 // GitCommand is our main git interface
 type GitCommand struct {
-	Log                *logrus.Entry
-	OSCommand          *OSCommand
-	Worktree           *gogit.Worktree
-	Repo               *gogit.Repository
-	Tr                 *i18n.Localizer
-	Config             config.AppConfigurer
-	getGlobalGitConfig func(string) (string, error)
-	getLocalGitConfig  func(string) (string, error)
-	removeFile         func(string) error
+	Log                  *logrus.Entry
+	OSCommand            *OSCommand
+	Worktree             *gogit.Worktree
+	Repo                 *gogit.Repository
+	Tr                   *i18n.Localizer
+	Config               config.AppConfigurer
+	getGlobalGitConfig   func(string) (string, error)
+	getLocalGitConfig    func(string) (string, error)
+	removeFile           func(string) error
+	DotGitDir            string
+	onSuccessfulContinue func() error
+	PatchManager         *PatchManager
 }
 
 // NewGitCommand it runs git commands
@@ -99,7 +111,12 @@ func NewGitCommand(log *logrus.Entry, osCommand *OSCommand, tr *i18n.Localizer,
 		}
 	}
 
-	return &GitCommand{
+	dotGitDir, err := findDotGitDir(os.Stat, ioutil.ReadFile)
+	if err != nil {
+		return nil, err
+	}
+
+	gitCommand := &GitCommand{
 		Log:                log,
 		OSCommand:          osCommand,
 		Tr:                 tr,
@@ -109,12 +126,40 @@ func NewGitCommand(log *logrus.Entry, osCommand *OSCommand, tr *i18n.Localizer,
 		getGlobalGitConfig: gitconfig.Global,
 		getLocalGitConfig:  gitconfig.Local,
 		removeFile:         os.RemoveAll,
-	}, nil
+		DotGitDir:          dotGitDir,
+	}
+
+	gitCommand.PatchManager = NewPatchManager(log, gitCommand.ApplyPatch)
+
+	return gitCommand, nil
 }
 
-// GetStashEntries stash entryies
+func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filename string) ([]byte, error)) (string, error) {
+	f, err := stat(".git")
+	if err != nil {
+		return "", err
+	}
+
+	if f.IsDir() {
+		return ".git", nil
+	}
+
+	fileBytes, err := readFile(".git")
+	if err != nil {
+		return "", err
+	}
+	fileContent := string(fileBytes)
+	if !strings.HasPrefix(fileContent, "gitdir: ") {
+		return "", errors.New(".git is a file which suggests we are in a submodule but the file's contents do not contain a gitdir pointing to the actual .git directory")
+	}
+	return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
+}
+
+// GetStashEntries stash entries
 func (c *GitCommand) GetStashEntries() []*StashEntry {
-	rawString, _ := c.OSCommand.RunCommandWithOutput("git stash list --pretty='%gs'")
+	// if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string
+	unescaped := "git stash list --pretty='%gs'"
+	rawString, _ := c.OSCommand.RunCommandWithOutput(unescaped)
 	stashEntries := []*StashEntry{}
 	for i, line := range utils.SplitLines(rawString) {
 		stashEntries = append(stashEntries, stashEntryFromLine(line, i))
@@ -132,7 +177,7 @@ func stashEntryFromLine(line string, index int) *StashEntry {
 
 // GetStashEntryDiff stash diff
 func (c *GitCommand) GetStashEntryDiff(index int) (string, error) {
-	return c.OSCommand.RunCommandWithOutput("git stash show -p --color stash@{" + fmt.Sprint(index) + "}")
+	return c.OSCommand.RunCommandWithOutput("git stash show -p --color stash@{%d}", index)
 }
 
 // GetStatusFiles git status files
@@ -148,6 +193,8 @@ func (c *GitCommand) GetStatusFiles() []*File {
 		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]
+		hasMergeConflicts := change == "UU" || change == "AA" || change == "DU"
+		hasInlineMergeConflicts := change == "UU" || change == "AA"
 
 		file := &File{
 			Name:                    filename,
@@ -156,9 +203,10 @@ func (c *GitCommand) GetStatusFiles() []*File {
 			HasUnstagedChanges:      unstagedChange != " ",
 			Tracked:                 !untracked,
 			Deleted:                 unstagedChange == "D" || stagedChange == "D",
-			HasMergeConflicts:       change == "UU" || change == "AA" || change == "DU",
-			HasInlineMergeConflicts: change == "UU" || change == "AA",
+			HasMergeConflicts:       hasMergeConflicts,
+			HasInlineMergeConflicts: hasInlineMergeConflicts,
 			Type:                    c.OSCommand.FileType(filename),
+			ShortStatus:             change,
 		}
 		files = append(files, file)
 	}
@@ -167,13 +215,13 @@ 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 %s stash@{%d}", method, 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 %s", c.OSCommand.Quote(message))
 }
 
 // MergeStatusFiles merge status files
@@ -217,31 +265,30 @@ func includesInt(list []int, a int) bool {
 
 // ResetAndClean removes all unstaged changes and removes all untracked files
 func (c *GitCommand) ResetAndClean() error {
-	if err := c.OSCommand.RunCommand("git reset --hard HEAD"); err != nil {
+	if err := c.ResetHard("HEAD"); err != nil {
 		return err
 	}
 
-	return c.OSCommand.RunCommand("git clean -fd")
+	return c.RemoveUntrackedFiles()
 }
 
 func (c *GitCommand) GetCurrentBranchUpstreamDifferenceCount() (string, string) {
-	return c.GetCommitDifferences("HEAD", "@{u}")
+	return c.GetCommitDifferences("HEAD", "HEAD@{u}")
 }
 
 func (c *GitCommand) GetBranchUpstreamDifferenceCount(branchName string) (string, string) {
-	upstream := "origin" // hardcoded for now
-	return c.GetCommitDifferences(branchName, fmt.Sprintf("%s/%s", upstream, branchName))
+	return c.GetCommitDifferences(branchName, branchName+"@{u}")
 }
 
 // GetCommitDifferences checks how many pushables/pullables there are for the
 // current branch
 func (c *GitCommand) GetCommitDifferences(from, to string) (string, string) {
 	command := "git rev-list %s..%s --count"
-	pushableCount, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf(command, to, from))
+	pushableCount, err := c.OSCommand.RunCommandWithOutput(command, to, from)
 	if err != nil {
 		return "?", "?"
 	}
-	pullableCount, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf(command, from, to))
+	pullableCount, err := c.OSCommand.RunCommandWithOutput(command, from, to)
 	if err != nil {
 		return "?", "?"
 	}
@@ -250,7 +297,7 @@ func (c *GitCommand) GetCommitDifferences(from, to string) (string, string) {
 
 // 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 %s", c.OSCommand.Quote(name))
 }
 
 // RebaseBranch interactive rebases onto a branch
@@ -274,23 +321,26 @@ func (c *GitCommand) Fetch(unamePassQuestion func(string) string, canAskForCrede
 }
 
 // ResetToCommit reset to commit
-func (c *GitCommand) ResetToCommit(sha string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git reset %s", sha))
+func (c *GitCommand) ResetToCommit(sha string, strength string) error {
+	return c.OSCommand.RunCommand("git reset --%s %s", strength, sha)
 }
 
 // NewBranch create new branch
 func (c *GitCommand) NewBranch(name string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git checkout -b %s", name))
+	return c.OSCommand.RunCommand("git checkout -b %s", name)
 }
 
 // CurrentBranchName is a function.
 func (c *GitCommand) CurrentBranchName() (string, error) {
 	branchName, err := c.OSCommand.RunCommandWithOutput("git symbolic-ref --short HEAD")
-	if err != nil {
-		branchName, err = c.OSCommand.RunCommandWithOutput("git rev-parse --short HEAD")
+	if err != nil || branchName == "HEAD\n" {
+		output, err := c.OSCommand.RunCommandWithOutput("git branch --contains")
 		if err != nil {
 			return "", err
 		}
+		re := regexp.MustCompile(CurrentBranchNameRegex)
+		match := re.FindStringSubmatch(output)
+		branchName = match[1]
 	}
 	return utils.TrimTrailingNewline(branchName), nil
 }
@@ -303,7 +353,7 @@ func (c *GitCommand) DeleteBranch(branch string, force bool) error {
 		command = "git branch -D"
 	}
 
-	return c.OSCommand.RunCommand(fmt.Sprintf("%s %s", command, branch))
+	return c.OSCommand.RunCommand("%s %s", command, branch)
 }
 
 // ListStash list stash
@@ -313,7 +363,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 %s", branchName)
 }
 
 // AbortMerge abort merge
@@ -334,8 +384,8 @@ func (c *GitCommand) usingGpg() bool {
 }
 
 // Commit commits to git
-func (c *GitCommand) Commit(message string) (*exec.Cmd, error) {
-	command := fmt.Sprintf("git commit -m %s", c.OSCommand.Quote(message))
+func (c *GitCommand) Commit(message string, flags string) (*exec.Cmd, error) {
+	command := fmt.Sprintf("git commit %s -m %s", flags, c.OSCommand.Quote(message))
 	if c.usingGpg() {
 		return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command), nil
 	}
@@ -345,7 +395,7 @@ func (c *GitCommand) Commit(message string) (*exec.Cmd, error) {
 
 // AmendHead amends HEAD with whatever is staged in your working tree
 func (c *GitCommand) AmendHead() (*exec.Cmd, error) {
-	command := "git commit --amend --no-edit"
+	command := "git commit --amend --no-edit --allow-empty"
 	if c.usingGpg() {
 		return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command), nil
 	}
@@ -359,24 +409,29 @@ func (c *GitCommand) Pull(ask func(string) string) error {
 }
 
 // Push pushes to a branch
-func (c *GitCommand) Push(branchName string, force bool, ask func(string) string) error {
+func (c *GitCommand) Push(branchName string, force bool, upstream string, ask func(string) string) error {
 	forceFlag := ""
 	if force {
-		forceFlag = "--force-with-lease "
+		forceFlag = "--force-with-lease"
 	}
 
-	cmd := fmt.Sprintf("git push %s-u origin %s", forceFlag, branchName)
+	setUpstreamArg := ""
+	if upstream != "" {
+		setUpstreamArg = "--set-upstream " + upstream
+	}
+
+	cmd := fmt.Sprintf("git push --follow-tags %s %s", forceFlag, setUpstreamArg)
 	return c.OSCommand.DetectUnamePass(cmd, ask)
 }
 
 // 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)))
+	return c.OSCommand.RunCommandWithOutput("cat %s", c.OSCommand.Quote(fileName))
 }
 
 // StageFile stages a file
 func (c *GitCommand) StageFile(fileName string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git add %s", c.OSCommand.Quote(fileName)))
+	return c.OSCommand.RunCommand("git add %s", c.OSCommand.Quote(fileName))
 }
 
 // StageAll stages all files
@@ -399,7 +454,7 @@ func (c *GitCommand) UnStageFile(fileName string, tracked bool) error {
 	// renamed files look like "file1 -> file2"
 	fileNames := strings.Split(fileName, " -> ")
 	for _, name := range fileNames {
-		if err := c.OSCommand.RunCommand(fmt.Sprintf(command, c.OSCommand.Quote(name))); err != nil {
+		if err := c.OSCommand.RunCommand(command, c.OSCommand.Quote(name)); err != nil {
 			return err
 		}
 	}
@@ -408,7 +463,7 @@ func (c *GitCommand) UnStageFile(fileName string, tracked bool) error {
 
 // GitStatus returns the plaintext short status of the repo
 func (c *GitCommand) GitStatus() (string, error) {
-	return c.OSCommand.RunCommandWithOutput("git status --untracked-files=all --short")
+	return c.OSCommand.RunCommandWithOutput("git status --untracked-files=all --porcelain")
 }
 
 // IsInMergeState states whether we are still mid-merge
@@ -423,14 +478,14 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
 // RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
 // and "interactive" for interactive rebase
 func (c *GitCommand) RebaseMode() (string, error) {
-	exists, err := c.OSCommand.FileExists(".git/rebase-apply")
+	exists, err := c.OSCommand.FileExists(fmt.Sprintf("%s/rebase-apply", c.DotGitDir))
 	if err != nil {
 		return "", err
 	}
 	if exists {
 		return "normal", nil
 	}
-	exists, err = c.OSCommand.FileExists(".git/rebase-merge")
+	exists, err = c.OSCommand.FileExists(fmt.Sprintf("%s/rebase-merge", c.DotGitDir))
 	if exists {
 		return "interactive", err
 	} else {
@@ -438,35 +493,35 @@ func (c *GitCommand) RebaseMode() (string, error) {
 	}
 }
 
-// RemoveFile directly
-func (c *GitCommand) RemoveFile(file *File) error {
+// DiscardAllFileChanges directly
+func (c *GitCommand) DiscardAllFileChanges(file *File) error {
 	// if the file isn't tracked, we assume you want to delete it
 	quotedFileName := c.OSCommand.Quote(file.Name)
-	if file.HasStagedChanges {
-		if err := c.OSCommand.RunCommand(fmt.Sprintf("git reset -- %s", quotedFileName)); err != nil {
+	if file.HasStagedChanges || file.HasMergeConflicts {
+		if err := c.OSCommand.RunCommand("git reset -- %s", quotedFileName); err != nil {
 			return err
 		}
 	}
+
 	if !file.Tracked {
 		return c.removeFile(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", quotedFileName))
+	return c.DiscardUnstagedFileChanges(file)
 }
 
-// Checkout checks out a branch, with --force if you set the force arg to true
+// DiscardUnstagedFileChanges directly
+func (c *GitCommand) DiscardUnstagedFileChanges(file *File) error {
+	quotedFileName := c.OSCommand.Quote(file.Name)
+	return c.OSCommand.RunCommand("git checkout -- %s", quotedFileName)
+}
+
+// Checkout checks out a branch (or commit), with --force if you set the force arg to true
 func (c *GitCommand) Checkout(branch string, force bool) error {
 	forceArg := ""
 	if force {
 		forceArg = "--force "
 	}
-	return c.OSCommand.RunCommand(fmt.Sprintf("git checkout %s %s", 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 {
-	return c.OSCommand.PrepareSubProcess("git", "add", "--patch", c.OSCommand.Quote(filename))
+	return c.OSCommand.RunCommand("git checkout %s %s", forceArg, branch)
 }
 
 // PrepareCommitSubProcess prepares a subprocess for `git commit`
@@ -483,7 +538,12 @@ func (c *GitCommand) PrepareCommitAmendSubProcess() *exec.Cmd {
 // Currently it limits the result to 100 commits, but when we get async stuff
 // working we can do lazy loading
 func (c *GitCommand) GetBranchGraph(branchName string) (string, error) {
-	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 %s", branchName)
+}
+
+func (c *GitCommand) GetUpstreamForBranch(branchName string) (string, error) {
+	output, err := c.OSCommand.RunCommandWithOutput("git rev-parse --abbrev-ref --symbolic-full-name %s@{u}", branchName)
+	return strings.TrimSpace(output), err
 }
 
 // Ignore adds a file to the gitignore for the repo
@@ -493,13 +553,13 @@ func (c *GitCommand) Ignore(filename string) error {
 
 // Show shows the diff of a commit
 func (c *GitCommand) Show(sha string) (string, error) {
-	show, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git show --color %s", sha))
+	show, err := c.OSCommand.RunCommandWithOutput("git show --color --no-renames %s", sha)
 	if err != nil {
 		return "", err
 	}
 
 	// if this is a merge commit, we need to go a step further and get the diff between the two branches we merged
-	revList, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git rev-list -1 --merges %s^...%s", sha, sha))
+	revList, err := c.OSCommand.RunCommandWithOutput("git rev-list -1 --merges %s^...%s", sha, sha)
 	if err != nil {
 		// turns out we get an error here when it's the first commit. We'll just return the original show
 		return show, nil
@@ -521,7 +581,7 @@ func (c *GitCommand) Show(sha string) (string, error) {
 		return show, nil
 	}
 
-	mergeDiff, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git diff --color %s...%s", secondLineWords[1], secondLineWords[2]))
+	mergeDiff, err := c.OSCommand.RunCommandWithOutput("git diff --color %s...%s", secondLineWords[1], secondLineWords[2])
 	if err != nil {
 		return "", err
 	}
@@ -536,22 +596,22 @@ func (c *GitCommand) GetRemoteURL() string {
 
 // CheckRemoteBranchExists Returns remote branch
 func (c *GitCommand) CheckRemoteBranchExists(branch *Branch) bool {
-	_, err := c.OSCommand.RunCommandWithOutput(fmt.Sprintf(
+	_, err := c.OSCommand.RunCommandWithOutput(
 		"git show-ref --verify -- refs/remotes/origin/%s",
 		branch.Name,
-	))
+	)
 
 	return err == nil
 }
 
 // Diff returns the diff of a file
-func (c *GitCommand) Diff(file *File, plain bool) string {
+func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
 	cachedArg := ""
 	trackedArg := "--"
 	colorArg := "--color"
 	split := strings.Split(file.Name, " -> ") // in case of a renamed file we get the new filename
 	fileName := c.OSCommand.Quote(split[len(split)-1])
-	if file.HasStagedChanges && !file.HasUnstagedChanges {
+	if cached {
 		cachedArg = "--cached"
 	}
 	if !file.Tracked && !file.HasStagedChanges {
@@ -561,34 +621,34 @@ func (c *GitCommand) Diff(file *File, plain bool) string {
 		colorArg = ""
 	}
 
-	command := fmt.Sprintf("git diff %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
-
 	// for now we assume an error means the file was deleted
-	s, _ := c.OSCommand.RunCommandWithOutput(command)
+	s, _ := c.OSCommand.RunCommandWithOutput("git diff %s %s %s %s", colorArg, cachedArg, trackedArg, fileName)
 	return s
 }
 
-func (c *GitCommand) ApplyPatch(patch string) (string, error) {
-	filename, err := c.OSCommand.CreateTempFile("patch", patch)
-	if err != nil {
-		c.Log.Error(err)
-		return "", err
+func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
+	c.Log.Warn(patch)
+	filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch")
+	if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil {
+		return err
 	}
 
-	defer func() { _ = c.OSCommand.RemoveFile(filename) }()
+	flagStr := ""
+	for _, flag := range flags {
+		flagStr += " --" + flag
+	}
 
-	return c.OSCommand.RunCommandWithOutput(fmt.Sprintf("git apply --cached %s", c.OSCommand.Quote(filename)))
+	return c.OSCommand.RunCommand("git apply %s %s", flagStr, c.OSCommand.Quote(filepath))
 }
 
-func (c *GitCommand) FastForward(branchName string) error {
-	upstream := "origin" // hardcoding for now
-	return c.OSCommand.RunCommand(fmt.Sprintf("git fetch %s %s:%s", upstream, branchName, branchName))
+func (c *GitCommand) FastForward(branchName string, remoteName string, remoteBranchName string) error {
+	return c.OSCommand.RunCommand("git fetch %s %s:%s", remoteName, remoteBranchName, branchName)
 }
 
 func (c *GitCommand) RunSkipEditorCommand(command string) error {
 	cmd := c.OSCommand.ExecutableFromString(command)
 	cmd.Env = append(
-		os.Environ(),
+		cmd.Env,
 		"LAZYGIT_CLIENT_COMMAND=EXIT_IMMEDIATELY",
 		"EDITOR="+c.OSCommand.GetLazygitPath(),
 	)
@@ -598,22 +658,38 @@ func (c *GitCommand) RunSkipEditorCommand(command string) error {
 // GenericMerge takes a commandType of "merge" or "rebase" and a command of "abort", "skip" or "continue"
 // By default we skip the editor in the case where a commit will be made
 func (c *GitCommand) GenericMerge(commandType string, command string) error {
-	return c.RunSkipEditorCommand(
+	err := c.RunSkipEditorCommand(
 		fmt.Sprintf(
 			"git %s --%s",
 			commandType,
 			command,
 		),
 	)
+	if err != nil {
+		return err
+	}
+
+	// sometimes we need to do a sequence of things in a rebase but the user needs to
+	// fix merge conflicts along the way. When this happens we queue up the next step
+	// so that after the next successful rebase continue we can continue from where we left off
+	if commandType == "rebase" && command == "continue" && c.onSuccessfulContinue != nil {
+		f := c.onSuccessfulContinue
+		c.onSuccessfulContinue = nil
+		return f()
+	}
+	if command == "abort" {
+		c.onSuccessfulContinue = nil
+	}
+	return nil
 }
 
 func (c *GitCommand) RewordCommit(commits []*Commit, index int) (*exec.Cmd, error) {
-	todo, err := c.GenerateGenericRebaseTodo(commits, index, "reword")
+	todo, sha, err := c.GenerateGenericRebaseTodo(commits, index, "reword")
 	if err != nil {
 		return nil, err
 	}
 
-	return c.PrepareInteractiveRebaseCommand(commits[index+1].Sha, todo, false)
+	return c.PrepareInteractiveRebaseCommand(sha, todo, false)
 }
 
 func (c *GitCommand) MoveCommitDown(commits []*Commit, index int) error {
@@ -638,12 +714,12 @@ func (c *GitCommand) MoveCommitDown(commits []*Commit, index int) error {
 }
 
 func (c *GitCommand) InteractiveRebase(commits []*Commit, index int, action string) error {
-	todo, err := c.GenerateGenericRebaseTodo(commits, index, action)
+	todo, sha, err := c.GenerateGenericRebaseTodo(commits, index, action)
 	if err != nil {
 		return err
 	}
 
-	cmd, err := c.PrepareInteractiveRebaseCommand(commits[index+1].Sha, todo, true)
+	cmd, err := c.PrepareInteractiveRebaseCommand(sha, todo, true)
 	if err != nil {
 		return err
 	}
@@ -658,11 +734,11 @@ func (c *GitCommand) PrepareInteractiveRebaseCommand(baseSha string, todo string
 	ex := c.OSCommand.GetLazygitPath()
 
 	debug := "FALSE"
-	if c.OSCommand.Config.GetDebug() == true {
+	if c.OSCommand.Config.GetDebug() {
 		debug = "TRUE"
 	}
 
-	splitCmd := str.ToArgv(fmt.Sprintf("git rebase --interactive --autostash %s", baseSha))
+	splitCmd := str.ToArgv(fmt.Sprintf("git rebase --interactive --autostash --keep-empty --rebase-merges %s", baseSha))
 
 	cmd := c.OSCommand.command(splitCmd[0], splitCmd[1:]...)
 
@@ -697,38 +773,45 @@ func (c *GitCommand) SoftReset(baseSha string) error {
 	return c.OSCommand.RunCommand("git reset --soft " + baseSha)
 }
 
-func (c *GitCommand) GenerateGenericRebaseTodo(commits []*Commit, index int, action string) (string, error) {
-	if len(commits) <= index+1 {
-		// assuming they aren't picking the bottom commit
-		return "", errors.New(c.Tr.SLocalize("CannotRebaseOntoFirstCommit"))
+func (c *GitCommand) GenerateGenericRebaseTodo(commits []*Commit, actionIndex int, action string) (string, string, error) {
+	baseIndex := actionIndex + 1
+
+	if len(commits) <= baseIndex {
+		return "", "", errors.New(c.Tr.SLocalize("CannotRebaseOntoFirstCommit"))
+	}
+
+	if action == "squash" || action == "fixup" {
+		baseIndex++
+
+		if len(commits) <= baseIndex {
+			return "", "", errors.New(c.Tr.SLocalize("CannotSquashOntoSecondCommit"))
+		}
 	}
 
 	todo := ""
-	for i, commit := range commits[0 : index+1] {
+	for i, commit := range commits[0:baseIndex] {
 		a := "pick"
-		if i == index {
+		if i == actionIndex {
 			a = action
 		}
 		todo = a + " " + commit.Sha + " " + commit.Name + "\n" + todo
 	}
-	return todo, nil
+
+	return todo, commits[baseIndex].Sha, nil
 }
 
 // AmendTo amends the given commit with whatever files are staged
 func (c *GitCommand) AmendTo(sha string) error {
-	if err := c.OSCommand.RunCommand(fmt.Sprintf("git commit --fixup=%s", sha)); err != nil {
+	if err := c.CreateFixupCommit(sha); err != nil {
 		return err
 	}
-	return c.RunSkipEditorCommand(
-		fmt.Sprintf(
-			"git rebase --interactive --autostash --autosquash %s^", sha,
-		),
-	)
+
+	return c.SquashAllAboveFixupCommits(sha)
 }
 
 // EditRebaseTodo sets the action at a given index in the git-rebase-todo file
 func (c *GitCommand) EditRebaseTodo(index int, action string) error {
-	fileName := ".git/rebase-merge/git-rebase-todo"
+	fileName := fmt.Sprintf("%s/rebase-merge/git-rebase-todo", c.DotGitDir)
 	bytes, err := ioutil.ReadFile(fileName)
 	if err != nil {
 		return err
@@ -760,7 +843,7 @@ func (c *GitCommand) getTodoCommitCount(content []string) int {
 
 // MoveTodoDown moves a rebase todo item down by one position
 func (c *GitCommand) MoveTodoDown(index int) error {
-	fileName := ".git/rebase-merge/git-rebase-todo"
+	fileName := fmt.Sprintf("%s/rebase-merge/git-rebase-todo", c.DotGitDir)
 	bytes, err := ioutil.ReadFile(fileName)
 	if err != nil {
 		return err
@@ -779,7 +862,7 @@ func (c *GitCommand) MoveTodoDown(index int) error {
 
 // Revert reverts the selected commit by sha
 func (c *GitCommand) Revert(sha string) error {
-	return c.OSCommand.RunCommand(fmt.Sprintf("git revert %s", sha))
+	return c.OSCommand.RunCommand("git revert %s", sha)
 }
 
 // CherryPickCommits begins an interactive rebase with the given shas being cherry picked onto HEAD
@@ -796,3 +879,237 @@ func (c *GitCommand) CherryPickCommits(commits []*Commit) error {
 
 	return c.OSCommand.RunPreparedCommand(cmd)
 }
+
+// GetCommitFiles get the specified commit files
+func (c *GitCommand) GetCommitFiles(commitSha string, patchManager *PatchManager) ([]*CommitFile, error) {
+	files, err := c.OSCommand.RunCommandWithOutput("git show --pretty= --name-only --no-renames %s", commitSha)
+	if err != nil {
+		return nil, err
+	}
+
+	commitFiles := make([]*CommitFile, 0)
+
+	for _, file := range strings.Split(strings.TrimRight(files, "\n"), "\n") {
+		status := UNSELECTED
+		if patchManager != nil && patchManager.CommitSha == commitSha {
+			status = patchManager.GetFileStatus(file)
+		}
+
+		commitFiles = append(commitFiles, &CommitFile{
+			Sha:           commitSha,
+			Name:          file,
+			DisplayString: file,
+			Status:        status,
+		})
+	}
+
+	return commitFiles, nil
+}
+
+// ShowCommitFile get the diff of specified commit file
+func (c *GitCommand) ShowCommitFile(commitSha, fileName string, plain bool) (string, error) {
+	colorArg := "--color"
+	if plain {
+		colorArg = ""
+	}
+	return c.OSCommand.RunCommandWithOutput("git show --no-renames %s %s -- %s", colorArg, commitSha, fileName)
+}
+
+// CheckoutFile checks out the file for the given commit
+func (c *GitCommand) CheckoutFile(commitSha, fileName string) error {
+	return c.OSCommand.RunCommand("git checkout %s %s", commitSha, fileName)
+}
+
+// DiscardOldFileChanges discards changes to a file from an old commit
+func (c *GitCommand) DiscardOldFileChanges(commits []*Commit, commitIndex int, fileName string) error {
+	if err := c.BeginInteractiveRebaseForCommit(commits, commitIndex); err != nil {
+		return err
+	}
+
+	// check if file exists in previous commit (this command returns an error if the file doesn't exist)
+	if err := c.OSCommand.RunCommand("git cat-file -e HEAD^:%s", fileName); err != nil {
+		if err := c.OSCommand.Remove(fileName); err != nil {
+			return err
+		}
+		if err := c.StageFile(fileName); err != nil {
+			return err
+		}
+	} else if err := c.CheckoutFile("HEAD^", fileName); err != nil {
+		return err
+	}
+
+	// amend the commit
+	cmd, err := c.AmendHead()
+	if cmd != nil {
+		return errors.New("received unexpected pointer to cmd")
+	}
+	if err != nil {
+		return err
+	}
+
+	// continue
+	return c.GenericMerge("rebase", "continue")
+}
+
+// DiscardAnyUnstagedFileChanges discards any unstages file changes via `git checkout -- .`
+func (c *GitCommand) DiscardAnyUnstagedFileChanges() error {
+	return c.OSCommand.RunCommand("git checkout -- .")
+}
+
+// RemoveUntrackedFiles runs `git clean -fd`
+func (c *GitCommand) RemoveUntrackedFiles() error {
+	return c.OSCommand.RunCommand("git clean -fd")
+}
+
+// ResetHardHead runs `git reset --hard`
+func (c *GitCommand) ResetHard(ref string) error {
+	return c.OSCommand.RunCommand("git reset --hard " + ref)
+}
+
+// ResetSoft runs `git reset --soft HEAD`
+func (c *GitCommand) ResetSoft(ref string) error {
+	return c.OSCommand.RunCommand("git reset --soft " + ref)
+}
+
+// DiffCommits show diff between commits
+func (c *GitCommand) DiffCommits(sha1, sha2 string) (string, error) {
+	return c.OSCommand.RunCommandWithOutput("git diff --color %s %s", sha1, sha2)
+}
+
+// CreateFixupCommit creates a commit that fixes up a previous commit
+func (c *GitCommand) CreateFixupCommit(sha string) error {
+	return c.OSCommand.RunCommand("git commit --fixup=%s", sha)
+}
+
+// SquashAllAboveFixupCommits squashes all fixup! commits above the given one
+func (c *GitCommand) SquashAllAboveFixupCommits(sha string) error {
+	return c.RunSkipEditorCommand(
+		fmt.Sprintf(
+			"git rebase --interactive --autostash --autosquash %s^",
+			sha,
+		),
+	)
+}
+
+// StashSaveStagedChanges stashes only the currently staged changes. This takes a few steps
+// shoutouts to Joe on https://stackoverflow.com/questions/14759748/stashing-only-staged-changes-in-git-is-it-possible
+func (c *GitCommand) StashSaveStagedChanges(message string) error {
+
+	if err := c.OSCommand.RunCommand("git stash --keep-index"); err != nil {
+		return err
+	}
+
+	if err := c.StashSave(message); err != nil {
+		return err
+	}
+
+	if err := c.OSCommand.RunCommand("git stash apply stash@{1}"); err != nil {
+		return err
+	}
+
+	if err := c.OSCommand.PipeCommands("git stash show -p", "git apply -R"); err != nil {
+		return err
+	}
+
+	if err := c.OSCommand.RunCommand("git stash drop stash@{1}"); err != nil {
+		return err
+	}
+
+	// if you had staged an untracked file, that will now appear as 'AD' in git status
+	// meaning it's deleted in your working tree but added in your index. Given that it's
+	// now safely stashed, we need to remove it.
+	files := c.GetStatusFiles()
+	for _, file := range files {
+		if file.ShortStatus == "AD" {
+			if err := c.UnStageFile(file.Name, false); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+// BeginInteractiveRebaseForCommit starts an interactive rebase to edit the current
+// commit and pick all others. After this you'll want to call `c.GenericMerge("rebase", "continue")`
+func (c *GitCommand) BeginInteractiveRebaseForCommit(commits []*Commit, commitIndex int) error {
+	if len(commits)-1 < commitIndex {
+		return errors.New("index outside of range of commits")
+	}
+
+	// we can make this GPG thing possible it just means we need to do this in two parts:
+	// one where we handle the possibility of a credential request, and the other
+	// where we continue the rebase
+	if c.usingGpg() {
+		return errors.New(c.Tr.SLocalize("DisabledForGPG"))
+	}
+
+	todo, sha, err := c.GenerateGenericRebaseTodo(commits, commitIndex, "edit")
+	if err != nil {
+		return err
+	}
+
+	cmd, err := c.PrepareInteractiveRebaseCommand(sha, todo, true)
+	if err != nil {
+		return err
+	}
+
+	if err := c.OSCommand.RunPreparedCommand(cmd); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *GitCommand) SetUpstreamBranch(upstream string) error {
+	return c.OSCommand.RunCommand("git branch -u %s", upstream)
+}
+
+func (c *GitCommand) AddRemote(name string, url string) error {
+	return c.OSCommand.RunCommand("git remote add %s %s", name, url)
+}
+
+func (c *GitCommand) RemoveRemote(name string) error {
+	return c.OSCommand.RunCommand("git remote remove %s", name)
+}
+
+func (c *GitCommand) IsHeadDetached() bool {
+	err := c.OSCommand.RunCommand("git symbolic-ref -q HEAD")
+	return err != nil
+}
+
+func (c *GitCommand) DeleteRemoteBranch(remoteName string, branchName string) error {
+	return c.OSCommand.RunCommand("git push %s --delete %s", remoteName, branchName)
+}
+
+func (c *GitCommand) SetBranchUpstream(remoteName string, remoteBranchName string, branchName string) error {
+	return c.OSCommand.RunCommand("git branch --set-upstream-to=%s/%s %s", remoteName, remoteBranchName, branchName)
+}
+
+func (c *GitCommand) RenameRemote(oldRemoteName string, newRemoteName string) error {
+	return c.OSCommand.RunCommand("git remote rename %s %s", oldRemoteName, newRemoteName)
+}
+
+func (c *GitCommand) UpdateRemoteUrl(remoteName string, updatedUrl string) error {
+	return c.OSCommand.RunCommand("git remote set-url %s %s", remoteName, updatedUrl)
+}
+
+func (c *GitCommand) CreateLightweightTag(tagName string, commitSha string) error {
+	return c.OSCommand.RunCommand("git tag %s %s", tagName, commitSha)
+}
+
+func (c *GitCommand) ShowTag(tagName string) (string, error) {
+	return c.OSCommand.RunCommandWithOutput("git tag -n99 %s", tagName)
+}
+
+func (c *GitCommand) DeleteTag(tagName string) error {
+	return c.OSCommand.RunCommand("git tag -d %s", tagName)
+}
+
+func (c *GitCommand) PushTag(remoteName string, tagName string) error {
+	return c.OSCommand.RunCommand("git push %s %s", remoteName, tagName)
+}
+
+func (c *GitCommand) FetchRemote(remoteName string) error {
+	return c.OSCommand.RunCommand("git fetch %s", remoteName)
+}

pkg/commands/git_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-errors/errors"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/test"
 	"github.com/stretchr/testify/assert"
@@ -57,14 +58,14 @@ func (f fileInfoMock) Sys() interface{} {
 func TestVerifyInGitRepo(t *testing.T) {
 	type scenario struct {
 		testName string
-		runCmd   func(string) error
+		runCmd   func(string, ...interface{}) error
 		test     func(error)
 	}
 
 	scenarios := []scenario{
 		{
 			"Valid git repository",
-			func(string) error {
+			func(string, ...interface{}) error {
 				return nil
 			},
 			func(err error) {
@@ -73,7 +74,7 @@ func TestVerifyInGitRepo(t *testing.T) {
 		},
 		{
 			"Not a valid git repository",
-			func(string) error {
+			func(string, ...interface{}) error {
 				return fmt.Errorf("fatal: Not a git repository (or any of the parent directories): .git")
 			},
 			func(err error) {
@@ -355,52 +356,72 @@ func TestGitCommandGetStatusFiles(t *testing.T) {
 			func(cmd string, args ...string) *exec.Cmd {
 				return exec.Command(
 					"echo",
-					"MM file1.txt\nA  file3.txt\nAM file2.txt\n?? file4.txt",
+					"MM file1.txt\nA  file3.txt\nAM file2.txt\n?? file4.txt\nUU file5.txt",
 				)
 			},
 			func(files []*File) {
-				assert.Len(t, files, 4)
+				assert.Len(t, files, 5)
 
 				expected := []*File{
 					{
-						Name:               "file1.txt",
-						HasStagedChanges:   true,
-						HasUnstagedChanges: true,
-						Tracked:            true,
-						Deleted:            false,
-						HasMergeConflicts:  false,
-						DisplayString:      "MM file1.txt",
-						Type:               "other",
+						Name:                    "file1.txt",
+						HasStagedChanges:        true,
+						HasUnstagedChanges:      true,
+						Tracked:                 true,
+						Deleted:                 false,
+						HasMergeConflicts:       false,
+						HasInlineMergeConflicts: false,
+						DisplayString:           "MM file1.txt",
+						Type:                    "other",
+						ShortStatus:             "MM",
 					},
 					{
-						Name:               "file3.txt",
-						HasStagedChanges:   true,
-						HasUnstagedChanges: false,
-						Tracked:            false,
-						Deleted:            false,
-						HasMergeConflicts:  false,
-						DisplayString:      "A  file3.txt",
-						Type:               "other",
+						Name:                    "file3.txt",
+						HasStagedChanges:        true,
+						HasUnstagedChanges:      false,
+						Tracked:                 false,
+						Deleted:                 false,
+						HasMergeConflicts:       false,
+						HasInlineMergeConflicts: false,
+						DisplayString:           "A  file3.txt",
+						Type:                    "other",
+						ShortStatus:             "A ",
 					},
 					{
-						Name:               "file2.txt",
-						HasStagedChanges:   true,
-						HasUnstagedChanges: true,
-						Tracked:            false,
-						Deleted:            false,
-						HasMergeConflicts:  false,
-						DisplayString:      "AM file2.txt",
-						Type:               "other",
+						Name:                    "file2.txt",
+						HasStagedChanges:        true,
+						HasUnstagedChanges:      true,
+						Tracked:                 false,
+						Deleted:                 false,
+						HasMergeConflicts:       false,
+						HasInlineMergeConflicts: false,
+						DisplayString:           "AM file2.txt",
+						Type:                    "other",
+						ShortStatus:             "AM",
 					},
 					{
-						Name:               "file4.txt",
-						HasStagedChanges:   false,
-						HasUnstagedChanges: true,
-						Tracked:            false,
-						Deleted:            false,
-						HasMergeConflicts:  false,
-						DisplayString:      "?? file4.txt",
-						Type:               "other",
+						Name:                    "file4.txt",
+						HasStagedChanges:        false,
+						HasUnstagedChanges:      true,
+						Tracked:                 false,
+						Deleted:                 false,
+						HasMergeConflicts:       false,
+						HasInlineMergeConflicts: false,
+						DisplayString:           "?? file4.txt",
+						Type:                    "other",
+						ShortStatus:             "??",
+					},
+					{
+						Name:                    "file5.txt",
+						HasStagedChanges:        false,
+						HasUnstagedChanges:      true,
+						Tracked:                 true,
+						Deleted:                 false,
+						HasMergeConflicts:       true,
+						HasInlineMergeConflicts: true,
+						DisplayString:           "UU file5.txt",
+						Type:                    "other",
+						ShortStatus:             "UU",
 					},
 				}
 
@@ -616,12 +637,12 @@ func TestGitCommandResetToCommit(t *testing.T) {
 	gitCmd := NewDummyGitCommand()
 	gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
 		assert.EqualValues(t, "git", cmd)
-		assert.EqualValues(t, []string{"reset", "78976bc"}, args)
+		assert.EqualValues(t, []string{"reset", "--hard", "78976bc"}, args)
 
 		return exec.Command("echo")
 	}
 
-	assert.NoError(t, gitCmd.ResetToCommit("78976bc"))
+	assert.NoError(t, gitCmd.ResetToCommit("78976bc", "hard"))
 }
 
 // TestGitCommandNewBranch is a function.
@@ -801,6 +822,7 @@ func TestGitCommandCommit(t *testing.T) {
 		command            func(string, ...string) *exec.Cmd
 		getGlobalGitConfig func(string) (string, error)
 		test               func(*exec.Cmd, error)
+		flags              string
 	}
 
 	scenarios := []scenario{
@@ -808,7 +830,7 @@ func TestGitCommandCommit(t *testing.T) {
 			"Commit using gpg",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "bash", cmd)
-				assert.EqualValues(t, []string{"-c", `git commit -m 'test'`}, args)
+				assert.EqualValues(t, []string{"-c", `git commit  -m 'test'`}, args)
 
 				return exec.Command("echo")
 			},
@@ -819,6 +841,7 @@ func TestGitCommandCommit(t *testing.T) {
 				assert.NotNil(t, cmd)
 				assert.Nil(t, err)
 			},
+			"",
 		},
 		{
 			"Commit without using gpg",
@@ -835,6 +858,24 @@ func TestGitCommandCommit(t *testing.T) {
 				assert.Nil(t, cmd)
 				assert.Nil(t, err)
 			},
+			"",
+		},
+		{
+			"Commit with --no-verify flag",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"commit", "--no-verify", "-m", "test"}, args)
+
+				return exec.Command("echo")
+			},
+			func(string) (string, error) {
+				return "false", nil
+			},
+			func(cmd *exec.Cmd, err error) {
+				assert.Nil(t, cmd)
+				assert.Nil(t, err)
+			},
+			"--no-verify",
 		},
 		{
 			"Commit without using gpg with an error",
@@ -851,6 +892,7 @@ func TestGitCommandCommit(t *testing.T) {
 				assert.Nil(t, cmd)
 				assert.Error(t, err)
 			},
+			"",
 		},
 	}
 
@@ -859,7 +901,7 @@ func TestGitCommandCommit(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.getGlobalGitConfig = s.getGlobalGitConfig
 			gitCmd.OSCommand.command = s.command
-			s.test(gitCmd.Commit("test"))
+			s.test(gitCmd.Commit("test", s.flags))
 		})
 	}
 }
@@ -878,7 +920,7 @@ func TestGitCommandAmendHead(t *testing.T) {
 			"Amend commit using gpg",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "bash", cmd)
-				assert.EqualValues(t, []string{"-c", "git commit --amend --no-edit"}, args)
+				assert.EqualValues(t, []string{"-c", "git commit --amend --no-edit --allow-empty"}, args)
 
 				return exec.Command("echo")
 			},
@@ -894,7 +936,7 @@ func TestGitCommandAmendHead(t *testing.T) {
 			"Amend commit without using gpg",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"commit", "--amend", "--no-edit"}, args)
+				assert.EqualValues(t, []string{"commit", "--amend", "--no-edit", "--allow-empty"}, args)
 
 				return exec.Command("echo")
 			},
@@ -910,7 +952,7 @@ func TestGitCommandAmendHead(t *testing.T) {
 			"Amend commit without using gpg with an error",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"commit", "--amend", "--no-edit"}, args)
+				assert.EqualValues(t, []string{"commit", "--amend", "--no-edit", "--allow-empty"}, args)
 
 				return exec.Command("test")
 			},
@@ -948,7 +990,7 @@ func TestGitCommandPush(t *testing.T) {
 			"Push with force disabled",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"push", "-u", "origin", "test"}, args)
+				assert.EqualValues(t, []string{"push", "--follow-tags"}, args)
 
 				return exec.Command("echo")
 			},
@@ -961,7 +1003,7 @@ func TestGitCommandPush(t *testing.T) {
 			"Push with force enabled",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"push", "--force-with-lease", "-u", "origin", "test"}, args)
+				assert.EqualValues(t, []string{"push", "--follow-tags", "--force-with-lease"}, args)
 
 				return exec.Command("echo")
 			},
@@ -974,7 +1016,7 @@ func TestGitCommandPush(t *testing.T) {
 			"Push with an error occurring",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"push", "-u", "origin", "test"}, args)
+				assert.EqualValues(t, []string{"push", "--follow-tags"}, args)
 				return exec.Command("test")
 			},
 			false,
@@ -988,7 +1030,7 @@ func TestGitCommandPush(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command
-			err := gitCmd.Push("test", s.forcePush, func(passOrUname string) string {
+			err := gitCmd.Push("test", s.forcePush, "", func(passOrUname string) string {
 				return "\n"
 			})
 			s.test(err)
@@ -1140,8 +1182,8 @@ func TestGitCommandIsInMergeState(t *testing.T) {
 	}
 }
 
-// TestGitCommandRemoveFile is a function.
-func TestGitCommandRemoveFile(t *testing.T) {
+// TestGitCommandDiscardAllFileChanges is a function.
+func TestGitCommandDiscardAllFileChanges(t *testing.T) {
 	type scenario struct {
 		testName   string
 		command    func() (func(string, ...string) *exec.Cmd, *[][]string)
@@ -1252,7 +1294,7 @@ func TestGitCommandRemoveFile(t *testing.T) {
 			},
 		},
 		{
-			"Reset and checkout",
+			"Reset and checkout staged changes",
 			func() (func(string, ...string) *exec.Cmd, *[][]string) {
 				cmdsCalled := [][]string{}
 				return func(cmd string, args ...string) *exec.Cmd {
@@ -1278,6 +1320,33 @@ func TestGitCommandRemoveFile(t *testing.T) {
 				return nil
 			},
 		},
+		{
+			"Reset and checkout merge conflicts",
+			func() (func(string, ...string) *exec.Cmd, *[][]string) {
+				cmdsCalled := [][]string{}
+				return func(cmd string, args ...string) *exec.Cmd {
+					cmdsCalled = append(cmdsCalled, args)
+
+					return exec.Command("echo")
+				}, &cmdsCalled
+			},
+			func(cmdsCalled *[][]string, err error) {
+				assert.NoError(t, err)
+				assert.Len(t, *cmdsCalled, 2)
+				assert.EqualValues(t, *cmdsCalled, [][]string{
+					{"reset", "--", "test"},
+					{"checkout", "--", "test"},
+				})
+			},
+			&File{
+				Name:              "test",
+				Tracked:           true,
+				HasMergeConflicts: true,
+			},
+			func(string) error {
+				return nil
+			},
+		},
 		{
 			"Reset and remove",
 			func() (func(string, ...string) *exec.Cmd, *[][]string) {
@@ -1337,7 +1406,7 @@ func TestGitCommandRemoveFile(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command, cmdsCalled = s.command()
 			gitCmd.removeFile = s.removeFile
-			s.test(cmdsCalled, gitCmd.RemoveFile(s.file))
+			s.test(cmdsCalled, gitCmd.DiscardAllFileChanges(s.file))
 		})
 	}
 }
@@ -1357,7 +1426,7 @@ func TestGitCommandShow(t *testing.T) {
 			"456abcde",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git show --color 456abcde",
+					Expect:  "git show --color --no-renames 456abcde",
 					Replace: "echo \"commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nblah\"",
 				},
 				{
@@ -1375,7 +1444,7 @@ func TestGitCommandShow(t *testing.T) {
 			"456abcde",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git show --color 456abcde",
+					Expect:  "git show --color --no-renames 456abcde",
 					Replace: "echo \"commit ccc771d8b13d5b0d4635db4463556366470fd4f6\nMerge: 1a6a69a 3b51d7c\"",
 				},
 				{
@@ -1470,6 +1539,7 @@ func TestGitCommandDiff(t *testing.T) {
 		command  func(string, ...string) *exec.Cmd
 		file     *File
 		plain    bool
+		cached   bool
 	}
 
 	scenarios := []scenario{
@@ -1487,9 +1557,26 @@ func TestGitCommandDiff(t *testing.T) {
 				Tracked:          true,
 			},
 			false,
+			false,
 		},
 		{
-			"Default case",
+			"cached",
+			func(cmd string, args ...string) *exec.Cmd {
+				assert.EqualValues(t, "git", cmd)
+				assert.EqualValues(t, []string{"diff", "--color", "--cached", "--", "test.txt"}, args)
+
+				return exec.Command("echo")
+			},
+			&File{
+				Name:             "test.txt",
+				HasStagedChanges: false,
+				Tracked:          true,
+			},
+			false,
+			true,
+		},
+		{
+			"plain",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
 				assert.EqualValues(t, []string{"diff", "--", "test.txt"}, args)
@@ -1502,21 +1589,6 @@ func TestGitCommandDiff(t *testing.T) {
 				Tracked:          true,
 			},
 			true,
-		},
-		{
-			"All changes staged",
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"diff", "--color", "--cached", "--", "test.txt"}, args)
-
-				return exec.Command("echo")
-			},
-			&File{
-				Name:               "test.txt",
-				HasStagedChanges:   true,
-				HasUnstagedChanges: false,
-				Tracked:            true,
-			},
 			false,
 		},
 		{
@@ -1533,6 +1605,7 @@ func TestGitCommandDiff(t *testing.T) {
 				Tracked:          false,
 			},
 			false,
+			false,
 		},
 	}
 
@@ -1540,7 +1613,7 @@ func TestGitCommandDiff(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command
-			gitCmd.Diff(s.file, s.plain)
+			gitCmd.Diff(s.file, s.plain, s.cached)
 		})
 	}
 }
@@ -1566,7 +1639,7 @@ func TestGitCommandCurrentBranchName(t *testing.T) {
 			},
 		},
 		{
-			"falls back to git rev-parse if symbolic-ref fails",
+			"falls back to git `git branch --contains` if symbolic-ref fails",
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
 
@@ -1574,9 +1647,9 @@ func TestGitCommandCurrentBranchName(t *testing.T) {
 				case "symbolic-ref":
 					assert.EqualValues(t, []string{"symbolic-ref", "--short", "HEAD"}, args)
 					return exec.Command("test")
-				case "rev-parse":
-					assert.EqualValues(t, []string{"rev-parse", "--short", "HEAD"}, args)
-					return exec.Command("echo", "master")
+				case "branch":
+					assert.EqualValues(t, []string{"branch", "--contains"}, args)
+					return exec.Command("echo", "* master")
 				}
 
 				return nil
@@ -1612,7 +1685,7 @@ func TestGitCommandApplyPatch(t *testing.T) {
 	type scenario struct {
 		testName string
 		command  func(string, ...string) *exec.Cmd
-		test     func(string, error)
+		test     func(error)
 	}
 
 	scenarios := []scenario{
@@ -1629,9 +1702,8 @@ func TestGitCommandApplyPatch(t *testing.T) {
 
 				return exec.Command("echo", "done")
 			},
-			func(output string, err error) {
+			func(err error) {
 				assert.NoError(t, err)
-				assert.EqualValues(t, "done\n", output)
 			},
 		},
 		{
@@ -1651,7 +1723,7 @@ func TestGitCommandApplyPatch(t *testing.T) {
 
 				return exec.Command("test")
 			},
-			func(output string, err error) {
+			func(err error) {
 				assert.Error(t, err)
 			},
 		},
@@ -1661,7 +1733,7 @@ func TestGitCommandApplyPatch(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.command = s.command
-			s.test(gitCmd.ApplyPatch("test"))
+			s.test(gitCmd.ApplyPatch("test", "cached"))
 		})
 	}
 }
@@ -1681,7 +1753,7 @@ func TestGitCommandRebaseBranch(t *testing.T) {
 			"master",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git rebase --interactive --autostash master",
+					Expect:  "git rebase --interactive --autostash --keep-empty --rebase-merges master",
 					Replace: "echo",
 				},
 			}),
@@ -1694,7 +1766,7 @@ func TestGitCommandRebaseBranch(t *testing.T) {
 			"master",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git rebase --interactive --autostash master",
+					Expect:  "git rebase --interactive --autostash --keep-empty --rebase-merges master",
 					Replace: "test",
 				},
 			}),
@@ -1707,7 +1779,474 @@ func TestGitCommandRebaseBranch(t *testing.T) {
 	gitCmd := NewDummyGitCommand()
 
 	for _, s := range scenarios {
-		gitCmd.OSCommand.command = s.command
-		s.test(gitCmd.RebaseBranch(s.arg))
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.RebaseBranch(s.arg))
+		})
+	}
+}
+
+// TestGitCommandCheckoutFile is a function.
+func TestGitCommandCheckoutFile(t *testing.T) {
+	type scenario struct {
+		testName  string
+		commitSha string
+		fileName  string
+		command   func(string, ...string) *exec.Cmd
+		test      func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"typical case",
+			"11af912",
+			"test999.txt",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git checkout 11af912 test999.txt",
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		{
+			"returns error if there is one",
+			"11af912",
+			"test999.txt",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git checkout 11af912 test999.txt",
+					Replace: "test",
+				},
+			}),
+			func(err error) {
+				assert.Error(t, err)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.CheckoutFile(s.commitSha, s.fileName))
+		})
+	}
+}
+
+// TestGitCommandDiscardOldFileChanges is a function.
+func TestGitCommandDiscardOldFileChanges(t *testing.T) {
+	type scenario struct {
+		testName          string
+		getLocalGitConfig func(string) (string, error)
+		commits           []*Commit
+		commitIndex       int
+		fileName          string
+		command           func(string, ...string) *exec.Cmd
+		test              func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"returns error when index outside of range of commits",
+			func(string) (string, error) {
+				return "", nil
+			},
+			[]*Commit{},
+			0,
+			"test999.txt",
+			nil,
+			func(err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			"returns error when using gpg",
+			func(string) (string, error) {
+				return "true", nil
+			},
+			[]*Commit{{Name: "commit", Sha: "123456"}},
+			0,
+			"test999.txt",
+			nil,
+			func(err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			"checks out file if it already existed",
+			func(string) (string, error) {
+				return "", nil
+			},
+			[]*Commit{
+				{Name: "commit", Sha: "123456"},
+				{Name: "commit2", Sha: "abcdef"},
+			},
+			0,
+			"test999.txt",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git rebase --interactive --autostash --keep-empty --rebase-merges abcdef",
+					Replace: "echo",
+				},
+				{
+					Expect:  "git cat-file -e HEAD^:test999.txt",
+					Replace: "echo",
+				},
+				{
+					Expect:  "git checkout HEAD^ test999.txt",
+					Replace: "echo",
+				},
+				{
+					Expect:  "git commit --amend --no-edit --allow-empty",
+					Replace: "echo",
+				},
+				{
+					Expect:  "git rebase --continue",
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+		// test for when the file was created within the commit requires a refactor to support proper mocks
+		// currently we'd need to mock out the os.Remove function and that's gonna introduce tech debt
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			gitCmd.getLocalGitConfig = s.getLocalGitConfig
+			s.test(gitCmd.DiscardOldFileChanges(s.commits, s.commitIndex, s.fileName))
+		})
+	}
+}
+
+// TestGitCommandShowCommitFile is a function.
+func TestGitCommandShowCommitFile(t *testing.T) {
+	type scenario struct {
+		testName  string
+		commitSha string
+		fileName  string
+		command   func(string, ...string) *exec.Cmd
+		test      func(string, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			"123456",
+			"hello.txt",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git show --no-renames 123456 -- hello.txt",
+					Replace: "echo -n hello",
+				},
+			}),
+			func(str string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "hello", str)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.ShowCommitFile(s.commitSha, s.fileName, true))
+		})
+	}
+}
+
+// TestGitCommandGetCommitFiles is a function.
+func TestGitCommandGetCommitFiles(t *testing.T) {
+	type scenario struct {
+		testName  string
+		commitSha string
+		command   func(string, ...string) *exec.Cmd
+		test      func([]*CommitFile, error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			"123456",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  "git show --pretty= --name-only --no-renames 123456",
+					Replace: "echo 'hello\nworld'",
+				},
+			}),
+			func(commitFiles []*CommitFile, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, []*CommitFile{
+					{Sha: "123456", Name: "hello", DisplayString: "hello"},
+					{Sha: "123456", Name: "world", DisplayString: "world"},
+				}, commitFiles)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.GetCommitFiles(s.commitSha, nil))
+		})
+	}
+}
+
+// TestGitCommandDiscardUnstagedFileChanges is a function.
+func TestGitCommandDiscardUnstagedFileChanges(t *testing.T) {
+	type scenario struct {
+		testName string
+		file     *File
+		command  func(string, ...string) *exec.Cmd
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			&File{Name: "test.txt"},
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  `git checkout -- "test.txt"`,
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.DiscardUnstagedFileChanges(s.file))
+		})
+	}
+}
+
+// TestGitCommandDiscardAnyUnstagedFileChanges is a function.
+func TestGitCommandDiscardAnyUnstagedFileChanges(t *testing.T) {
+	type scenario struct {
+		testName string
+		command  func(string, ...string) *exec.Cmd
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  `git checkout -- .`,
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.DiscardAnyUnstagedFileChanges())
+		})
+	}
+}
+
+// TestGitCommandRemoveUntrackedFiles is a function.
+func TestGitCommandRemoveUntrackedFiles(t *testing.T) {
+	type scenario struct {
+		testName string
+		command  func(string, ...string) *exec.Cmd
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  `git clean -fd`,
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.RemoveUntrackedFiles())
+		})
+	}
+}
+
+// TestGitCommandResetHard is a function.
+func TestGitCommandResetHard(t *testing.T) {
+	type scenario struct {
+		testName string
+		ref      string
+		command  func(string, ...string) *exec.Cmd
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			"HEAD",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  `git reset --hard HEAD`,
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.ResetHard(s.ref))
+		})
+	}
+}
+
+// TestGitCommandCreateFixupCommit is a function.
+func TestGitCommandCreateFixupCommit(t *testing.T) {
+	type scenario struct {
+		testName string
+		sha      string
+		command  func(string, ...string) *exec.Cmd
+		test     func(error)
+	}
+
+	scenarios := []scenario{
+		{
+			"valid case",
+			"12345",
+			test.CreateMockCommand(t, []*test.CommandSwapper{
+				{
+					Expect:  `git commit --fixup=12345`,
+					Replace: "echo",
+				},
+			}),
+			func(err error) {
+				assert.NoError(t, err)
+			},
+		},
+	}
+
+	gitCmd := NewDummyGitCommand()
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			gitCmd.OSCommand.command = s.command
+			s.test(gitCmd.CreateFixupCommit(s.sha))
+		})
+	}
+}
+
+func TestFindDotGitDir(t *testing.T) {
+	type scenario struct {
+		testName string
+		stat     func(string) (os.FileInfo, error)
+		readFile func(filename string) ([]byte, error)
+		test     func(string, error)
+	}
+
+	scenarios := []scenario{
+		{
+			".git is a directory",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return os.Stat("testdata/a_dir")
+			},
+			func(dotGit string) ([]byte, error) {
+				assert.Fail(t, "readFile should not be called if .git is a directory")
+				return nil, nil
+			},
+			func(gitDir string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, ".git", gitDir)
+			},
+		},
+		{
+			".git is a file",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return os.Stat("testdata/a_file")
+			},
+			func(dotGit string) ([]byte, error) {
+				assert.Equal(t, ".git", dotGit)
+				return []byte("gitdir: blah\n"), nil
+			},
+			func(gitDir string, err error) {
+				assert.NoError(t, err)
+				assert.Equal(t, "blah", gitDir)
+			},
+		},
+		{
+			"os.Stat returns an error",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return nil, errors.New("error")
+			},
+			func(dotGit string) ([]byte, error) {
+				assert.Fail(t, "readFile should not be called os.Stat returns an error")
+				return nil, nil
+			},
+			func(gitDir string, err error) {
+				assert.Error(t, err)
+			},
+		},
+		{
+			"readFile returns an error",
+			func(dotGit string) (os.FileInfo, error) {
+				assert.Equal(t, ".git", dotGit)
+				return os.Stat("testdata/a_file")
+			},
+			func(dotGit string) ([]byte, error) {
+				return nil, errors.New("error")
+			},
+			func(gitDir string, err error) {
+				assert.Error(t, err)
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			s.test(findDotGitDir(s.stat, s.readFile))
+		})
 	}
 }

pkg/commands/loading_remotes.go

@@ -0,0 +1,58 @@
+package commands
+
+import (
+	"fmt"
+	"regexp"
+	"sort"
+	"strings"
+)
+
+func (c *GitCommand) GetRemotes() ([]*Remote, error) {
+	// get remote branches
+	unescaped := "git branch -r"
+	remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(unescaped)
+	if err != nil {
+		return nil, err
+	}
+
+	goGitRemotes, err := c.Repo.Remotes()
+	if err != nil {
+		return nil, err
+	}
+
+	// first step is to get our remotes from go-git
+	remotes := make([]*Remote, len(goGitRemotes))
+	for i, goGitRemote := range goGitRemotes {
+		remoteName := goGitRemote.Config().Name
+
+		re := regexp.MustCompile(fmt.Sprintf(`%s\/([\S]+)`, remoteName))
+		matches := re.FindAllStringSubmatch(remoteBranchesStr, -1)
+		branches := make([]*RemoteBranch, len(matches))
+		for j, match := range matches {
+			branches[j] = &RemoteBranch{
+				Name:       match[1],
+				RemoteName: remoteName,
+			}
+		}
+
+		remotes[i] = &Remote{
+			Name:     goGitRemote.Config().Name,
+			Urls:     goGitRemote.Config().URLs,
+			Branches: branches,
+		}
+	}
+
+	// now lets sort our remotes by name alphabetically
+	sort.Slice(remotes, func(i, j int) bool {
+		// we want origin at the top because we'll be most likely to want it
+		if remotes[i].Name == "origin" {
+			return true
+		}
+		if remotes[j].Name == "origin" {
+			return false
+		}
+		return strings.ToLower(remotes[i].Name) < strings.ToLower(remotes[j].Name)
+	})
+
+	return remotes, nil
+}

pkg/commands/loading_tags.go

@@ -0,0 +1,87 @@
+package commands
+
+import (
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+const semverRegex = `v?((\d+\.?)+)([^\d]?.*)`
+
+func convertToInt(s string) int {
+	i, err := strconv.Atoi(s)
+	if err != nil {
+		return 0
+	}
+	return i
+}
+
+func (c *GitCommand) GetTags() ([]*Tag, error) {
+	// get remote branches
+	remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(`git tag --list`)
+	if err != nil {
+		return nil, err
+	}
+
+	content := utils.TrimTrailingNewline(remoteBranchesStr)
+	if content == "" {
+		return nil, nil
+	}
+
+	split := strings.Split(content, "\n")
+
+	// first step is to get our remotes from go-git
+	tags := make([]*Tag, len(split))
+	for i, tagName := range split {
+
+		tags[i] = &Tag{
+			Name: tagName,
+		}
+	}
+
+	// now lets sort our tags by name numerically
+	re := regexp.MustCompile(semverRegex)
+
+	// the reason  this is complicated is because we're both sorting alphabetically
+	// and when we're dealing with semver strings
+	sort.Slice(tags, func(i, j int) bool {
+		a := tags[i].Name
+		b := tags[j].Name
+
+		matchA := re.FindStringSubmatch(a)
+		matchB := re.FindStringSubmatch(b)
+
+		if len(matchA) > 0 && len(matchB) > 0 {
+			numbersA := strings.Split(matchA[1], ".")
+			numbersB := strings.Split(matchB[1], ".")
+			k := 0
+			for {
+				if len(numbersA) == k && len(numbersB) == k {
+					break
+				}
+				if len(numbersA) == k {
+					return true
+				}
+				if len(numbersB) == k {
+					return false
+				}
+				if convertToInt(numbersA[k]) < convertToInt(numbersB[k]) {
+					return true
+				}
+				if convertToInt(numbersA[k]) > convertToInt(numbersB[k]) {
+					return false
+				}
+				k++
+			}
+
+			return strings.ToLower(matchA[3]) < strings.ToLower(matchB[3])
+		}
+
+		return strings.ToLower(a) < strings.ToLower(b)
+	})
+
+	return tags, nil
+}

pkg/commands/os.go

@@ -1,12 +1,14 @@
 package commands
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"
 
 	"github.com/go-errors/errors"
 
@@ -57,7 +59,16 @@ func (c *OSCommand) SetCommand(cmd func(string, ...string) *exec.Cmd) {
 }
 
 // RunCommandWithOutput wrapper around commands returning their output and error
-func (c *OSCommand) RunCommandWithOutput(command string) (string, error) {
+// NOTE: If you don't pass any formatArgs we'll just use the command directly,
+// however there's a bizarre compiler error/warning when you pass in a formatString
+// with a percent sign because it thinks it's supposed to be a formatString when
+// in that case it's not. To get around that error you'll need to define the string
+// in a variable and pass the variable into RunCommandWithOutput.
+func (c *OSCommand) RunCommandWithOutput(formatString string, formatArgs ...interface{}) (string, error) {
+	command := formatString
+	if formatArgs != nil {
+		command = fmt.Sprintf(formatString, formatArgs...)
+	}
 	c.Log.WithField("command", command).Info("RunCommand")
 	cmd := c.ExecutableFromString(command)
 	return sanitisedCommandOutput(cmd.CombinedOutput())
@@ -77,8 +88,9 @@ func (c *OSCommand) RunExecutable(cmd *exec.Cmd) error {
 // ExecutableFromString takes a string like `git status` and returns an executable command for it
 func (c *OSCommand) ExecutableFromString(commandStr string) *exec.Cmd {
 	splitCmd := str.ToArgv(commandStr)
-	c.Log.Info(splitCmd)
-	return c.command(splitCmd[0], splitCmd[1:]...)
+	cmd := c.command(splitCmd[0], splitCmd[1:]...)
+	cmd.Env = append(os.Environ(), "GIT_OPTIONAL_LOCKS=0")
+	return cmd
 }
 
 // RunCommandWithOutputLive runs RunCommandWithOutputLiveWrapper
@@ -112,8 +124,8 @@ func (c *OSCommand) DetectUnamePass(command string, ask func(string) string) err
 }
 
 // RunCommand runs a command and just returns the error
-func (c *OSCommand) RunCommand(command string) error {
-	_, err := c.RunCommandWithOutput(command)
+func (c *OSCommand) RunCommand(formatString string, formatArgs ...interface{}) error {
+	_, err := c.RunCommandWithOutput(formatString, formatArgs...)
 	return err
 }
 
@@ -145,7 +157,7 @@ func sanitisedCommandOutput(output []byte, err error) (string, error) {
 		// errors like 'exit status 1' are not very useful so we'll create an error
 		// from the combined output
 		if outputString == "" {
-			return "", errors.Wrap(err, 0)
+			return "", WrapError(err)
 		}
 		return outputString, errors.New(outputString)
 	}
@@ -200,8 +212,13 @@ func (c *OSCommand) EditFile(filename string) (*exec.Cmd, error) {
 }
 
 // PrepareSubProcess iniPrepareSubProcessrocess then tells the Gui to switch to it
+// TODO: see if this needs to exist, given that ExecutableFromString does the same things
 func (c *OSCommand) PrepareSubProcess(cmdName string, commandArgs ...string) *exec.Cmd {
-	return c.command(cmdName, commandArgs...)
+	cmd := c.command(cmdName, commandArgs...)
+	if cmd != nil {
+		cmd.Env = append(os.Environ(), "GIT_OPTIONAL_LOCKS=0")
+	}
+	return cmd
 }
 
 // Quote wraps a message in platform-specific quotation marks
@@ -224,13 +241,13 @@ func (c *OSCommand) Unquote(message string) string {
 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 errors.Wrap(err, 0)
+		return WrapError(err)
 	}
 	defer f.Close()
 
 	_, err = f.WriteString("\n" + line)
 	if err != nil {
-		return errors.Wrap(err, 0)
+		return WrapError(err)
 	}
 	return nil
 }
@@ -240,25 +257,40 @@ func (c *OSCommand) CreateTempFile(filename, content string) (string, error) {
 	tmpfile, err := ioutil.TempFile("", filename)
 	if err != nil {
 		c.Log.Error(err)
-		return "", errors.Wrap(err, 0)
+		return "", WrapError(err)
 	}
 
 	if _, err := tmpfile.WriteString(content); err != nil {
 		c.Log.Error(err)
-		return "", errors.Wrap(err, 0)
+		return "", WrapError(err)
 	}
 	if err := tmpfile.Close(); err != nil {
 		c.Log.Error(err)
-		return "", errors.Wrap(err, 0)
+		return "", WrapError(err)
 	}
 
 	return tmpfile.Name(), nil
 }
 
-// RemoveFile removes a file at the specified path
-func (c *OSCommand) RemoveFile(filename string) error {
-	err := os.Remove(filename)
-	return errors.Wrap(err, 0)
+// CreateFileWithContent creates a file with the given content
+func (c *OSCommand) CreateFileWithContent(path string, content string) error {
+	if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
+		c.Log.Error(err)
+		return err
+	}
+
+	if err := ioutil.WriteFile(path, []byte(content), 0644); err != nil {
+		c.Log.Error(err)
+		return WrapError(err)
+	}
+
+	return nil
+}
+
+// Remove removes a file or directory at the specified path
+func (c *OSCommand) Remove(filename string) error {
+	err := os.RemoveAll(filename)
+	return WrapError(err)
 }
 
 // FileExists checks whether a file exists at the specified path
@@ -294,5 +326,70 @@ func (c *OSCommand) GetLazygitPath() string {
 	if err != nil {
 		ex = os.Args[0] // fallback to the first call argument if needed
 	}
-	return filepath.ToSlash(ex)
+	return `"` + filepath.ToSlash(ex) + `"`
+}
+
+// RunCustomCommand returns the pointer to a custom command
+func (c *OSCommand) RunCustomCommand(command string) *exec.Cmd {
+	return c.PrepareSubProcess(c.Platform.shell, c.Platform.shellArg, command)
+}
+
+// PipeCommands runs a heap of commands and pipes their inputs/outputs together like A | B | C
+func (c *OSCommand) PipeCommands(commandStrings ...string) error {
+
+	cmds := make([]*exec.Cmd, len(commandStrings))
+
+	for i, str := range commandStrings {
+		cmds[i] = c.ExecutableFromString(str)
+	}
+
+	for i := 0; i < len(cmds)-1; i++ {
+		stdout, err := cmds[i].StdoutPipe()
+		if err != nil {
+			return err
+		}
+
+		cmds[i+1].Stdin = stdout
+	}
+
+	// keeping this here in case I adapt this code for some other purpose in the future
+	// cmds[len(cmds)-1].Stdout = os.Stdout
+
+	finalErrors := []string{}
+
+	wg := sync.WaitGroup{}
+	wg.Add(len(cmds))
+
+	for _, cmd := range cmds {
+		currentCmd := cmd
+		go func() {
+			stderr, err := currentCmd.StderrPipe()
+			if err != nil {
+				c.Log.Error(err)
+			}
+
+			if err := currentCmd.Start(); err != nil {
+				c.Log.Error(err)
+			}
+
+			if b, err := ioutil.ReadAll(stderr); err == nil {
+				if len(b) > 0 {
+					finalErrors = append(finalErrors, string(b))
+				}
+			}
+
+			if err := currentCmd.Wait(); err != nil {
+				c.Log.Error(err)
+			}
+
+			wg.Done()
+		}()
+	}
+
+	wg.Wait()
+
+	if len(finalErrors) > 0 {
+		return errors.New(strings.Join(finalErrors, "\n"))
+	}
+	return nil
 }

pkg/commands/patch_manager.go

@@ -0,0 +1,229 @@
+package commands
+
+import (
+	"sort"
+
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sirupsen/logrus"
+)
+
+type fileInfo struct {
+	mode                int // one of WHOLE/PART
+	includedLineIndices []int
+	diff                string
+}
+
+type applyPatchFunc func(patch string, flags ...string) error
+
+// PatchManager manages the building of a patch for a commit to be applied to another commit (or the working tree, or removed from the current commit)
+type PatchManager struct {
+	CommitSha   string
+	fileInfoMap map[string]*fileInfo
+	Log         *logrus.Entry
+	ApplyPatch  applyPatchFunc
+}
+
+// NewPatchManager returns a new PatchModifier
+func NewPatchManager(log *logrus.Entry, applyPatch applyPatchFunc) *PatchManager {
+	return &PatchManager{
+		Log:        log,
+		ApplyPatch: applyPatch,
+	}
+}
+
+// NewPatchManager returns a new PatchModifier
+func (p *PatchManager) Start(commitSha string, diffMap map[string]string) {
+	p.CommitSha = commitSha
+	p.fileInfoMap = map[string]*fileInfo{}
+	for filename, diff := range diffMap {
+		p.fileInfoMap[filename] = &fileInfo{
+			mode: UNSELECTED,
+			diff: diff,
+		}
+	}
+}
+
+func (p *PatchManager) AddFile(filename string) {
+	p.fileInfoMap[filename].mode = WHOLE
+	p.fileInfoMap[filename].includedLineIndices = nil
+}
+
+func (p *PatchManager) RemoveFile(filename string) {
+	p.fileInfoMap[filename].mode = UNSELECTED
+	p.fileInfoMap[filename].includedLineIndices = nil
+}
+
+func (p *PatchManager) ToggleFileWhole(filename string) {
+	info := p.fileInfoMap[filename]
+	switch info.mode {
+	case UNSELECTED:
+		p.AddFile(filename)
+	case WHOLE:
+		p.RemoveFile(filename)
+	case PART:
+		p.AddFile(filename)
+	}
+}
+
+func getIndicesForRange(first, last int) []int {
+	indices := []int{}
+	for i := first; i <= last; i++ {
+		indices = append(indices, i)
+	}
+	return indices
+}
+
+func (p *PatchManager) AddFileLineRange(filename string, firstLineIdx, lastLineIdx int) {
+	info := p.fileInfoMap[filename]
+	info.mode = PART
+	info.includedLineIndices = utils.UnionInt(info.includedLineIndices, getIndicesForRange(firstLineIdx, lastLineIdx))
+}
+
+func (p *PatchManager) RemoveFileLineRange(filename string, firstLineIdx, lastLineIdx int) {
+	info := p.fileInfoMap[filename]
+	info.mode = PART
+	info.includedLineIndices = utils.DifferenceInt(info.includedLineIndices, getIndicesForRange(firstLineIdx, lastLineIdx))
+	if len(info.includedLineIndices) == 0 {
+		p.RemoveFile(filename)
+	}
+}
+
+func (p *PatchManager) RenderPlainPatchForFile(filename string, reverse bool, keepOriginalHeader bool) string {
+	info := p.fileInfoMap[filename]
+	if info == nil {
+		return ""
+	}
+
+	switch info.mode {
+	case WHOLE:
+		// use the whole diff
+		// the reverse flag is only for part patches so we're ignoring it here
+		return info.diff
+	case PART:
+		// generate a new diff with just the selected lines
+		m := NewPatchModifier(p.Log, filename, info.diff)
+		return m.ModifiedPatchForLines(info.includedLineIndices, reverse, keepOriginalHeader)
+	default:
+		return ""
+	}
+}
+
+func (p *PatchManager) RenderPatchForFile(filename string, plain bool, reverse bool, keepOriginalHeader bool) string {
+	patch := p.RenderPlainPatchForFile(filename, reverse, keepOriginalHeader)
+	if plain {
+		return patch
+	}
+	parser, err := NewPatchParser(p.Log, patch)
+	if err != nil {
+		// swallowing for now
+		return ""
+	}
+	// not passing included lines because we don't want to see them in the secondary panel
+	return parser.Render(-1, -1, nil)
+}
+
+func (p *PatchManager) RenderEachFilePatch(plain bool) []string {
+	// sort files by name then iterate through and render each patch
+	filenames := make([]string, len(p.fileInfoMap))
+	index := 0
+	for filename := range p.fileInfoMap {
+		filenames[index] = filename
+		index++
+	}
+
+	sort.Strings(filenames)
+	output := []string{}
+	for _, filename := range filenames {
+		patch := p.RenderPatchForFile(filename, plain, false, true)
+		if patch != "" {
+			output = append(output, patch)
+		}
+	}
+
+	return output
+}
+
+func (p *PatchManager) RenderAggregatedPatchColored(plain bool) string {
+	result := ""
+	for _, patch := range p.RenderEachFilePatch(plain) {
+		if patch != "" {
+			result += patch + "\n"
+		}
+	}
+	return result
+}
+
+func (p *PatchManager) GetFileStatus(filename string) int {
+	info := p.fileInfoMap[filename]
+	if info == nil {
+		return UNSELECTED
+	}
+	return info.mode
+}
+
+func (p *PatchManager) GetFileIncLineIndices(filename string) []int {
+	info := p.fileInfoMap[filename]
+	if info == nil {
+		return []int{}
+	}
+	return info.includedLineIndices
+}
+
+func (p *PatchManager) ApplyPatches(reverse bool) error {
+	// for whole patches we'll apply the patch in reverse
+	// but for part patches we'll apply a reverse patch forwards
+	for filename, info := range p.fileInfoMap {
+		if info.mode == UNSELECTED {
+			continue
+		}
+
+		applyFlags := []string{"index", "3way"}
+		reverseOnGenerate := false
+		if reverse {
+			if info.mode == WHOLE {
+				applyFlags = append(applyFlags, "reverse")
+			} else {
+				reverseOnGenerate = true
+			}
+		}
+
+		var err error
+		// first run we try with the original header, then without
+		for _, keepOriginalHeader := range []bool{true, false} {
+			patch := p.RenderPatchForFile(filename, true, reverseOnGenerate, keepOriginalHeader)
+			if patch == "" {
+				continue
+			}
+			if err = p.ApplyPatch(patch, applyFlags...); err != nil {
+				continue
+			}
+			break
+		}
+
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// clears the patch
+func (p *PatchManager) Reset() {
+	p.CommitSha = ""
+	p.fileInfoMap = map[string]*fileInfo{}
+}
+
+func (p *PatchManager) CommitSelected() bool {
+	return p.CommitSha != ""
+}
+
+func (p *PatchManager) IsEmpty() bool {
+	for _, fileInfo := range p.fileInfoMap {
+		if fileInfo.mode == WHOLE || (fileInfo.mode == PART && len(fileInfo.includedLineIndices) > 0) {
+			return false
+		}
+	}
+
+	return true
+}

pkg/commands/patch_modifier.go

@@ -0,0 +1,260 @@
+package commands
+
+import (
+	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sirupsen/logrus"
+)
+
+var hunkHeaderRegexp = regexp.MustCompile(`(?m)^@@ -(\d+)[^\+]+\+(\d+)[^@]+@@(.*)$`)
+var patchHeaderRegexp = regexp.MustCompile(`(?ms)(^diff.*?)^@@`)
+
+type PatchHunk struct {
+	header       string
+	FirstLineIdx int
+	LastLineIdx  int
+	bodyLines    []string
+}
+
+func newHunk(header string, body string, firstLineIdx int) *PatchHunk {
+	bodyLines := strings.SplitAfter(header+body, "\n")[1:] // dropping the header line
+
+	return &PatchHunk{
+		header:       header,
+		FirstLineIdx: firstLineIdx,
+		LastLineIdx:  firstLineIdx + len(bodyLines),
+		bodyLines:    bodyLines,
+	}
+}
+
+func (hunk *PatchHunk) updatedLines(lineIndices []int, reverse bool) []string {
+	skippedNewlineMessageIndex := -1
+	newLines := []string{}
+
+	lineIdx := hunk.FirstLineIdx
+	for _, line := range hunk.bodyLines {
+		lineIdx++ // incrementing at the start to skip the header line
+		if line == "" {
+			break
+		}
+		isLineSelected := utils.IncludesInt(lineIndices, lineIdx)
+
+		firstChar, content := line[:1], line[1:]
+		transformedFirstChar := transformedFirstChar(firstChar, reverse, isLineSelected)
+
+		if isLineSelected || (transformedFirstChar == "\\" && skippedNewlineMessageIndex != lineIdx) || transformedFirstChar == " " {
+			newLines = append(newLines, transformedFirstChar+content)
+			continue
+		}
+
+		if transformedFirstChar == "+" {
+			// we don't want to include the 'newline at end of file' line if it involves an addition we're not including
+			skippedNewlineMessageIndex = lineIdx + 1
+		}
+	}
+
+	return newLines
+}
+
+func transformedFirstChar(firstChar string, reverse bool, isLineSelected bool) string {
+	if reverse {
+		if !isLineSelected && firstChar == "+" {
+			return " "
+		} else if firstChar == "-" {
+			return "+"
+		} else if firstChar == "+" {
+			return "-"
+		} else {
+			return firstChar
+		}
+	}
+
+	if !isLineSelected && firstChar == "-" {
+		return " "
+	}
+
+	return firstChar
+}
+
+func (hunk *PatchHunk) formatHeader(oldStart int, oldLength int, newStart int, newLength int, heading string) string {
+	return fmt.Sprintf("@@ -%d,%d +%d,%d @@%s\n", oldStart, oldLength, newStart, newLength, heading)
+}
+
+func (hunk *PatchHunk) formatWithChanges(lineIndices []int, reverse bool, startOffset int) (int, string) {
+	bodyLines := hunk.updatedLines(lineIndices, reverse)
+	startOffset, header, ok := hunk.updatedHeader(bodyLines, startOffset, reverse)
+	if !ok {
+		return startOffset, ""
+	}
+	return startOffset, header + strings.Join(bodyLines, "")
+}
+
+func (hunk *PatchHunk) updatedHeader(newBodyLines []string, startOffset int, reverse bool) (int, string, bool) {
+	changeCount := 0
+	oldLength := 0
+	newLength := 0
+	for _, line := range newBodyLines {
+		switch line[:1] {
+		case "+":
+			newLength++
+			changeCount++
+		case "-":
+			oldLength++
+			changeCount++
+		case " ":
+			oldLength++
+			newLength++
+		}
+	}
+
+	if changeCount == 0 {
+		// if nothing has changed we just return nothing
+		return startOffset, "", false
+	}
+
+	// get oldstart, newstart, and heading from header
+	match := hunkHeaderRegexp.FindStringSubmatch(hunk.header)
+
+	var oldStart int
+	if reverse {
+		oldStart = mustConvertToInt(match[2])
+	} else {
+		oldStart = mustConvertToInt(match[1])
+	}
+	heading := match[3]
+
+	var newStartOffset int
+	// if the hunk went from zero to positive length, we need to increment the starting point by one
+	// if the hunk went from positive to zero length, we need to decrement the starting point by one
+	if oldLength == 0 {
+		newStartOffset = 1
+	} else if newLength == 0 {
+		newStartOffset = -1
+	} else {
+		newStartOffset = 0
+	}
+
+	newStart := oldStart + startOffset + newStartOffset
+
+	newStartOffset = startOffset + newLength - oldLength
+	formattedHeader := hunk.formatHeader(oldStart, oldLength, newStart, newLength, heading)
+	return newStartOffset, formattedHeader, true
+}
+
+func mustConvertToInt(s string) int {
+	i, err := strconv.Atoi(s)
+	if err != nil {
+		panic(err)
+	}
+	return i
+}
+
+func GetHeaderFromDiff(diff string) string {
+	match := patchHeaderRegexp.FindStringSubmatch(diff)
+	if len(match) <= 1 {
+		return ""
+	}
+	return match[1]
+}
+
+func GetHunksFromDiff(diff string) []*PatchHunk {
+	headers := hunkHeaderRegexp.FindAllString(diff, -1)
+	bodies := hunkHeaderRegexp.Split(diff, -1)[1:] // discarding top bit
+
+	headerFirstLineIndices := []int{}
+	for lineIdx, line := range strings.Split(diff, "\n") {
+		if strings.HasPrefix(line, "@@ -") {
+			headerFirstLineIndices = append(headerFirstLineIndices, lineIdx)
+		}
+	}
+
+	hunks := make([]*PatchHunk, len(headers))
+	for index, header := range headers {
+		hunks[index] = newHunk(header, bodies[index], headerFirstLineIndices[index])
+	}
+
+	return hunks
+}
+
+type PatchModifier struct {
+	Log      *logrus.Entry
+	filename string
+	hunks    []*PatchHunk
+	header   string
+}
+
+func NewPatchModifier(log *logrus.Entry, filename string, diffText string) *PatchModifier {
+	return &PatchModifier{
+		Log:      log,
+		filename: filename,
+		hunks:    GetHunksFromDiff(diffText),
+		header:   GetHeaderFromDiff(diffText),
+	}
+}
+
+func (d *PatchModifier) ModifiedPatchForLines(lineIndices []int, reverse bool, keepOriginalHeader bool) string {
+	// step one is getting only those hunks which we care about
+	hunksInRange := []*PatchHunk{}
+outer:
+	for _, hunk := range d.hunks {
+		// if there is any line in our lineIndices array that the hunk contains, we append it
+		for _, lineIdx := range lineIndices {
+			if lineIdx >= hunk.FirstLineIdx && lineIdx <= hunk.LastLineIdx {
+				hunksInRange = append(hunksInRange, hunk)
+				continue outer
+			}
+		}
+	}
+
+	// step 2 is collecting all the hunks with new headers
+	startOffset := 0
+	formattedHunks := ""
+	var formattedHunk string
+	for _, hunk := range hunksInRange {
+		startOffset, formattedHunk = hunk.formatWithChanges(lineIndices, reverse, startOffset)
+		formattedHunks += formattedHunk
+	}
+
+	if formattedHunks == "" {
+		return ""
+	}
+
+	var fileHeader string
+	// for staging/unstaging lines we don't want the original header because
+	// it makes git confused e.g. when dealing with deleted/added files
+	// but with building and applying patches the original header gives git
+	// information it needs to cleanly apply patches
+	if keepOriginalHeader {
+		fileHeader = d.header
+	} else {
+		fileHeader = fmt.Sprintf("--- a/%s\n+++ b/%s\n", d.filename, d.filename)
+	}
+
+	return fileHeader + formattedHunks
+}
+
+func (d *PatchModifier) ModifiedPatchForRange(firstLineIdx int, lastLineIdx int, reverse bool, keepOriginalHeader bool) string {
+	// generate array of consecutive line indices from our range
+	selectedLines := []int{}
+	for i := firstLineIdx; i <= lastLineIdx; i++ {
+		selectedLines = append(selectedLines, i)
+	}
+	return d.ModifiedPatchForLines(selectedLines, reverse, keepOriginalHeader)
+}
+
+func (d *PatchModifier) OriginalPatchLength() int {
+	if len(d.hunks) == 0 {
+		return 0
+	}
+
+	return d.hunks[len(d.hunks)-1].LastLineIdx
+}
+
+func ModifiedPatchForRange(log *logrus.Entry, filename string, diffText string, firstLineIdx int, lastLineIdx int, reverse bool, keepOriginalHeader bool) string {
+	p := NewPatchModifier(log, filename, diffText)
+	return p.ModifiedPatchForRange(firstLineIdx, lastLineIdx, reverse, keepOriginalHeader)
+}

pkg/commands/patch_modifier_test.go

@@ -0,0 +1,511 @@
+package commands
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const simpleDiff = `diff --git a/filename b/filename
+index dcd3485..1ba5540 100644
+--- a/filename
++++ b/filename
+@@ -1,5 +1,5 @@
+ apple
+-orange
++grape
+ ...
+ ...
+ ...
+`
+
+const addNewlineToEndOfFile = `diff --git a/filename b/filename
+index 80a73f1..e48a11c 100644
+--- a/filename
++++ b/filename
+@@ -60,4 +60,4 @@ grape
+ ...
+ ...
+ ...
+-last line
+\ No newline at end of file
++last line
+`
+
+const removeNewlinefromEndOfFile = `diff --git a/filename b/filename
+index e48a11c..80a73f1 100644
+--- a/filename
++++ b/filename
+@@ -60,4 +60,4 @@ grape
+ ...
+ ...
+ ...
+-last line
++last line
+\ No newline at end of file
+`
+
+const twoHunks = `diff --git a/filename b/filename
+index e48a11c..b2ab81b 100644
+--- a/filename
++++ b/filename
+@@ -1,5 +1,5 @@
+ apple
+-grape
++orange
+ ...
+ ...
+ ...
+@@ -8,6 +8,8 @@ grape
+ ...
+ ...
+ ...
++pear
++lemon
+ ...
+ ...
+ ...
+`
+
+const newFile = `diff --git a/newfile b/newfile
+new file mode 100644
+index 0000000..4e680cc
+--- /dev/null
++++ b/newfile
+@@ -0,0 +1,3 @@
++apple
++orange
++grape
+`
+
+const addNewlineToPreviouslyEmptyFile = `diff --git a/newfile b/newfile
+index e69de29..c6568ea 100644
+--- a/newfile
++++ b/newfile
+@@ -0,0 +1 @@
++new line
+\ No newline at end of file
+`
+
+// TestModifyPatchForRange is a function.
+func TestModifyPatchForRange(t *testing.T) {
+	type scenario struct {
+		testName       string
+		filename       string
+		diffText       string
+		firstLineIndex int
+		lastLineIndex  int
+		reverse        bool
+		expected       string
+	}
+
+	scenarios := []scenario{
+		{
+			testName:       "nothing selected",
+			filename:       "filename",
+			firstLineIndex: -1,
+			lastLineIndex:  -1,
+			reverse:        false,
+			diffText:       simpleDiff,
+			expected:       "",
+		},
+		{
+			testName:       "only context selected",
+			filename:       "filename",
+			firstLineIndex: 5,
+			lastLineIndex:  5,
+			reverse:        false,
+			diffText:       simpleDiff,
+			expected:       "",
+		},
+		{
+			testName:       "whole range selected",
+			filename:       "filename",
+			firstLineIndex: 0,
+			lastLineIndex:  11,
+			reverse:        false,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,5 @@
+ apple
+-orange
++grape
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "only removal selected",
+			filename:       "filename",
+			firstLineIndex: 6,
+			lastLineIndex:  6,
+			reverse:        false,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,4 @@
+ apple
+-orange
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "only addition selected",
+			filename:       "filename",
+			firstLineIndex: 7,
+			lastLineIndex:  7,
+			reverse:        false,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,6 @@
+ apple
+ orange
++grape
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "range that extends beyond diff bounds",
+			filename:       "filename",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        false,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,5 @@
+ apple
+-orange
++grape
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "whole range reversed",
+			filename:       "filename",
+			firstLineIndex: 0,
+			lastLineIndex:  11,
+			reverse:        true,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,5 @@
+ apple
++orange
+-grape
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "removal reversed",
+			filename:       "filename",
+			firstLineIndex: 6,
+			lastLineIndex:  6,
+			reverse:        true,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,6 @@
+ apple
++orange
+ grape
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "removal reversed",
+			filename:       "filename",
+			firstLineIndex: 7,
+			lastLineIndex:  7,
+			reverse:        true,
+			diffText:       simpleDiff,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,4 @@
+ apple
+-grape
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "add newline to end of file",
+			filename:       "filename",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        false,
+			diffText:       addNewlineToEndOfFile,
+			expected: `--- a/filename
++++ b/filename
+@@ -60,4 +60,4 @@ grape
+ ...
+ ...
+ ...
+-last line
+\ No newline at end of file
++last line
+`,
+		},
+		{
+			testName:       "add newline to end of file, addition only",
+			filename:       "filename",
+			firstLineIndex: 8,
+			lastLineIndex:  8,
+			reverse:        true,
+			diffText:       addNewlineToEndOfFile,
+			expected: `--- a/filename
++++ b/filename
+@@ -60,4 +60,5 @@ grape
+ ...
+ ...
+ ...
++last line
+\ No newline at end of file
+ last line
+`,
+		},
+		{
+			testName:       "add newline to end of file, removal only",
+			filename:       "filename",
+			firstLineIndex: 10,
+			lastLineIndex:  10,
+			reverse:        true,
+			diffText:       addNewlineToEndOfFile,
+			expected: `--- a/filename
++++ b/filename
+@@ -60,4 +60,3 @@ grape
+ ...
+ ...
+ ...
+-last line
+`,
+		},
+		{
+			testName:       "remove newline from end of file",
+			filename:       "filename",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        false,
+			diffText:       removeNewlinefromEndOfFile,
+			expected: `--- a/filename
++++ b/filename
+@@ -60,4 +60,4 @@ grape
+ ...
+ ...
+ ...
+-last line
++last line
+\ No newline at end of file
+`,
+		},
+		{
+			testName:       "remove newline from end of file, removal only",
+			filename:       "filename",
+			firstLineIndex: 8,
+			lastLineIndex:  8,
+			reverse:        false,
+			diffText:       removeNewlinefromEndOfFile,
+			expected: `--- a/filename
++++ b/filename
+@@ -60,4 +60,3 @@ grape
+ ...
+ ...
+ ...
+-last line
+`,
+		},
+		{
+			testName:       "remove newline from end of file, addition only",
+			filename:       "filename",
+			firstLineIndex: 9,
+			lastLineIndex:  9,
+			reverse:        false,
+			diffText:       removeNewlinefromEndOfFile,
+			expected: `--- a/filename
++++ b/filename
+@@ -60,4 +60,5 @@ grape
+ ...
+ ...
+ ...
+ last line
++last line
+\ No newline at end of file
+`,
+		},
+		{
+			testName:       "staging two whole hunks",
+			filename:       "filename",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        false,
+			diffText:       twoHunks,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,5 @@
+ apple
+-grape
++orange
+ ...
+ ...
+ ...
+@@ -8,6 +8,8 @@ grape
+ ...
+ ...
+ ...
++pear
++lemon
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "staging part of both hunks",
+			filename:       "filename",
+			firstLineIndex: 7,
+			lastLineIndex:  15,
+			reverse:        false,
+			diffText:       twoHunks,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,6 @@
+ apple
+ grape
++orange
+ ...
+ ...
+ ...
+@@ -8,6 +9,7 @@ grape
+ ...
+ ...
+ ...
++pear
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "staging part of both hunks, reversed",
+			filename:       "filename",
+			firstLineIndex: 7,
+			lastLineIndex:  15,
+			reverse:        true,
+			diffText:       twoHunks,
+			expected: `--- a/filename
++++ b/filename
+@@ -1,5 +1,4 @@
+ apple
+-orange
+ ...
+ ...
+ ...
+@@ -8,8 +7,7 @@ grape
+ ...
+ ...
+ ...
+-pear
+ lemon
+ ...
+ ...
+ ...
+`,
+		},
+		{
+			testName:       "adding a new file",
+			filename:       "newfile",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        false,
+			diffText:       newFile,
+			expected: `--- a/newfile
++++ b/newfile
+@@ -0,0 +1,3 @@
++apple
++orange
++grape
+`,
+		},
+		{
+			testName:       "adding part of a new file",
+			filename:       "newfile",
+			firstLineIndex: 6,
+			lastLineIndex:  7,
+			reverse:        false,
+			diffText:       newFile,
+			expected: `--- a/newfile
++++ b/newfile
+@@ -0,0 +1,2 @@
++apple
++orange
+`,
+		},
+		{
+			testName:       "adding a new file, reversed",
+			filename:       "newfile",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        true,
+			diffText:       newFile,
+			expected: `--- a/newfile
++++ b/newfile
+@@ -1,3 +0,0 @@
+-apple
+-orange
+-grape
+`,
+		},
+		{
+			testName:       "adding a new line to a previously empty file",
+			filename:       "newfile",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        false,
+			diffText:       addNewlineToPreviouslyEmptyFile,
+			expected: `--- a/newfile
++++ b/newfile
+@@ -0,0 +1,1 @@
++new line
+\ No newline at end of file
+`,
+		},
+		{
+			testName:       "adding a new line to a previously empty file, reversed",
+			filename:       "newfile",
+			firstLineIndex: -100,
+			lastLineIndex:  100,
+			reverse:        true,
+			diffText:       addNewlineToPreviouslyEmptyFile,
+			expected: `--- a/newfile
++++ b/newfile
+@@ -1,1 +0,0 @@
+-new line
+\ No newline at end of file
+`,
+		},
+	}
+
+	for _, s := range scenarios {
+		t.Run(s.testName, func(t *testing.T) {
+			result := ModifiedPatchForRange(nil, s.filename, s.diffText, s.firstLineIndex, s.lastLineIndex, s.reverse, false)
+			if !assert.Equal(t, s.expected, result) {
+				fmt.Println(result)
+			}
+		})
+	}
+}

pkg/commands/patch_parser.go

@@ -0,0 +1,213 @@
+package commands
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/jesseduffield/lazygit/pkg/theme"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sirupsen/logrus"
+)
+
+const (
+	PATCH_HEADER = iota
+	COMMIT_SHA
+	COMMIT_DESCRIPTION
+	HUNK_HEADER
+	ADDITION
+	DELETION
+	CONTEXT
+	NEWLINE_MESSAGE
+)
+
+// the job of this file is to parse a diff, find out where the hunks begin and end, which lines are stageable, and how to find the next hunk from the current position or the next stageable line from the current position.
+
+type PatchLine struct {
+	Kind    int
+	Content string // something like '+ hello' (note the first character is not removed)
+}
+
+type PatchParser struct {
+	Log            *logrus.Entry
+	PatchLines     []*PatchLine
+	PatchHunks     []*PatchHunk
+	HunkStarts     []int
+	StageableLines []int // rename to mention we're talking about indexes
+}
+
+// NewPatchParser builds a new branch list builder
+func NewPatchParser(log *logrus.Entry, patch string) (*PatchParser, error) {
+	hunkStarts, stageableLines, patchLines, err := parsePatch(patch)
+	if err != nil {
+		return nil, err
+	}
+
+	patchHunks := GetHunksFromDiff(patch)
+
+	return &PatchParser{
+		Log:            log,
+		HunkStarts:     hunkStarts, // deprecated
+		StageableLines: stageableLines,
+		PatchLines:     patchLines,
+		PatchHunks:     patchHunks,
+	}, nil
+}
+
+// GetHunkContainingLine takes a line index and an offset and finds the hunk
+// which contains the line index, then returns the hunk considering the offset.
+// e.g. if the offset is 1 it will return the next hunk.
+func (p *PatchParser) GetHunkContainingLine(lineIndex int, offset int) *PatchHunk {
+	if len(p.PatchHunks) == 0 {
+		return nil
+	}
+
+	for index, hunk := range p.PatchHunks {
+		if lineIndex >= hunk.FirstLineIdx && lineIndex <= hunk.LastLineIdx {
+			resultIndex := index + offset
+			if resultIndex < 0 {
+				resultIndex = 0
+			} else if resultIndex > len(p.PatchHunks)-1 {
+				resultIndex = len(p.PatchHunks) - 1
+			}
+			return p.PatchHunks[resultIndex]
+		}
+	}
+
+	// if your cursor is past the last hunk, select the last hunk
+	if lineIndex > p.PatchHunks[len(p.PatchHunks)-1].LastLineIdx {
+		return p.PatchHunks[len(p.PatchHunks)-1]
+	}
+
+	// otherwise select the first
+	return p.PatchHunks[0]
+}
+
+// selected means you've got it highlighted with your cursor
+// included means the line has been included in the patch (only applicable when
+// building a patch)
+func (l *PatchLine) render(selected bool, included bool) string {
+	content := l.Content
+	if len(content) == 0 {
+		content = " " // using the space so that we can still highlight if necessary
+	}
+
+	// for hunk headers we need to start off cyan and then use white for the message
+	if l.Kind == HUNK_HEADER {
+		re := regexp.MustCompile("(@@.*?@@)(.*)")
+		match := re.FindStringSubmatch(content)
+		return coloredString(color.FgCyan, match[1], selected, included) + coloredString(theme.DefaultTextColor, match[2], selected, false)
+	}
+
+	var colorAttr color.Attribute
+	switch l.Kind {
+	case PATCH_HEADER:
+		colorAttr = color.Bold
+	case ADDITION:
+		colorAttr = color.FgGreen
+	case DELETION:
+		colorAttr = color.FgRed
+	case COMMIT_SHA:
+		colorAttr = color.FgYellow
+	default:
+		colorAttr = theme.DefaultTextColor
+	}
+
+	return coloredString(colorAttr, content, selected, included)
+}
+
+func coloredString(colorAttr color.Attribute, str string, selected bool, included bool) string {
+	var cl *color.Color
+	attributes := []color.Attribute{colorAttr}
+	if selected {
+		attributes = append(attributes, color.BgBlue)
+	}
+	cl = color.New(attributes...)
+	var clIncluded *color.Color
+	if included {
+		clIncluded = color.New(append(attributes, color.BgGreen)...)
+	} else {
+		clIncluded = color.New(attributes...)
+	}
+
+	if len(str) < 2 {
+		return utils.ColoredStringDirect(str, clIncluded)
+	}
+
+	return utils.ColoredStringDirect(str[:1], clIncluded) + utils.ColoredStringDirect(str[1:], cl)
+}
+
+func parsePatch(patch string) ([]int, []int, []*PatchLine, error) {
+	lines := strings.Split(patch, "\n")
+	hunkStarts := []int{}
+	stageableLines := []int{}
+	pastFirstHunkHeader := false
+	pastCommitDescription := true
+	patchLines := make([]*PatchLine, len(lines))
+	var lineKind int
+	var firstChar string
+	for index, line := range lines {
+		firstChar = " "
+		if len(line) > 0 {
+			firstChar = line[:1]
+		}
+		if index == 0 && strings.HasPrefix(line, "commit") {
+			lineKind = COMMIT_SHA
+			pastCommitDescription = false
+		} else if !pastCommitDescription {
+			if strings.HasPrefix(line, "diff") || strings.HasPrefix(line, "---") {
+				pastCommitDescription = true
+				lineKind = PATCH_HEADER
+			} else {
+				lineKind = COMMIT_DESCRIPTION
+			}
+		} else if firstChar == "@" {
+			pastFirstHunkHeader = true
+			hunkStarts = append(hunkStarts, index)
+			lineKind = HUNK_HEADER
+		} else if pastFirstHunkHeader {
+			switch firstChar {
+			case "-":
+				lineKind = DELETION
+				stageableLines = append(stageableLines, index)
+			case "+":
+				lineKind = ADDITION
+				stageableLines = append(stageableLines, index)
+			case "\\":
+				lineKind = NEWLINE_MESSAGE
+			case " ":
+				lineKind = CONTEXT
+			}
+		} else {
+			lineKind = PATCH_HEADER
+		}
+		patchLines[index] = &PatchLine{Kind: lineKind, Content: line}
+	}
+	return hunkStarts, stageableLines, patchLines, nil
+}
+
+// Render returns the coloured string of the diff with any selected lines highlighted
+func (p *PatchParser) Render(firstLineIndex int, lastLineIndex int, incLineIndices []int) string {
+	renderedLines := make([]string, len(p.PatchLines))
+	for index, patchLine := range p.PatchLines {
+		selected := index >= firstLineIndex && index <= lastLineIndex
+		included := utils.IncludesInt(incLineIndices, index)
+		renderedLines[index] = patchLine.render(selected, included)
+	}
+	result := strings.Join(renderedLines, "\n")
+	if strings.TrimSpace(utils.Decolorise(result)) == "" {
+		return ""
+	}
+	return result
+}
+
+// GetNextStageableLineIndex takes a line index and returns the line index of the next stageable line
+// note this will actually include the current index if it is stageable
+func (p *PatchParser) GetNextStageableLineIndex(currentIndex int) int {
+	for _, lineIndex := range p.StageableLines {
+		if lineIndex >= currentIndex {
+			return lineIndex
+		}
+	}
+	return p.StageableLines[len(p.StageableLines)-1]
+}

pkg/commands/patch_rebases.go

@@ -0,0 +1,169 @@
+package commands
+
+import "github.com/go-errors/errors"
+
+// DeletePatchesFromCommit applies a patch in reverse for a commit
+func (c *GitCommand) DeletePatchesFromCommit(commits []*Commit, commitIndex int, p *PatchManager) error {
+	if err := c.BeginInteractiveRebaseForCommit(commits, commitIndex); err != nil {
+		return err
+	}
+
+	// apply each patch in reverse
+	if err := p.ApplyPatches(true); err != nil {
+		if err := c.GenericMerge("rebase", "abort"); err != nil {
+			return err
+		}
+		return err
+	}
+
+	// time to amend the selected commit
+	if _, err := c.AmendHead(); err != nil {
+		return err
+	}
+
+	c.onSuccessfulContinue = func() error {
+		c.PatchManager.Reset()
+		return nil
+	}
+
+	// continue
+	return c.GenericMerge("rebase", "continue")
+}
+
+func (c *GitCommand) MovePatchToSelectedCommit(commits []*Commit, sourceCommitIdx int, destinationCommitIdx int, p *PatchManager) error {
+	if sourceCommitIdx < destinationCommitIdx {
+		if err := c.BeginInteractiveRebaseForCommit(commits, destinationCommitIdx); err != nil {
+			return err
+		}
+
+		// apply each patch forward
+		if err := p.ApplyPatches(false); err != nil {
+			if err := c.GenericMerge("rebase", "abort"); err != nil {
+				return err
+			}
+			return err
+		}
+
+		// amend the destination commit
+		if _, err := c.AmendHead(); err != nil {
+			return err
+		}
+
+		c.onSuccessfulContinue = func() error {
+			c.PatchManager.Reset()
+			return nil
+		}
+
+		// continue
+		return c.GenericMerge("rebase", "continue")
+	}
+
+	if len(commits)-1 < sourceCommitIdx {
+		return errors.New("index outside of range of commits")
+	}
+
+	// we can make this GPG thing possible it just means we need to do this in two parts:
+	// one where we handle the possibility of a credential request, and the other
+	// where we continue the rebase
+	if c.usingGpg() {
+		return errors.New(c.Tr.SLocalize("DisabledForGPG"))
+	}
+
+	baseIndex := sourceCommitIdx + 1
+	todo := ""
+	for i, commit := range commits[0:baseIndex] {
+		a := "pick"
+		if i == sourceCommitIdx || i == destinationCommitIdx {
+			a = "edit"
+		}
+		todo = a + " " + commit.Sha + " " + commit.Name + "\n" + todo
+	}
+
+	cmd, err := c.PrepareInteractiveRebaseCommand(commits[baseIndex].Sha, todo, true)
+	if err != nil {
+		return err
+	}
+
+	if err := c.OSCommand.RunPreparedCommand(cmd); err != nil {
+		return err
+	}
+
+	// apply each patch in reverse
+	if err := p.ApplyPatches(true); err != nil {
+		if err := c.GenericMerge("rebase", "abort"); err != nil {
+			return err
+		}
+		return err
+	}
+
+	// amend the source commit
+	if _, err := c.AmendHead(); err != nil {
+		return err
+	}
+
+	if c.onSuccessfulContinue != nil {
+		return errors.New("You are midway through another rebase operation. Please abort to start again")
+	}
+
+	c.onSuccessfulContinue = func() error {
+		// now we should be up to the destination, so let's apply forward these patches to that.
+		// ideally we would ensure we're on the right commit but I'm not sure if that check is necessary
+		if err := p.ApplyPatches(false); err != nil {
+			if err := c.GenericMerge("rebase", "abort"); err != nil {
+				return err
+			}
+			return err
+		}
+
+		// amend the destination commit
+		if _, err := c.AmendHead(); err != nil {
+			return err
+		}
+
+		c.onSuccessfulContinue = func() error {
+			c.PatchManager.Reset()
+			return nil
+		}
+
+		return c.GenericMerge("rebase", "continue")
+	}
+
+	return c.GenericMerge("rebase", "continue")
+}
+
+func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *PatchManager) error {
+	if err := c.BeginInteractiveRebaseForCommit(commits, commitIdx); err != nil {
+		return err
+	}
+
+	if err := p.ApplyPatches(true); err != nil {
+		if err := c.GenericMerge("rebase", "abort"); err != nil {
+			return err
+		}
+		return err
+	}
+
+	// amend the commit
+	if _, err := c.AmendHead(); err != nil {
+		return err
+	}
+
+	if c.onSuccessfulContinue != nil {
+		return errors.New("You are midway through another rebase operation. Please abort to start again")
+	}
+
+	c.onSuccessfulContinue = func() error {
+		// add patches to index
+		if err := p.ApplyPatches(false); err != nil {
+			if err := c.GenericMerge("rebase", "abort"); err != nil {
+				return err
+			}
+			return err
+		}
+
+		c.PatchManager.Reset()
+		return nil
+	}
+
+	return c.GenericMerge("rebase", "continue")
+}

pkg/commands/pull_request.go

@@ -34,7 +34,7 @@ func getServices() []*Service {
 		},
 		{
 			Name:           "bitbucket.org",
-			PullRequestURL: "https://bitbucket.org/%s/%s/pull-requests/new?t=%s",
+			PullRequestURL: "https://bitbucket.org/%s/%s/pull-requests/new?source=%s&t=1",
 		},
 		{
 			Name:           "gitlab.com",

pkg/commands/pull_request_test.go

@@ -64,7 +64,7 @@ func TestCreatePullRequest(t *testing.T) {
 				}
 
 				assert.Equal(t, cmd, "open")
-				assert.Equal(t, args, []string{"https://bitbucket.org/johndoe/social_network/pull-requests/new?t=feature/profile-page"})
+				assert.Equal(t, args, []string{"https://bitbucket.org/johndoe/social_network/pull-requests/new?source=feature/profile-page&t=1"})
 				return exec.Command("echo")
 			},
 			func(err error) {
@@ -83,7 +83,7 @@ func TestCreatePullRequest(t *testing.T) {
 				}
 
 				assert.Equal(t, cmd, "open")
-				assert.Equal(t, args, []string{"https://bitbucket.org/johndoe/social_network/pull-requests/new?t=feature/events"})
+				assert.Equal(t, args, []string{"https://bitbucket.org/johndoe/social_network/pull-requests/new?source=feature/events&t=1"})
 				return exec.Command("echo")
 			},
 			func(err error) {

pkg/commands/remote.go

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

pkg/commands/remote_branch.go

@@ -0,0 +1,19 @@
+package commands
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+// Remote Branch : A git remote branch
+type RemoteBranch struct {
+	Name       string
+	Selected   bool
+	RemoteName string
+}
+
+// GetDisplayStrings returns the display string of branch
+func (b *RemoteBranch) GetDisplayStrings(isFocused bool) []string {
+	displayName := utils.ColoredString(b.Name, GetBranchColor(b.Name))
+
+	return []string{displayName}
+}

pkg/commands/stash_entry.go

@@ -7,7 +7,7 @@ type StashEntry struct {
 	DisplayString string
 }
 
-// GetDisplayStrings returns the dispaly string of branch
+// GetDisplayStrings returns the display string of branch
 func (s *StashEntry) GetDisplayStrings(isFocused bool) []string {
 	return []string{s.DisplayString}
 }

pkg/commands/tag.go

@@ -0,0 +1,11 @@
+package commands
+
+// Tag : A git tag
+type Tag struct {
+	Name string
+}
+
+// GetDisplayStrings returns the display string of a remote
+func (r *Tag) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.Name}
+}

pkg/config/app_config.go

@@ -13,15 +13,16 @@ import (
 
 // 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
-	IsNewRepo   bool
+	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
+	UserConfigDir string
+	AppState      *AppState
+	IsNewRepo     bool
 }
 
 // AppConfigurer interface allows individual app config structs to inherit Fields
@@ -34,8 +35,9 @@ type AppConfigurer interface {
 	GetName() string
 	GetBuildSource() string
 	GetUserConfig() *viper.Viper
+	GetUserConfigDir() string
 	GetAppState() *AppState
-	WriteToUserConfig(string, string) error
+	WriteToUserConfig(string, interface{}) error
 	SaveAppState() error
 	LoadAppState() error
 	SetIsNewRepo(bool)
@@ -44,7 +46,7 @@ type AppConfigurer interface {
 
 // NewAppConfig makes a new app config
 func NewAppConfig(name, version, commit, date string, buildSource string, debuggingFlag bool) (*AppConfig, error) {
-	userConfig, err := LoadConfig("config", true)
+	userConfig, userConfigPath, err := LoadConfig("config", true)
 	if err != nil {
 		return nil, err
 	}
@@ -54,15 +56,16 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg
 	}
 
 	appConfig := &AppConfig{
-		Name:        "lazygit",
-		Version:     version,
-		Commit:      commit,
-		BuildDate:   date,
-		Debug:       debuggingFlag,
-		BuildSource: buildSource,
-		UserConfig:  userConfig,
-		AppState:    &AppState{},
-		IsNewRepo:   false,
+		Name:          "lazygit",
+		Version:       version,
+		Commit:        commit,
+		BuildDate:     date,
+		Debug:         debuggingFlag,
+		BuildSource:   buildSource,
+		UserConfig:    userConfig,
+		UserConfigDir: filepath.Dir(userConfigPath),
+		AppState:      &AppState{},
+		IsNewRepo:     false,
 	}
 
 	if err := appConfig.LoadAppState(); err != nil {
@@ -123,6 +126,10 @@ func (c *AppConfig) GetAppState() *AppState {
 	return c.AppState
 }
 
+func (c *AppConfig) GetUserConfigDir() string {
+	return c.UserConfigDir
+}
+
 func newViper(filename string) (*viper.Viper, error) {
 	v := viper.New()
 	v.SetConfigType("yaml")
@@ -131,23 +138,24 @@ func newViper(filename string) (*viper.Viper, error) {
 }
 
 // LoadConfig gets the user's config
-func LoadConfig(filename string, withDefaults bool) (*viper.Viper, error) {
+func LoadConfig(filename string, withDefaults bool) (*viper.Viper, string, error) {
 	v, err := newViper(filename)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 	if withDefaults {
 		if err = LoadDefaults(v, GetDefaultConfig()); err != nil {
-			return nil, err
+			return nil, "", err
 		}
 		if err = LoadDefaults(v, GetPlatformDefaultConfig()); err != nil {
-			return nil, err
+			return nil, "", err
 		}
 	}
-	if err = LoadAndMergeFile(v, filename+".yml"); err != nil {
-		return nil, err
+	configPath, err := LoadAndMergeFile(v, filename+".yml")
+	if err != nil {
+		return nil, "", err
 	}
-	return v, nil
+	return v, configPath, nil
 }
 
 // LoadDefaults loads in the defaults defined in this file
@@ -173,21 +181,21 @@ func prepareConfigFile(filename string) (string, error) {
 
 // LoadAndMergeFile Loads the config/state file, creating
 // the file has an empty one if it does not exist
-func LoadAndMergeFile(v *viper.Viper, filename string) error {
+func LoadAndMergeFile(v *viper.Viper, filename string) (string, error) {
 	configPath, err := prepareConfigFile(filename)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	v.AddConfigPath(filepath.Dir(configPath))
-	return v.MergeInConfig()
+	return configPath, v.MergeInConfig()
 }
 
 // WriteToUserConfig adds a key/value pair to the user's config and saves it
-func (c *AppConfig) WriteToUserConfig(key, value string) error {
+func (c *AppConfig) WriteToUserConfig(key string, value interface{}) 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)
+	v, _, err := LoadConfig("config", false)
 	if err != nil {
 		return err
 	}
@@ -196,7 +204,7 @@ func (c *AppConfig) WriteToUserConfig(key, value string) error {
 	return v.WriteConfig()
 }
 
-// SaveAppState marhsalls the AppState struct and writes it to the disk
+// SaveAppState marshalls the AppState struct and writes it to the disk
 func (c *AppConfig) SaveAppState() error {
 	marshalledAppState, err := yaml.Marshal(c.AppState)
 	if err != nil {
@@ -234,8 +242,9 @@ func GetDefaultConfig() []byte {
   ## stuff relating to the UI
   scrollHeight: 2
   scrollPastBottom: true
-  mouseEvents: false # will default to true when the feature is complete
+  mouseEvents: true
   theme:
+    lightTheme: false
     activeBorderColor:
       - white
       - bold
@@ -245,14 +254,109 @@ func GetDefaultConfig() []byte {
       - blue
   commitLength:
     show: true
-  git:
-    merging:
-      manualCommit: false
+git:
+  merging:
+    manualCommit: false
+  skipHookPrefix: 'WIP'
+  autoFetch: 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'
+splashUpdatesIndex: 0
 confirmOnQuit: false
+keybinding:
+  universal:
+    quit: 'q'
+    quit-alt1: '<c-c>'
+    return: '<esc>'
+    quitWithoutChangingDirectory: 'Q'
+    togglePanel: '<tab>'
+    prevItem: '<up>'
+    nextItem: '<down>'
+    prevItem-alt: 'k'
+    nextItem-alt: 'j'
+    prevBlock: '<left>'
+    nextBlock: '<right>'
+    prevBlock-alt: 'h'
+    nextBlock-alt: 'l'
+    optionMenu: 'x'
+    optionMenu-alt1: '?'
+    select: '<space>'
+    goInto: '<enter>'
+    remove: 'd'
+    new: 'n'
+    edit: 'e'
+    openFile: 'o'
+    scrollUpMain: '<pgup>'
+    scrollDownMain: '<pgdown>'
+    scrollUpMain-alt1: 'K'
+    scrollDownMain-alt1: 'J'
+    scrollUpMain-alt2: '<c-u>'
+    scrollDownMain-alt2: '<c-d>'
+    executeCustomCommand: 'X'
+    createRebaseOptionsMenu: 'm'
+    pushFiles: 'P'
+    pullFiles: 'p'
+    refresh: 'R'
+    createPatchOptionsMenu: '<c-p>'
+    nextBranchTab: ']'
+    prevBranchTab: '['
+  status:
+    checkForUpdate: 'u'
+    recentRepos: '<enter>'
+  files:
+    commitChanges: 'c'
+    commitChangesWithoutHook: 'w'
+    amendLastCommit: 'A'
+    commitChangesWithEditor: 'C'
+    ignoreFile: 'i'
+    refreshFiles: 'r'
+    stashAllChanges: 's'
+    viewStashOptions: 'S'
+    toggleStagedAll: 'a'
+    viewResetOptions: 'D'
+    fetch: 'f'
+  branches:
+    createPullRequest: 'o'
+    checkoutBranchByName: 'c'
+    forceCheckoutBranch: 'F'
+    rebaseBranch: 'r'
+    mergeIntoCurrentBranch: 'M'
+    viewGitFlowOptions: 'i'
+    fastForward: 'f'
+    pushTag: 'P'
+    setUpstream: 'u'
+    fetchRemote: 'f'
+  commits:
+    squashDown: 's'
+    renameCommit: 'r'
+    renameCommitWithEditor: 'R'
+    viewResetOptions: 'g'
+    markCommitAsFixup: 'f'
+    createFixupCommit: 'F'
+    squashAboveCommits: 'S'
+    moveDownCommit: '<c-j>'
+    moveUpCommit: '<c-k>'
+    amendToCommit: 'A'
+    pickCommit: 'p'
+    revertCommit: 't'
+    cherryPickCopy: 'c'
+    cherryPickCopyRange: 'C'
+    pasteCommits: 'v'
+    tagCommit: 'T'
+    toggleDiffCommit: 'h'
+    checkoutCommit: '<space>'
+  stash:
+    popStash: 'g'
+  commitFiles:
+    checkoutCommitFile: 'c'
+  main:
+    toggleDragSelect: 'v'
+    toggleDragSelect-alt: 'V'
+    toggleSelectHunk: 'a'
+    pickBothHunks: 'b'
+    undo: 'z'
 `)
 }
 

pkg/git/patch_modifier.go

@@ -1,157 +0,0 @@
-package git
-
-import (
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/go-errors/errors"
-
-	"github.com/jesseduffield/lazygit/pkg/i18n"
-	"github.com/jesseduffield/lazygit/pkg/utils"
-	"github.com/sirupsen/logrus"
-)
-
-type PatchModifier struct {
-	Log *logrus.Entry
-	Tr  *i18n.Localizer
-}
-
-// NewPatchModifier builds a new branch list builder
-func NewPatchModifier(log *logrus.Entry) (*PatchModifier, error) {
-	return &PatchModifier{
-		Log: log,
-	}, nil
-}
-
-// ModifyPatchForHunk takes the original patch, which may contain several hunks,
-// and removes any hunks that aren't the selected hunk
-func (p *PatchModifier) ModifyPatchForHunk(patch string, hunkStarts []int, currentLine int) (string, error) {
-	// get hunk start and end
-	lines := strings.Split(patch, "\n")
-	hunkStartIndex := utils.PrevIndex(hunkStarts, currentLine)
-	hunkStart := hunkStarts[hunkStartIndex]
-	nextHunkStartIndex := utils.NextIndex(hunkStarts, currentLine)
-	var hunkEnd int
-	if nextHunkStartIndex == 0 {
-		hunkEnd = len(lines) - 1
-	} else {
-		hunkEnd = hunkStarts[nextHunkStartIndex]
-	}
-
-	headerLength, err := p.getHeaderLength(lines)
-	if err != nil {
-		return "", err
-	}
-
-	output := strings.Join(lines[0:headerLength], "\n") + "\n"
-	output += strings.Join(lines[hunkStart:hunkEnd], "\n") + "\n"
-
-	return output, nil
-}
-
-func (p *PatchModifier) getHeaderLength(patchLines []string) (int, error) {
-	for index, line := range patchLines {
-		if strings.HasPrefix(line, "@@") {
-			return index, nil
-		}
-	}
-	return 0, errors.New(p.Tr.SLocalize("CantFindHunks"))
-}
-
-// ModifyPatchForLine takes the original patch, which may contain several hunks,
-// and the line number of the line we want to stage
-func (p *PatchModifier) ModifyPatchForLine(patch string, lineNumber int) (string, error) {
-	lines := strings.Split(patch, "\n")
-	headerLength, err := p.getHeaderLength(lines)
-	if err != nil {
-		return "", err
-	}
-	output := strings.Join(lines[0:headerLength], "\n") + "\n"
-
-	hunkStart, err := p.getHunkStart(lines, lineNumber)
-	if err != nil {
-		return "", err
-	}
-
-	hunk, err := p.getModifiedHunk(lines, hunkStart, lineNumber)
-	if err != nil {
-		return "", err
-	}
-
-	output += strings.Join(hunk, "\n")
-
-	return output, nil
-}
-
-// getHunkStart returns the line number of the hunk we're going to be modifying
-// in order to stage our line
-func (p *PatchModifier) getHunkStart(patchLines []string, lineNumber int) (int, error) {
-	// find the hunk that we're modifying
-	hunkStart := 0
-	for index, line := range patchLines {
-		if strings.HasPrefix(line, "@@") {
-			hunkStart = index
-		}
-		if index == lineNumber {
-			return hunkStart, nil
-		}
-	}
-
-	return 0, errors.New(p.Tr.SLocalize("CantFindHunk"))
-}
-
-func (p *PatchModifier) getModifiedHunk(patchLines []string, hunkStart int, lineNumber int) ([]string, error) {
-	lineChanges := 0
-	// strip the hunk down to just the line we want to stage
-	newHunk := []string{patchLines[hunkStart]}
-	for offsetIndex, line := range patchLines[hunkStart+1:] {
-		index := offsetIndex + hunkStart + 1
-		if strings.HasPrefix(line, "@@") {
-			newHunk = append(newHunk, "\n")
-			break
-		}
-		if index != lineNumber {
-			// we include other removals but treat them like context
-			if strings.HasPrefix(line, "-") {
-				newHunk = append(newHunk, " "+line[1:])
-				lineChanges += 1
-				continue
-			}
-			// we don't include other additions
-			if strings.HasPrefix(line, "+") {
-				lineChanges -= 1
-				continue
-			}
-		}
-		newHunk = append(newHunk, line)
-	}
-
-	var err error
-	newHunk[0], err = p.updatedHeader(newHunk[0], lineChanges)
-	if err != nil {
-		return nil, err
-	}
-
-	return newHunk, nil
-}
-
-// updatedHeader returns the hunk header with the updated line range
-// we need to update the hunk length to reflect the changes we made
-// if the hunk has three additions but we're only staging one, then
-// @@ -14,8 +14,11 @@ import (
-// becomes
-// @@ -14,8 +14,9 @@ import (
-func (p *PatchModifier) updatedHeader(currentHeader string, lineChanges int) (string, error) {
-	// current counter is the number after the second comma
-	re := regexp.MustCompile(`(\d+) @@`)
-	prevLengthString := re.FindStringSubmatch(currentHeader)[1]
-
-	prevLength, err := strconv.Atoi(prevLengthString)
-	if err != nil {
-		return "", err
-	}
-	re = regexp.MustCompile(`\d+ @@`)
-	newLength := strconv.Itoa(prevLength + lineChanges)
-	return re.ReplaceAllString(currentHeader, newLength+" @@"), nil
-}

pkg/git/patch_modifier_test.go

@@ -1,85 +0,0 @@
-package git
-
-import (
-	"io/ioutil"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/stretchr/testify/assert"
-)
-
-// NewDummyPatchModifier constructs a new dummy patch modifier for testing
-func NewDummyPatchModifier() *PatchModifier {
-	return &PatchModifier{
-		Log: commands.NewDummyLog(),
-	}
-}
-
-func TestModifyPatchForLine(t *testing.T) {
-	type scenario struct {
-		testName              string
-		patchFilename         string
-		lineNumber            int
-		shouldError           bool
-		expectedPatchFilename string
-	}
-
-	scenarios := []scenario{
-		{
-			"Removing one line",
-			"testdata/testPatchBefore.diff",
-			8,
-			false,
-			"testdata/testPatchAfter1.diff",
-		},
-		{
-			"Adding one line",
-			"testdata/testPatchBefore.diff",
-			10,
-			false,
-			"testdata/testPatchAfter2.diff",
-		},
-		{
-			"Adding one line in top hunk in diff with multiple hunks",
-			"testdata/testPatchBefore2.diff",
-			20,
-			false,
-			"testdata/testPatchAfter3.diff",
-		},
-		{
-			"Adding one line in top hunk in diff with multiple hunks",
-			"testdata/testPatchBefore2.diff",
-			53,
-			false,
-			"testdata/testPatchAfter4.diff",
-		},
-		{
-			"adding unstaged file with a single line",
-			"testdata/addedFile.diff",
-			6,
-			false,
-			"testdata/addedFile.diff",
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			p := NewDummyPatchModifier()
-			beforePatch, err := ioutil.ReadFile(s.patchFilename)
-			if err != nil {
-				panic("Cannot open file at " + s.patchFilename)
-			}
-			afterPatch, err := p.ModifyPatchForLine(string(beforePatch), s.lineNumber)
-			if s.shouldError {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				expected, err := ioutil.ReadFile(s.expectedPatchFilename)
-				if err != nil {
-					panic("Cannot open file at " + s.expectedPatchFilename)
-				}
-				assert.Equal(t, string(expected), afterPatch)
-			}
-		})
-	}
-}

pkg/git/patch_parser.go

@@ -1,36 +0,0 @@
-package git
-
-import (
-	"strings"
-
-	"github.com/sirupsen/logrus"
-)
-
-type PatchParser struct {
-	Log *logrus.Entry
-}
-
-// NewPatchParser builds a new branch list builder
-func NewPatchParser(log *logrus.Entry) (*PatchParser, error) {
-	return &PatchParser{
-		Log: log,
-	}, nil
-}
-
-func (p *PatchParser) ParsePatch(patch string) ([]int, []int, error) {
-	lines := strings.Split(patch, "\n")
-	hunkStarts := []int{}
-	stageableLines := []int{}
-	pastHeader := false
-	for index, line := range lines {
-		if strings.HasPrefix(line, "@@") {
-			pastHeader = true
-			hunkStarts = append(hunkStarts, index)
-		}
-		if pastHeader && (strings.HasPrefix(line, "-") || strings.HasPrefix(line, "+")) {
-			stageableLines = append(stageableLines, index)
-		}
-	}
-	p.Log.WithField("staging", "staging").Info(stageableLines)
-	return hunkStarts, stageableLines, nil
-}

pkg/git/patch_parser_test.go

@@ -1,68 +0,0 @@
-package git
-
-import (
-	"io/ioutil"
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/stretchr/testify/assert"
-)
-
-// NewDummyPatchParser constructs a new dummy patch parser for testing
-func NewDummyPatchParser() *PatchParser {
-	return &PatchParser{
-		Log: commands.NewDummyLog(),
-	}
-}
-
-func TestParsePatch(t *testing.T) {
-	type scenario struct {
-		testName               string
-		patchFilename          string
-		shouldError            bool
-		expectedStageableLines []int
-		expectedHunkStarts     []int
-	}
-
-	scenarios := []scenario{
-		{
-			"Diff with one hunk",
-			"testdata/testPatchBefore.diff",
-			false,
-			[]int{8, 9, 10, 11},
-			[]int{4},
-		},
-		{
-			"Diff with two hunks",
-			"testdata/testPatchBefore2.diff",
-			false,
-			[]int{8, 9, 10, 11, 12, 13, 20, 21, 22, 23, 24, 25, 26, 27, 28, 33, 34, 35, 36, 37, 45, 46, 47, 48, 49, 50, 51, 52, 53},
-			[]int{4, 41},
-		},
-		{
-			"Unstaged file",
-			"testdata/addedFile.diff",
-			false,
-			[]int{6},
-			[]int{5},
-		},
-	}
-
-	for _, s := range scenarios {
-		t.Run(s.testName, func(t *testing.T) {
-			p := NewDummyPatchParser()
-			beforePatch, err := ioutil.ReadFile(s.patchFilename)
-			if err != nil {
-				panic("Cannot open file at " + s.patchFilename)
-			}
-			hunkStarts, stageableLines, err := p.ParsePatch(string(beforePatch))
-			if s.shouldError {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, s.expectedStageableLines, stageableLines)
-				assert.Equal(t, s.expectedHunkStarts, hunkStarts)
-			}
-		})
-	}
-}

pkg/git/testdata/addedFile.diff

@@ -1,7 +0,0 @@
-diff --git a/blah b/blah
-new file mode 100644
-index 0000000..907b308
---- /dev/null
-+++ b/blah
-@@ -0,0 +1 @@
-+blah

pkg/git/testdata/testPatchAfter1.diff

@@ -1,13 +0,0 @@
-diff --git a/pkg/git/branch_list_builder.go b/pkg/git/branch_list_builder.go
-index 60ec4e0..db4485d 100644
---- a/pkg/git/branch_list_builder.go
-+++ b/pkg/git/branch_list_builder.go
-@@ -14,8 +14,7 @@ import (
- 
- // context:
- // we want to only show 'safe' branches (ones that haven't e.g. been deleted)
--// which `git branch -a` gives us, but we also want the recency data that
- // git reflog gives us.
- // So we get the HEAD, then append get the reflog branches that intersect with
- // our safe branches, then add the remaining safe branches, ensuring uniqueness
- // along the way

pkg/git/testdata/testPatchAfter2.diff

@@ -1,14 +0,0 @@
-diff --git a/pkg/git/branch_list_builder.go b/pkg/git/branch_list_builder.go
-index 60ec4e0..db4485d 100644
---- a/pkg/git/branch_list_builder.go
-+++ b/pkg/git/branch_list_builder.go
-@@ -14,8 +14,9 @@ import (
- 
- // context:
- // we want to only show 'safe' branches (ones that haven't e.g. been deleted)
- // which `git branch -a` gives us, but we also want the recency data that
- // git reflog gives us.
-+// test 2 - if I remove this, I decrement the end counter
- // So we get the HEAD, then append get the reflog branches that intersect with
- // our safe branches, then add the remaining safe branches, ensuring uniqueness
- // along the way

pkg/git/testdata/testPatchAfter3.diff

@@ -1,25 +0,0 @@
-diff --git a/pkg/git/patch_modifier.go b/pkg/git/patch_modifier.go
-index a8fc600..6d8f7d7 100644
---- a/pkg/git/patch_modifier.go
-+++ b/pkg/git/patch_modifier.go
-@@ -36,18 +36,19 @@ func (p *PatchModifier) ModifyPatchForHunk(patch string, hunkStarts []int, curre
- 		hunkEnd = hunkStarts[nextHunkStartIndex]
- 	}
- 
- 	headerLength := 4
- 	output := strings.Join(lines[0:headerLength], "\n") + "\n"
- 	output += strings.Join(lines[hunkStart:hunkEnd], "\n") + "\n"
- 
- 	return output, nil
- }
- 
-+func getHeaderLength(patchLines []string) (int, error) {
- // ModifyPatchForLine takes the original patch, which may contain several hunks,
- // and the line number of the line we want to stage
- func (p *PatchModifier) ModifyPatchForLine(patch string, lineNumber int) (string, error) {
- 	lines := strings.Split(patch, "\n")
- 	headerLength := 4
- 	output := strings.Join(lines[0:headerLength], "\n") + "\n"
- 
- 	hunkStart, err := p.getHunkStart(lines, lineNumber)
-

pkg/git/testdata/testPatchAfter4.diff

@@ -1,19 +0,0 @@
-diff --git a/pkg/git/patch_modifier.go b/pkg/git/patch_modifier.go
-index a8fc600..6d8f7d7 100644
---- a/pkg/git/patch_modifier.go
-+++ b/pkg/git/patch_modifier.go
-@@ -124,13 +140,14 @@ func (p *PatchModifier) getModifiedHunk(patchLines []string, hunkStart int, line
- // @@ -14,8 +14,9 @@ import (
- func (p *PatchModifier) updatedHeader(currentHeader string, lineChanges int) (string, error) {
- 	// current counter is the number after the second comma
- 	re := regexp.MustCompile(`^[^,]+,[^,]+,(\d+)`)
- 	matches := re.FindStringSubmatch(currentHeader)
- 	if len(matches) < 2 {
- 		re = regexp.MustCompile(`^[^,]+,[^+]+\+(\d+)`)
- 		matches = re.FindStringSubmatch(currentHeader)
- 	}
- 	prevLengthString := matches[1]
-+	prevLengthString := re.FindStringSubmatch(currentHeader)[1]
- 
- 	prevLength, err := strconv.Atoi(prevLengthString)
- 	if err != nil {

pkg/git/testdata/testPatchBefore.diff

@@ -1,15 +0,0 @@
-diff --git a/pkg/git/branch_list_builder.go b/pkg/git/branch_list_builder.go
-index 60ec4e0..db4485d 100644
---- a/pkg/git/branch_list_builder.go
-+++ b/pkg/git/branch_list_builder.go
-@@ -14,8 +14,8 @@ import (
- 
- // context:
- // we want to only show 'safe' branches (ones that haven't e.g. been deleted)
--// which `git branch -a` gives us, but we also want the recency data that
--// git reflog gives us.
-+// test 2 - if I remove this, I decrement the end counter
-+// test
- // So we get the HEAD, then append get the reflog branches that intersect with
- // our safe branches, then add the remaining safe branches, ensuring uniqueness
- // along the way

pkg/git/testdata/testPatchBefore2.diff

@@ -1,57 +0,0 @@
-diff --git a/pkg/git/patch_modifier.go b/pkg/git/patch_modifier.go
-index a8fc600..6d8f7d7 100644
---- a/pkg/git/patch_modifier.go
-+++ b/pkg/git/patch_modifier.go
-@@ -36,18 +36,34 @@ func (p *PatchModifier) ModifyPatchForHunk(patch string, hunkStarts []int, curre
- 		hunkEnd = hunkStarts[nextHunkStartIndex]
- 	}
- 
--	headerLength := 4
-+	headerLength, err := getHeaderLength(lines)
-+	if err != nil {
-+		return "", err
-+	}
-+
- 	output := strings.Join(lines[0:headerLength], "\n") + "\n"
- 	output += strings.Join(lines[hunkStart:hunkEnd], "\n") + "\n"
- 
- 	return output, nil
- }
- 
-+func getHeaderLength(patchLines []string) (int, error) {
-+	for index, line := range patchLines {
-+		if strings.HasPrefix(line, "@@") {
-+			return index, nil
-+		}
-+	}
-+	return 0, errors.New("Could not find any hunks in this patch")
-+}
-+
- // ModifyPatchForLine takes the original patch, which may contain several hunks,
- // and the line number of the line we want to stage
- func (p *PatchModifier) ModifyPatchForLine(patch string, lineNumber int) (string, error) {
- 	lines := strings.Split(patch, "\n")
--	headerLength := 4
-+	headerLength, err := getHeaderLength(lines)
-+	if err != nil {
-+		return "", err
-+	}
- 	output := strings.Join(lines[0:headerLength], "\n") + "\n"
- 
- 	hunkStart, err := p.getHunkStart(lines, lineNumber)
-@@ -124,13 +140,8 @@ func (p *PatchModifier) getModifiedHunk(patchLines []string, hunkStart int, line
- // @@ -14,8 +14,9 @@ import (
- func (p *PatchModifier) updatedHeader(currentHeader string, lineChanges int) (string, error) {
- 	// current counter is the number after the second comma
--	re := regexp.MustCompile(`^[^,]+,[^,]+,(\d+)`)
--	matches := re.FindStringSubmatch(currentHeader)
--	if len(matches) < 2 {
--		re = regexp.MustCompile(`^[^,]+,[^+]+\+(\d+)`)
--		matches = re.FindStringSubmatch(currentHeader)
--	}
--	prevLengthString := matches[1]
-+	re := regexp.MustCompile(`(\d+) @@`)
-+	prevLengthString := re.FindStringSubmatch(currentHeader)[1]
- 
- 	prevLength, err := strconv.Atoi(prevLengthString)
- 	if err != nil {

pkg/gui/branches_panel.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/git"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 // list panel functions
@@ -26,26 +27,35 @@ func (gui *Gui) handleBranchSelect(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
+	gui.State.SplitMainPanel = false
+
 	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
 		return err
 	}
+
+	gui.getMainView().Title = "Log"
+
 	// This really shouldn't happen: there should always be a master branch
 	if len(gui.State.Branches) == 0 {
 		return gui.renderString(g, "main", gui.Tr.SLocalize("NoBranchesThisRepo"))
 	}
 	branch := gui.getSelectedBranch()
-	if err := gui.focusPoint(0, gui.State.Panels.Branches.SelectedLine, v); err != nil {
+	if err := gui.focusPoint(0, gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches), v); err != nil {
 		return err
 	}
 	go func() {
 		_ = gui.RenderSelectedBranchUpstreamDifferences()
 	}()
 	go func() {
+		upstream, _ := gui.GitCommand.GetUpstreamForBranch(branch.Name)
+		if strings.Contains(upstream, "no upstream configured for branch") || strings.Contains(upstream, "unknown revision or path not in the working tree") {
+			upstream = gui.Tr.SLocalize("notTrackingRemote")
+		}
 		graph, err := gui.GitCommand.GetBranchGraph(branch.Name)
 		if err != nil && strings.HasPrefix(graph, "fatal: ambiguous argument") {
 			graph = gui.Tr.SLocalize("NoTrackingThisBranch")
 		}
-		_ = gui.renderString(g, "main", graph)
+		_ = gui.renderString(g, "main", fmt.Sprintf("%s → %s\n\n%s", utils.ColoredString(branch.Name, color.FgGreen), utils.ColoredString(upstream, color.FgRed), graph))
 	}()
 	return nil
 }
@@ -66,16 +76,27 @@ func (gui *Gui) RenderSelectedBranchUpstreamDifferences() error {
 // gui.refreshStatus is called at the end of this because that's when we can
 // be sure there is a state.Branches array to pick the current branch from
 func (gui *Gui) refreshBranches(g *gocui.Gui) error {
+	if err := gui.refreshRemotes(); err != nil {
+		return err
+	}
+
+	if err := gui.refreshTags(); err != nil {
+		return err
+	}
+
 	g.Update(func(g *gocui.Gui) error {
-		builder, err := git.NewBranchListBuilder(gui.Log, gui.GitCommand)
+		builder, err := commands.NewBranchListBuilder(gui.Log, gui.GitCommand)
 		if err != nil {
 			return err
 		}
 		gui.State.Branches = builder.Build()
 
-		gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
-		if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
-			return err
+		// TODO: if we're in the remotes view and we've just deleted a remote we need to refresh accordingly
+		if gui.getBranchesView().Context == "local-branches" {
+			gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
+			if err := gui.RenderSelectedBranchUpstreamDifferences(); err != nil {
+				return err
+			}
 		}
 
 		return gui.refreshStatus(g)
@@ -83,32 +104,18 @@ func (gui *Gui) refreshBranches(g *gocui.Gui) error {
 	return nil
 }
 
-func (gui *Gui) handleBranchesNextLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
+func (gui *Gui) renderLocalBranchesWithSelection() error {
+	branchesView := gui.getBranchesView()
 
-	panelState := gui.State.Panels.Branches
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.Branches), false)
-
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
+	gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
+	if err := gui.renderListPanel(branchesView, gui.State.Branches); err != nil {
 		return err
 	}
-	return gui.handleBranchSelect(gui.g, v)
-}
-
-func (gui *Gui) handleBranchesPrevLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Branches
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.Branches), true)
-
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
+	if err := gui.handleBranchSelect(gui.g, branchesView); err != nil {
 		return err
 	}
-	return gui.handleBranchSelect(gui.g, v)
+
+	return nil
 }
 
 // specific functions
@@ -121,15 +128,7 @@ func (gui *Gui) handleBranchPress(g *gocui.Gui, v *gocui.View) error {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("AlreadyCheckedOutBranch"))
 	}
 	branch := gui.getSelectedBranch()
-	if err := gui.GitCommand.Checkout(branch.Name, false); err != nil {
-		if err := gui.createErrorPanel(g, err.Error()); err != nil {
-			return err
-		}
-	} else {
-		gui.State.Panels.Branches.SelectedLine = 0
-	}
-
-	return gui.refreshSidePanels(g)
+	return gui.handleCheckoutRef(branch.Name)
 }
 
 func (gui *Gui) handleCreatePullRequestPress(g *gocui.Gui, v *gocui.View) error {
@@ -158,7 +157,7 @@ func (gui *Gui) handleForceCheckout(g *gocui.Gui, v *gocui.View) error {
 	branch := gui.getSelectedBranch()
 	message := gui.Tr.SLocalize("SureForceCheckout")
 	title := gui.Tr.SLocalize("ForceCheckoutBranch")
-	return gui.createConfirmationPanel(g, v, title, message, func(g *gocui.Gui, v *gocui.View) error {
+	return gui.createConfirmationPanel(g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.Checkout(branch.Name, true); err != nil {
 			gui.createErrorPanel(g, err.Error())
 		}
@@ -166,25 +165,67 @@ func (gui *Gui) handleForceCheckout(g *gocui.Gui, v *gocui.View) error {
 	}, nil)
 }
 
-func (gui *Gui) handleCheckoutByName(g *gocui.Gui, v *gocui.View) error {
-	gui.createPromptPanel(g, v, gui.Tr.SLocalize("BranchName")+":", func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.Checkout(gui.trimmedContent(v), false); err != nil {
-			return gui.createErrorPanel(g, err.Error())
+func (gui *Gui) handleCheckoutRef(ref string) error {
+	if err := gui.GitCommand.Checkout(ref, false); err != nil {
+		// note, this will only work for english-language git commands. If we force git to use english, and the error isn't this one, then the user will receive an english command they may not understand. I'm not sure what the best solution to this is. Running the command once in english and a second time in the native language is one option
+
+		if strings.Contains(err.Error(), "Please commit your changes or stash them before you switch branch") {
+			// offer to autostash changes
+			return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("AutoStashTitle"), gui.Tr.SLocalize("AutoStashPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+				if err := gui.GitCommand.StashSave(gui.Tr.SLocalize("StashPrefix") + ref); err != nil {
+					return gui.createErrorPanel(g, err.Error())
+				}
+				if err := gui.GitCommand.Checkout(ref, false); err != nil {
+					return gui.createErrorPanel(g, err.Error())
+				}
+
+				// checkout successful so we select the new branch
+				gui.State.Panels.Branches.SelectedLine = 0
+
+				if err := gui.GitCommand.StashDo(0, "pop"); err != nil {
+					if err := gui.refreshSidePanels(g); err != nil {
+						return err
+					}
+					return gui.createErrorPanel(g, err.Error())
+				}
+				return gui.refreshSidePanels(g)
+			}, nil)
 		}
-		return gui.refreshSidePanels(g)
+
+		if err := gui.createErrorPanel(gui.g, err.Error()); err != nil {
+			return err
+		}
+	}
+
+	gui.State.Panels.Branches.SelectedLine = 0
+	gui.State.Panels.Commits.SelectedLine = 0
+	return gui.refreshSidePanels(gui.g)
+}
+
+func (gui *Gui) handleCheckoutByName(g *gocui.Gui, v *gocui.View) error {
+	gui.createPromptPanel(g, v, gui.Tr.SLocalize("BranchName")+":", "", func(g *gocui.Gui, v *gocui.View) error {
+		return gui.handleCheckoutRef(gui.trimmedContent(v))
 	})
 	return nil
 }
 
+func (gui *Gui) getCheckedOutBranch() *commands.Branch {
+	if len(gui.State.Branches) == 0 {
+		return nil
+	}
+
+	return gui.State.Branches[0]
+}
+
 func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error {
-	branch := gui.State.Branches[0]
+	branch := gui.getCheckedOutBranch()
 	message := gui.Tr.TemplateLocalize(
 		"NewBranchNameBranchOff",
 		Teml{
 			"branchName": branch.Name,
 		},
 	)
-	gui.createPromptPanel(g, v, message, func(g *gocui.Gui, v *gocui.View) error {
+	gui.createPromptPanel(g, v, message, "", func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.NewBranch(gui.trimmedContent(v)); err != nil {
 			return gui.createErrorPanel(g, err.Error())
 		}
@@ -207,7 +248,7 @@ func (gui *Gui) deleteBranch(g *gocui.Gui, v *gocui.View, force bool) error {
 	if selectedBranch == nil {
 		return nil
 	}
-	checkedOutBranch := gui.State.Branches[0]
+	checkedOutBranch := gui.getCheckedOutBranch()
 	if checkedOutBranch.Name == selectedBranch.Name {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantDeleteCheckOutBranch"))
 	}
@@ -228,7 +269,7 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
 			"selectedBranchName": selectedBranch.Name,
 		},
 	)
-	return gui.createConfirmationPanel(g, v, title, message, func(g *gocui.Gui, v *gocui.View) error {
+	return gui.createConfirmationPanel(g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.DeleteBranch(selectedBranch.Name, force); err != nil {
 			errMessage := err.Error()
 			if !force && strings.Contains(errMessage, "is not fully merged") {
@@ -240,44 +281,54 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
 	}, nil)
 }
 
-func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
-	checkedOutBranch := gui.State.Branches[0].Name
-	selectedBranch := gui.getSelectedBranch().Name
-	if checkedOutBranch == selectedBranch {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantMergeBranchIntoItself"))
+func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
+	if gui.GitCommand.IsHeadDetached() {
+		return gui.createErrorPanel(gui.g, "Cannot merge branch in detached head state. You might have checked out a commit directly or a remote branch, in which case you should checkout the local branch you want to be on")
+	}
+	checkedOutBranchName := gui.getCheckedOutBranch().Name
+	if checkedOutBranchName == branchName {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantMergeBranchIntoItself"))
 	}
 	prompt := gui.Tr.TemplateLocalize(
 		"ConfirmMerge",
 		Teml{
-			"checkedOutBranch": checkedOutBranch,
-			"selectedBranch":   selectedBranch,
+			"checkedOutBranch": checkedOutBranchName,
+			"selectedBranch":   branchName,
 		},
 	)
-	return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("MergingTitle"), prompt,
+	return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("MergingTitle"), prompt,
 		func(g *gocui.Gui, v *gocui.View) error {
 
-			err := gui.GitCommand.Merge(selectedBranch)
+			err := gui.GitCommand.Merge(branchName)
 			return gui.handleGenericMergeCommandResult(err)
 		}, nil)
 }
 
-func (gui *Gui) handleRebase(g *gocui.Gui, v *gocui.View) error {
-	checkedOutBranch := gui.State.Branches[0].Name
-	selectedBranch := gui.getSelectedBranch().Name
-	if selectedBranch == checkedOutBranch {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantRebaseOntoSelf"))
+func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
+	selectedBranchName := gui.getSelectedBranch().Name
+	return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName)
+}
+
+func (gui *Gui) handleRebaseOntoLocalBranch(g *gocui.Gui, v *gocui.View) error {
+	selectedBranchName := gui.getSelectedBranch().Name
+	return gui.handleRebaseOntoBranch(selectedBranchName)
+}
+
+func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error {
+	checkedOutBranch := gui.getCheckedOutBranch().Name
+	if selectedBranchName == checkedOutBranch {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantRebaseOntoSelf"))
 	}
 	prompt := gui.Tr.TemplateLocalize(
 		"ConfirmRebase",
 		Teml{
 			"checkedOutBranch": checkedOutBranch,
-			"selectedBranch":   selectedBranch,
+			"selectedBranch":   selectedBranchName,
 		},
 	)
-	return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("RebasingTitle"), prompt,
+	return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("RebasingTitle"), prompt,
 		func(g *gocui.Gui, v *gocui.View) error {
-
-			err := gui.GitCommand.RebaseBranch(selectedBranch)
+			err := gui.GitCommand.RebaseBranch(selectedBranchName)
 			return gui.handleGenericMergeCommandResult(err)
 		}, nil)
 }
@@ -296,22 +347,79 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
 	if branch.Pushables != "0" {
 		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FwdCommitsToPush"))
 	}
-	upstream := "origin" // hardcoding for now
+
+	upstream, err := gui.GitCommand.GetUpstreamForBranch(branch.Name)
+	if err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+
+	split := strings.Split(upstream, "/")
+	remoteName := split[0]
+	remoteBranchName := strings.Join(split[1:], "/")
+
 	message := gui.Tr.TemplateLocalize(
 		"Fetching",
 		Teml{
-			"from": fmt.Sprintf("%s/%s", upstream, branch.Name),
+			"from": fmt.Sprintf("%s/%s", remoteName, remoteBranchName),
 			"to":   branch.Name,
 		},
 	)
 	go func() {
 		_ = gui.createLoaderPanel(gui.g, v, message)
-		if err := gui.GitCommand.FastForward(branch.Name); err != nil {
+
+		if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
 			_ = gui.createErrorPanel(gui.g, err.Error())
 		} else {
-			_ = gui.closeConfirmationPrompt(gui.g)
+			_ = gui.closeConfirmationPrompt(gui.g, true)
 			_ = gui.RenderSelectedBranchUpstreamDifferences()
 		}
 	}()
 	return nil
 }
+
+func (gui *Gui) onBranchesTabClick(tabIndex int) error {
+	contexts := []string{"local-branches", "remotes", "tags"}
+	branchesView := gui.getBranchesView()
+	branchesView.TabIndex = tabIndex
+
+	return gui.switchBranchesPanelContext(contexts[tabIndex])
+}
+
+func (gui *Gui) switchBranchesPanelContext(context string) error {
+	branchesView := gui.getBranchesView()
+	branchesView.Context = context
+
+	contextTabIndexMap := map[string]int{
+		"local-branches":  0,
+		"remotes":         1,
+		"remote-branches": 1,
+		"tags":            2,
+	}
+
+	branchesView.TabIndex = contextTabIndexMap[context]
+
+	switch context {
+	case "local-branches":
+		return gui.renderLocalBranchesWithSelection()
+	case "remotes":
+		return gui.renderRemotesWithSelection()
+	case "remote-branches":
+		return gui.renderRemoteBranchesWithSelection()
+	case "tags":
+		return gui.renderTagsWithSelection()
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleNextBranchesTab(g *gocui.Gui, v *gocui.View) error {
+	return gui.onBranchesTabClick(
+		utils.ModuloWithWrap(v.TabIndex+1, len(v.Tabs)),
+	)
+}
+
+func (gui *Gui) handlePrevBranchesTab(g *gocui.Gui, v *gocui.View) error {
+	return gui.onBranchesTabClick(
+		utils.ModuloWithWrap(v.TabIndex-1, len(v.Tabs)),
+	)
+}

pkg/gui/commit_files_panel.go

@@ -0,0 +1,210 @@
+package gui
+
+import (
+	"github.com/go-errors/errors"
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
+)
+
+func (gui *Gui) getSelectedCommitFile(g *gocui.Gui) *commands.CommitFile {
+	selectedLine := gui.State.Panels.CommitFiles.SelectedLine
+	if selectedLine == -1 {
+		return nil
+	}
+
+	return gui.State.CommitFiles[selectedLine]
+}
+
+func (gui *Gui) handleCommitFilesClick(g *gocui.Gui, v *gocui.View) error {
+	itemCount := len(gui.State.CommitFiles)
+	handleSelect := gui.handleCommitFileSelect
+	selectedLine := &gui.State.Panels.CommitFiles.SelectedLine
+
+	return gui.handleClick(v, itemCount, selectedLine, handleSelect)
+}
+
+func (gui *Gui) handleCommitFileSelect(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	gui.getMainView().Title = "Patch"
+	gui.State.Panels.LineByLine = nil
+
+	commitFile := gui.getSelectedCommitFile(g)
+	if commitFile == nil {
+		return gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
+	}
+
+	if err := gui.refreshSecondaryPatchPanel(); err != nil {
+		return err
+	}
+
+	if err := gui.focusPoint(0, gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles), v); err != nil {
+		return err
+	}
+	commitText, err := gui.GitCommand.ShowCommitFile(commitFile.Sha, commitFile.Name, false)
+	if err != nil {
+		return err
+	}
+	return gui.renderString(g, "main", commitText)
+}
+
+func (gui *Gui) handleSwitchToCommitsPanel(g *gocui.Gui, v *gocui.View) error {
+	return gui.switchFocus(g, v, gui.getCommitsView())
+}
+
+func (gui *Gui) handleCheckoutCommitFile(g *gocui.Gui, v *gocui.View) error {
+	file := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine]
+
+	if err := gui.GitCommand.CheckoutFile(file.Sha, file.Name); err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+
+	return gui.refreshFiles()
+}
+
+func (gui *Gui) handleDiscardOldFileChange(g *gocui.Gui, v *gocui.View) error {
+	if ok, err := gui.validateNormalWorkingTreeState(); !ok {
+		return err
+	}
+
+	fileName := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine].Name
+
+	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("DiscardFileChangesTitle"), gui.Tr.SLocalize("DiscardFileChangesPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
+			if err := gui.GitCommand.DiscardOldFileChanges(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, fileName); err != nil {
+				if err := gui.handleGenericMergeCommandResult(err); err != nil {
+					return err
+				}
+			}
+
+			return gui.refreshSidePanels(gui.g)
+		})
+	}, nil)
+}
+
+func (gui *Gui) refreshCommitFilesView() error {
+	if err := gui.refreshSecondaryPatchPanel(); err != nil {
+		return err
+	}
+
+	if err := gui.refreshPatchBuildingPanel(-1); err != nil {
+		return err
+	}
+
+	commit := gui.getSelectedCommit(gui.g)
+	if commit == nil {
+		return nil
+	}
+
+	files, err := gui.GitCommand.GetCommitFiles(commit.Sha, gui.GitCommand.PatchManager)
+	if err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+	gui.State.CommitFiles = files
+
+	gui.refreshSelectedLine(&gui.State.Panels.CommitFiles.SelectedLine, len(gui.State.CommitFiles))
+
+	if err := gui.renderListPanel(gui.getCommitFilesView(), gui.State.CommitFiles); err != nil {
+		return err
+	}
+
+	return gui.handleCommitFileSelect(gui.g, gui.getCommitFilesView())
+}
+
+func (gui *Gui) handleOpenOldCommitFile(g *gocui.Gui, v *gocui.View) error {
+	file := gui.getSelectedCommitFile(g)
+	return gui.openFile(file.Name)
+}
+
+func (gui *Gui) handleToggleFileForPatch(g *gocui.Gui, v *gocui.View) error {
+	if ok, err := gui.validateNormalWorkingTreeState(); !ok {
+		return err
+	}
+
+	commitFile := gui.getSelectedCommitFile(g)
+	if commitFile == nil {
+		return gui.renderString(g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
+	}
+
+	toggleTheFile := func() error {
+		if !gui.GitCommand.PatchManager.CommitSelected() {
+			if err := gui.startPatchManager(); err != nil {
+				return err
+			}
+		}
+
+		gui.GitCommand.PatchManager.ToggleFileWhole(commitFile.Name)
+
+		return gui.refreshCommitFilesView()
+	}
+
+	if gui.GitCommand.PatchManager.CommitSelected() && gui.GitCommand.PatchManager.CommitSha != commitFile.Sha {
+		return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("DiscardPatch"), gui.Tr.SLocalize("DiscardPatchConfirm"), func(g *gocui.Gui, v *gocui.View) error {
+			gui.GitCommand.PatchManager.Reset()
+			return toggleTheFile()
+		}, nil)
+	}
+
+	return toggleTheFile()
+}
+
+func (gui *Gui) startPatchManager() error {
+	diffMap := map[string]string{}
+	for _, commitFile := range gui.State.CommitFiles {
+		commitText, err := gui.GitCommand.ShowCommitFile(commitFile.Sha, commitFile.Name, true)
+		if err != nil {
+			return err
+		}
+		diffMap[commitFile.Name] = commitText
+	}
+
+	commit := gui.getSelectedCommit(gui.g)
+	if commit == nil {
+		return errors.New("No commit selected")
+	}
+
+	gui.GitCommand.PatchManager.Start(commit.Sha, diffMap)
+	return nil
+}
+
+func (gui *Gui) handleEnterCommitFile(g *gocui.Gui, v *gocui.View) error {
+	return gui.enterCommitFile(-1)
+}
+
+func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
+	if ok, err := gui.validateNormalWorkingTreeState(); !ok {
+		return err
+	}
+
+	commitFile := gui.getSelectedCommitFile(gui.g)
+	if commitFile == nil {
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
+	}
+
+	enterTheFile := func(selectedLineIdx int) error {
+		if !gui.GitCommand.PatchManager.CommitSelected() {
+			if err := gui.startPatchManager(); err != nil {
+				return err
+			}
+		}
+
+		if err := gui.changeMainViewsContext("patch-building"); err != nil {
+			return err
+		}
+		if err := gui.switchFocus(gui.g, gui.getCommitFilesView(), gui.getMainView()); err != nil {
+			return err
+		}
+		return gui.refreshPatchBuildingPanel(selectedLineIdx)
+	}
+
+	if gui.GitCommand.PatchManager.CommitSelected() && gui.GitCommand.PatchManager.CommitSha != commitFile.Sha {
+		return gui.createConfirmationPanel(gui.g, gui.getCommitFilesView(), false, gui.Tr.SLocalize("DiscardPatch"), gui.Tr.SLocalize("DiscardPatchConfirm"), func(g *gocui.Gui, v *gocui.View) error {
+			gui.GitCommand.PatchManager.Reset()
+			return enterTheFile(selectedLineIdx)
+		}, nil)
+	}
+
+	return enterTheFile(selectedLineIdx)
+}

pkg/gui/commit_message_panel.go

@@ -11,17 +11,18 @@ import (
 // runSyncOrAsyncCommand takes the output of a command that may have returned
 // either no error, an error, or a subprocess to execute, and if a subprocess
 // needs to be set on the gui object, it does so, and then returns the error
-func (gui *Gui) runSyncOrAsyncCommand(sub *exec.Cmd, err error) error {
+// the bool returned tells us whether the calling code should continue
+func (gui *Gui) runSyncOrAsyncCommand(sub *exec.Cmd, err error) (bool, error) {
 	if err != nil {
 		if err != gui.Errors.ErrSubProcess {
-			return gui.createErrorPanel(gui.g, err.Error())
+			return false, gui.createErrorPanel(gui.g, err.Error())
 		}
 	}
 	if sub != nil {
 		gui.SubProcess = sub
-		return gui.Errors.ErrSubProcess
+		return false, gui.Errors.ErrSubProcess
 	}
-	return nil
+	return true, nil
 }
 
 func (gui *Gui) handleCommitConfirm(g *gocui.Gui, v *gocui.View) error {
@@ -29,9 +30,18 @@ func (gui *Gui) handleCommitConfirm(g *gocui.Gui, v *gocui.View) error {
 	if message == "" {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CommitWithoutMessageErr"))
 	}
-	if err := gui.runSyncOrAsyncCommand(gui.GitCommand.Commit(message)); err != nil {
+	flags := ""
+	skipHookPrefix := gui.Config.GetUserConfig().GetString("git.skipHookPrefix")
+	if skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix) {
+		flags = "--no-verify"
+	}
+	ok, err := gui.runSyncOrAsyncCommand(gui.GitCommand.Commit(message, flags))
+	if err != nil {
 		return err
 	}
+	if !ok {
+		return nil
+	}
 
 	v.Clear()
 	_ = v.SetCursor(0, 0)
@@ -61,7 +71,22 @@ 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) {
+func (gui *Gui) getBufferLength(view *gocui.View) string {
+	return " " + strconv.Itoa(strings.Count(view.Buffer(), "")-1) + " "
+}
+
+// RenderCommitLength is a function.
+func (gui *Gui) RenderCommitLength() {
+	if !gui.Config.GetUserConfig().GetBool("gui.commitLength.show") {
+		return
+	}
+	v := gui.getCommitMessageView()
+	v.Subtitle = gui.getBufferLength(v)
+}
+
+// we've just copy+pasted the editor from gocui to here so that we can also re-
+// render the commit message length on each keypress
+func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 	switch {
 	case key == gocui.KeyBackspace || key == gocui.KeyBackspace2:
 		v.EditDelete(true)
@@ -81,22 +106,15 @@ func (gui *Gui) simpleEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Mo
 		v.EditWrite(' ')
 	case key == gocui.KeyInsert:
 		v.Overwrite = !v.Overwrite
+	case key == gocui.KeyCtrlU:
+		v.EditDeleteToStartOfLine()
+	case key == gocui.KeyCtrlA:
+		v.EditGotoToStartOfLine()
+	case key == gocui.KeyCtrlE:
+		v.EditGotoToEndOfLine()
 	default:
 		v.EditWrite(ch)
 	}
 
 	gui.RenderCommitLength()
 }
-
-func (gui *Gui) getBufferLength(view *gocui.View) string {
-	return " " + strconv.Itoa(strings.Count(view.Buffer(), "")-1) + " "
-}
-
-// RenderCommitLength is a function.
-func (gui *Gui) RenderCommitLength() {
-	if !gui.Config.GetUserConfig().GetBool("gui.commitLength.show") {
-		return
-	}
-	v := gui.getCommitMessageView()
-	v.Subtitle = gui.getBufferLength(v)
-}

pkg/gui/commits_panel.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/fatih/color"
 	"github.com/go-errors/errors"
 
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
-	"github.com/jesseduffield/lazygit/pkg/git"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
@@ -28,17 +28,33 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
+	// this probably belongs in an 'onFocus' function than a 'commit selected' function
+	if err := gui.refreshSecondaryPatchPanel(); err != nil {
+		return err
+	}
+
 	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
 		return err
 	}
+
+	gui.getMainView().Title = "Patch"
+	gui.getSecondaryView().Title = "Custom Patch"
+	gui.State.Panels.LineByLine = nil
+
 	commit := gui.getSelectedCommit(g)
 	if commit == nil {
 		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
 	}
 
-	if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, v); err != nil {
+	if err := gui.focusPoint(0, gui.State.Panels.Commits.SelectedLine, len(gui.State.Commits), v); err != nil {
 		return err
 	}
+
+	// if specific diff mode is on, don't show diff
+	if gui.State.Panels.Commits.SpecificDiffMode {
+		return nil
+	}
+
 	commitText, err := gui.GitCommand.Show(commit.Sha)
 	if err != nil {
 		return err
@@ -48,7 +64,7 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 
 func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 	g.Update(func(*gocui.Gui) error {
-		builder, err := git.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits)
+		builder, err := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits, gui.State.DiffEntries)
 		if err != nil {
 			return err
 		}
@@ -71,51 +87,27 @@ func (gui *Gui) refreshCommits(g *gocui.Gui) error {
 		fmt.Fprint(v, list)
 
 		gui.refreshStatus(g)
-		if v == g.CurrentView() {
+		if g.CurrentView() == v {
 			gui.handleCommitSelect(g, v)
 		}
+		if g.CurrentView() == gui.getCommitFilesView() || (g.CurrentView() == gui.getMainView() || gui.State.MainContext == "patch-building") {
+			return gui.refreshCommitFilesView()
+		}
 		return nil
 	})
 	return nil
 }
 
-func (gui *Gui) handleCommitsNextLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Commits
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.Commits), false)
-
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
-		return err
-	}
-	return gui.handleCommitSelect(gui.g, v)
-}
-
-func (gui *Gui) handleCommitsPrevLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Commits
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.Commits), true)
-
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
-		return err
-	}
-	return gui.handleCommitSelect(gui.g, v)
-}
-
 // specific functions
 
 func (gui *Gui) handleResetToCommit(g *gocui.Gui, commitView *gocui.View) error {
-	return gui.createConfirmationPanel(g, commitView, gui.Tr.SLocalize("ResetToCommit"), gui.Tr.SLocalize("SureResetThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+	return gui.createConfirmationPanel(g, commitView, true, gui.Tr.SLocalize("ResetToCommit"), gui.Tr.SLocalize("SureResetThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		commit := gui.getSelectedCommit(g)
 		if commit == nil {
 			panic(errors.New(gui.Tr.SLocalize("NoCommitsThisBranch")))
 		}
-		if err := gui.GitCommand.ResetToCommit(commit.Sha); err != nil {
+
+		if err := gui.GitCommand.ResetToCommit(commit.Sha, "mixed"); err != nil {
 			return gui.createErrorPanel(g, err.Error())
 		}
 		if err := gui.refreshCommits(g); err != nil {
@@ -143,7 +135,7 @@ func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
-	gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("Squash"), gui.Tr.SLocalize("SureSquashThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+	gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Squash"), gui.Tr.SLocalize("SureSquashThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("SquashingStatus"), func() error {
 			err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "squash")
 			return gui.handleGenericMergeCommandResult(err)
@@ -175,7 +167,7 @@ func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
-	gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("Fixup"), gui.Tr.SLocalize("SureFixupThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+	gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Fixup"), gui.Tr.SLocalize("SureFixupThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("FixingStatus"), func() error {
 			err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "fixup")
 			return gui.handleGenericMergeCommandResult(err)
@@ -196,7 +188,7 @@ func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
 	if gui.State.Panels.Commits.SelectedLine != 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 {
+	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("renameCommit"), "", func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.RenameCommit(v.Buffer()); err != nil {
 			return gui.createErrorPanel(g, err.Error())
 		}
@@ -275,7 +267,7 @@ func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
-	return gui.createConfirmationPanel(gui.g, v, gui.Tr.SLocalize("DeleteCommitTitle"), gui.Tr.SLocalize("DeleteCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
+	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("DeleteCommitTitle"), gui.Tr.SLocalize("DeleteCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("DeletingStatus"), func() error {
 			err := gui.GitCommand.InteractiveRebase(gui.State.Commits, gui.State.Panels.Commits.SelectedLine, "drop")
 			return gui.handleGenericMergeCommandResult(err)
@@ -345,7 +337,7 @@ func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error {
 }
 
 func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
-	return gui.createConfirmationPanel(gui.g, v, gui.Tr.SLocalize("AmendCommitTitle"), gui.Tr.SLocalize("AmendCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
+	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("AmendCommitTitle"), gui.Tr.SLocalize("AmendCommitPrompt"), func(*gocui.Gui, *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("AmendingStatus"), func() error {
 			err := gui.GitCommand.AmendTo(gui.State.Commits[gui.State.Panels.Commits.SelectedLine].Sha)
 			return gui.handleGenericMergeCommandResult(err)
@@ -364,7 +356,7 @@ func (gui *Gui) handleCommitPick(g *gocui.Gui, v *gocui.View) error {
 
 	// at this point we aren't actually rebasing so we will interpret this as an
 	// attempt to pull. We might revoke this later after enabling configurable keybindings
-	return gui.pullFiles(g, v)
+	return gui.handlePullFiles(g, v)
 }
 
 func (gui *Gui) handleCommitRevert(g *gocui.Gui, v *gocui.View) error {
@@ -430,10 +422,203 @@ func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
 
 // HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied
 func (gui *Gui) HandlePasteCommits(g *gocui.Gui, v *gocui.View) error {
-	return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("CherryPick"), gui.Tr.SLocalize("SureCherryPick"), func(g *gocui.Gui, v *gocui.View) error {
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("CherryPick"), gui.Tr.SLocalize("SureCherryPick"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.WithWaitingStatus(gui.Tr.SLocalize("CherryPickingStatus"), func() error {
 			err := gui.GitCommand.CherryPickCommits(gui.State.CherryPickedCommits)
 			return gui.handleGenericMergeCommandResult(err)
 		})
 	}, nil)
 }
+
+func (gui *Gui) handleSwitchToCommitFilesPanel(g *gocui.Gui, v *gocui.View) error {
+	if err := gui.refreshCommitFilesView(); err != nil {
+		return err
+	}
+
+	return gui.switchFocus(g, gui.getCommitsView(), gui.getCommitFilesView())
+}
+
+func (gui *Gui) handleToggleDiffCommit(g *gocui.Gui, v *gocui.View) error {
+	selectLimit := 2
+
+	// get selected commit
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	// if already selected commit delete
+	if idx, has := gui.hasCommit(gui.State.DiffEntries, commit.Sha); has {
+		gui.State.DiffEntries = gui.unchooseCommit(gui.State.DiffEntries, idx)
+	} else {
+		if len(gui.State.DiffEntries) == selectLimit {
+			gui.State.DiffEntries = gui.unchooseCommit(gui.State.DiffEntries, 0)
+		}
+		gui.State.DiffEntries = append(gui.State.DiffEntries, commit)
+	}
+
+	gui.setDiffMode()
+
+	// if selected two commits, display diff between
+	if len(gui.State.DiffEntries) == selectLimit {
+		commitText, err := gui.GitCommand.DiffCommits(gui.State.DiffEntries[0].Sha, gui.State.DiffEntries[1].Sha)
+
+		if err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+
+		return gui.renderString(g, "main", commitText)
+	}
+
+	return nil
+}
+
+func (gui *Gui) setDiffMode() {
+	v := gui.getCommitsView()
+	if len(gui.State.DiffEntries) != 0 {
+		gui.State.Panels.Commits.SpecificDiffMode = true
+		v.Title = gui.Tr.SLocalize("CommitsDiffTitle")
+	} else {
+		gui.State.Panels.Commits.SpecificDiffMode = false
+		v.Title = gui.Tr.SLocalize("CommitsTitle")
+	}
+
+	gui.refreshCommits(gui.g)
+}
+
+func (gui *Gui) hasCommit(commits []*commands.Commit, target string) (int, bool) {
+	for idx, commit := range commits {
+		if commit.Sha == target {
+			return idx, true
+		}
+	}
+	return -1, false
+}
+
+func (gui *Gui) unchooseCommit(commits []*commands.Commit, i int) []*commands.Commit {
+	return append(commits[:i], commits[i+1:]...)
+}
+
+func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return nil
+	}
+
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("CreateFixupCommit"), gui.Tr.TemplateLocalize(
+		"SureCreateFixupCommit",
+		Teml{
+			"commit": commit.Sha,
+		},
+	), func(g *gocui.Gui, v *gocui.View) error {
+		if err := gui.GitCommand.CreateFixupCommit(commit.Sha); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+
+		return gui.refreshSidePanels(gui.g)
+	}, nil)
+}
+
+func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return nil
+	}
+
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("SquashAboveCommits"), gui.Tr.TemplateLocalize(
+		"SureSquashAboveCommits",
+		Teml{
+			"commit": commit.Sha,
+		},
+	), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.WithWaitingStatus(gui.Tr.SLocalize("SquashingStatus"), func() error {
+			err := gui.GitCommand.SquashAllAboveFixupCommits(commit.Sha)
+			return gui.handleGenericMergeCommandResult(err)
+		})
+	}, nil)
+}
+
+type resetOption struct {
+	description string
+	command     string
+}
+
+// GetDisplayStrings is a function.
+func (r *resetOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description, color.New(color.FgRed).Sprint(r.command)}
+}
+
+func (gui *Gui) handleCreateCommitResetMenu(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	strengths := []string{"soft", "mixed", "hard"}
+	options := make([]*resetOption, len(strengths))
+	for i, strength := range strengths {
+		options[i] = &resetOption{
+			description: fmt.Sprintf("%s reset", strength),
+			command:     fmt.Sprintf("reset --%s %s", strength, commit.Sha),
+		}
+	}
+
+	handleMenuPress := func(index int) error {
+		if err := gui.GitCommand.ResetToCommit(commit.Sha, strengths[index]); err != nil {
+			return err
+		}
+
+		if err := gui.refreshCommits(g); err != nil {
+			return err
+		}
+		if err := gui.refreshFiles(); err != nil {
+			return err
+		}
+		if err := gui.resetOrigin(gui.getCommitsView()); err != nil {
+			return err
+		}
+
+		gui.State.Panels.Commits.SelectedLine = 0
+		return gui.handleCommitSelect(g, gui.getCommitsView())
+	}
+
+	return gui.createMenu(fmt.Sprintf("%s %s", gui.Tr.SLocalize("resetTo"), commit.Sha), options, len(options), handleMenuPress)
+}
+
+func (gui *Gui) handleTagCommit(g *gocui.Gui, v *gocui.View) error {
+	// TODO: bring up menu asking if you want to make a lightweight or annotated tag
+	// if annotated, switch to a subprocess to create the message
+
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return nil
+	}
+
+	return gui.handleCreateLightweightTag(commit.Sha)
+}
+
+func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
+	return gui.createPromptPanel(gui.g, gui.getCommitsView(), gui.Tr.SLocalize("TagNameTitle"), "", func(g *gocui.Gui, v *gocui.View) error {
+		if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), commitSha); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		if err := gui.refreshCommits(g); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		if err := gui.refreshTags(); err != nil {
+			return gui.createErrorPanel(g, err.Error())
+		}
+		return gui.handleCommitSelect(g, v)
+	})
+}
+
+func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
+	commit := gui.getSelectedCommit(g)
+	if commit == nil {
+		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))
+	}
+
+	return gui.createConfirmationPanel(g, gui.getCommitsView(), true, gui.Tr.SLocalize("checkoutCommit"), gui.Tr.SLocalize("SureCheckoutThisCommit"), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.handleCheckoutRef(commit.Sha)
+	}, nil)
+}

pkg/gui/confirmation_panel.go

@@ -12,26 +12,32 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/theme"
 )
 
-func (gui *Gui) wrappedConfirmationFunction(function func(*gocui.Gui, *gocui.View) error) func(*gocui.Gui, *gocui.View) error {
+func (gui *Gui) wrappedConfirmationFunction(function func(*gocui.Gui, *gocui.View) error, returnFocusOnClose bool) 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
 			}
 		}
-		return gui.closeConfirmationPrompt(g)
+
+		return gui.closeConfirmationPrompt(g, returnFocusOnClose)
 	}
 }
 
-func (gui *Gui) closeConfirmationPrompt(g *gocui.Gui) error {
+func (gui *Gui) closeConfirmationPrompt(g *gocui.Gui, returnFocusOnClose bool) error {
 	view, err := g.View("confirmation")
 	if err != nil {
 		return nil // if it's already been closed we can just return
 	}
-	if err := gui.returnFocus(g, view); err != nil {
-		panic(err)
+	view.Editable = false
+	if returnFocusOnClose {
+		if err := gui.returnFocus(g, view); err != nil {
+			panic(err)
+		}
 	}
 	g.DeleteKeybindings("confirmation")
 	return g.DeleteView("confirmation")
@@ -53,7 +59,7 @@ func (gui *Gui) getMessageHeight(wrap bool, message string, width int) int {
 
 func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, wrap bool, prompt string) (int, int, int, int) {
 	width, height := g.Size()
-	panelWidth := width / 2
+	panelWidth := 4 * width / 7
 	panelHeight := gui.getMessageHeight(wrap, prompt, panelWidth)
 	return width/2 - panelWidth/2,
 		height/2 - panelHeight/2 - panelHeight%2 - 1,
@@ -61,16 +67,6 @@ func (gui *Gui) getConfirmationPanelDimensions(g *gocui.Gui, wrap bool, prompt s
 		height/2 + panelHeight/2
 }
 
-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, "", false)
-	if err != nil {
-		return err
-	}
-	confirmationView.Editable = true
-	return gui.setKeyBindings(g, handleConfirm, nil)
-}
-
 func (gui *Gui) prepareConfirmationPanel(currentView *gocui.View, title, prompt string, hasLoader bool) (*gocui.View, error) {
 	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, true, prompt)
 	confirmationView, err := gui.g.SetView("confirmation", x0, y0, x1, y1, 0)
@@ -81,7 +77,7 @@ func (gui *Gui) prepareConfirmationPanel(currentView *gocui.View, title, prompt
 		confirmationView.HasLoader = hasLoader
 		confirmationView.Title = title
 		confirmationView.Wrap = true
-		confirmationView.FgColor = gocui.ColorWhite
+		confirmationView.FgColor = theme.GocuiDefaultTextColor
 	}
 	gui.g.Update(func(g *gocui.Gui) error {
 		return gui.switchFocus(gui.g, currentView, confirmationView)
@@ -98,44 +94,53 @@ func (gui *Gui) onNewPopupPanel() {
 	}
 }
 
-func (gui *Gui) createLoaderPanel(g *gocui.Gui, currentView *gocui.View, prompt string) error {
-	return gui.createPopupPanel(g, currentView, "", prompt, true, nil, nil)
-}
-
-// it is very important that within this function we never include the original prompt in any error messages, because it may contain e.g. a user password
-func (gui *Gui) createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, title, prompt string, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
-	return gui.createPopupPanel(g, currentView, title, prompt, false, handleConfirm, handleClose)
-}
-
-func (gui *Gui) createPopupPanel(g *gocui.Gui, currentView *gocui.View, title, prompt string, hasLoader bool, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
+func (gui *Gui) createPopupPanel(g *gocui.Gui, currentView *gocui.View, title, prompt string, hasLoader bool, returnFocusOnClose bool, editable bool, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
 	gui.onNewPopupPanel()
 	g.Update(func(g *gocui.Gui) error {
 		// delete the existing confirmation panel if it exists
 		if view, _ := g.View("confirmation"); view != nil {
-			if err := gui.closeConfirmationPrompt(g); err != nil {
-				errMessage := gui.Tr.TemplateLocalize(
-					"CantCloseConfirmationPrompt",
-					Teml{
-						"error": err.Error(),
-					},
-				)
-				gui.Log.Error(errMessage)
+			if err := gui.closeConfirmationPrompt(g, true); err != nil {
+				gui.Log.Error(err)
 			}
 		}
 		confirmationView, err := gui.prepareConfirmationPanel(currentView, title, prompt, hasLoader)
 		if err != nil {
 			return err
 		}
-		confirmationView.Editable = false
+		confirmationView.Editable = editable
+		if editable {
+			go func() {
+				// TODO: remove this wait (right now if you remove it the EditGotoToEndOfLine method doesn't seem to work)
+				time.Sleep(time.Millisecond)
+				gui.g.Update(func(g *gocui.Gui) error {
+					confirmationView.EditGotoToEndOfLine()
+					return nil
+				})
+			}()
+		}
+
 		if err := gui.renderString(g, "confirmation", prompt); err != nil {
 			return err
 		}
-		return gui.setKeyBindings(g, handleConfirm, handleClose)
+		return gui.setKeyBindings(g, handleConfirm, handleClose, returnFocusOnClose)
 	})
 	return nil
 }
 
-func (gui *Gui) setKeyBindings(g *gocui.Gui, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
+func (gui *Gui) createLoaderPanel(g *gocui.Gui, currentView *gocui.View, prompt string) error {
+	return gui.createPopupPanel(g, currentView, "", prompt, true, true, false, nil, nil)
+}
+
+// it is very important that within this function we never include the original prompt in any error messages, because it may contain e.g. a user password
+func (gui *Gui) createConfirmationPanel(g *gocui.Gui, currentView *gocui.View, returnFocusOnClose bool, title, prompt string, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error) error {
+	return gui.createPopupPanel(g, currentView, title, prompt, false, returnFocusOnClose, false, handleConfirm, handleClose)
+}
+
+func (gui *Gui) createPromptPanel(g *gocui.Gui, currentView *gocui.View, title string, initialContent string, handleConfirm func(*gocui.Gui, *gocui.View) error) error {
+	return gui.createPopupPanel(gui.g, currentView, title, initialContent, false, true, true, handleConfirm, nil)
+}
+
+func (gui *Gui) setKeyBindings(g *gocui.Gui, handleConfirm, handleClose func(*gocui.Gui, *gocui.View) error, returnFocusOnClose bool) error {
 	actions := gui.Tr.TemplateLocalize(
 		"CloseConfirm",
 		Teml{
@@ -146,14 +151,14 @@ func (gui *Gui) setKeyBindings(g *gocui.Gui, handleConfirm, handleClose func(*go
 	if err := gui.renderString(g, "options", actions); err != nil {
 		return err
 	}
-	if err := g.SetKeybinding("confirmation", gocui.KeyEnter, gocui.ModNone, gui.wrappedConfirmationFunction(handleConfirm)); err != nil {
+	if err := g.SetKeybinding("confirmation", nil, gocui.KeyEnter, gocui.ModNone, gui.wrappedConfirmationFunction(handleConfirm, returnFocusOnClose)); err != nil {
 		return err
 	}
-	return g.SetKeybinding("confirmation", gocui.KeyEsc, gocui.ModNone, gui.wrappedConfirmationFunction(handleClose))
+	return g.SetKeybinding("confirmation", nil, gocui.KeyEsc, gocui.ModNone, gui.wrappedConfirmationFunction(handleClose, returnFocusOnClose))
 }
 
 func (gui *Gui) createMessagePanel(g *gocui.Gui, currentView *gocui.View, title, prompt string) error {
-	return gui.createPopupPanel(g, currentView, title, prompt, false, nil, nil)
+	return gui.createPopupPanel(g, currentView, title, prompt, false, true, false, nil, nil)
 }
 
 // createSpecificErrorPanel allows you to create an error popup, specifying the
@@ -174,7 +179,7 @@ func (gui *Gui) createSpecificErrorPanel(message string, nextView *gocui.View, w
 
 	colorFunction := color.New(color.FgRed).SprintFunc()
 	coloredMessage := colorFunction(strings.TrimSpace(message))
-	return gui.createConfirmationPanel(gui.g, nextView, gui.Tr.SLocalize("Error"), coloredMessage, nil, nil)
+	return gui.createConfirmationPanel(gui.g, nextView, true, gui.Tr.SLocalize("Error"), coloredMessage, nil, nil)
 }
 
 func (gui *Gui) createErrorPanel(g *gocui.Gui, message string) error {

pkg/gui/context.go

@@ -1,75 +1,20 @@
 package gui
 
-func (gui *Gui) titleMap() map[string]string {
-	return map[string]string{
-		"commits":  gui.Tr.SLocalize("DiffTitle"),
-		"branches": gui.Tr.SLocalize("LogTitle"),
-		"files":    gui.Tr.SLocalize("DiffTitle"),
-		"status":   "",
-		"stash":    gui.Tr.SLocalize("DiffTitle"),
-	}
-}
-
-func (gui *Gui) contextTitleMap() map[string]map[string]string {
-	return map[string]map[string]string{
-		"main": {
-			"staging": gui.Tr.SLocalize("StagingMainTitle"),
-			"merging": gui.Tr.SLocalize("MergingMainTitle"),
-			"normal":  "",
-		},
-	}
-}
-
-func (gui *Gui) setMainTitle() error {
-	currentViewName := gui.g.CurrentView().Name()
-	var newTitle string
-	if context, ok := gui.State.Contexts[currentViewName]; ok {
-		newTitle = gui.contextTitleMap()[currentViewName][context]
-	} else if title, ok := gui.titleMap()[currentViewName]; ok {
-		newTitle = title
-	} else {
-		return nil
-	}
-	gui.getMainView().Title = newTitle
-	return nil
-}
-
-func (gui *Gui) changeContext(viewName, context string) error {
-	if gui.State.Contexts[viewName] == context {
+// changeContext is a helper function for when we want to change a 'main' context
+// which currently just means a context that affects both the main and secondary views
+// other views can have their context changed directly but this function helps
+// keep the main and secondary views in sync
+func (gui *Gui) changeMainViewsContext(context string) error {
+	if gui.State.MainContext == context {
 		return nil
 	}
 
-	contextMap := gui.GetContextMap()
-
-	gui.g.DeleteKeybindings(viewName)
-
-	bindings := contextMap[viewName][context]
-	for _, binding := range bindings {
-		if err := gui.g.SetKeybinding(viewName, binding.Key, binding.Modifier, binding.Handler); err != nil {
-			return err
-		}
-	}
-	gui.State.Contexts[viewName] = context
-	return gui.setMainTitle()
-}
-
-func (gui *Gui) setInitialContexts() error {
-	contextMap := gui.GetContextMap()
-
-	initialContexts := map[string]string{
-		"main": "normal",
+	switch context {
+	case "normal", "patch-building", "staging", "merging":
+		gui.getMainView().Context = context
+		gui.getSecondaryView().Context = context
 	}
 
-	for viewName, context := range initialContexts {
-		bindings := contextMap[viewName][context]
-		for _, binding := range bindings {
-			if err := gui.g.SetKeybinding(binding.ViewName, binding.Key, binding.Modifier, binding.Handler); err != nil {
-				return err
-			}
-		}
-	}
-
-	gui.State.Contexts = initialContexts
-
+	gui.State.MainContext = context
 	return nil
 }

pkg/gui/credentials_panel.go

@@ -98,7 +98,7 @@ func (gui *Gui) HandleCredentialsPopup(g *gocui.Gui, popupOpened bool, cmdErr er
 		// we are not logging this error because it may contain a password
 		_ = gui.createSpecificErrorPanel(errMessage, gui.getFilesView(), false)
 	} else {
-		_ = gui.closeConfirmationPrompt(g)
+		_ = gui.closeConfirmationPrompt(g, true)
 		_ = gui.refreshSidePanels(g)
 	}
 }

pkg/gui/file_watching.go

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

pkg/gui/files_panel.go

@@ -26,65 +26,73 @@ func (gui *Gui) getSelectedFile(g *gocui.Gui) (*commands.File, error) {
 	return gui.State.Files[selectedLine], nil
 }
 
-func (gui *Gui) handleFilesFocus(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	cx, cy := v.Cursor()
-	_, oy := v.Origin()
-
-	prevSelectedLine := gui.State.Panels.Files.SelectedLine
-	newSelectedLine := cy - oy
-
-	if newSelectedLine > len(gui.State.Files)-1 || len(utils.Decolorise(gui.State.Files[newSelectedLine].DisplayString)) < cx {
-		return gui.handleFileSelect(gui.g, v, false)
-	}
-
-	gui.State.Panels.Files.SelectedLine = newSelectedLine
-
-	if prevSelectedLine == newSelectedLine && gui.currentViewName() == v.Name() {
-		return gui.handleFilePress(gui.g, v)
-	} else {
-		return gui.handleFileSelect(gui.g, v, true)
-	}
-}
-
-func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View, alreadySelected bool) error {
-	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
-		return err
-	}
-
-	file, err := gui.getSelectedFile(g)
+func (gui *Gui) selectFile(alreadySelected bool) error {
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
 		}
-		return gui.renderString(g, "main", gui.Tr.SLocalize("NoChangedFiles"))
+		return gui.renderString(gui.g, "main", gui.Tr.SLocalize("NoChangedFiles"))
 	}
 
-	if err := gui.focusPoint(0, gui.State.Panels.Files.SelectedLine, v); err != nil {
+	if err := gui.focusPoint(0, gui.State.Panels.Files.SelectedLine, len(gui.State.Files), gui.getFilesView()); err != nil {
 		return err
 	}
 
 	if file.HasInlineMergeConflicts {
+		gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle")
+		gui.State.SplitMainPanel = false
 		return gui.refreshMergePanel()
 	}
 
-	content := gui.GitCommand.Diff(file, false)
+	content := gui.GitCommand.Diff(file, false, false)
+	contentCached := gui.GitCommand.Diff(file, false, true)
+	leftContent := content
+	if file.HasStagedChanges && file.HasUnstagedChanges {
+		gui.State.SplitMainPanel = true
+		gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
+		gui.getSecondaryView().Title = gui.Tr.SLocalize("StagedChanges")
+	} else {
+		gui.State.SplitMainPanel = false
+		if file.HasUnstagedChanges {
+			leftContent = content
+			gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
+		} else {
+			leftContent = contentCached
+			gui.getMainView().Title = gui.Tr.SLocalize("StagedChanges")
+		}
+	}
+
 	if alreadySelected {
-		g.Update(func(*gocui.Gui) error {
-			return gui.setViewContent(gui.g, gui.getMainView(), content)
+		gui.g.Update(func(*gocui.Gui) error {
+			if err := gui.setViewContent(gui.g, gui.getSecondaryView(), contentCached); err != nil {
+				return err
+			}
+			return gui.setViewContent(gui.g, gui.getMainView(), leftContent)
 		})
 		return nil
 	}
-	return gui.renderString(g, "main", content)
+	if err := gui.renderString(gui.g, "secondary", contentCached); err != nil {
+		return err
+	}
+	return gui.renderString(gui.g, "main", leftContent)
 }
 
 func (gui *Gui) refreshFiles() error {
+	gui.State.RefreshingFilesMutex.Lock()
+	gui.State.IsRefreshingFiles = true
+	defer func() {
+		gui.State.IsRefreshingFiles = false
+		gui.State.RefreshingFilesMutex.Unlock()
+	}()
+
 	selectedFile, _ := gui.getSelectedFile(gui.g)
 
 	filesView := gui.getFilesView()
+	if filesView == nil {
+		// if the filesView hasn't been instantiated yet we just return
+		return nil
+	}
 	if err := gui.refreshStateFiles(); err != nil {
 		return err
 	}
@@ -99,10 +107,10 @@ func (gui *Gui) refreshFiles() error {
 		}
 		fmt.Fprint(filesView, list)
 
-		if filesView == g.CurrentView() {
+		if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == "merging") {
 			newSelectedFile, _ := gui.getSelectedFile(gui.g)
 			alreadySelected := newSelectedFile.Name == selectedFile.Name
-			return gui.handleFileSelect(g, filesView, alreadySelected)
+			return gui.selectFile(alreadySelected)
 		}
 		return nil
 	})
@@ -110,28 +118,6 @@ func (gui *Gui) refreshFiles() error {
 	return nil
 }
 
-func (gui *Gui) handleFilesNextLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Files
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.Files), false)
-
-	return gui.handleFileSelect(gui.g, v, false)
-}
-
-func (gui *Gui) handleFilesPrevLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Files
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.Files), true)
-
-	return gui.handleFileSelect(gui.g, v, false)
-}
-
 // specific functions
 
 func (gui *Gui) stagedFiles() []*commands.File {
@@ -165,7 +151,11 @@ func (gui *Gui) stageSelectedFile(g *gocui.Gui) error {
 }
 
 func (gui *Gui) handleEnterFile(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile(g)
+	return gui.enterFile(false, -1)
+}
+
+func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error {
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
 			return err
@@ -173,18 +163,18 @@ func (gui *Gui) handleEnterFile(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 	if file.HasInlineMergeConflicts {
-		return gui.handleSwitchToMerge(g, v)
+		return gui.handleSwitchToMerge(gui.g, gui.getFilesView())
 	}
-	if !file.HasUnstagedChanges || file.HasMergeConflicts {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileStagingRequirements"))
+	if file.HasMergeConflicts {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FileStagingRequirements"))
 	}
-	if err := gui.changeContext("main", "staging"); err != nil {
+	if err := gui.changeMainViewsContext("staging"); err != nil {
 		return err
 	}
-	if err := gui.switchFocus(g, v, gui.getMainView()); err != nil {
+	if err := gui.switchFocus(gui.g, gui.getFilesView(), gui.getMainView()); err != nil {
 		return err
 	}
-	return gui.refreshStagingPanel()
+	return gui.refreshStagingPanel(forceSecondaryFocused, selectedLineIdx)
 }
 
 func (gui *Gui) handleFilePress(g *gocui.Gui, v *gocui.View) error {
@@ -210,7 +200,7 @@ func (gui *Gui) handleFilePress(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}
 
-	return gui.handleFileSelect(g, v, true)
+	return gui.selectFile(true)
 }
 
 func (gui *Gui) allFilesStaged() bool {
@@ -222,6 +212,14 @@ func (gui *Gui) allFilesStaged() bool {
 	return true
 }
 
+func (gui *Gui) focusAndSelectFile(g *gocui.Gui, v *gocui.View) error {
+	if _, err := gui.g.SetCurrentView("files"); err != nil {
+		return err
+	}
+
+	return gui.selectFile(false)
+}
+
 func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
 	var err error
 	if gui.allFilesStaged() {
@@ -237,55 +235,7 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
 		return err
 	}
 
-	return gui.handleFileSelect(g, v, false)
-}
-
-func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile(g)
-	if err != nil {
-		if err == gui.Errors.ErrNoFiles {
-			return nil
-		}
-		return err
-	}
-	if !file.HasUnstagedChanges {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileHasNoUnstagedChanges"))
-	}
-	if !file.Tracked {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("CannotGitAdd"))
-	}
-
-	gui.SubProcess = gui.GitCommand.AddPatch(file.Name)
-	return gui.Errors.ErrSubProcess
-}
-
-func (gui *Gui) handleFileRemove(g *gocui.Gui, v *gocui.View) error {
-	file, err := gui.getSelectedFile(g)
-	if err != nil {
-		if err == gui.Errors.ErrNoFiles {
-			return nil
-		}
-		return err
-	}
-	var deleteVerb string
-	if file.Tracked {
-		deleteVerb = gui.Tr.SLocalize("checkout")
-	} else {
-		deleteVerb = gui.Tr.SLocalize("delete")
-	}
-	message := gui.Tr.TemplateLocalize(
-		"SureTo",
-		Teml{
-			"deleteVerb": deleteVerb,
-			"fileName":   file.Name,
-		},
-	)
-	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
-		}
-		return gui.refreshFiles()
-	}, nil)
+	return gui.selectFile(false)
 }
 
 func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
@@ -302,6 +252,22 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
 	return gui.refreshFiles()
 }
 
+func (gui *Gui) handleWIPCommitPress(g *gocui.Gui, filesView *gocui.View) error {
+	skipHookPreifx := gui.Config.GetUserConfig().GetString("git.skipHookPrefix")
+	if skipHookPreifx == "" {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("SkipHookPrefixNotConfigured"))
+	}
+
+	if err := gui.renderString(g, "commitMessage", skipHookPreifx); err != nil {
+		return err
+	}
+	if err := gui.getCommitMessageView().SetCursor(len(skipHookPreifx), 0); err != nil {
+		return err
+	}
+
+	return gui.handleCommitPress(g, filesView)
+}
+
 func (gui *Gui) handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
 	if len(gui.stagedFiles()) == 0 && gui.State.WorkingTreeState == "normal" {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoStagedFilesToCommit"))
@@ -327,10 +293,14 @@ func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) erro
 	title := strings.Title(gui.Tr.SLocalize("AmendLastCommit"))
 	question := gui.Tr.SLocalize("SureToAmend")
 
-	return gui.createConfirmationPanel(g, filesView, title, question, func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.runSyncOrAsyncCommand(gui.GitCommand.AmendHead()); err != nil {
+	return gui.createConfirmationPanel(g, filesView, true, title, question, func(g *gocui.Gui, v *gocui.View) error {
+		ok, err := gui.runSyncOrAsyncCommand(gui.GitCommand.AmendHead())
+		if err != nil {
 			return err
 		}
+		if !ok {
+			return nil
+		}
 
 		return gui.refreshSidePanels(g)
 	}, nil)
@@ -355,13 +325,14 @@ func (gui *Gui) PrepareSubProcess(g *gocui.Gui, commands ...string) {
 }
 
 func (gui *Gui) editFile(filename string) error {
-	return gui.runSyncOrAsyncCommand(gui.OSCommand.EditFile(filename))
+	_, err := gui.runSyncOrAsyncCommand(gui.OSCommand.EditFile(filename))
+	return err
 }
 
 func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
 	file, err := gui.getSelectedFile(g)
 	if err != nil {
-		return err
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 
 	return gui.editFile(file.Name)
@@ -370,7 +341,7 @@ func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
 func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
 	file, err := gui.getSelectedFile(g)
 	if err != nil {
-		return err
+		return gui.createErrorPanel(gui.g, err.Error())
 	}
 	return gui.openFile(file.Name)
 }
@@ -383,6 +354,11 @@ func (gui *Gui) refreshStateFiles() error {
 	// get files to stage
 	files := gui.GitCommand.GetStatusFiles()
 	gui.State.Files = gui.GitCommand.MergeStatusFiles(gui.State.Files, files)
+
+	if err := gui.fileWatcher.addFilesToFileWatcher(files); err != nil {
+		return err
+	}
+
 	gui.refreshSelectedLine(&gui.State.Panels.Files.SelectedLine, len(gui.State.Files))
 	return gui.updateWorkTreeState()
 }
@@ -406,7 +382,31 @@ func (gui *Gui) catSelectedFile(g *gocui.Gui) (string, error) {
 	return cat, nil
 }
 
-func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
+func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
+	// if we have no upstream branch we need to set that first
+	_, pullables := gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount()
+	currentBranchName, err := gui.GitCommand.CurrentBranchName()
+	if err != nil {
+		return err
+	}
+	if pullables == "?" {
+		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin/"+currentBranchName, func(g *gocui.Gui, v *gocui.View) error {
+			upstream := gui.trimmedContent(v)
+			if err := gui.GitCommand.SetUpstreamBranch(upstream); err != nil {
+				errorMessage := err.Error()
+				if strings.Contains(errorMessage, "does not exist") {
+					errorMessage = fmt.Sprintf("upstream branch %s not found.\nIf you expect it to exist, you should fetch (with 'f').\nOtherwise, you should push (with 'shift+P')", upstream)
+				}
+				return gui.createErrorPanel(gui.g, errorMessage)
+			}
+			return gui.pullFiles(v)
+		})
+	}
+
+	return gui.pullFiles(v)
+}
+
+func (gui *Gui) pullFiles(v *gocui.View) error {
 	if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PullWait")); err != nil {
 		return err
 	}
@@ -415,21 +415,22 @@ func (gui *Gui) pullFiles(g *gocui.Gui, v *gocui.View) error {
 		unamePassOpend := false
 		err := gui.GitCommand.Pull(func(passOrUname string) string {
 			unamePassOpend = true
-			return gui.waitForPassUname(g, v, passOrUname)
+			return gui.waitForPassUname(gui.g, v, passOrUname)
 		})
-		gui.HandleCredentialsPopup(g, unamePassOpend, err)
+		gui.HandleCredentialsPopup(gui.g, unamePassOpend, err)
 	}()
+
 	return nil
 }
 
-func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error {
+func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstream string) error {
 	if err := gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("PushWait")); err != nil {
 		return err
 	}
 	go func() {
 		unamePassOpend := false
-		branchName := gui.State.Branches[0].Name
-		err := gui.GitCommand.Push(branchName, force, func(passOrUname string) string {
+		branchName := gui.getCheckedOutBranch().Name
+		err := gui.GitCommand.Push(branchName, force, upstream, func(passOrUname string) string {
 			unamePassOpend = true
 			return gui.waitForPassUname(g, v, passOrUname)
 		})
@@ -441,27 +442,35 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool) error
 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.GetCurrentBranchUpstreamDifferenceCount()
-	if pullables == "?" || pullables == "0" {
-		return gui.pushWithForceFlag(g, v, false)
+	currentBranchName, err := gui.GitCommand.CurrentBranchName()
+	if err != nil {
+		return err
 	}
-	err := gui.createConfirmationPanel(g, nil, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-		return gui.pushWithForceFlag(g, v, true)
+
+	if pullables == "?" {
+		return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranchName, func(g *gocui.Gui, v *gocui.View) error {
+			return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v))
+		})
+	} else if pullables == "0" {
+		return gui.pushWithForceFlag(g, v, false, "")
+	}
+	return gui.createConfirmationPanel(g, nil, true, gui.Tr.SLocalize("ForcePush"), gui.Tr.SLocalize("ForcePushPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+		return gui.pushWithForceFlag(g, v, true, "")
 	}, nil)
-	return err
 }
 
 func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
 	file, err := gui.getSelectedFile(g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
-			return err
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 		return nil
 	}
 	if !file.HasInlineMergeConflicts {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons"))
 	}
-	if err := gui.changeContext("main", "merging"); err != nil {
+	if err := gui.changeMainViewsContext("merging"); err != nil {
 		return err
 	}
 	if err := gui.switchFocus(g, v, gui.getMainView()); err != nil {
@@ -479,15 +488,6 @@ func (gui *Gui) handleAbortMerge(g *gocui.Gui, v *gocui.View) error {
 	return gui.refreshFiles()
 }
 
-func (gui *Gui) handleResetAndClean(g *gocui.Gui, v *gocui.View) error {
-	return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("ClearFilePanel"), gui.Tr.SLocalize("SureResetHardHead"), func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.ResetAndClean(); err != nil {
-			gui.createErrorPanel(g, err.Error())
-		}
-		return gui.refreshFiles()
-	}, nil)
-}
-
 func (gui *Gui) openFile(filename string) error {
 	if err := gui.OSCommand.OpenFile(filename); err != nil {
 		return gui.createErrorPanel(gui.g, err.Error())
@@ -504,15 +504,114 @@ func (gui *Gui) anyFilesWithMergeConflicts() bool {
 	return false
 }
 
-func (gui *Gui) handleSoftReset(g *gocui.Gui, v *gocui.View) error {
-	return gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("SoftReset"), gui.Tr.SLocalize("ConfirmSoftReset"), func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.SoftReset("HEAD^"); err != nil {
-			return gui.createErrorPanel(g, err.Error())
-		}
+type discardOption struct {
+	handler     func(fileName *commands.File) error
+	description string
+}
 
-		if err := gui.refreshCommits(gui.g); err != nil {
+// GetDisplayStrings is a function.
+func (r *discardOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description}
+}
+
+func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error {
+	file, err := gui.getSelectedFile(g)
+	if err != nil {
+		if err != gui.Errors.ErrNoFiles {
 			return err
 		}
+		return nil
+	}
+
+	options := []*discardOption{
+		{
+			description: gui.Tr.SLocalize("discardAllChanges"),
+			handler: func(file *commands.File) error {
+				return gui.GitCommand.DiscardAllFileChanges(file)
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func(file *commands.File) error {
+				return nil
+			},
+		},
+	}
+
+	if file.HasStagedChanges && file.HasUnstagedChanges {
+		discardUnstagedChanges := &discardOption{
+			description: gui.Tr.SLocalize("discardUnstagedChanges"),
+			handler: func(file *commands.File) error {
+				return gui.GitCommand.DiscardUnstagedFileChanges(file)
+			},
+		}
+
+		options = append(options[:1], append([]*discardOption{discardUnstagedChanges}, options[1:]...)...)
+	}
+
+	handleMenuPress := func(index int) error {
+		file, err := gui.getSelectedFile(g)
+		if err != nil {
+			return err
+		}
+
+		if err := options[index].handler(file); err != nil {
+			return err
+		}
+
 		return gui.refreshFiles()
-	}, nil)
+	}
+
+	return gui.createMenu(file.Name, options, len(options), handleMenuPress)
+}
+
+func (gui *Gui) handleCustomCommand(g *gocui.Gui, v *gocui.View) error {
+	return gui.createPromptPanel(g, v, gui.Tr.SLocalize("CustomCommand"), "", func(g *gocui.Gui, v *gocui.View) error {
+		command := gui.trimmedContent(v)
+		gui.SubProcess = gui.OSCommand.RunCustomCommand(command)
+		return gui.Errors.ErrSubProcess
+	})
+}
+
+type stashOption struct {
+	description string
+	handler     func() error
+}
+
+// GetDisplayStrings is a function.
+func (o *stashOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{o.description}
+}
+
+func (gui *Gui) handleCreateStashMenu(g *gocui.Gui, v *gocui.View) error {
+	options := []*stashOption{
+		{
+			description: gui.Tr.SLocalize("stashAllChanges"),
+			handler: func() error {
+				return gui.handleStashSave(gui.GitCommand.StashSave)
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("stashStagedChanges"),
+			handler: func() error {
+				return gui.handleStashSave(gui.GitCommand.StashSaveStagedChanges)
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func() error {
+				return nil
+			},
+		},
+	}
+
+	handleMenuPress := func(index int) error {
+		return options[index].handler()
+	}
+
+	return gui.createMenu(gui.Tr.SLocalize("stashOptions"), options, len(options), handleMenuPress)
+}
+
+func (gui *Gui) handleStashChanges(g *gocui.Gui, v *gocui.View) error {
+	return gui.handleStashSave(gui.GitCommand.StashSave)
 }

pkg/gui/git_flow.go

@@ -0,0 +1,106 @@
+package gui
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/jesseduffield/gocui"
+)
+
+type gitFlowOption struct {
+	handler     func() error
+	description string
+}
+
+func (gui *Gui) gitFlowFinishBranch(gitFlowConfig string, branchName string) error {
+	// need to find out what kind of branch this is
+	prefix := strings.SplitAfterN(branchName, "/", 2)[0]
+	suffix := strings.Replace(branchName, prefix, "", 1)
+
+	branchType := ""
+	for _, line := range strings.Split(strings.TrimSpace(gitFlowConfig), "\n") {
+		if strings.HasPrefix(line, "gitflow.prefix.") && strings.HasSuffix(line, prefix) {
+			// now I just need to how do you say
+			regex := regexp.MustCompile("gitflow.prefix.([^ ]*) .*")
+			matches := regex.FindAllStringSubmatch(line, 1)
+
+			if len(matches) > 0 && len(matches[0]) > 1 {
+				branchType = matches[0][1]
+				break
+			}
+		}
+	}
+
+	if branchType == "" {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NotAGitFlowBranch"))
+	}
+
+	subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "finish", suffix)
+	gui.SubProcess = subProcess
+	return gui.Errors.ErrSubProcess
+}
+
+// GetDisplayStrings is a function.
+func (r *gitFlowOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description}
+}
+
+func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
+	branch := gui.getSelectedBranch()
+	if branch == nil {
+		return nil
+	}
+
+	// get config
+	gitFlowConfig, err := gui.OSCommand.RunCommandWithOutput("git config --local --get-regexp gitflow")
+	if err != nil {
+		return gui.createErrorPanel(gui.g, "You need to install git-flow and enable it in this repo to use git-flow features")
+	}
+
+	startHandler := func(branchType string) func() error {
+		return func() error {
+			title := gui.Tr.TemplateLocalize("NewBranchNamePrompt", map[string]interface{}{"branchType": branchType})
+			return gui.createPromptPanel(gui.g, gui.getMenuView(), title, "", func(g *gocui.Gui, v *gocui.View) error {
+				name := gui.trimmedContent(v)
+				subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "start", name)
+				gui.SubProcess = subProcess
+				return gui.Errors.ErrSubProcess
+			})
+		}
+	}
+
+	options := []*gitFlowOption{
+		{
+			// not localising here because it's one to one with the actual git flow commands
+			description: fmt.Sprintf("finish branch '%s'", branch.Name),
+			handler: func() error {
+				return gui.gitFlowFinishBranch(gitFlowConfig, branch.Name)
+			},
+		},
+		{
+			description: "start feature",
+			handler:     startHandler("feature"),
+		},
+		{
+			description: "start hotfix",
+			handler:     startHandler("hotfix"),
+		},
+		{
+			description: "start release",
+			handler:     startHandler("release"),
+		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func() error {
+				return nil
+			},
+		},
+	}
+
+	handleMenuPress := func(index int) error {
+		return options[index].handler()
+	}
+
+	return gui.createMenu("git flow", options, len(options), handleMenuPress)
+}

pkg/gui/gui.go

@@ -1,14 +1,16 @@
 package gui
 
 import (
+	"fmt"
+	"io/ioutil"
 	"math"
+	"os"
+	"runtime"
 	"sync"
 
 	// "io"
 	// "io/ioutil"
 
-	"io/ioutil"
-	"os"
 	"os/exec"
 	"strings"
 	"time"
@@ -23,11 +25,15 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
+	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/updates"
 	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/mattn/go-runewidth"
 	"github.com/sirupsen/logrus"
 )
 
+const StartupPopupVersion = 1
+
 // OverlappingEdges determines if panel edges overlap
 var OverlappingEdges = false
 
@@ -75,16 +81,20 @@ type Gui struct {
 	statusManager *statusManager
 	credentials   credentials
 	waitForIntro  sync.WaitGroup
+	fileWatcher   *fileWatcher
 }
 
 // for now the staging panel state, unlike the other panel states, is going to be
 // non-mutative, so that we don't accidentally end up
 // with mismatches of data. We might change this in the future
-type stagingPanelState struct {
-	SelectedLine   int
-	StageableLines []int
-	HunkStarts     []int
-	Diff           string
+type lineByLinePanelState struct {
+	SelectedLineIdx  int
+	FirstLineIdx     int
+	LastLineIdx      int
+	Diff             string
+	PatchParser      *commands.PatchParser
+	SelectMode       int  // one of LINE, HUNK, or RANGE
+	SecondaryFocused bool // this is for if we show the left or right panel
 }
 
 type mergingPanelState struct {
@@ -98,46 +108,87 @@ type filePanelState struct {
 	SelectedLine int
 }
 
+// TODO: consider splitting this out into the window and the branches view
 type branchPanelState struct {
 	SelectedLine int
 }
 
-type commitPanelState struct {
+type remotePanelState struct {
 	SelectedLine int
 }
 
+type remoteBranchesState struct {
+	SelectedLine int
+}
+
+type tagsPanelState struct {
+	SelectedLine int
+}
+
+type commitPanelState struct {
+	SelectedLine     int
+	SpecificDiffMode bool
+}
+
 type stashPanelState struct {
 	SelectedLine int
 }
 
 type menuPanelState struct {
 	SelectedLine int
+	OnPress      func(g *gocui.Gui, v *gocui.View) error
+}
+
+type commitFilesPanelState struct {
+	SelectedLine int
+}
+
+type statusPanelState struct {
+	pushables string
+	pullables string
 }
 
 type panelStates struct {
-	Files    *filePanelState
-	Branches *branchPanelState
-	Commits  *commitPanelState
-	Stash    *stashPanelState
-	Menu     *menuPanelState
-	Staging  *stagingPanelState
-	Merging  *mergingPanelState
+	Files          *filePanelState
+	Branches       *branchPanelState
+	Remotes        *remotePanelState
+	RemoteBranches *remoteBranchesState
+	Tags           *tagsPanelState
+	Commits        *commitPanelState
+	Stash          *stashPanelState
+	Menu           *menuPanelState
+	LineByLine     *lineByLinePanelState
+	Merging        *mergingPanelState
+	CommitFiles    *commitFilesPanelState
+	Status         *statusPanelState
 }
 
 type guiState struct {
-	Files               []*commands.File
-	Branches            []*commands.Branch
-	Commits             []*commands.Commit
-	StashEntries        []*commands.StashEntry
-	PreviousView        string
-	Platform            commands.Platform
-	Updating            bool
-	Panels              *panelStates
-	WorkingTreeState    string // one of "merging", "rebasing", "normal"
-	Contexts            map[string]string
-	CherryPickedCommits []*commands.Commit
+	Files                []*commands.File
+	Branches             []*commands.Branch
+	Commits              []*commands.Commit
+	StashEntries         []*commands.StashEntry
+	CommitFiles          []*commands.CommitFile
+	DiffEntries          []*commands.Commit
+	Remotes              []*commands.Remote
+	RemoteBranches       []*commands.RemoteBranch
+	Tags                 []*commands.Tag
+	MenuItemCount        int // can't store the actual list because it's of interface{} type
+	PreviousView         string
+	Platform             commands.Platform
+	Updating             bool
+	Panels               *panelStates
+	WorkingTreeState     string // one of "merging", "rebasing", "normal"
+	MainContext          string // used to keep the main and secondary views' contexts in sync
+	CherryPickedCommits  []*commands.Commit
+	SplitMainPanel       bool
+	RetainOriginalDir    bool
+	IsRefreshingFiles    bool
+	RefreshingFilesMutex sync.Mutex
 }
 
+// for now the split view will always be on
+
 // 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) {
 
@@ -147,19 +198,25 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 		Commits:             make([]*commands.Commit, 0),
 		CherryPickedCommits: make([]*commands.Commit, 0),
 		StashEntries:        make([]*commands.StashEntry, 0),
+		DiffEntries:         make([]*commands.Commit, 0),
 		Platform:            *oSCommand.Platform,
 		Panels: &panelStates{
-			Files:    &filePanelState{SelectedLine: -1},
-			Branches: &branchPanelState{SelectedLine: 0},
-			Commits:  &commitPanelState{SelectedLine: -1},
-			Stash:    &stashPanelState{SelectedLine: -1},
-			Menu:     &menuPanelState{SelectedLine: 0},
+			Files:          &filePanelState{SelectedLine: -1},
+			Branches:       &branchPanelState{SelectedLine: 0},
+			Remotes:        &remotePanelState{SelectedLine: 0},
+			RemoteBranches: &remoteBranchesState{SelectedLine: -1},
+			Tags:           &tagsPanelState{SelectedLine: -1},
+			Commits:        &commitPanelState{SelectedLine: -1},
+			CommitFiles:    &commitFilesPanelState{SelectedLine: -1},
+			Stash:          &stashPanelState{SelectedLine: -1},
+			Menu:           &menuPanelState{SelectedLine: 0},
 			Merging: &mergingPanelState{
 				ConflictIndex: 0,
 				ConflictTop:   true,
 				Conflicts:     []commands.Conflict{},
 				EditHistory:   stack.New(),
 			},
+			Status: &statusPanelState{},
 		},
 	}
 
@@ -174,20 +231,22 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
 		statusManager: &statusManager{},
 	}
 
+	gui.watchFilesForChanges()
+
 	gui.GenerateSentinelErrors()
 
 	return gui, nil
 }
 
-func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
-	mainView, _ := g.View("main")
+func (gui *Gui) scrollUpView(viewName string) error {
+	mainView, _ := gui.g.View(viewName)
 	ox, oy := mainView.Origin()
 	newOy := int(math.Max(0, float64(oy-gui.Config.GetUserConfig().GetInt("gui.scrollHeight"))))
 	return mainView.SetOrigin(ox, newOy)
 }
 
-func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
-	mainView, _ := g.View("main")
+func (gui *Gui) scrollDownView(viewName string) error {
+	mainView, _ := gui.g.View(viewName)
 	ox, oy := mainView.Origin()
 	y := oy
 	if !gui.Config.GetUserConfig().GetBool("gui.scrollPastBottom") {
@@ -200,6 +259,22 @@ func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
 	return nil
 }
 
+func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
+	return gui.scrollUpView("main")
+}
+
+func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
+	return gui.scrollDownView("main")
+}
+
+func (gui *Gui) scrollUpSecondary(g *gocui.Gui, v *gocui.View) error {
+	return gui.scrollUpView("secondary")
+}
+
+func (gui *Gui) scrollDownSecondary(g *gocui.Gui, v *gocui.View) error {
+	return gui.scrollDownView("secondary")
+}
+
 func (gui *Gui) handleRefresh(g *gocui.Gui, v *gocui.View) error {
 	return gui.refreshSidePanels(g)
 }
@@ -213,20 +288,21 @@ func max(a, b int) int {
 
 // getFocusLayout returns a manager function for when view gain and lose focus
 func (gui *Gui) getFocusLayout() func(g *gocui.Gui) error {
-	var focusedView *gocui.View
+	var previousView *gocui.View
 	return func(g *gocui.Gui) error {
-		v := gui.g.CurrentView()
-		if v != focusedView {
-			if err := gui.onFocusChange(); err != nil {
+		newView := gui.g.CurrentView()
+		if err := gui.onFocusChange(); err != nil {
+			return err
+		}
+		// for now we don't consider losing focus to a popup panel as actually losing focus
+		if newView != previousView && !gui.isPopupPanel(newView.Name()) {
+			if err := gui.onFocusLost(previousView, newView); err != nil {
 				return err
 			}
-			if err := gui.onFocusLost(focusedView); err != nil {
+			if err := gui.onFocus(newView); err != nil {
 				return err
 			}
-			if err := gui.onFocus(v); err != nil {
-				return err
-			}
-			focusedView = v
+			previousView = newView
 		}
 		return nil
 	}
@@ -237,25 +313,32 @@ func (gui *Gui) onFocusChange() error {
 	for _, view := range gui.g.Views() {
 		view.Highlight = view == currentView
 	}
-	return gui.setMainTitle()
+	return nil
 }
 
-func (gui *Gui) onFocusLost(v *gocui.View) error {
+func (gui *Gui) onFocusLost(v *gocui.View, newView *gocui.View) error {
 	if v == nil {
 		return nil
 	}
-	if v.Name() == "branches" {
-		if err := gui.renderListPanel(gui.getBranchesView(), gui.State.Branches); err != nil {
+	switch v.Name() {
+	case "branches":
+		if v.Context == "local-branches" {
+			// This stops the branches panel from showing the upstream/downstream changes to the selected branch, when it loses focus
+			// inside renderListPanel it checks to see if the panel has focus
+			if err := gui.renderListPanel(gui.getBranchesView(), gui.State.Branches); err != nil {
+				return err
+			}
+		}
+	case "main":
+		// if we have lost focus to a first-class panel, we need to do some cleanup
+		if err := gui.changeMainViewsContext("normal"); err != nil {
 			return err
 		}
-	} else if v.Name() == "main" {
-		// if we have lost focus to a popup panel, that's okay
-		if gui.popupPanelFocused() {
-			return nil
-		}
-
-		if err := gui.changeContext("main", "normal"); err != nil {
-			return err
+	case "commitFiles":
+		if gui.State.MainContext != "patch-building" {
+			if _, err := gui.g.SetViewOnBottom(v.Name()); err != nil {
+				return err
+			}
 		}
 	}
 	gui.Log.Info(v.Name() + " focus lost")
@@ -274,20 +357,74 @@ func (gui *Gui) onFocus(v *gocui.View) error {
 func (gui *Gui) layout(g *gocui.Gui) error {
 	g.Highlight = true
 	width, height := g.Size()
+
 	information := gui.Config.GetVersion()
 	if gui.g.Mouse {
 		donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
 		information = donate + " " + information
 	}
-	leftSideWidth := width / 3
-	statusFilesBoundary := 2
-	filesBranchesBoundary := 2 * height / 5
-	commitsBranchesBoundary := 3 * height / 5
-	optionsTop := height - 2
-	commitsStashBoundary := optionsTop - 3
-	optionsVersionBoundary := width - max(len(utils.Decolorise(information)), 1)
-	minimumHeight := 18
+
+	minimumHeight := 9
 	minimumWidth := 10
+	if height < minimumHeight || width < minimumWidth {
+		v, err := g.SetView("limit", 0, 0, width-1, height-1, 0)
+		if err != nil {
+			if err.Error() != "unknown view" {
+				return err
+			}
+			v.Title = gui.Tr.SLocalize("NotEnoughSpace")
+			v.Wrap = true
+			_, _ = g.SetViewOnTop("limit")
+		}
+		return nil
+	}
+
+	currView := gui.g.CurrentView()
+	currentCyclebleView := gui.State.PreviousView
+	if currView != nil {
+		viewName := currView.Name()
+		usePreviouseView := true
+		for _, view := range cyclableViews {
+			if view == viewName {
+				currentCyclebleView = viewName
+				usePreviouseView = false
+				break
+			}
+		}
+		if usePreviouseView {
+			currentCyclebleView = gui.State.PreviousView
+		}
+	}
+
+	usableSpace := height - 7
+	extraSpace := usableSpace - (usableSpace/3)*3
+
+	vHeights := map[string]int{
+		"status":   3,
+		"files":    (usableSpace / 3) + extraSpace,
+		"branches": usableSpace / 3,
+		"commits":  usableSpace / 3,
+		"stash":    3,
+		"options":  1,
+	}
+
+	if height < 28 {
+		defaultHeight := 3
+		if height < 21 {
+			defaultHeight = 1
+		}
+		vHeights = map[string]int{
+			"status":   defaultHeight,
+			"files":    defaultHeight,
+			"branches": defaultHeight,
+			"commits":  defaultHeight,
+			"stash":    defaultHeight,
+			"options":  defaultHeight,
+		}
+		vHeights[currentCyclebleView] = height - defaultHeight*4 - 1
+	}
+
+	optionsVersionBoundary := width - max(len(utils.Decolorise(information)), 1)
 
 	appStatus := gui.statusManager.getStatusString()
 	appStatusOptionsBoundary := 0
@@ -300,103 +437,130 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		panelSpacing = 0
 	}
 
-	if height < minimumHeight || width < minimumWidth {
-		v, err := g.SetView("limit", 0, 0, max(width-1, 2), max(height-1, 2), 0)
-		if err != nil {
-			if err.Error() != "unknown view" {
-				return err
-			}
-			v.Title = gui.Tr.SLocalize("NotEnoughSpace")
-			v.Wrap = true
-			g.SetViewOnTop("limit")
-		}
-		return nil
-	}
 	_, _ = g.SetViewOnBottom("limit")
 	g.DeleteView("limit")
 
-	v, err := g.SetView("main", leftSideWidth+panelSpacing, 0, width-1, optionsTop, gocui.LEFT)
+	textColor := theme.GocuiDefaultTextColor
+	leftSideWidth := width / 3
+	panelSplitX := width - 1
+	if gui.State.SplitMainPanel {
+		units := 7
+		leftSideWidth = width / units
+		panelSplitX = (1 + ((units - 1) / 2)) * width / units
+	}
+
+	main := "main"
+	secondary := "secondary"
+	swappingMainPanels := gui.State.Panels.LineByLine != nil && gui.State.Panels.LineByLine.SecondaryFocused
+	if swappingMainPanels {
+		main = "secondary"
+		secondary = "main"
+	}
+
+	v, err := g.SetView(main, leftSideWidth+panelSpacing, 0, panelSplitX, height-2, gocui.LEFT)
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		v.Title = gui.Tr.SLocalize("DiffTitle")
 		v.Wrap = true
-		v.FgColor = gocui.ColorWhite
+		v.FgColor = textColor
 	}
 
-	if v, err := g.SetView("status", 0, 0, leftSideWidth, statusFilesBoundary, gocui.BOTTOM|gocui.RIGHT); err != nil {
+	hiddenViewOffset := 0
+	if !gui.State.SplitMainPanel {
+		hiddenViewOffset = 9999
+	}
+	secondaryView, err := g.SetView(secondary, panelSplitX+1+hiddenViewOffset, hiddenViewOffset, width-1+hiddenViewOffset, height-2+hiddenViewOffset, gocui.LEFT)
+	if err != nil {
+		if err.Error() != "unknown view" {
+			return err
+		}
+		secondaryView.Title = gui.Tr.SLocalize("DiffTitle")
+		secondaryView.Wrap = true
+		secondaryView.FgColor = gocui.ColorWhite
+	}
+
+	if v, err := g.SetView("status", 0, 0, leftSideWidth, vHeights["status"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		v.Title = gui.Tr.SLocalize("StatusTitle")
-		v.FgColor = gocui.ColorWhite
+		v.FgColor = textColor
 	}
 
-	filesView, err := g.SetView("files", 0, statusFilesBoundary+panelSpacing, leftSideWidth, filesBranchesBoundary, gocui.TOP|gocui.BOTTOM)
+	filesView, err := g.SetViewBeneath("files", "status", vHeights["files"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		filesView.Highlight = true
 		filesView.Title = gui.Tr.SLocalize("FilesTitle")
-		v.FgColor = gocui.ColorWhite
+		v.FgColor = textColor
 	}
 
-	branchesView, err := g.SetView("branches", 0, filesBranchesBoundary+panelSpacing, leftSideWidth, commitsBranchesBoundary, gocui.TOP|gocui.BOTTOM)
+	branchesView, err := g.SetViewBeneath("branches", "files", vHeights["branches"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		branchesView.Title = gui.Tr.SLocalize("BranchesTitle")
-		branchesView.FgColor = gocui.ColorWhite
+		branchesView.Tabs = []string{"Local Branches", "Remotes", "Tags"}
+		branchesView.FgColor = textColor
 	}
 
-	commitsView, err := g.SetView("commits", 0, commitsBranchesBoundary+panelSpacing, leftSideWidth, commitsStashBoundary, gocui.TOP|gocui.BOTTOM)
+	if v, err := g.SetViewBeneath("commitFiles", "branches", vHeights["commits"]); err != nil {
+		if err.Error() != "unknown view" {
+			return err
+		}
+		v.Title = gui.Tr.SLocalize("CommitFiles")
+		v.FgColor = textColor
+	}
+
+	commitsView, err := g.SetViewBeneath("commits", "branches", vHeights["commits"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		commitsView.Title = gui.Tr.SLocalize("CommitsTitle")
-		commitsView.FgColor = gocui.ColorWhite
+		commitsView.FgColor = textColor
 	}
 
-	stashView, err := g.SetView("stash", 0, commitsStashBoundary+panelSpacing, leftSideWidth, optionsTop, gocui.TOP|gocui.RIGHT)
+	stashView, err := g.SetViewBeneath("stash", "commits", vHeights["stash"])
 	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		stashView.Title = gui.Tr.SLocalize("StashTitle")
-		stashView.FgColor = gocui.ColorWhite
+		stashView.FgColor = textColor
 	}
 
-	if v, err := g.SetView("options", appStatusOptionsBoundary-1, optionsTop, optionsVersionBoundary-1, optionsTop+2, 0); err != nil {
+	if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
 		v.Frame = false
-		if v.FgColor, err = gui.GetOptionsPanelTextColor(); err != nil {
-			return err
-		}
+		userConfig := gui.Config.GetUserConfig()
+		v.FgColor = theme.GetColor(userConfig.GetStringSlice("gui.theme.optionsTextColor"))
 	}
 
 	if gui.getCommitMessageView() == nil {
 		// doesn't matter where this view starts because it will be hidden
-		if commitMessageView, err := g.SetView("commitMessage", 0, 0, width/2, height/2, 0); err != nil {
+		if commitMessageView, err := g.SetView("commitMessage", width, height, width*2, height*2, 0); err != nil {
 			if err.Error() != "unknown view" {
 				return err
 			}
 			g.SetViewOnBottom("commitMessage")
 			commitMessageView.Title = gui.Tr.SLocalize("CommitMessage")
-			commitMessageView.FgColor = gocui.ColorWhite
+			commitMessageView.FgColor = textColor
 			commitMessageView.Editable = true
-			commitMessageView.Editor = gocui.EditorFunc(gui.simpleEditor)
+			commitMessageView.Editor = gocui.EditorFunc(gui.commitMessageEditor)
 		}
 	}
 
 	if check, _ := g.View("credentials"); check == nil {
 		// doesn't matter where this view starts because it will be hidden
-		if credentialsView, err := g.SetView("credentials", 0, 0, width/2, height/2, 0); err != nil {
+		if credentialsView, err := g.SetView("credentials", width, height, width*2, height*2, 0); err != nil {
 			if err.Error() != "unknown view" {
 				return err
 			}
@@ -405,13 +569,12 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 				return err
 			}
 			credentialsView.Title = gui.Tr.SLocalize("CredentialsUsername")
-			credentialsView.FgColor = gocui.ColorWhite
+			credentialsView.FgColor = textColor
 			credentialsView.Editable = true
-			credentialsView.Editor = gocui.EditorFunc(gui.simpleEditor)
 		}
 	}
 
-	if appStatusView, err := g.SetView("appStatus", -1, optionsTop, width, optionsTop+2, 0); err != nil {
+	if appStatusView, err := g.SetView("appStatus", -1, height-2, width, height, 0); err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
@@ -423,7 +586,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 	}
 
-	if v, err := g.SetView("information", optionsVersionBoundary-1, optionsTop, width, optionsTop+2, 0); err != nil {
+	if v, err := g.SetView("information", optionsVersionBoundary-1, height-2, width, height, 0); err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
@@ -434,47 +597,49 @@ 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 {
+		// doing this here because it'll only happen once
+		if err := gui.onInitialViewsCreation(); err != nil {
 			return err
 		}
-		gui.waitForIntro.Done()
-
-		if _, err := gui.g.SetCurrentView(filesView.Name()); err != nil {
-			return err
-		}
-
-		if err := gui.refreshSidePanels(gui.g); err != nil {
-			return err
-		}
-
-		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
-			}
-		}
 	}
 
-	listViews := map[*gocui.View]int{
-		filesView:    gui.State.Panels.Files.SelectedLine,
-		branchesView: gui.State.Panels.Branches.SelectedLine,
-		commitsView:  gui.State.Panels.Commits.SelectedLine,
-		stashView:    gui.State.Panels.Stash.SelectedLine,
+	if gui.g.CurrentView() == nil {
+		if _, err := gui.g.SetCurrentView(gui.getFilesView().Name()); err != nil {
+			return err
+		}
+
+		if err := gui.switchFocus(gui.g, nil, gui.getFilesView()); err != nil {
+			return err
+		}
+	}
+
+	type listViewState struct {
+		selectedLine int
+		lineCount    int
+		view         *gocui.View
+		context      string
+	}
+
+	listViews := []listViewState{
+		{view: filesView, context: "", selectedLine: gui.State.Panels.Files.SelectedLine, lineCount: len(gui.State.Files)},
+		{view: branchesView, context: "local-branches", selectedLine: gui.State.Panels.Branches.SelectedLine, lineCount: len(gui.State.Branches)},
+		{view: branchesView, context: "remotes", selectedLine: gui.State.Panels.Remotes.SelectedLine, lineCount: len(gui.State.Remotes)},
+		{view: branchesView, context: "remote-branches", selectedLine: gui.State.Panels.RemoteBranches.SelectedLine, lineCount: len(gui.State.Remotes)},
+		{view: commitsView, context: "", selectedLine: gui.State.Panels.Commits.SelectedLine, lineCount: len(gui.State.Commits)},
+		{view: stashView, context: "", selectedLine: gui.State.Panels.Stash.SelectedLine, lineCount: len(gui.State.StashEntries)},
 	}
 
 	// menu view might not exist so we check to be safe
 	if menuView, err := gui.g.View("menu"); err == nil {
-		listViews[menuView] = gui.State.Panels.Menu.SelectedLine
+		listViews = append(listViews, listViewState{view: menuView, context: "", selectedLine: gui.State.Panels.Menu.SelectedLine, lineCount: gui.State.MenuItemCount})
 	}
-	for view, selectedLine := range listViews {
+	for _, listView := range listViews {
+		// ignore views where the context doesn't match up with the selected line we're trying to focus
+		if listView.context != "" && (listView.view.Context != listView.context) {
+			continue
+		}
 		// check if the selected line is now out of view and if so refocus it
-		if err := gui.focusPoint(0, selectedLine, view); err != nil {
+		if err := gui.focusPoint(0, listView.selectedLine, listView.lineCount, listView.view); err != nil {
 			return err
 		}
 	}
@@ -486,12 +651,63 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 	return gui.resizeCurrentPopupPanel(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 {
-		gui.waitForIntro.Done()
+func (gui *Gui) onInitialViewsCreation() error {
+	if err := gui.changeMainViewsContext("normal"); err != nil {
+		return err
+	}
+
+	gui.getBranchesView().Context = "local-branches"
+
+	return gui.loadNewRepo()
+}
+
+func (gui *Gui) loadNewRepo() error {
+	gui.Updater.CheckForNewUpdate(gui.onBackgroundUpdateCheckFinish, false)
+	if err := gui.updateRecentRepoList(); err != nil {
+		return err
+	}
+	gui.waitForIntro.Done()
+
+	if err := gui.refreshSidePanels(gui.g); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) showInitialPopups(tasks []func(chan struct{}) error) {
+	gui.waitForIntro.Add(len(tasks))
+	done := make(chan struct{})
+
+	go func() {
+		for _, task := range tasks {
+			go func() {
+				if err := task(done); err != nil {
+					_ = gui.createErrorPanel(gui.g, err.Error())
+				}
+			}()
+
+			<-done
+			gui.waitForIntro.Done()
+		}
+	}()
+}
+
+func (gui *Gui) showShamelessSelfPromotionMessage(done chan struct{}) error {
+	onConfirm := func(g *gocui.Gui, v *gocui.View) error {
+		done <- struct{}{}
+		return gui.Config.WriteToUserConfig("startupPopupVersion", StartupPopupVersion)
+	}
+
+	return gui.createConfirmationPanel(gui.g, nil, true, gui.Tr.SLocalize("ShamelessSelfPromotionTitle"), gui.Tr.SLocalize("ShamelessSelfPromotionMessage"), onConfirm, onConfirm)
+}
+
+func (gui *Gui) promptAnonymousReporting(done chan struct{}) error {
+	return gui.createConfirmationPanel(gui.g, nil, true, gui.Tr.SLocalize("AnonymousReportingTitle"), gui.Tr.SLocalize("AnonymousReportingPrompt"), func(g *gocui.Gui, v *gocui.View) error {
+		done <- struct{}{}
 		return gui.Config.WriteToUserConfig("reporting", "on")
 	}, func(g *gocui.Gui, v *gocui.View) error {
-		gui.waitForIntro.Done()
+		done <- struct{}{}
 		return gui.Config.WriteToUserConfig("reporting", "off")
 	})
 }
@@ -509,7 +725,7 @@ func (gui *Gui) fetch(g *gocui.Gui, v *gocui.View, canAskForCredentials bool) (u
 		close := func(g *gocui.Gui, v *gocui.View) error {
 			return nil
 		}
-		_ = gui.createConfirmationPanel(g, v, gui.Tr.SLocalize("Error"), coloredMessage, close, close)
+		_ = gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("Error"), coloredMessage, close, close)
 	}
 
 	gui.refreshStatus(g)
@@ -526,10 +742,11 @@ func (gui *Gui) renderAppStatus() error {
 
 func (gui *Gui) renderGlobalOptions() error {
 	return gui.renderOptionsMap(map[string]string{
-		"PgUp/PgDn": gui.Tr.SLocalize("scroll"),
-		"← → ↑ ↓":   gui.Tr.SLocalize("navigate"),
-		"esc/q":     gui.Tr.SLocalize("close"),
-		"x":         gui.Tr.SLocalize("menu"),
+		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")):                                                                                 gui.Tr.SLocalize("scroll"),
+		fmt.Sprintf("%s %s %s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock"), gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"),
+		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")):                                                                                                 gui.Tr.SLocalize("close"),
+		fmt.Sprintf("%s", gui.getKeyDisplay("universal.optionMenu")):                                                                                                                                     gui.Tr.SLocalize("menu"),
+		"1-5": gui.Tr.SLocalize("jump"),
 	})
 }
 
@@ -541,6 +758,23 @@ func (gui *Gui) goEvery(interval time.Duration, function func() error) {
 	}()
 }
 
+func (gui *Gui) startBackgroundFetch() {
+	gui.waitForIntro.Wait()
+	isNew := gui.Config.GetIsNewRepo()
+	if !isNew {
+		time.After(60 * time.Second)
+	}
+	_, err := gui.fetch(gui.g, gui.g.CurrentView(), false)
+	if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
+		_ = gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil)
+	} else {
+		gui.goEvery(time.Second*60, func() error {
+			_, err := gui.fetch(gui.g, gui.g.CurrentView(), false)
+			return err
+		})
+	}
+}
+
 // Run setup the gui with keybindings and start the mainloop
 func (gui *Gui) Run() error {
 	g, err := gocui.NewGui(gocui.OutputNormal, OverlappingEdges)
@@ -549,38 +783,34 @@ func (gui *Gui) Run() error {
 	}
 	defer g.Close()
 
+	g.ASCII = runtime.GOOS == "windows" && runewidth.IsEastAsian()
+
 	if gui.Config.GetUserConfig().GetBool("gui.mouseEvents") {
 		g.Mouse = true
 	}
 
 	gui.g = g // TODO: always use gui.g rather than passing g around everywhere
 
-	if err := gui.SetColorScheme(); err != nil {
+	if err := gui.setColorScheme(); err != nil {
 		return err
 	}
 
+	popupTasks := []func(chan struct{}) error{}
 	if gui.Config.GetUserConfig().GetString("reporting") == "undetermined" {
-		gui.waitForIntro.Add(2)
-	} else {
-		gui.waitForIntro.Add(1)
+		popupTasks = append(popupTasks, gui.promptAnonymousReporting)
+	}
+	configPopupVersion := gui.Config.GetUserConfig().GetInt("StartupPopupVersion")
+	// -1 means we've disabled these popups
+	if configPopupVersion != -1 && configPopupVersion < StartupPopupVersion {
+		popupTasks = append(popupTasks, gui.showShamelessSelfPromotionMessage)
+	}
+	gui.showInitialPopups(popupTasks)
+
+	gui.waitForIntro.Add(1)
+	if gui.Config.GetUserConfig().GetBool("git.autoFetch") {
+		go gui.startBackgroundFetch()
 	}
 
-	go func() {
-		gui.waitForIntro.Wait()
-		isNew := gui.Config.GetIsNewRepo()
-		if !isNew {
-			time.After(60 * time.Second)
-		}
-		_, err := gui.fetch(g, g.CurrentView(), false)
-		if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
-			_ = gui.createConfirmationPanel(g, g.CurrentView(), gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), gui.Tr.SLocalize("NoAutomaticGitFetchBody"), nil, nil)
-		} else {
-			gui.goEvery(time.Second*60, func() error {
-				_, err := gui.fetch(gui.g, gui.g.CurrentView(), false)
-				return err
-			})
-		}
-	}()
 	gui.goEvery(time.Second*10, gui.refreshFiles)
 	gui.goEvery(time.Millisecond*50, gui.renderAppStatus)
 
@@ -590,6 +820,8 @@ func (gui *Gui) Run() error {
 		return err
 	}
 
+	gui.Log.Warn("starting main loop")
+
 	err = g.MainLoop()
 	return err
 }
@@ -601,18 +833,21 @@ func (gui *Gui) RunWithSubprocesses() error {
 	for {
 		if err := gui.Run(); err != nil {
 			if err == gocui.ErrQuit {
+				if !gui.State.RetainOriginalDir {
+					if err := gui.recordCurrentDirectory(); err != nil {
+						return err
+					}
+				}
+
+				gui.fileWatcher.Watcher.Close()
+
 				break
 			} else if err == gui.Errors.ErrSwitchRepo {
 				continue
 			} else if err == gui.Errors.ErrSubProcess {
-				gui.SubProcess.Stdin = os.Stdin
-				gui.SubProcess.Stdout = os.Stdout
-				gui.SubProcess.Stderr = os.Stderr
-				gui.SubProcess.Run()
-				gui.SubProcess.Stdout = ioutil.Discard
-				gui.SubProcess.Stderr = ioutil.Discard
-				gui.SubProcess.Stdin = nil
-				gui.SubProcess = nil
+				if err := gui.runCommand(); err != nil {
+					return err
+				}
 			} else {
 				return err
 			}
@@ -621,16 +856,28 @@ func (gui *Gui) RunWithSubprocesses() error {
 	return nil
 }
 
-func (gui *Gui) quit(g *gocui.Gui, v *gocui.View) error {
-	if gui.State.Updating {
-		return gui.createUpdateQuitConfirmation(g, v)
+func (gui *Gui) runCommand() error {
+	gui.SubProcess.Stdout = os.Stdout
+	gui.SubProcess.Stderr = os.Stdout
+	gui.SubProcess.Stdin = os.Stdin
+
+	fmt.Fprintf(os.Stdout, "\n%s\n\n", utils.ColoredString("+ "+strings.Join(gui.SubProcess.Args, " "), color.FgBlue))
+
+	if err := gui.SubProcess.Run(); err != nil {
+		// not handling the error explicitly because usually we're going to see it
+		// in the output anyway
+		gui.Log.Error(err)
 	}
-	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
+
+	gui.SubProcess.Stdout = ioutil.Discard
+	gui.SubProcess.Stderr = ioutil.Discard
+	gui.SubProcess.Stdin = nil
+	gui.SubProcess = nil
+
+	fmt.Fprintf(os.Stdout, "\n%s", utils.ColoredString(gui.Tr.SLocalize("pressEnterToReturn"), color.FgGreen))
+	fmt.Scanln() // wait for enter press
+
+	return nil
 }
 
 func (gui *Gui) handleDonate(g *gocui.Gui, v *gocui.View) error {
@@ -642,5 +889,44 @@ func (gui *Gui) handleDonate(g *gocui.Gui, v *gocui.View) error {
 	if cx > len(gui.Tr.SLocalize("Donate")) {
 		return nil
 	}
-	return gui.OSCommand.OpenLink("https://donorbox.org/lazygit")
+	return gui.OSCommand.OpenLink("https://github.com/sponsors/jesseduffield")
+}
+
+// setColorScheme sets the color scheme for the app based on the user config
+func (gui *Gui) setColorScheme() error {
+	userConfig := gui.Config.GetUserConfig()
+	theme.UpdateTheme(userConfig)
+
+	gui.g.FgColor = theme.InactiveBorderColor
+	gui.g.SelFgColor = theme.ActiveBorderColor
+
+	return nil
+}
+
+func (gui *Gui) handleMouseDownMain(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	switch g.CurrentView().Name() {
+	case "files":
+		return gui.enterFile(false, v.SelectedLineIdx())
+	case "commitFiles":
+		return gui.enterCommitFile(v.SelectedLineIdx())
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleMouseDownSecondary(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	switch g.CurrentView().Name() {
+	case "files":
+		return gui.enterFile(true, v.SelectedLineIdx())
+	}
+
+	return nil
 }

pkg/gui/line_by_line_panel.go

@@ -0,0 +1,316 @@
+package gui
+
+import (
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
+)
+
+// Currently there are two 'pseudo-panels' that make use of this 'pseudo-panel'.
+// One is the staging panel where we stage files line-by-line, the other is the
+// patch building panel where we add lines of an old commit's file to a patch.
+// This file contains the logic around selecting lines and displaying the diffs
+// staging_panel.go and patch_building_panel.go have functions specific to their
+// use cases
+
+// these represent what select mode we're in
+const (
+	LINE = iota
+	RANGE
+	HUNK
+)
+
+// returns whether the patch is empty so caller can escape if necessary
+// both diffs should be non-coloured because we'll parse them and colour them here
+func (gui *Gui) refreshLineByLinePanel(diff string, secondaryDiff string, secondaryFocused bool, selectedLineIdx int) (bool, error) {
+	state := gui.State.Panels.LineByLine
+
+	patchParser, err := commands.NewPatchParser(gui.Log, diff)
+	if err != nil {
+		return false, nil
+	}
+
+	if len(patchParser.StageableLines) == 0 {
+		return true, nil
+	}
+
+	var firstLineIdx int
+	var lastLineIdx int
+	selectMode := LINE
+	// if we have clicked from the outside to focus the main view we'll pass in a non-negative line index so that we can instantly select that line
+	if selectedLineIdx >= 0 {
+		selectMode = RANGE
+		firstLineIdx, lastLineIdx = selectedLineIdx, selectedLineIdx
+	} else if state != nil {
+		if state.SelectMode == HUNK {
+			// this is tricky: we need to find out which hunk we just staged based on our old `state.PatchParser` (as opposed to the new `patchParser`)
+			// we do this by getting the first line index of the original hunk, then
+			// finding the next stageable line, then getting its containing hunk
+			// in the new diff
+			selectMode = HUNK
+			prevNewHunk := state.PatchParser.GetHunkContainingLine(state.SelectedLineIdx, 0)
+			selectedLineIdx = patchParser.GetNextStageableLineIndex(prevNewHunk.FirstLineIdx)
+			newHunk := patchParser.GetHunkContainingLine(selectedLineIdx, 0)
+			firstLineIdx, lastLineIdx = newHunk.FirstLineIdx, newHunk.LastLineIdx
+		} else {
+			selectedLineIdx = patchParser.GetNextStageableLineIndex(state.SelectedLineIdx)
+			firstLineIdx, lastLineIdx = selectedLineIdx, selectedLineIdx
+		}
+	} else {
+		selectedLineIdx = patchParser.StageableLines[0]
+		firstLineIdx, lastLineIdx = selectedLineIdx, selectedLineIdx
+	}
+
+	gui.State.Panels.LineByLine = &lineByLinePanelState{
+		PatchParser:      patchParser,
+		SelectedLineIdx:  selectedLineIdx,
+		SelectMode:       selectMode,
+		FirstLineIdx:     firstLineIdx,
+		LastLineIdx:      lastLineIdx,
+		Diff:             diff,
+		SecondaryFocused: secondaryFocused,
+	}
+
+	if err := gui.refreshMainView(); err != nil {
+		return false, err
+	}
+
+	if err := gui.focusSelection(selectMode == HUNK); err != nil {
+		return false, err
+	}
+
+	secondaryView := gui.getSecondaryView()
+	secondaryView.Highlight = true
+	secondaryView.Wrap = false
+
+	secondaryPatchParser, err := commands.NewPatchParser(gui.Log, secondaryDiff)
+	if err != nil {
+		return false, nil
+	}
+
+	gui.g.Update(func(*gocui.Gui) error {
+		return gui.setViewContent(gui.g, gui.getSecondaryView(), secondaryPatchParser.Render(-1, -1, nil))
+	})
+
+	return false, nil
+}
+
+func (gui *Gui) handleSelectPrevLine(g *gocui.Gui, v *gocui.View) error {
+	return gui.handleCycleLine(-1)
+}
+
+func (gui *Gui) handleSelectNextLine(g *gocui.Gui, v *gocui.View) error {
+	return gui.handleCycleLine(+1)
+}
+
+func (gui *Gui) handleSelectPrevHunk(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+	newHunk := state.PatchParser.GetHunkContainingLine(state.SelectedLineIdx, -1)
+
+	return gui.selectNewHunk(newHunk)
+}
+
+func (gui *Gui) handleSelectNextHunk(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+	newHunk := state.PatchParser.GetHunkContainingLine(state.SelectedLineIdx, 1)
+
+	return gui.selectNewHunk(newHunk)
+}
+
+func (gui *Gui) selectNewHunk(newHunk *commands.PatchHunk) error {
+	state := gui.State.Panels.LineByLine
+	state.SelectedLineIdx = state.PatchParser.GetNextStageableLineIndex(newHunk.FirstLineIdx)
+	if state.SelectMode == HUNK {
+		state.FirstLineIdx, state.LastLineIdx = newHunk.FirstLineIdx, newHunk.LastLineIdx
+	} else {
+		state.FirstLineIdx, state.LastLineIdx = state.SelectedLineIdx, state.SelectedLineIdx
+	}
+
+	if err := gui.refreshMainView(); err != nil {
+		return err
+	}
+
+	return gui.focusSelection(true)
+}
+
+func (gui *Gui) handleCycleLine(change int) error {
+	state := gui.State.Panels.LineByLine
+
+	if state.SelectMode == HUNK {
+		newHunk := state.PatchParser.GetHunkContainingLine(state.SelectedLineIdx, change)
+		return gui.selectNewHunk(newHunk)
+	}
+
+	return gui.handleSelectNewLine(state.SelectedLineIdx + change)
+}
+
+func (gui *Gui) handleSelectNewLine(newSelectedLineIdx int) error {
+	state := gui.State.Panels.LineByLine
+
+	if newSelectedLineIdx < 0 {
+		newSelectedLineIdx = 0
+	} else if newSelectedLineIdx > len(state.PatchParser.PatchLines)-1 {
+		newSelectedLineIdx = len(state.PatchParser.PatchLines) - 1
+	}
+
+	state.SelectedLineIdx = newSelectedLineIdx
+
+	if state.SelectMode == RANGE {
+		if state.SelectedLineIdx < state.FirstLineIdx {
+			state.FirstLineIdx = state.SelectedLineIdx
+		} else {
+			state.LastLineIdx = state.SelectedLineIdx
+		}
+	} else {
+		state.LastLineIdx = state.SelectedLineIdx
+		state.FirstLineIdx = state.SelectedLineIdx
+	}
+
+	if err := gui.refreshMainView(); err != nil {
+		return err
+	}
+
+	return gui.focusSelection(false)
+}
+
+func (gui *Gui) handleMouseDown(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	newSelectedLineIdx := v.SelectedLineIdx()
+	state.FirstLineIdx = newSelectedLineIdx
+	state.LastLineIdx = newSelectedLineIdx
+
+	state.SelectMode = RANGE
+
+	return gui.handleSelectNewLine(newSelectedLineIdx)
+}
+
+func (gui *Gui) handleMouseDrag(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	return gui.handleSelectNewLine(v.SelectedLineIdx())
+}
+
+func (gui *Gui) handleMouseScrollUp(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	state.SelectMode = LINE
+
+	return gui.handleCycleLine(-1)
+}
+
+func (gui *Gui) handleMouseScrollDown(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	state.SelectMode = LINE
+
+	return gui.handleCycleLine(1)
+}
+
+func (gui *Gui) refreshMainView() error {
+	state := gui.State.Panels.LineByLine
+
+	var includedLineIndices []int
+	// I'd prefer not to have knowledge of contexts using this file but I'm not sure
+	// how to get around this
+	if gui.State.MainContext == "patch-building" {
+		filename := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine].Name
+		includedLineIndices = gui.GitCommand.PatchManager.GetFileIncLineIndices(filename)
+	}
+	colorDiff := state.PatchParser.Render(state.FirstLineIdx, state.LastLineIdx, includedLineIndices)
+
+	mainView := gui.getMainView()
+	mainView.Highlight = true
+	mainView.Wrap = false
+
+	gui.g.Update(func(*gocui.Gui) error {
+		return gui.setViewContent(gui.g, gui.getMainView(), colorDiff)
+	})
+
+	return nil
+}
+
+// focusSelection works out the best focus for the staging panel given the
+// selected line and size of the hunk
+func (gui *Gui) focusSelection(includeCurrentHunk bool) error {
+	stagingView := gui.getMainView()
+	state := gui.State.Panels.LineByLine
+
+	_, viewHeight := stagingView.Size()
+	bufferHeight := viewHeight - 1
+	_, origin := stagingView.Origin()
+
+	firstLineIdx := state.SelectedLineIdx
+	lastLineIdx := state.SelectedLineIdx
+
+	if includeCurrentHunk {
+		hunk := state.PatchParser.GetHunkContainingLine(state.SelectedLineIdx, 0)
+		firstLineIdx = hunk.FirstLineIdx
+		lastLineIdx = hunk.LastLineIdx
+	}
+
+	margin := 0 // we may want to have a margin in place to show context  but right now I'm thinking we keep this at zero
+
+	var newOrigin int
+	if firstLineIdx-origin < margin {
+		newOrigin = firstLineIdx - margin
+	} else if lastLineIdx-origin > bufferHeight-margin {
+		newOrigin = lastLineIdx - bufferHeight + margin
+	} else {
+		newOrigin = origin
+	}
+
+	gui.g.Update(func(*gocui.Gui) error {
+		if err := stagingView.SetOrigin(0, newOrigin); err != nil {
+			return err
+		}
+
+		return stagingView.SetCursor(0, state.SelectedLineIdx-newOrigin)
+	})
+
+	return nil
+}
+
+func (gui *Gui) handleToggleSelectRange(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+	if state.SelectMode == RANGE {
+		state.SelectMode = LINE
+	} else {
+		state.SelectMode = RANGE
+	}
+	state.FirstLineIdx, state.LastLineIdx = state.SelectedLineIdx, state.SelectedLineIdx
+
+	return gui.refreshMainView()
+}
+
+func (gui *Gui) handleToggleSelectHunk(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	if state.SelectMode == HUNK {
+		state.SelectMode = LINE
+		state.FirstLineIdx, state.LastLineIdx = state.SelectedLineIdx, state.SelectedLineIdx
+	} else {
+		state.SelectMode = HUNK
+		selectedHunk := state.PatchParser.GetHunkContainingLine(state.SelectedLineIdx, 0)
+		state.FirstLineIdx, state.LastLineIdx = selectedHunk.FirstLineIdx, selectedHunk.LastLineIdx
+	}
+
+	if err := gui.refreshMainView(); err != nil {
+		return err
+	}
+
+	return gui.focusSelection(state.SelectMode == HUNK)
+}

pkg/gui/list_view.go

@@ -0,0 +1,158 @@
+package gui
+
+import "github.com/jesseduffield/gocui"
+
+type listView struct {
+	viewName                string
+	context                 string
+	getItemsLength          func() int
+	getSelectedLineIdxPtr   func() *int
+	handleFocus             func(g *gocui.Gui, v *gocui.View) error
+	handleItemSelect        func(g *gocui.Gui, v *gocui.View) error
+	handleClickSelectedItem func(g *gocui.Gui, v *gocui.View) error
+	gui                     *Gui
+	rendersToMainView       bool
+}
+
+func (lv *listView) handlePrevLine(g *gocui.Gui, v *gocui.View) error {
+	return lv.handleLineChange(-1)
+}
+
+func (lv *listView) handleNextLine(g *gocui.Gui, v *gocui.View) error {
+	return lv.handleLineChange(1)
+}
+
+func (lv *listView) handleLineChange(change int) error {
+	if !lv.gui.isPopupPanel(lv.viewName) && lv.gui.popupPanelFocused() {
+		return nil
+	}
+
+	lv.gui.changeSelectedLine(lv.getSelectedLineIdxPtr(), lv.getItemsLength(), change)
+
+	if lv.rendersToMainView {
+		if err := lv.gui.resetOrigin(lv.gui.getMainView()); err != nil {
+			return err
+		}
+	}
+	view, err := lv.gui.g.View(lv.viewName)
+	if err != nil {
+		return err
+	}
+	return lv.handleItemSelect(lv.gui.g, view)
+}
+
+func (lv *listView) handleClick(g *gocui.Gui, v *gocui.View) error {
+	if !lv.gui.isPopupPanel(lv.viewName) && lv.gui.popupPanelFocused() {
+		return nil
+	}
+
+	selectedLineIdxPtr := lv.getSelectedLineIdxPtr()
+	prevSelectedLineIdx := *selectedLineIdxPtr
+	newSelectedLineIdx := v.SelectedLineIdx()
+
+	if newSelectedLineIdx > lv.getItemsLength()-1 {
+		return lv.handleFocus(lv.gui.g, v)
+	}
+
+	*selectedLineIdxPtr = newSelectedLineIdx
+
+	if prevSelectedLineIdx == newSelectedLineIdx && lv.gui.currentViewName() == lv.viewName && lv.handleClickSelectedItem != nil {
+		return lv.handleClickSelectedItem(lv.gui.g, v)
+	}
+	return lv.handleItemSelect(lv.gui.g, v)
+}
+
+func (gui *Gui) getListViews() []*listView {
+	return []*listView{
+		{
+			viewName:              "menu",
+			getItemsLength:        func() int { return gui.getMenuView().LinesHeight() },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.Menu.SelectedLine },
+			handleFocus:           gui.handleMenuSelect,
+			handleItemSelect:      gui.handleMenuSelect,
+			// need to add a layer of indirection here because the callback changes during runtime
+			handleClickSelectedItem: gui.wrappedHandler(func() error { return gui.State.Panels.Menu.OnPress(gui.g, nil) }),
+			gui:                     gui,
+			rendersToMainView:       false,
+		},
+		{
+			viewName:                "files",
+			getItemsLength:          func() int { return len(gui.State.Files) },
+			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Files.SelectedLine },
+			handleFocus:             gui.focusAndSelectFile,
+			handleItemSelect:        gui.focusAndSelectFile,
+			handleClickSelectedItem: gui.handleFilePress,
+			gui:                     gui,
+			rendersToMainView:       true,
+		},
+		{
+			viewName:              "branches",
+			context:               "local-branches",
+			getItemsLength:        func() int { return len(gui.State.Branches) },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.Branches.SelectedLine },
+			handleFocus:           gui.handleBranchSelect,
+			handleItemSelect:      gui.handleBranchSelect,
+			gui:                   gui,
+			rendersToMainView:     true,
+		},
+		{
+			viewName:                "branches",
+			context:                 "remotes",
+			getItemsLength:          func() int { return len(gui.State.Remotes) },
+			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Remotes.SelectedLine },
+			handleFocus:             gui.wrappedHandler(gui.renderRemotesWithSelection),
+			handleItemSelect:        gui.handleRemoteSelect,
+			handleClickSelectedItem: gui.handleRemoteEnter,
+			gui:                     gui,
+			rendersToMainView:       true,
+		},
+		{
+			viewName:              "branches",
+			context:               "remote-branches",
+			getItemsLength:        func() int { return len(gui.State.RemoteBranches) },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.RemoteBranches.SelectedLine },
+			handleFocus:           gui.handleRemoteBranchSelect,
+			handleItemSelect:      gui.handleRemoteBranchSelect,
+			gui:                   gui,
+			rendersToMainView:     true,
+		},
+		{
+			viewName:              "branches",
+			context:               "tags",
+			getItemsLength:        func() int { return len(gui.State.Tags) },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.Tags.SelectedLine },
+			handleFocus:           gui.handleTagSelect,
+			handleItemSelect:      gui.handleTagSelect,
+			gui:                   gui,
+			rendersToMainView:     true,
+		},
+		{
+			viewName:                "commits",
+			getItemsLength:          func() int { return len(gui.State.Commits) },
+			getSelectedLineIdxPtr:   func() *int { return &gui.State.Panels.Commits.SelectedLine },
+			handleFocus:             gui.handleCommitSelect,
+			handleItemSelect:        gui.handleCommitSelect,
+			handleClickSelectedItem: gui.handleSwitchToCommitFilesPanel,
+			gui:                     gui,
+			rendersToMainView:       true,
+		},
+		{
+			viewName:              "stash",
+			getItemsLength:        func() int { return len(gui.State.StashEntries) },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.Stash.SelectedLine },
+			handleFocus:           gui.handleStashEntrySelect,
+			handleItemSelect:      gui.handleStashEntrySelect,
+			gui:                   gui,
+			rendersToMainView:     true,
+		},
+		{
+			viewName:              "commitFiles",
+			getItemsLength:        func() int { return len(gui.State.CommitFiles) },
+			getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.CommitFiles.SelectedLine },
+			handleFocus:           gui.handleCommitFileSelect,
+			handleItemSelect:      gui.handleCommitFileSelect,
+			gui:                   gui,
+			rendersToMainView:     true,
+		},
+	}
+}

pkg/gui/menu_panel.go

@@ -4,36 +4,23 @@ import (
 	"fmt"
 
 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 // list panel functions
 
 func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error {
-	return gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, v)
-}
-
-func (gui *Gui) handleMenuNextLine(g *gocui.Gui, v *gocui.View) error {
-	panelState := gui.State.Panels.Menu
-	gui.changeSelectedLine(&panelState.SelectedLine, v.LinesHeight(), false)
-
-	return gui.handleMenuSelect(g, v)
-}
-
-func (gui *Gui) handleMenuPrevLine(g *gocui.Gui, v *gocui.View) error {
-	panelState := gui.State.Panels.Menu
-	gui.changeSelectedLine(&panelState.SelectedLine, v.LinesHeight(), true)
-
-	return gui.handleMenuSelect(g, v)
+	return gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, gui.State.MenuItemCount, v)
 }
 
 // specific functions
 
 func (gui *Gui) renderMenuOptions() error {
 	optionsMap := map[string]string{
-		"esc/q": gui.Tr.SLocalize("close"),
-		"↑ ↓":   gui.Tr.SLocalize("navigate"),
-		"space": gui.Tr.SLocalize("execute"),
+		fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")):       gui.Tr.SLocalize("close"),
+		fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"),
+		gui.getKeyDisplay("universal.select"): gui.Tr.SLocalize("execute"),
 	}
 	return gui.renderOptionsMap(optionsMap)
 }
@@ -51,8 +38,9 @@ func (gui *Gui) handleMenuClose(g *gocui.Gui, v *gocui.View) error {
 	return gui.returnFocus(g, v)
 }
 
-func (gui *Gui) createMenu(title string, items interface{}, handlePress func(int) error) error {
+func (gui *Gui) createMenu(title string, items interface{}, itemCount int, handlePress func(int) error) error {
 	isFocused := gui.g.CurrentView().Name() == "menu"
+	gui.State.MenuItemCount = itemCount
 	list, err := utils.RenderList(items, isFocused)
 	if err != nil {
 		return err
@@ -61,7 +49,7 @@ func (gui *Gui) createMenu(title string, items interface{}, handlePress func(int
 	x0, y0, x1, y1 := gui.getConfirmationPanelDimensions(gui.g, false, list)
 	menuView, _ := gui.g.SetView("menu", x0, y0, x1, y1, 0)
 	menuView.Title = title
-	menuView.FgColor = gocui.ColorWhite
+	menuView.FgColor = theme.GocuiDefaultTextColor
 	menuView.Clear()
 	fmt.Fprint(menuView, list)
 	gui.State.Panels.Menu.SelectedLine = 0
@@ -80,8 +68,12 @@ func (gui *Gui) createMenu(title string, items interface{}, handlePress func(int
 		return gui.returnFocus(gui.g, menuView)
 	}
 
-	for _, key := range []gocui.Key{gocui.KeySpace, gocui.KeyEnter} {
-		if err := gui.g.SetKeybinding("menu", key, gocui.ModNone, wrappedHandlePress); err != nil {
+	gui.State.Panels.Menu.OnPress = wrappedHandlePress
+
+	for _, key := range []gocui.Key{gocui.KeySpace, gocui.KeyEnter, 'y'} {
+		_ = gui.g.DeleteKeybinding("menu", key, gocui.ModNone)
+
+		if err := gui.g.SetKeybinding("menu", nil, key, gocui.ModNone, wrappedHandlePress); err != nil {
 			return err
 		}
 	}

pkg/gui/merge_panel.go

@@ -5,6 +5,7 @@ package gui
 import (
 	"bufio"
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"math"
 	"os"
@@ -14,6 +15,7 @@ import (
 	"github.com/golang-collections/collections/stack"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
+	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
@@ -23,7 +25,7 @@ func (gui *Gui) findConflicts(content string) ([]commands.Conflict, error) {
 	for i, line := range utils.SplitLines(content) {
 		trimmedLine := strings.TrimPrefix(line, "++")
 		gui.Log.Info(trimmedLine)
-		if trimmedLine == "<<<<<<< HEAD" || trimmedLine == "<<<<<<< MERGE_HEAD" || trimmedLine == "<<<<<<< Updated upstream" {
+		if trimmedLine == "<<<<<<< HEAD" || trimmedLine == "<<<<<<< MERGE_HEAD" || trimmedLine == "<<<<<<< Updated upstream" || trimmedLine == "<<<<<<< ours" {
 			newConflict = commands.Conflict{Start: i}
 		} else if trimmedLine == "=======" {
 			newConflict.Middle = i
@@ -50,7 +52,7 @@ func (gui *Gui) coloredConflictFile(content string, conflicts []commands.Conflic
 	conflict, remainingConflicts := gui.shiftConflict(conflicts)
 	var outputBuffer bytes.Buffer
 	for i, line := range utils.SplitLines(content) {
-		colourAttr := color.FgWhite
+		colourAttr := theme.DefaultTextColor
 		if i == conflict.Start || i == conflict.Middle || i == conflict.End {
 			colourAttr = color.FgRed
 		}
@@ -242,11 +244,11 @@ func (gui *Gui) scrollToConflict(g *gocui.Gui) error {
 
 func (gui *Gui) renderMergeOptions() error {
 	return gui.renderOptionsMap(map[string]string{
-		"↑ ↓":   gui.Tr.SLocalize("selectHunk"),
-		"← →":   gui.Tr.SLocalize("navigateConflicts"),
-		"space": gui.Tr.SLocalize("pickHunk"),
-		"b":     gui.Tr.SLocalize("pickBothHunks"),
-		"z":     gui.Tr.SLocalize("undo"),
+		fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")):   gui.Tr.SLocalize("selectHunk"),
+		fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock")): gui.Tr.SLocalize("navigateConflicts"),
+		gui.getKeyDisplay("universal.select"):   gui.Tr.SLocalize("pickHunk"),
+		gui.getKeyDisplay("main.pickBothHunks"): gui.Tr.SLocalize("pickBothHunks"),
+		gui.getKeyDisplay("main.undo"):          gui.Tr.SLocalize("undo"),
 	})
 }
 
@@ -284,7 +286,7 @@ func (gui *Gui) handleCompleteMerge() error {
 
 // promptToContinue asks the user if they want to continue the rebase/merge that's in progress
 func (gui *Gui) promptToContinue() error {
-	return gui.createConfirmationPanel(gui.g, gui.getFilesView(), "continue", gui.Tr.SLocalize("ConflictsResolved"), func(g *gocui.Gui, v *gocui.View) error {
+	return gui.createConfirmationPanel(gui.g, gui.getFilesView(), true, "continue", gui.Tr.SLocalize("ConflictsResolved"), func(g *gocui.Gui, v *gocui.View) error {
 		return gui.genericMergeCommand("continue")
 	}, nil)
 }

pkg/gui/options_menu_panel.go

@@ -6,6 +6,7 @@ import (
 	"github.com/go-errors/errors"
 
 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 func (gui *Gui) getBindings(v *gocui.View) []*Binding {
@@ -13,15 +14,17 @@ func (gui *Gui) getBindings(v *gocui.View) []*Binding {
 		bindingsGlobal, bindingsPanel []*Binding
 	)
 
-	bindings := gui.GetCurrentKeybindings()
+	bindings := gui.GetInitialKeybindings()
 
 	for _, binding := range bindings {
-		if binding.GetKey() != "" && binding.Description != "" {
+		if GetKeyDisplay(binding.Key) != "" && binding.Description != "" {
 			switch binding.ViewName {
 			case "":
 				bindingsGlobal = append(bindingsGlobal, binding)
 			case v.Name():
-				bindingsPanel = append(bindingsPanel, binding)
+				if len(binding.Contexts) == 0 || utils.IncludesString(binding.Contexts, v.Context) {
+					bindingsPanel = append(bindingsPanel, binding)
+				}
 			}
 		}
 	}
@@ -49,5 +52,5 @@ func (gui *Gui) handleCreateOptionsMenu(g *gocui.Gui, v *gocui.View) error {
 		return bindings[index].Handler(g, v)
 	}
 
-	return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), bindings, handleMenuPress)
+	return gui.createMenu(strings.Title(gui.Tr.SLocalize("menu")), bindings, len(bindings), handleMenuPress)
 }

pkg/gui/patch_building_panel.go

@@ -0,0 +1,116 @@
+package gui
+
+import (
+	"github.com/jesseduffield/gocui"
+)
+
+func (gui *Gui) refreshPatchBuildingPanel(selectedLineIdx int) error {
+	if !gui.GitCommand.PatchManager.CommitSelected() {
+		return gui.handleEscapePatchBuildingPanel(gui.g, nil)
+	}
+
+	gui.State.SplitMainPanel = true
+
+	gui.getMainView().Title = "Patch"
+	gui.getSecondaryView().Title = "Custom Patch"
+
+	// get diff from commit file that's currently selected
+	commitFile := gui.getSelectedCommitFile(gui.g)
+	if commitFile == nil {
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
+	}
+
+	diff, err := gui.GitCommand.ShowCommitFile(commitFile.Sha, commitFile.Name, true)
+	if err != nil {
+		return err
+	}
+
+	secondaryDiff := gui.GitCommand.PatchManager.RenderPatchForFile(commitFile.Name, true, false, true)
+	if err != nil {
+		return err
+	}
+
+	empty, err := gui.refreshLineByLinePanel(diff, secondaryDiff, false, selectedLineIdx)
+	if err != nil {
+		return err
+	}
+
+	if empty {
+		return gui.handleEscapePatchBuildingPanel(gui.g, nil)
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleAddSelectionToPatch(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	// add range of lines to those set for the file
+	commitFile := gui.getSelectedCommitFile(gui.g)
+	if commitFile == nil {
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
+	}
+
+	gui.GitCommand.PatchManager.AddFileLineRange(commitFile.Name, state.FirstLineIdx, state.LastLineIdx)
+
+	if err := gui.refreshCommitFilesView(); err != nil {
+		return err
+	}
+
+	if err := gui.refreshPatchBuildingPanel(-1); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleRemoveSelectionFromPatch(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	// add range of lines to those set for the file
+	commitFile := gui.getSelectedCommitFile(gui.g)
+	if commitFile == nil {
+		return gui.renderString(gui.g, "commitFiles", gui.Tr.SLocalize("NoCommiteFiles"))
+	}
+
+	gui.GitCommand.PatchManager.RemoveFileLineRange(commitFile.Name, state.FirstLineIdx, state.LastLineIdx)
+
+	if err := gui.refreshCommitFilesView(); err != nil {
+		return err
+	}
+
+	if err := gui.refreshPatchBuildingPanel(-1); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleEscapePatchBuildingPanel(g *gocui.Gui, v *gocui.View) error {
+	gui.State.Panels.LineByLine = nil
+	gui.changeMainViewsContext("normal")
+
+	if gui.GitCommand.PatchManager.IsEmpty() {
+		gui.GitCommand.PatchManager.Reset()
+		gui.State.SplitMainPanel = false
+	}
+
+	return gui.switchFocus(gui.g, nil, gui.getCommitFilesView())
+}
+
+func (gui *Gui) refreshSecondaryPatchPanel() error {
+	if gui.GitCommand.PatchManager.CommitSelected() {
+		gui.State.SplitMainPanel = true
+		secondaryView := gui.getSecondaryView()
+		secondaryView.Highlight = true
+		secondaryView.Wrap = false
+
+		gui.g.Update(func(*gocui.Gui) error {
+			return gui.setViewContent(gui.g, gui.getSecondaryView(), gui.GitCommand.PatchManager.RenderAggregatedPatchColored(false))
+		})
+	} else {
+		gui.State.SplitMainPanel = false
+	}
+
+	return nil
+}

pkg/gui/patch_options_panel.go

@@ -0,0 +1,127 @@
+package gui
+
+import (
+	"fmt"
+
+	"github.com/jesseduffield/gocui"
+)
+
+type patchMenuOption struct {
+	displayName string
+	function    func() error
+}
+
+// GetDisplayStrings is a function.
+func (o *patchMenuOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{o.displayName}
+}
+
+func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error {
+	if !gui.GitCommand.PatchManager.CommitSelected() {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoPatchError"))
+	}
+
+	options := []*patchMenuOption{
+		{displayName: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.CommitSha), function: gui.handleDeletePatchFromCommit},
+		{displayName: "pull patch out into index", function: gui.handlePullPatchIntoWorkingTree},
+		{displayName: "reset patch", function: gui.handleResetPatch},
+	}
+
+	selectedCommit := gui.getSelectedCommit(gui.g)
+	if selectedCommit != nil && gui.GitCommand.PatchManager.CommitSha != selectedCommit.Sha {
+		// adding this option to index 1
+		options = append(
+			options[:1],
+			append(
+				[]*patchMenuOption{
+					{
+						displayName: fmt.Sprintf("move patch to selected commit (%s)", selectedCommit.Sha),
+						function:    gui.handleMovePatchToSelectedCommit,
+					},
+				}, options[1:]...,
+			)...,
+		)
+	}
+
+	handleMenuPress := func(index int) error {
+		return options[index].function()
+	}
+
+	return gui.createMenu(gui.Tr.SLocalize("PatchOptionsTitle"), options, len(options), handleMenuPress)
+}
+
+func (gui *Gui) getPatchCommitIndex() int {
+	for index, commit := range gui.State.Commits {
+		if commit.Sha == gui.GitCommand.PatchManager.CommitSha {
+			return index
+		}
+	}
+	return -1
+}
+
+func (gui *Gui) validateNormalWorkingTreeState() (bool, error) {
+	if gui.State.WorkingTreeState != "normal" {
+		return false, gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantPatchWhileRebasingError"))
+	}
+	return true, nil
+}
+
+func (gui *Gui) returnFocusFromLineByLinePanelIfNecessary() error {
+	if gui.State.MainContext == "patch-building" {
+		return gui.handleEscapePatchBuildingPanel(gui.g, nil)
+	}
+	return nil
+}
+
+func (gui *Gui) handleDeletePatchFromCommit() error {
+	if ok, err := gui.validateNormalWorkingTreeState(); !ok {
+		return err
+	}
+
+	if err := gui.returnFocusFromLineByLinePanelIfNecessary(); err != nil {
+		return err
+	}
+
+	return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
+		commitIndex := gui.getPatchCommitIndex()
+		err := gui.GitCommand.DeletePatchesFromCommit(gui.State.Commits, commitIndex, gui.GitCommand.PatchManager)
+		return gui.handleGenericMergeCommandResult(err)
+	})
+}
+
+func (gui *Gui) handleMovePatchToSelectedCommit() error {
+	if ok, err := gui.validateNormalWorkingTreeState(); !ok {
+		return err
+	}
+
+	if err := gui.returnFocusFromLineByLinePanelIfNecessary(); err != nil {
+		return err
+	}
+
+	return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
+		commitIndex := gui.getPatchCommitIndex()
+		err := gui.GitCommand.MovePatchToSelectedCommit(gui.State.Commits, commitIndex, gui.State.Panels.Commits.SelectedLine, gui.GitCommand.PatchManager)
+		return gui.handleGenericMergeCommandResult(err)
+	})
+}
+
+func (gui *Gui) handlePullPatchIntoWorkingTree() error {
+	if ok, err := gui.validateNormalWorkingTreeState(); !ok {
+		return err
+	}
+
+	if err := gui.returnFocusFromLineByLinePanelIfNecessary(); err != nil {
+		return err
+	}
+
+	return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
+		commitIndex := gui.getPatchCommitIndex()
+		err := gui.GitCommand.PullPatchIntoIndex(gui.State.Commits, commitIndex, gui.GitCommand.PatchManager)
+		return gui.handleGenericMergeCommandResult(err)
+	})
+}
+
+func (gui *Gui) handleResetPatch() error {
+	gui.GitCommand.PatchManager.Reset()
+	return gui.refreshCommitFilesView()
+}

pkg/gui/quitting.go

@@ -0,0 +1,48 @@
+package gui
+
+import (
+	"os"
+
+	"github.com/jesseduffield/gocui"
+)
+
+// when a user runs lazygit with the LAZYGIT_NEW_DIR_FILE env variable defined
+// we will write the current directory to that file on exit so that their
+// shell can then change to that directory. That means you don't get kicked
+// back to the directory that you started with.
+func (gui *Gui) recordCurrentDirectory() error {
+	if os.Getenv("LAZYGIT_NEW_DIR_FILE") == "" {
+		return nil
+	}
+
+	// determine current directory, set it in LAZYGIT_NEW_DIR_FILE
+	dirName, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	return gui.OSCommand.CreateFileWithContent(os.Getenv("LAZYGIT_NEW_DIR_FILE"), dirName)
+}
+
+func (gui *Gui) handleQuitWithoutChangingDirectory(g *gocui.Gui, v *gocui.View) error {
+	gui.State.RetainOriginalDir = true
+	return gui.quit(v)
+}
+
+func (gui *Gui) handleQuit(g *gocui.Gui, v *gocui.View) error {
+	gui.State.RetainOriginalDir = false
+	return gui.quit(v)
+}
+
+func (gui *Gui) quit(v *gocui.View) error {
+	if gui.State.Updating {
+		return gui.createUpdateQuitConfirmation(gui.g, v)
+	}
+	if gui.Config.GetUserConfig().GetBool("confirmOnQuit") {
+		return gui.createConfirmationPanel(gui.g, v, true, "", gui.Tr.SLocalize("ConfirmQuit"), func(g *gocui.Gui, v *gocui.View) error {
+			return gocui.ErrQuit
+		}, nil)
+	}
+
+	return gocui.ErrQuit
+}

pkg/gui/rebase_options_panel.go

@@ -26,8 +26,13 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
 		options = append(options, &option{value: "skip"})
 	}
 
+	options = append(options, &option{value: "cancel"})
+
 	handleMenuPress := func(index int) error {
 		command := options[index].value
+		if command == "cancel" {
+			return nil
+		}
 		return gui.genericMergeCommand(command)
 	}
 
@@ -38,7 +43,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
 		title = gui.Tr.SLocalize("RebaseOptionsTitle")
 	}
 
-	return gui.createMenu(title, options, handleMenuPress)
+	return gui.createMenu(title, options, len(options), handleMenuPress)
 }
 
 func (gui *Gui) genericMergeCommand(command string) error {
@@ -77,8 +82,10 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error {
 		return result
 	} else if strings.Contains(result.Error(), "No changes - did you forget to use") {
 		return gui.genericMergeCommand("skip")
+	} else if strings.Contains(result.Error(), "The previous cherry-pick is now empty") {
+		return gui.genericMergeCommand("continue")
 	} else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") {
-		return gui.createConfirmationPanel(gui.g, gui.getFilesView(), gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"),
+		return gui.createConfirmationPanel(gui.g, gui.getFilesView(), true, gui.Tr.SLocalize("FoundConflictsTitle"), gui.Tr.SLocalize("FoundConflicts"),
 			func(g *gocui.Gui, v *gocui.View) error {
 				return nil
 			}, func(g *gocui.Gui, v *gocui.View) error {

pkg/gui/recent_repos_panel.go

@@ -44,7 +44,7 @@ func (gui *Gui) handleCreateRecentReposMenu(g *gocui.Gui, v *gocui.View) error {
 		return gui.Errors.ErrSwitchRepo
 	}
 
-	return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), recentRepos, handleMenuPress)
+	return gui.createMenu(gui.Tr.SLocalize("RecentRepos"), recentRepos, len(recentRepos), handleMenuPress)
 }
 
 // updateRecentRepoList registers the fact that we opened lazygit in this repo,

pkg/gui/remote_branches_panel.go

@@ -0,0 +1,134 @@
+package gui
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+// list panel functions
+
+func (gui *Gui) getSelectedRemoteBranch() *commands.RemoteBranch {
+	selectedLine := gui.State.Panels.RemoteBranches.SelectedLine
+	if selectedLine == -1 || len(gui.State.RemoteBranches) == 0 {
+		return nil
+	}
+
+	return gui.State.RemoteBranches[selectedLine]
+}
+
+func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	gui.State.SplitMainPanel = false
+
+	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
+		return err
+	}
+
+	gui.getMainView().Title = "Remote Branch"
+
+	remote := gui.getSelectedRemote()
+	remoteBranch := gui.getSelectedRemoteBranch()
+	if remoteBranch == nil {
+		return gui.renderString(g, "main", "No branches for this remote")
+	}
+
+	gui.focusPoint(0, gui.State.Panels.Menu.SelectedLine, gui.State.MenuItemCount, v)
+	if err := gui.focusPoint(0, gui.State.Panels.RemoteBranches.SelectedLine, len(gui.State.RemoteBranches), v); err != nil {
+		return err
+	}
+
+	go func() {
+		graph, err := gui.GitCommand.GetBranchGraph(fmt.Sprintf("%s/%s", remote.Name, remoteBranch.Name))
+		if err != nil && strings.HasPrefix(graph, "fatal: ambiguous argument") {
+			graph = gui.Tr.SLocalize("NoTrackingThisBranch")
+		}
+		_ = gui.renderString(g, "main", fmt.Sprintf("%s/%s\n\n%s", utils.ColoredString(remote.Name, color.FgRed), utils.ColoredString(remoteBranch.Name, color.FgGreen), graph))
+	}()
+
+	return nil
+}
+
+func (gui *Gui) handleRemoteBranchesEscape(g *gocui.Gui, v *gocui.View) error {
+	return gui.switchBranchesPanelContext("remotes")
+}
+
+func (gui *Gui) renderRemoteBranchesWithSelection() error {
+	branchesView := gui.getBranchesView()
+
+	gui.refreshSelectedLine(&gui.State.Panels.RemoteBranches.SelectedLine, len(gui.State.RemoteBranches))
+	if err := gui.renderListPanel(branchesView, gui.State.RemoteBranches); err != nil {
+		return err
+	}
+	if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleCheckoutRemoteBranch(g *gocui.Gui, v *gocui.View) error {
+	remoteBranch := gui.getSelectedRemoteBranch()
+	if remoteBranch == nil {
+		return nil
+	}
+	if err := gui.handleCheckoutRef(remoteBranch.RemoteName + "/" + remoteBranch.Name); err != nil {
+		return err
+	}
+	return gui.switchBranchesPanelContext("local-branches")
+}
+
+func (gui *Gui) handleMergeRemoteBranch(g *gocui.Gui, v *gocui.View) error {
+	selectedBranchName := gui.getSelectedRemoteBranch().Name
+	return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName)
+}
+
+func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error {
+	remoteBranch := gui.getSelectedRemoteBranch()
+	if remoteBranch == nil {
+		return nil
+	}
+	message := fmt.Sprintf("%s '%s/%s'?", gui.Tr.SLocalize("DeleteRemoteBranchMessage"), remoteBranch.RemoteName, remoteBranch.Name)
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("DeleteRemoteBranch"), message, func(*gocui.Gui, *gocui.View) error {
+		return gui.WithWaitingStatus(gui.Tr.SLocalize("DeletingStatus"), func() error {
+			if err := gui.GitCommand.DeleteRemoteBranch(remoteBranch.RemoteName, remoteBranch.Name); err != nil {
+				return err
+			}
+
+			return gui.refreshRemotes()
+		})
+	}, nil)
+}
+
+func (gui *Gui) handleRebaseOntoRemoteBranch(g *gocui.Gui, v *gocui.View) error {
+	selectedBranchName := gui.getSelectedRemoteBranch().Name
+	return gui.handleRebaseOntoBranch(selectedBranchName)
+}
+
+func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
+	selectedBranch := gui.getSelectedRemoteBranch()
+	checkedOutBranch := gui.getCheckedOutBranch()
+
+	message := gui.Tr.TemplateLocalize(
+		"SetUpstreamMessage",
+		Teml{
+			"checkedOut": checkedOutBranch.Name,
+			"selected":   selectedBranch.RemoteName + "/" + selectedBranch.Name,
+		},
+	)
+
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("SetUpstreamTitle"), message, func(*gocui.Gui, *gocui.View) error {
+		if err := gui.GitCommand.SetBranchUpstream(selectedBranch.RemoteName, selectedBranch.Name, checkedOutBranch.Name); err != nil {
+			return err
+		}
+
+		return gui.refreshSidePanels(gui.g)
+	}, nil)
+}

pkg/gui/remotes_panel.go

@@ -0,0 +1,193 @@
+package gui
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+)
+
+// list panel functions
+
+func (gui *Gui) getSelectedRemote() *commands.Remote {
+	selectedLine := gui.State.Panels.Remotes.SelectedLine
+	if selectedLine == -1 || len(gui.State.Remotes) == 0 {
+		return nil
+	}
+
+	return gui.State.Remotes[selectedLine]
+}
+
+func (gui *Gui) handleRemoteSelect(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	gui.State.SplitMainPanel = false
+
+	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
+		return err
+	}
+
+	gui.getMainView().Title = "Remote"
+
+	remote := gui.getSelectedRemote()
+	if remote == nil {
+		return gui.renderString(g, "main", "No remotes")
+	}
+	if err := gui.focusPoint(0, gui.State.Panels.Remotes.SelectedLine, len(gui.State.Remotes), v); err != nil {
+		return err
+	}
+
+	return gui.renderString(g, "main", fmt.Sprintf("%s\nUrls:\n%s", utils.ColoredString(remote.Name, color.FgGreen), strings.Join(remote.Urls, "\n")))
+}
+
+func (gui *Gui) refreshRemotes() error {
+	prevSelectedRemote := gui.getSelectedRemote()
+
+	remotes, err := gui.GitCommand.GetRemotes()
+	if err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+
+	gui.State.Remotes = remotes
+
+	// we need to ensure our selected remote branches aren't now outdated
+	if prevSelectedRemote != nil && gui.State.RemoteBranches != nil {
+		// find remote now
+		for _, remote := range remotes {
+			if remote.Name == prevSelectedRemote.Name {
+				gui.State.RemoteBranches = remote.Branches
+			}
+		}
+	}
+
+	// TODO: see if this works for deleting remote branches
+	switch gui.getBranchesView().Context {
+	case "remotes":
+		return gui.renderRemotesWithSelection()
+	case "remote-branches":
+		return gui.renderRemoteBranchesWithSelection()
+	}
+
+	return nil
+}
+
+func (gui *Gui) renderRemotesWithSelection() error {
+	branchesView := gui.getBranchesView()
+
+	gui.refreshSelectedLine(&gui.State.Panels.Remotes.SelectedLine, len(gui.State.Remotes))
+	if err := gui.renderListPanel(branchesView, gui.State.Remotes); err != nil {
+		return err
+	}
+	if err := gui.handleRemoteSelect(gui.g, branchesView); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleRemoteEnter(g *gocui.Gui, v *gocui.View) error {
+	// naive implementation: get the branches and render them to the list, change the context
+	remote := gui.getSelectedRemote()
+	if remote == nil {
+		return nil
+	}
+
+	gui.State.RemoteBranches = remote.Branches
+
+	newSelectedLine := 0
+	if len(remote.Branches) == 0 {
+		newSelectedLine = -1
+	}
+	gui.State.Panels.RemoteBranches.SelectedLine = newSelectedLine
+
+	return gui.switchBranchesPanelContext("remote-branches")
+}
+
+func (gui *Gui) handleAddRemote(g *gocui.Gui, v *gocui.View) error {
+	branchesView := gui.getBranchesView()
+	return gui.createPromptPanel(g, branchesView, gui.Tr.SLocalize("newRemoteName"), "", func(g *gocui.Gui, v *gocui.View) error {
+		remoteName := gui.trimmedContent(v)
+		return gui.createPromptPanel(g, branchesView, gui.Tr.SLocalize("newRemoteUrl"), "", func(g *gocui.Gui, v *gocui.View) error {
+			remoteUrl := gui.trimmedContent(v)
+			if err := gui.GitCommand.AddRemote(remoteName, remoteUrl); err != nil {
+				return err
+			}
+			return gui.refreshRemotes()
+		})
+	})
+}
+
+func (gui *Gui) handleRemoveRemote(g *gocui.Gui, v *gocui.View) error {
+	remote := gui.getSelectedRemote()
+	if remote == nil {
+		return nil
+	}
+	return gui.createConfirmationPanel(g, v, true, gui.Tr.SLocalize("removeRemote"), gui.Tr.SLocalize("removeRemotePrompt")+" '"+remote.Name+"'?", func(*gocui.Gui, *gocui.View) error {
+		if err := gui.GitCommand.RemoveRemote(remote.Name); err != nil {
+			return err
+		}
+
+		return gui.refreshRemotes()
+
+	}, nil)
+}
+
+func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {
+	branchesView := gui.getBranchesView()
+	remote := gui.getSelectedRemote()
+	if remote == nil {
+		return nil
+	}
+
+	editNameMessage := gui.Tr.TemplateLocalize(
+		"editRemoteName",
+		Teml{
+			"remoteName": remote.Name,
+		},
+	)
+
+	return gui.createPromptPanel(g, branchesView, editNameMessage, "", func(g *gocui.Gui, v *gocui.View) error {
+		updatedRemoteName := gui.trimmedContent(v)
+
+		if updatedRemoteName != remote.Name {
+			if err := gui.GitCommand.RenameRemote(remote.Name, updatedRemoteName); err != nil {
+				return gui.createErrorPanel(gui.g, err.Error())
+			}
+		}
+
+		editUrlMessage := gui.Tr.TemplateLocalize(
+			"editRemoteUrl",
+			Teml{
+				"remoteName": updatedRemoteName,
+			},
+		)
+
+		return gui.createPromptPanel(g, branchesView, editUrlMessage, "", func(g *gocui.Gui, v *gocui.View) error {
+			updatedRemoteUrl := gui.trimmedContent(v)
+			if err := gui.GitCommand.UpdateRemoteUrl(updatedRemoteName, updatedRemoteUrl); err != nil {
+				return gui.createErrorPanel(gui.g, err.Error())
+			}
+			return gui.refreshRemotes()
+		})
+	})
+}
+
+func (gui *Gui) handleFetchRemote(g *gocui.Gui, v *gocui.View) error {
+	remote := gui.getSelectedRemote()
+	if remote == nil {
+		return nil
+	}
+
+	return gui.WithWaitingStatus(gui.Tr.SLocalize("FetchingRemoteStatus"), func() error {
+		if err := gui.GitCommand.FetchRemote(remote.Name); err != nil {
+			return err
+		}
+
+		return gui.refreshRemotes()
+	})
+}

pkg/gui/staging_panel.go

@@ -1,12 +1,17 @@
 package gui
 
 import (
+	"strings"
+
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/git"
-	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/jesseduffield/lazygit/pkg/commands"
 )
 
-func (gui *Gui) refreshStagingPanel() error {
+func (gui *Gui) refreshStagingPanel(forceSecondaryFocused bool, selectedLineIdx int) error {
+	gui.State.SplitMainPanel = true
+
+	state := gui.State.Panels.LineByLine
+
 	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		if err != gui.Errors.ErrNoFiles {
@@ -15,208 +20,132 @@ func (gui *Gui) refreshStagingPanel() error {
 		return gui.handleStagingEscape(gui.g, nil)
 	}
 
-	if !file.HasUnstagedChanges {
+	if !file.HasUnstagedChanges && !file.HasStagedChanges {
 		return gui.handleStagingEscape(gui.g, nil)
 	}
 
+	secondaryFocused := false
+	if forceSecondaryFocused {
+		secondaryFocused = true
+	} else {
+		if state != nil {
+			secondaryFocused = state.SecondaryFocused
+		}
+	}
+
+	if (secondaryFocused && !file.HasStagedChanges) || (!secondaryFocused && !file.HasUnstagedChanges) {
+		secondaryFocused = !secondaryFocused
+	}
+
+	if secondaryFocused {
+		gui.getMainView().Title = gui.Tr.SLocalize("StagedChanges")
+		gui.getSecondaryView().Title = gui.Tr.SLocalize("UnstagedChanges")
+	} else {
+		gui.getMainView().Title = gui.Tr.SLocalize("UnstagedChanges")
+		gui.getSecondaryView().Title = gui.Tr.SLocalize("StagedChanges")
+	}
+
 	// note for custom diffs, we'll need to send a flag here saying not to use the custom diff
-	diff := gui.GitCommand.Diff(file, true)
-	colorDiff := gui.GitCommand.Diff(file, false)
+	diff := gui.GitCommand.Diff(file, true, secondaryFocused)
+	secondaryDiff := gui.GitCommand.Diff(file, true, !secondaryFocused)
 
-	if len(diff) < 2 {
-		return gui.handleStagingEscape(gui.g, nil)
-	}
-
-	// parse the diff and store the line numbers of hunks and stageable lines
-	// TODO: maybe instantiate this at application start
-	p, err := git.NewPatchParser(gui.Log)
-	if err != nil {
-		return nil
-	}
-	hunkStarts, stageableLines, err := p.ParsePatch(diff)
-	if err != nil {
-		return nil
-	}
-
-	var selectedLine int
-	if gui.State.Panels.Staging != nil {
-		end := len(stageableLines) - 1
-		if end < gui.State.Panels.Staging.SelectedLine {
-			selectedLine = end
-		} else {
-			selectedLine = gui.State.Panels.Staging.SelectedLine
+	// if we have e.g. a deleted file with nothing else to the diff will have only
+	// 4-5 lines in which case we'll swap panels
+	if len(strings.Split(diff, "\n")) < 5 {
+		if len(strings.Split(secondaryDiff, "\n")) < 5 {
+			return gui.handleStagingEscape(gui.g, nil)
 		}
-	} else {
-		selectedLine = 0
+		secondaryFocused = !secondaryFocused
+		diff, secondaryDiff = secondaryDiff, diff
 	}
 
-	gui.State.Panels.Staging = &stagingPanelState{
-		StageableLines: stageableLines,
-		HunkStarts:     hunkStarts,
-		SelectedLine:   selectedLine,
-		Diff:           diff,
-	}
-
-	if len(stageableLines) == 0 {
-		return gui.createErrorPanel(gui.g, "No lines to stage")
-	}
-
-	if err := gui.focusLineAndHunk(); err != nil {
+	empty, err := gui.refreshLineByLinePanel(diff, secondaryDiff, secondaryFocused, selectedLineIdx)
+	if err != nil {
 		return err
 	}
 
-	mainView := gui.getMainView()
-	mainView.Highlight = true
-	mainView.Wrap = false
-
-	gui.g.Update(func(*gocui.Gui) error {
-		return gui.setViewContent(gui.g, gui.getMainView(), colorDiff)
-	})
+	if empty {
+		return gui.handleStagingEscape(gui.g, nil)
+	}
 
 	return nil
 }
 
+func (gui *Gui) handleTogglePanelClick(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	state.SecondaryFocused = !state.SecondaryFocused
+
+	return gui.refreshStagingPanel(false, v.SelectedLineIdx())
+}
+
+func (gui *Gui) handleTogglePanel(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	state.SecondaryFocused = !state.SecondaryFocused
+	return gui.refreshStagingPanel(false, -1)
+}
+
 func (gui *Gui) handleStagingEscape(g *gocui.Gui, v *gocui.View) error {
-	gui.State.Panels.Staging = nil
+	gui.State.Panels.LineByLine = nil
 
 	return gui.switchFocus(gui.g, nil, gui.getFilesView())
 }
 
-func (gui *Gui) handleStagingPrevLine(g *gocui.Gui, v *gocui.View) error {
-	return gui.handleCycleLine(true)
+func (gui *Gui) handleStageSelection(g *gocui.Gui, v *gocui.View) error {
+	return gui.applySelection(false)
 }
 
-func (gui *Gui) handleStagingNextLine(g *gocui.Gui, v *gocui.View) error {
-	return gui.handleCycleLine(false)
+func (gui *Gui) handleResetSelection(g *gocui.Gui, v *gocui.View) error {
+	return gui.applySelection(true)
 }
 
-func (gui *Gui) handleStagingPrevHunk(g *gocui.Gui, v *gocui.View) error {
-	return gui.handleCycleHunk(true)
-}
+func (gui *Gui) applySelection(reverse bool) error {
+	state := gui.State.Panels.LineByLine
 
-func (gui *Gui) handleStagingNextHunk(g *gocui.Gui, v *gocui.View) error {
-	return gui.handleCycleHunk(false)
-}
-
-func (gui *Gui) handleCycleHunk(prev bool) error {
-	state := gui.State.Panels.Staging
-	lineNumbers := state.StageableLines
-	currentLine := lineNumbers[state.SelectedLine]
-	currentHunkIndex := utils.PrevIndex(state.HunkStarts, currentLine)
-	var newHunkIndex int
-	if prev {
-		if currentHunkIndex == 0 {
-			newHunkIndex = len(state.HunkStarts) - 1
-		} else {
-			newHunkIndex = currentHunkIndex - 1
-		}
-	} else {
-		if currentHunkIndex == len(state.HunkStarts)-1 {
-			newHunkIndex = 0
-		} else {
-			newHunkIndex = currentHunkIndex + 1
-		}
+	if !reverse && state.SecondaryFocused {
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantStageStaged"))
 	}
 
-	state.SelectedLine = utils.NextIndex(lineNumbers, state.HunkStarts[newHunkIndex])
-
-	return gui.focusLineAndHunk()
-}
-
-func (gui *Gui) handleCycleLine(prev bool) error {
-	state := gui.State.Panels.Staging
-	lineNumbers := state.StageableLines
-	currentLine := lineNumbers[state.SelectedLine]
-	var newIndex int
-	if prev {
-		newIndex = utils.PrevIndex(lineNumbers, currentLine)
-	} else {
-		newIndex = utils.NextIndex(lineNumbers, currentLine)
-	}
-	state.SelectedLine = newIndex
-
-	return gui.focusLineAndHunk()
-}
-
-// focusLineAndHunk works out the best focus for the staging panel given the
-// selected line and size of the hunk
-func (gui *Gui) focusLineAndHunk() error {
-	stagingView := gui.getMainView()
-	state := gui.State.Panels.Staging
-
-	lineNumber := state.StageableLines[state.SelectedLine]
-
-	// we want the bottom line of the view buffer to ideally be the bottom line
-	// of the hunk, but if the hunk is too big we'll just go three lines beyond
-	// the currently selected line so that the user can see the context
-	var bottomLine int
-	nextHunkStartIndex := utils.NextIndex(state.HunkStarts, lineNumber)
-	if nextHunkStartIndex == 0 {
-		// for now linesHeight is an efficient means of getting the number of lines
-		// in the patch. However if we introduce word wrap we'll need to update this
-		bottomLine = stagingView.LinesHeight() - 1
-	} else {
-		bottomLine = state.HunkStarts[nextHunkStartIndex] - 1
-	}
-
-	hunkStartIndex := utils.PrevIndex(state.HunkStarts, lineNumber)
-	hunkStart := state.HunkStarts[hunkStartIndex]
-	// if it's the first hunk we'll also show the diff header
-	if hunkStartIndex == 0 {
-		hunkStart = 0
-	}
-
-	_, height := stagingView.Size()
-	// if this hunk is too big, we will just ensure that the user can at least
-	// see three lines of context below the cursor
-	if bottomLine-hunkStart > height {
-		bottomLine = lineNumber + 3
-	}
-
-	return gui.generalFocusLine(lineNumber, bottomLine, stagingView)
-}
-
-func (gui *Gui) handleStageHunk(g *gocui.Gui, v *gocui.View) error {
-	return gui.handleStageLineOrHunk(true)
-}
-
-func (gui *Gui) handleStageLine(g *gocui.Gui, v *gocui.View) error {
-	return gui.handleStageLineOrHunk(false)
-}
-
-func (gui *Gui) handleStageLineOrHunk(hunk bool) error {
-	state := gui.State.Panels.Staging
-	p, err := git.NewPatchModifier(gui.Log)
+	file, err := gui.getSelectedFile(gui.g)
 	if err != nil {
 		return err
 	}
 
-	currentLine := state.StageableLines[state.SelectedLine]
-	var patch string
-	if hunk {
-		patch, err = p.ModifyPatchForHunk(state.Diff, state.HunkStarts, currentLine)
-	} else {
-		patch, err = p.ModifyPatchForLine(state.Diff, currentLine)
-	}
-	if err != nil {
-		return err
-	}
+	patch := commands.ModifiedPatchForRange(gui.Log, file.Name, state.Diff, state.FirstLineIdx, state.LastLineIdx, reverse, false)
 
-	// for logging purposes
-	// ioutil.WriteFile("patch.diff", []byte(patch), 0600)
+	if patch == "" {
+		return nil
+	}
 
 	// apply the patch then refresh this panel
 	// create a new temp file with the patch, then call git apply with that patch
-	_, err = gui.GitCommand.ApplyPatch(patch)
+	applyFlags := []string{}
+	if !reverse || state.SecondaryFocused {
+		applyFlags = append(applyFlags, "cached")
+	}
+	err = gui.GitCommand.ApplyPatch(patch, applyFlags...)
 	if err != nil {
-		return err
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+
+	if state.SelectMode == RANGE {
+		state.SelectMode = LINE
 	}
 
 	if err := gui.refreshFiles(); err != nil {
 		return err
 	}
-	if err := gui.refreshStagingPanel(); err != nil {
+	if err := gui.refreshStagingPanel(false, -1); err != nil {
 		return err
 	}
 	return nil
 }
+
+func (gui *Gui) handleMouseDownSecondaryWhileStaging(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.LineByLine
+
+	state.SecondaryFocused = !state.SecondaryFocused
+
+	return gui.refreshStagingPanel(false, -1)
+}

pkg/gui/stash_panel.go

@@ -24,14 +24,19 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {
 		return nil
 	}
 
+	gui.State.SplitMainPanel = false
+
 	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
 		return err
 	}
+
+	gui.getMainView().Title = "Stash"
+
 	stashEntry := gui.getSelectedStashEntry(v)
 	if stashEntry == nil {
 		return gui.renderString(g, "main", gui.Tr.SLocalize("NoStashEntries"))
 	}
-	if err := gui.focusPoint(0, gui.State.Panels.Stash.SelectedLine, v); err != nil {
+	if err := gui.focusPoint(0, gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries), v); err != nil {
 		return err
 	}
 	go func() {
@@ -66,34 +71,6 @@ func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {
 	return nil
 }
 
-func (gui *Gui) handleStashNextLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Stash
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.StashEntries), false)
-
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
-		return err
-	}
-	return gui.handleStashEntrySelect(gui.g, v)
-}
-
-func (gui *Gui) handleStashPrevLine(g *gocui.Gui, v *gocui.View) error {
-	if gui.popupPanelFocused() {
-		return nil
-	}
-
-	panelState := gui.State.Panels.Stash
-	gui.changeSelectedLine(&panelState.SelectedLine, len(gui.State.StashEntries), true)
-
-	if err := gui.resetOrigin(gui.getMainView()); err != nil {
-		return err
-	}
-	return gui.handleStashEntrySelect(gui.g, v)
-}
-
 // specific functions
 
 func (gui *Gui) handleStashApply(g *gocui.Gui, v *gocui.View) error {
@@ -107,7 +84,7 @@ func (gui *Gui) handleStashPop(g *gocui.Gui, v *gocui.View) error {
 func (gui *Gui) handleStashDrop(g *gocui.Gui, v *gocui.View) error {
 	title := gui.Tr.SLocalize("StashDrop")
 	message := gui.Tr.SLocalize("SureDropStashEntry")
-	return gui.createConfirmationPanel(g, v, title, message, func(g *gocui.Gui, v *gocui.View) error {
+	return gui.createConfirmationPanel(g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
 		return gui.stashDo(g, v, "drop")
 	}, nil)
 }
@@ -130,16 +107,15 @@ func (gui *Gui) stashDo(g *gocui.Gui, v *gocui.View, method string) error {
 	return gui.refreshFiles()
 }
 
-func (gui *Gui) handleStashSave(g *gocui.Gui, filesView *gocui.View) error {
+func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
 	if len(gui.trackedFiles()) == 0 && len(gui.stagedFiles()) == 0 {
-		return gui.createErrorPanel(g, gui.Tr.SLocalize("NoTrackedStagedFilesStash"))
+		return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoTrackedStagedFilesStash"))
 	}
-	gui.createPromptPanel(g, filesView, gui.Tr.SLocalize("StashChanges"), func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.StashSave(gui.trimmedContent(v)); err != nil {
+	return gui.createPromptPanel(gui.g, gui.getFilesView(), gui.Tr.SLocalize("StashChanges"), "", func(g *gocui.Gui, v *gocui.View) error {
+		if err := stashFunc(gui.trimmedContent(v)); err != nil {
 			gui.createErrorPanel(g, err.Error())
 		}
 		gui.refreshStashEntries(g)
 		return gui.refreshFiles()
 	})
-	return nil
 }

pkg/gui/status_panel.go

@@ -6,10 +6,13 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
 func (gui *Gui) refreshStatus(g *gocui.Gui) error {
+	state := gui.State.Panels.Status
+
 	v, err := g.View("status")
 	if err != nil {
 		panic(err)
@@ -19,53 +22,93 @@ func (gui *Gui) refreshStatus(g *gocui.Gui) error {
 	// contents end up cleared
 	g.Update(func(*gocui.Gui) error {
 		v.Clear()
-		pushables, pullables := gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount()
-		fmt.Fprint(v, "↑"+pushables+"↓"+pullables)
-		branches := gui.State.Branches
+		state.pushables, state.pullables = gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount()
 		if err := gui.updateWorkTreeState(); err != nil {
 			return err
 		}
+		status := fmt.Sprintf("↑%s↓%s", state.pushables, state.pullables)
+		branches := gui.State.Branches
+
 		if gui.State.WorkingTreeState != "normal" {
-			fmt.Fprint(v, utils.ColoredString(fmt.Sprintf(" (%s)", gui.State.WorkingTreeState), color.FgYellow))
+			status += utils.ColoredString(fmt.Sprintf(" (%s)", gui.State.WorkingTreeState), color.FgYellow)
 		}
 
-		if len(branches) == 0 {
-			return nil
+		if len(branches) > 0 {
+			branch := branches[0]
+			name := utils.ColoredString(branch.Name, commands.GetBranchColor(branch.Name))
+			repoName := utils.GetCurrentRepoName()
+			status += fmt.Sprintf(" %s → %s", repoName, name)
 		}
-		branch := branches[0]
-		name := utils.ColoredString(branch.Name, branch.GetColor())
-		repo := utils.GetCurrentRepoName()
-		fmt.Fprint(v, " "+repo+" → "+name)
+
+		fmt.Fprint(v, status)
 		return nil
 	})
 
 	return nil
 }
 
+func runeCount(str string) int {
+	return len([]rune(str))
+}
+
+func cursorInSubstring(cx int, prefix string, substring string) bool {
+	return cx >= runeCount(prefix) && cx < runeCount(prefix+substring)
+}
+
 func (gui *Gui) handleCheckForUpdate(g *gocui.Gui, v *gocui.View) error {
 	gui.Updater.CheckForNewUpdate(gui.onUserUpdateCheckFinish, true)
 	return gui.createLoaderPanel(gui.g, v, gui.Tr.SLocalize("CheckingForUpdates"))
 }
 
+func (gui *Gui) handleStatusClick(g *gocui.Gui, v *gocui.View) error {
+	state := gui.State.Panels.Status
+
+	cx, _ := v.Cursor()
+	upstreamStatus := fmt.Sprintf("↑%s↓%s", state.pushables, state.pullables)
+	repoName := utils.GetCurrentRepoName()
+	gui.Log.Warn(gui.State.WorkingTreeState)
+	switch gui.State.WorkingTreeState {
+	case "rebasing", "merging":
+		workingTreeStatus := fmt.Sprintf("(%s)", gui.State.WorkingTreeState)
+		if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) {
+			return gui.handleCreateRebaseOptionsMenu(gui.g, v)
+		}
+		if cursorInSubstring(cx, upstreamStatus+" "+workingTreeStatus+" ", repoName) {
+			return gui.handleCreateRecentReposMenu(gui.g, v)
+		}
+	default:
+		if cursorInSubstring(cx, upstreamStatus+" ", repoName) {
+			return gui.handleCreateRecentReposMenu(gui.g, v)
+		}
+	}
+
+	return gui.handleStatusSelect(gui.g, v)
+}
+
 func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
 	if gui.popupPanelFocused() {
 		return nil
 	}
 
+	gui.State.SplitMainPanel = false
+
 	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
 		return err
 	}
+
+	gui.getMainView().Title = ""
+
 	magenta := color.New(color.FgMagenta)
 
 	dashboardString := strings.Join(
 		[]string{
 			lazygitTitle(),
 			"Copyright (c) 2018 Jesse Duffield",
-			"Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md",
+			"Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings",
 			"Config Options: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md",
 			"Tutorial: https://youtu.be/VDXvbHZYeKY",
 			"Raise an Issue: https://github.com/jesseduffield/lazygit/issues",
-			magenta.Sprint("Buy Jesse a coffee: https://donorbox.org/lazygit"), // caffeine ain't free
+			magenta.Sprint("Become a sponsor (github is matching all donations for 12 months): https://github.com/sponsors/jesseduffield"), // caffeine ain't free
 		}, "\n\n")
 
 	return gui.renderString(g, "main", dashboardString)

pkg/gui/tags_panel.go

@@ -0,0 +1,149 @@
+package gui
+
+import (
+	"fmt"
+
+	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands"
+)
+
+// list panel functions
+
+func (gui *Gui) getSelectedTag() *commands.Tag {
+	selectedLine := gui.State.Panels.Tags.SelectedLine
+	if selectedLine == -1 || len(gui.State.Tags) == 0 {
+		return nil
+	}
+
+	return gui.State.Tags[selectedLine]
+}
+
+func (gui *Gui) handleTagSelect(g *gocui.Gui, v *gocui.View) error {
+	if gui.popupPanelFocused() {
+		return nil
+	}
+
+	gui.State.SplitMainPanel = false
+
+	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
+		return err
+	}
+
+	gui.getMainView().Title = "Tag"
+
+	tag := gui.getSelectedTag()
+	if tag == nil {
+		return gui.renderString(g, "main", "No tags")
+	}
+	if err := gui.focusPoint(0, gui.State.Panels.Tags.SelectedLine, len(gui.State.Tags), v); err != nil {
+		return err
+	}
+
+	go func() {
+		show, err := gui.GitCommand.ShowTag(tag.Name)
+		if err != nil {
+			show = ""
+		}
+
+		graph, err := gui.GitCommand.GetBranchGraph(tag.Name)
+		if err != nil {
+			graph = "No graph for tag " + tag.Name
+		}
+
+		_ = gui.renderString(g, "main", fmt.Sprintf("%s\n%s", show, graph))
+	}()
+
+	return nil
+}
+
+func (gui *Gui) refreshTags() error {
+	tags, err := gui.GitCommand.GetTags()
+	if err != nil {
+		return gui.createErrorPanel(gui.g, err.Error())
+	}
+
+	gui.State.Tags = tags
+
+	if gui.getBranchesView().Context == "tags" {
+		gui.renderTagsWithSelection()
+	}
+
+	return nil
+}
+
+func (gui *Gui) renderTagsWithSelection() error {
+	branchesView := gui.getBranchesView()
+
+	gui.refreshSelectedLine(&gui.State.Panels.Tags.SelectedLine, len(gui.State.Tags))
+	if err := gui.renderListPanel(branchesView, gui.State.Tags); err != nil {
+		return err
+	}
+	if err := gui.handleTagSelect(gui.g, branchesView); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (gui *Gui) handleCheckoutTag(g *gocui.Gui, v *gocui.View) error {
+	tag := gui.getSelectedTag()
+	if tag == nil {
+		return nil
+	}
+	if err := gui.handleCheckoutRef(tag.Name); err != nil {
+		return err
+	}
+	return gui.switchBranchesPanelContext("local-branches")
+}
+
+func (gui *Gui) handleDeleteTag(g *gocui.Gui, v *gocui.View) error {
+	tag := gui.getSelectedTag()
+	if tag == nil {
+		return nil
+	}
+
+	prompt := gui.Tr.TemplateLocalize(
+		"DeleteTagPrompt",
+		Teml{
+			"tagName": tag.Name,
+		},
+	)
+
+	return gui.createConfirmationPanel(gui.g, v, true, gui.Tr.SLocalize("DeleteTagTitle"), prompt, func(g *gocui.Gui, v *gocui.View) error {
+		if err := gui.GitCommand.DeleteTag(tag.Name); err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+		return gui.refreshTags()
+	}, nil)
+}
+
+func (gui *Gui) handlePushTag(g *gocui.Gui, v *gocui.View) error {
+	tag := gui.getSelectedTag()
+	if tag == nil {
+		return nil
+	}
+
+	title := gui.Tr.TemplateLocalize(
+		"PushTagTitle",
+		Teml{
+			"tagName": tag.Name,
+		},
+	)
+
+	return gui.createPromptPanel(gui.g, v, title, "origin", func(g *gocui.Gui, v *gocui.View) error {
+		if err := gui.GitCommand.PushTag(v.Buffer(), tag.Name); err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+		return gui.refreshTags()
+	})
+}
+
+func (gui *Gui) handleCreateTag(g *gocui.Gui, v *gocui.View) error {
+	return gui.createPromptPanel(gui.g, v, gui.Tr.SLocalize("CreateTagTitle"), "", func(g *gocui.Gui, v *gocui.View) error {
+		// leaving commit SHA blank so that we're just creating the tag for the current commit
+		if err := gui.GitCommand.CreateLightweightTag(v.Buffer(), ""); err != nil {
+			return gui.createErrorPanel(gui.g, err.Error())
+		}
+		return gui.refreshTags()
+	})
+}

pkg/gui/theme.go

@@ -1,54 +0,0 @@
-package gui
-
-import (
-	"github.com/jesseduffield/gocui"
-)
-
-// GetAttribute gets the gocui color attribute from the string
-func (gui *Gui) GetAttribute(key string) gocui.Attribute {
-	colorMap := map[string]gocui.Attribute{
-		"default":   gocui.ColorDefault,
-		"black":     gocui.ColorBlack,
-		"red":       gocui.ColorRed,
-		"green":     gocui.ColorGreen,
-		"yellow":    gocui.ColorYellow,
-		"blue":      gocui.ColorBlue,
-		"magenta":   gocui.ColorMagenta,
-		"cyan":      gocui.ColorCyan,
-		"white":     gocui.ColorWhite,
-		"bold":      gocui.AttrBold,
-		"reverse":   gocui.AttrReverse,
-		"underline": gocui.AttrUnderline,
-	}
-	value, present := colorMap[key]
-	if present {
-		return value
-	}
-	return gocui.ColorWhite
-}
-
-// GetColor bitwise OR's a list of attributes obtained via the given keys
-func (gui *Gui) GetColor(keys []string) gocui.Attribute {
-	var attribute gocui.Attribute
-	for _, key := range keys {
-		attribute = attribute | gui.GetAttribute(key)
-	}
-	return attribute
-}
-
-// GetOptionsPanelTextColor gets the color of the options panel text
-func (gui *Gui) GetOptionsPanelTextColor() (gocui.Attribute, error) {
-	userConfig := gui.Config.GetUserConfig()
-	optionsColor := userConfig.GetStringSlice("gui.theme.optionsTextColor")
-	return gui.GetColor(optionsColor), nil
-}
-
-// SetColorScheme sets the color scheme for the app based on the user config
-func (gui *Gui) SetColorScheme() error {
-	userConfig := gui.Config.GetUserConfig()
-	activeBorderColor := userConfig.GetStringSlice("gui.theme.activeBorderColor")
-	inactiveBorderColor := userConfig.GetStringSlice("gui.theme.inactiveBorderColor")
-	gui.g.FgColor = gui.GetColor(inactiveBorderColor)
-	gui.g.SelFgColor = gui.GetColor(activeBorderColor)
-	return nil
-}

pkg/gui/updates.go

@@ -6,7 +6,7 @@ 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 {
+	return gui.createConfirmationPanel(gui.g, currentView, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
 		gui.startUpdating(newVersion)
 		return nil
 	}, nil)
@@ -59,7 +59,7 @@ func (gui *Gui) onUpdateFinish(err error) error {
 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 gui.createConfirmationPanel(gui.g, v, true, title, message, func(g *gocui.Gui, v *gocui.View) error {
 		return gocui.ErrQuit
 	}, nil)
 }

pkg/gui/view_helpers.go

@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/go-errors/errors"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/spkg/bom"
@@ -22,6 +23,7 @@ func (gui *Gui) refreshSidePanels(g *gocui.Gui) error {
 	if err := gui.refreshCommits(g); err != nil {
 		return err
 	}
+
 	return gui.refreshStashEntries(g)
 }
 
@@ -30,8 +32,13 @@ func (gui *Gui) nextView(g *gocui.Gui, v *gocui.View) error {
 	if v == nil || v.Name() == cyclableViews[len(cyclableViews)-1] {
 		focusedViewName = cyclableViews[0]
 	} else {
+		// if we're in the commitFiles view we'll act like we're in the commits view
+		viewName := v.Name()
+		if viewName == "commitFiles" {
+			viewName = "commits"
+		}
 		for i := range cyclableViews {
-			if v.Name() == cyclableViews[i] {
+			if viewName == cyclableViews[i] {
 				focusedViewName = cyclableViews[i+1]
 				break
 			}
@@ -39,7 +46,7 @@ func (gui *Gui) nextView(g *gocui.Gui, v *gocui.View) error {
 				message := gui.Tr.TemplateLocalize(
 					"IssntListOfViews",
 					Teml{
-						"name": v.Name(),
+						"name": viewName,
 					},
 				)
 				gui.Log.Info(message)
@@ -59,8 +66,13 @@ func (gui *Gui) previousView(g *gocui.Gui, v *gocui.View) error {
 	if v == nil || v.Name() == cyclableViews[0] {
 		focusedViewName = cyclableViews[len(cyclableViews)-1]
 	} else {
+		// if we're in the commitFiles view we'll act like we're in the commits view
+		viewName := v.Name()
+		if viewName == "commitFiles" {
+			viewName = "commits"
+		}
 		for i := range cyclableViews {
-			if v.Name() == cyclableViews[i] {
+			if viewName == cyclableViews[i] {
 				focusedViewName = cyclableViews[i-1] // TODO: make this work properly
 				break
 			}
@@ -68,7 +80,7 @@ func (gui *Gui) previousView(g *gocui.Gui, v *gocui.View) error {
 				message := gui.Tr.TemplateLocalize(
 					"IssntListOfViews",
 					Teml{
-						"name": v.Name(),
+						"name": viewName,
 					},
 				)
 				gui.Log.Info(message)
@@ -90,11 +102,25 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 	case "status":
 		return gui.handleStatusSelect(g, v)
 	case "files":
-		return gui.handleFileSelect(g, v, false)
+		return gui.focusAndSelectFile(g, v)
 	case "branches":
-		return gui.handleBranchSelect(g, v)
+		branchesView := gui.getBranchesView()
+		switch branchesView.Context {
+		case "local-branches":
+			return gui.handleBranchSelect(g, v)
+		case "remotes":
+			return gui.handleRemoteSelect(g, v)
+		case "remote-branches":
+			return gui.handleRemoteBranchSelect(g, v)
+		case "tags":
+			return gui.handleTagSelect(g, v)
+		default:
+			return errors.New("unknown branches panel context: " + branchesView.Context)
+		}
 	case "commits":
 		return gui.handleCommitSelect(g, v)
+	case "commitFiles":
+		return gui.handleCommitFileSelect(g, v)
 	case "stash":
 		return gui.handleStashEntrySelect(g, v)
 	case "confirmation":
@@ -104,7 +130,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
 	case "credentials":
 		return gui.handleCredentialsViewFocused(g, v)
 	case "main":
-		if gui.State.Contexts["main"] == "merging" {
+		if gui.State.MainContext == "merging" {
 			return gui.refreshMergePanel()
 		}
 		v.Highlight = false
@@ -126,18 +152,39 @@ func (gui *Gui) returnFocus(g *gocui.Gui, v *gocui.View) error {
 	return gui.switchFocus(g, v, previousView)
 }
 
+func (gui *Gui) goToSideView(sideViewName string) func(g *gocui.Gui, v *gocui.View) error {
+	return func(g *gocui.Gui, v *gocui.View) error {
+		view, err := g.View(sideViewName)
+		if err != nil {
+			gui.Log.Error(err)
+			return nil
+		}
+		err = gui.closePopupPanels()
+		if err != nil {
+			gui.Log.Error(err)
+			return nil
+		}
+		return gui.switchFocus(g, nil, view)
+	}
+}
+
+func (gui *Gui) closePopupPanels() error {
+	gui.onNewPopupPanel()
+	err := gui.closeConfirmationPrompt(gui.g, true)
+	if err != nil {
+		gui.Log.Error(err)
+		return err
+	}
+	return nil
+}
+
 // pass in oldView = nil if you don't want to be able to return to your old view
 // TODO: move some of this logic into our onFocusLost and onFocus hooks
 func (gui *Gui) switchFocus(g *gocui.Gui, oldView, newView *gocui.View) error {
-	// we assume we'll never want to return focus to a confirmation panel i.e.
-	// we should never stack confirmation panels
-	if oldView != nil && oldView.Name() != "confirmation" {
-		// 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()
-		}
+	// we assume we'll never want to return focus to a popup panel i.e.
+	// we should never stack popup panels
+	if oldView != nil && !gui.isPopupPanel(oldView.Name()) {
+		gui.State.PreviousView = oldView.Name()
 	}
 
 	gui.Log.Info("setting highlight to true for view" + newView.Name())
@@ -165,49 +212,37 @@ func (gui *Gui) switchFocus(g *gocui.Gui, oldView, newView *gocui.View) error {
 }
 
 func (gui *Gui) resetOrigin(v *gocui.View) error {
-	if err := v.SetCursor(0, 0); err != nil {
-		return err
-	}
+	_ = v.SetCursor(0, 0)
 	return v.SetOrigin(0, 0)
 }
 
 // if the cursor down past the last item, move it to the last line
-func (gui *Gui) focusPoint(cx int, cy int, v *gocui.View) error {
-	if cy < 0 {
+func (gui *Gui) focusPoint(cx int, cy int, lineCount int, v *gocui.View) error {
+	if cy < 0 || cy > lineCount {
 		return nil
 	}
 	ox, oy := v.Origin()
 	_, height := v.Size()
+
 	ly := height - 1
+	if ly == -1 {
+		ly = 0
+	}
 
 	// if line is above origin, move origin and set cursor to zero
 	// if line is below origin + height, move origin and set cursor to max
 	// otherwise set cursor to value - origin
-	if ly > v.LinesHeight() {
-		if err := v.SetCursor(cx, cy); err != nil {
-			return err
-		}
-		if err := v.SetOrigin(ox, 0); err != nil {
-			return err
-		}
+	if ly > lineCount {
+		_ = v.SetCursor(cx, cy)
+		_ = v.SetOrigin(ox, 0)
 	} else if cy < oy {
-		if err := v.SetCursor(cx, 0); err != nil {
-			return err
-		}
-		if err := v.SetOrigin(ox, cy); err != nil {
-			return err
-		}
+		_ = v.SetCursor(cx, 0)
+		_ = v.SetOrigin(ox, cy)
 	} else if cy > oy+ly {
-		if err := v.SetCursor(cx, ly); err != nil {
-			return err
-		}
-		if err := v.SetOrigin(ox, cy-ly); err != nil {
-			return err
-		}
+		_ = v.SetCursor(cx, ly)
+		_ = v.SetOrigin(ox, cy-ly)
 	} else {
-		if err := v.SetCursor(cx, cy-oy); err != nil {
-			return err
-		}
+		_ = v.SetCursor(cx, cy-oy)
 	}
 	return nil
 }
@@ -278,11 +313,26 @@ func (gui *Gui) getMainView() *gocui.View {
 	return v
 }
 
+func (gui *Gui) getSecondaryView() *gocui.View {
+	v, _ := gui.g.View("secondary")
+	return v
+}
+
 func (gui *Gui) getStashView() *gocui.View {
 	v, _ := gui.g.View("stash")
 	return v
 }
 
+func (gui *Gui) getCommitFilesView() *gocui.View {
+	v, _ := gui.g.View("commitFiles")
+	return v
+}
+
+func (gui *Gui) getMenuView() *gocui.View {
+	v, _ := gui.g.View("menu")
+	return v
+}
+
 func (gui *Gui) trimmedContent(v *gocui.View) string {
 	return strings.TrimSpace(v.Buffer())
 }
@@ -294,7 +344,7 @@ func (gui *Gui) currentViewName() string {
 
 func (gui *Gui) resizeCurrentPopupPanel(g *gocui.Gui) error {
 	v := g.CurrentView()
-	if v.Name() == "commitMessage" || v.Name() == "credentials" || v.Name() == "confirmation" {
+	if gui.isPopupPanel(v.Name()) {
 		return gui.resizePopupPanel(g, v)
 	}
 	return nil
@@ -330,19 +380,17 @@ func (gui *Gui) generalFocusLine(lineNumber int, bottomLine int, v *gocui.View)
 	return nil
 }
 
-func (gui *Gui) changeSelectedLine(line *int, total int, up bool) {
-	if up {
-		if *line == -1 || *line == 0 {
-			return
-		}
-
-		*line -= 1
+func (gui *Gui) changeSelectedLine(line *int, total int, change int) {
+	// TODO: find out why we're doing this
+	if *line == -1 {
+		return
+	}
+	if *line+change < 0 {
+		*line = 0
+	} else if *line+change >= total {
+		*line = total - 1
 	} else {
-		if *line == -1 || *line == total-1 {
-			return
-		}
-
-		*line += 1
+		*line += change
 	}
 }
 
@@ -374,7 +422,7 @@ func (gui *Gui) renderPanelOptions() error {
 	case "menu":
 		return gui.renderMenuOptions()
 	case "main":
-		if gui.State.Contexts["main"] == "merging" {
+		if gui.State.MainContext == "merging" {
 			return gui.renderMergeOptions()
 		}
 	}
@@ -386,14 +434,43 @@ func (gui *Gui) handleFocusView(g *gocui.Gui, v *gocui.View) error {
 	return err
 }
 
-func (gui *Gui) popupPanelFocused() bool {
-	viewNames := []string{"commitMessage",
-		"credentials",
-		"menu"}
-	for _, viewName := range viewNames {
-		if gui.currentViewName() == viewName {
-			return true
-		}
-	}
-	return false
+func (gui *Gui) isPopupPanel(viewName string) bool {
+	return viewName == "commitMessage" || viewName == "credentials" || viewName == "confirmation" || viewName == "menu"
+}
+
+func (gui *Gui) popupPanelFocused() bool {
+	return gui.isPopupPanel(gui.currentViewName())
+}
+
+func (gui *Gui) handleClick(v *gocui.View, itemCount int, selectedLine *int, handleSelect func(*gocui.Gui, *gocui.View) error) error {
+	if gui.popupPanelFocused() && v != nil && !gui.isPopupPanel(v.Name()) {
+		return nil
+	}
+
+	if _, err := gui.g.SetCurrentView(v.Name()); err != nil {
+		return err
+	}
+
+	newSelectedLine := v.SelectedLineIdx()
+
+	if newSelectedLine < 0 {
+		newSelectedLine = 0
+	}
+
+	if newSelectedLine > itemCount-1 {
+		newSelectedLine = itemCount - 1
+	}
+
+	*selectedLine = newSelectedLine
+
+	return handleSelect(gui.g, v)
+}
+
+// often gocui wants functions in the form `func(g *gocui.Gui, v *gocui.View) error`
+// but sometimes we just have a function that returns an error, so this is a
+// convenience wrapper to give gocui what it wants.
+func (gui *Gui) wrappedHandler(f func() error) func(g *gocui.Gui, v *gocui.View) error {
+	return func(g *gocui.Gui, v *gocui.View) error {
+		return f()
+	}
 }

pkg/gui/workspace_reset_options_panel.go

@@ -0,0 +1,100 @@
+package gui
+
+import (
+	"github.com/fatih/color"
+	"github.com/jesseduffield/gocui"
+)
+
+type workspaceResetOption struct {
+	handler     func() error
+	description string
+	command     string
+}
+
+// GetDisplayStrings is a function.
+func (r *workspaceResetOption) GetDisplayStrings(isFocused bool) []string {
+	return []string{r.description, color.New(color.FgRed).Sprint(r.command)}
+}
+
+func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
+	options := []*workspaceResetOption{
+		{
+			description: gui.Tr.SLocalize("discardAllChangesToAllFiles"),
+			command:     "reset --hard HEAD && git clean -fd",
+			handler: func() error {
+				if err := gui.GitCommand.ResetAndClean(); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				return gui.refreshFiles()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("discardAnyUnstagedChanges"),
+			command:     "git checkout -- .",
+			handler: func() error {
+				if err := gui.GitCommand.DiscardAnyUnstagedFileChanges(); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				return gui.refreshFiles()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("discardUntrackedFiles"),
+			command:     "git clean -fd",
+			handler: func() error {
+				if err := gui.GitCommand.RemoveUntrackedFiles(); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				return gui.refreshFiles()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("softReset"),
+			command:     "git reset --soft HEAD",
+			handler: func() error {
+				if err := gui.GitCommand.ResetSoft("HEAD"); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				return gui.refreshFiles()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("hardReset"),
+			command:     "git reset --hard HEAD",
+			handler: func() error {
+				if err := gui.GitCommand.ResetHard("HEAD"); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				return gui.refreshFiles()
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("hardResetUpstream"),
+			command:     "git reset --hard @{upstream}",
+			handler: func() error {
+				if err := gui.GitCommand.ResetHard("@{upstream}"); err != nil {
+					return gui.createErrorPanel(gui.g, err.Error())
+				}
+
+				return gui.refreshSidePanels(gui.g)
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("cancel"),
+			handler: func() error {
+				return nil
+			},
+		},
+	}
+
+	handleMenuPress := func(index int) error {
+		return options[index].handler()
+	}
+
+	return gui.createMenu("", options, len(options), handleMenuPress)
+}

pkg/i18n/dutch.go

@@ -28,12 +28,21 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CommitsTitle",
 			Other: "Commits",
+		}, &i18n.Message{
+			ID:    "CommitsDiffTitle",
+			Other: "Commits (specific diff mode)",
+		}, &i18n.Message{
+			ID:    "CommitsDiff",
+			Other: "select commit to diff with another commit",
 		}, &i18n.Message{
 			ID:    "StashTitle",
 			Other: "Stash",
 		}, &i18n.Message{
-			ID:    "StagingMainTitle",
-			Other: `Stage Lines/Hunks`,
+			ID:    "UnstagedChanges",
+			Other: `Unstaged Changes`,
+		}, &i18n.Message{
+			ID:    "StagedChanges",
+			Other: `Staged Changes`,
 		}, &i18n.Message{
 			ID:    "MergingMainTitle",
 			Other: "Resolve merge conflicts",
@@ -79,9 +88,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "execute",
 			Other: "uitvoeren",
-		}, &i18n.Message{
-			ID:    "stashFiles",
-			Other: "stash-bestanden",
 		}, &i18n.Message{
 			ID:    "open",
 			Other: "open",
@@ -106,9 +112,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "pull",
 			Other: "pull",
-		}, &i18n.Message{
-			ID:    "addPatch",
-			Other: "bewerkingen toevoegen",
 		}, &i18n.Message{
 			ID:    "edit",
 			Other: "bewerken",
@@ -157,9 +160,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "FileNoMergeCons",
 			Other: "Dit bestand heeft geen merge conflicten",
-		}, &i18n.Message{
-			ID:    "SureResetHardHead",
-			Other: "Weet je het zeker dat je `reset --hard HEAD` en `clean -fd` wil uitvoeren? Het kan dat je hierdoor bestanden verliest",
 		}, &i18n.Message{
 			ID:    "SureTo",
 			Other: "Weet je het zeker dat je {{.fileName}} wilt {{.deleteVerb}} (je veranderingen zullen worden verwijderd)",
@@ -337,12 +337,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "newFocusedViewIs",
 			Other: "nieuw gefocussed weergave is {{.newFocusedView}}",
-		}, &i18n.Message{
-			ID:    "CantCloseConfirmationPrompt",
-			Other: "Kon de bevestiging prompt niet sluiten: {{.error}}",
-		}, &i18n.Message{
-			ID:    "ClearFilePanel",
-			Other: "maak bestandsvenster leeg",
 		}, &i18n.Message{
 			ID:    "MergeAborted",
 			Other: "Merge afgebroken",
@@ -382,9 +376,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "GitconfigParseErr",
 			Other: `Gogit kon je gitconfig bestand niet goed parsen door de aanwezigheid van losstaande '\' tekens. Het weghalen van deze tekens zou het probleem moeten oplossen. `,
-		}, &i18n.Message{
-			ID:    "removeFile",
-			Other: `Verwijder als untracked / uitchecken wordt gevolgd (ga weg)`,
 		}, &i18n.Message{
 			ID:    "editFile",
 			Other: `verander bestand`,
@@ -397,9 +388,6 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "refreshFiles",
 			Other: `refresh bestanden`,
-		}, &i18n.Message{
-			ID:    "resetHard",
-			Other: `harde reset and verwijderen ongevolgde bestanden`,
 		}, &i18n.Message{
 			ID:    "mergeIntoCurrentBranch",
 			Other: `merge in met huidige checked out branch`,
@@ -423,7 +411,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: `fetch`,
 		}, &i18n.Message{
 			ID:    "NoAutomaticGitFetchTitle",
-			Other: `Geen automatiese git fetch`,
+			Other: `Geen automatische git fetch`,
 		}, &i18n.Message{
 			ID:    "NoAutomaticGitFetchBody",
 			Other: `Lazygit kan niet "git fetch" uitvoeren in een privé repository, gebruik f in het branches paneel om "git fetch" manueel uit te voeren`,
@@ -443,7 +431,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			ID:    "StageLine",
 			Other: `stage lijn`,
 		}, &i18n.Message{
-			ID:    "EscapeStaging",
+			ID:    "ReturnToFilesPanel",
 			Other: `ga terug naar het bestanden paneel`,
 		}, &i18n.Message{
 			ID:    "CantFindHunks",
@@ -459,40 +447,34 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "Merging",
 		}, &i18n.Message{
 			ID:    "ConfirmRebase",
-			Other: "Are you sure you want to rebase {{.checkedOutBranch}} onto {{.selectedBranch}}?",
+			Other: "Weet je zeker dat je {{.checkedOutBranch}} op {{.selectedBranch}} wil rebasen?",
 		}, &i18n.Message{
 			ID:    "ConfirmMerge",
-			Other: "Are you sure you want to merge {{.selectedBranch}} into {{.checkedOutBranch}}?",
+			Other: "Weet je zeker dat je {{.selectedBranch}} in {{.checkedOutBranch}} wil mergen?",
 		}, &i18n.Message{
 			ID:    "FwdNoUpstream",
-			Other: "Cannot fast-forward a branch with no upstream",
+			Other: "Kan niet de branch vooruitspoelen zonder upstream",
 		}, &i18n.Message{
 			ID:    "ErrorOccurred",
-			Other: "An error occurred! Please create an issue at https://github.com/jesseduffield/lazygit/issues",
+			Other: "Er is iets fout gegaan! Zou je hier een issue aan willen maken: https://github.com/jesseduffield/lazygit/issues",
 		}, &i18n.Message{
 			ID:    "FwdCommitsToPush",
-			Other: "Cannot fast-forward a branch with commits to push",
+			Other: "Je kan niet vooruitspoelen als de branch geen nieuwe commits heeft",
 		}, &i18n.Message{
 			ID:    "MainTitle",
-			Other: "Main",
+			Other: "Hoofd",
 		}, &i18n.Message{
 			ID:    "NormalTitle",
-			Other: "Normal",
+			Other: "Normaal",
 		}, &i18n.Message{
 			ID:    "softReset",
-			Other: "soft reset to last commit",
-		}, &i18n.Message{
-			ID:    "SoftReset",
-			Other: "Soft reset",
-		}, &i18n.Message{
-			ID:    "ConfirmSoftReset",
-			Other: "Are you sure you want to `reset --soft HEAD^`? The changes in your topmost commit will be placed in your working tree",
+			Other: "zacht reset",
 		}, &i18n.Message{
 			ID:    "CantRebaseOntoSelf",
-			Other: "You cannot rebase a branch onto itself",
+			Other: "Je kan niet een branch rebasen op zichzelf",
 		}, &i18n.Message{
 			ID:    "SureSquashThisCommit",
-			Other: "Are you sure you want to squash this commit into the commit below?",
+			Other: "Weet je zeker dat je deze commit wil samenvoegen met de commit hieronder?",
 		}, &i18n.Message{
 			ID:    "Squash",
 			Other: "Squash",
@@ -501,127 +483,130 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "pick commit (when mid-rebase)",
 		}, &i18n.Message{
 			ID:    "revertCommit",
-			Other: "revert commit",
+			Other: "commit omgedaan maken",
 		}, &i18n.Message{
 			ID:    "deleteCommit",
-			Other: "delete commit",
+			Other: "verwijder commit",
 		}, &i18n.Message{
 			ID:    "moveDownCommit",
-			Other: "move commit down one",
+			Other: "verplaats commit 1 omlaag",
 		}, &i18n.Message{
 			ID:    "moveUpCommit",
-			Other: "move commit up one",
+			Other: "verplaats commit 1 omhoog",
 		}, &i18n.Message{
 			ID:    "editCommit",
-			Other: "edit commit",
+			Other: "verander commit",
 		}, &i18n.Message{
 			ID:    "amendToCommit",
-			Other: "amend commit with staged changes",
+			Other: "wijzig commit met staged veranderingen",
 		}, &i18n.Message{
 			ID:    "FoundConflicts",
-			Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'",
+			Other: "Conflicten!, Om af te breken druk 'esc', anders druk op 'enter'",
 		}, &i18n.Message{
 			ID:    "FoundConflictsTitle",
-			Other: "Auto-merge failed",
+			Other: "Auto-merge mislukt",
 		}, &i18n.Message{
 			ID:    "Undo",
-			Other: "undo",
+			Other: "ongedaan maken",
 		}, &i18n.Message{
 			ID:    "PickHunk",
 			Other: "pick hunk",
 		}, &i18n.Message{
 			ID:    "PickBothHunks",
-			Other: "pick both hunks",
+			Other: "pick beide hunks",
 		}, &i18n.Message{
 			ID:    "ViewMergeRebaseOptions",
-			Other: "view merge/rebase options",
+			Other: "bekijk merge/rebase opties",
 		}, &i18n.Message{
 			ID:    "NotMergingOrRebasing",
-			Other: "You are currently neither rebasing nor merging",
+			Other: "Je bent momenteel niet aan het rebasen of mergen",
 		}, &i18n.Message{
 			ID:    "RecentRepos",
 			Other: "recent repositories",
 		}, &i18n.Message{
 			ID:    "MergeOptionsTitle",
-			Other: "Merge Options",
+			Other: "Merge Opties",
 		}, &i18n.Message{
 			ID:    "RebaseOptionsTitle",
-			Other: "Rebase Options",
+			Other: "Rebase Opties",
 		}, &i18n.Message{
 			ID:    "ConflictsResolved",
-			Other: "all merge conflicts resolved. Continue?",
+			Other: "alle merge conflicten zijn opgelost. Wilt je verder gaan?",
 		}, &i18n.Message{
 			ID:    "NoRoom",
-			Other: "Not enough room",
+			Other: "Niet genoeg ruimte",
 		}, &i18n.Message{
 			ID:    "YouAreHere",
-			Other: "YOU ARE HERE",
+			Other: "JE BENT HIER",
 		}, &i18n.Message{
 			ID:    "rewordNotSupported",
-			Other: "rewording commits while interactively rebasing is not currently supported",
+			Other: "herformatteren van commits in interactief rebasen is nog niet ondersteund",
 		}, &i18n.Message{
 			ID:    "cherryPickCopy",
-			Other: "copy commit (cherry-pick)",
+			Other: "kopiëer commit (cherry-pick)",
 		}, &i18n.Message{
 			ID:    "cherryPickCopyRange",
-			Other: "copy commit range (cherry-pick)",
+			Other: "kopiëer commit reeks (cherry-pick)",
 		}, &i18n.Message{
 			ID:    "pasteCommits",
-			Other: "paste commits (cherry-pick)",
+			Other: "plak commits (cherry-pick)",
 		}, &i18n.Message{
 			ID:    "SureCherryPick",
-			Other: "Are you sure you want to cherry-pick the copied commits onto this branch?",
+			Other: "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?",
 		}, &i18n.Message{
 			ID:    "CherryPick",
 			Other: "Cherry-Pick",
 		}, &i18n.Message{
 			ID:    "CannotRebaseOntoFirstCommit",
-			Other: "You cannot interactive rebase onto the first commit",
+			Other: "Je kan niet interactief rebasen naar de eerste commit",
+		}, &i18n.Message{
+			ID:    "CannotSquashOntoSecondCommit",
+			Other: "Je kan niet een squash/fixup doen naar de 2de commit",
 		}, &i18n.Message{
 			ID:    "Donate",
-			Other: "Donate",
+			Other: "Doneer",
 		}, &i18n.Message{
 			ID:    "PrevLine",
-			Other: "select previous line",
+			Other: "selecteer de vorige lijn",
 		}, &i18n.Message{
 			ID:    "NextLine",
-			Other: "select next line",
+			Other: "selecteer de volgende lijn",
 		}, &i18n.Message{
 			ID:    "PrevHunk",
-			Other: "select previous hunk",
+			Other: "selecteer de vorige hunk",
 		}, &i18n.Message{
 			ID:    "NextHunk",
-			Other: "select next hunk",
+			Other: "selecteer de volgende hunk",
 		}, &i18n.Message{
 			ID:    "PrevConflict",
-			Other: "select previous conflict",
+			Other: "selecteer voorgaand conflict",
 		}, &i18n.Message{
 			ID:    "NextConflict",
-			Other: "select next conflict",
+			Other: "selecteer volgende conflict",
 		}, &i18n.Message{
 			ID:    "SelectTop",
-			Other: "select top hunk",
+			Other: "selecteer bovenste hunk",
 		}, &i18n.Message{
 			ID:    "SelectBottom",
-			Other: "select bottom hunk",
+			Other: "selecteer onderste hunk",
 		}, &i18n.Message{
 			ID:    "ScrollDown",
-			Other: "scroll down",
+			Other: "scroll omlaag",
 		}, &i18n.Message{
 			ID:    "ScrollUp",
-			Other: "scroll up",
+			Other: "scroll omhoog",
 		}, &i18n.Message{
 			ID:    "AmendCommitTitle",
-			Other: "Amend Commit",
+			Other: "Commit wijzigen",
 		}, &i18n.Message{
 			ID:    "AmendCommitPrompt",
-			Other: "Are you sure you want to amend this commit with your staged files?",
+			Other: "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?",
 		}, &i18n.Message{
 			ID:    "DeleteCommitTitle",
-			Other: "Delete Commit",
+			Other: "Verwijder Commit",
 		}, &i18n.Message{
 			ID:    "DeleteCommitPrompt",
-			Other: "Are you sure you want to delete this commit?",
+			Other: "Weet je zeker dat je deze commit wil verwijderen?",
 		}, &i18n.Message{
 			ID:    "SquashingStatus",
 			Other: "squashing",
@@ -630,19 +615,151 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "fixing up",
 		}, &i18n.Message{
 			ID:    "DeletingStatus",
-			Other: "deleting",
+			Other: "verwijderen",
 		}, &i18n.Message{
 			ID:    "MovingStatus",
-			Other: "moving",
+			Other: "verplaatsen",
 		}, &i18n.Message{
 			ID:    "RebasingStatus",
 			Other: "rebasing",
 		}, &i18n.Message{
 			ID:    "AmendingStatus",
-			Other: "amending",
+			Other: "wijzigen",
 		}, &i18n.Message{
 			ID:    "CherryPickingStatus",
 			Other: "cherry-picking",
+		}, &i18n.Message{
+			ID:    "CommitFiles",
+			Other: "Commit bestanden",
+		}, &i18n.Message{
+			ID:    "viewCommitFiles",
+			Other: "bekijk gecommite bestanden",
+		}, &i18n.Message{
+			ID:    "CommitFilesTitle",
+			Other: "Commit bestanden",
+		}, &i18n.Message{
+			ID:    "goBack",
+			Other: "ga terug",
+		}, &i18n.Message{
+			ID:    "NoCommiteFiles",
+			Other: "Geen bestanden voor deze commit",
+		}, &i18n.Message{
+			ID:    "checkoutCommitFile",
+			Other: "bestand uitchecken",
+		}, &i18n.Message{
+			ID:    "discardOldFileChange",
+			Other: "uitsluit deze commit zijn veranderingen aan dit bestand",
+		}, &i18n.Message{
+			ID:    "DiscardFileChangesTitle",
+			Other: "uitsluit bestand zijn veranderingen",
+		}, &i18n.Message{
+			ID:    "DiscardFileChangesPrompt",
+			Other: "Weet je zeker dat je de wijzigingen van deze commit in dit bestand wilt weggooien? Als dit bestand is gecreëerd in deze commit dan zal dit bestand worden verwijdert",
+		}, &i18n.Message{
+			ID:    "DisabledForGPG",
+			Other: "Onderdelen niet beschikbaar voor gebruikers die GPG gebruiken",
+		}, &i18n.Message{
+			ID:    "CreateRepo",
+			Other: "Niet in een git repository. Creëer een nieuwe git repository? (y/n): ",
+		}, &i18n.Message{
+			ID:    "AutoStashTitle",
+			Other: "Autostash?",
+		}, &i18n.Message{
+			ID:    "AutoStashPrompt",
+			Other: "Je moet je veranderingen stashen en poppen om ze over te bregen. Dit automatisch doen? (enter/esc)",
+		}, &i18n.Message{
+			ID:    "StashPrefix",
+			Other: "Auto-stashing veranderingen voor ",
+		}, &i18n.Message{
+			ID:    "viewDiscardOptions",
+			Other: "bekijk 'veranderingen ongedaan maken' opties",
+		}, &i18n.Message{
+			ID:    "cancel",
+			Other: "anuleren",
+		}, &i18n.Message{
+			ID:    "discardAllChanges",
+			Other: "negeer alle wijzigingen",
+		}, &i18n.Message{
+			ID:    "discardUnstagedChanges",
+			Other: "negeer unstaged wijzigingen",
+		}, &i18n.Message{
+			ID:    "discardAllChangesToAllFiles",
+			Other: "verwijder werkende tree",
+		}, &i18n.Message{
+			ID:    "discardAnyUnstagedChanges",
+			Other: "discard unstaged changes",
+		}, &i18n.Message{
+			ID:    "discardUntrackedFiles",
+			Other: "negeer niet-gevonden bestanden",
+		}, &i18n.Message{
+			ID:    "viewResetOptions",
+			Other: `bekijk reset opties`,
+		}, &i18n.Message{
+			ID:    "hardReset",
+			Other: "harde reset",
+		}, &i18n.Message{
+			ID:    "createFixupCommit",
+			Other: `creëer fixup commit voor deze commit`,
+		}, &i18n.Message{
+			ID:    "squashAboveCommits",
+			Other: `squash bovenstaande commits`,
+		}, &i18n.Message{
+			ID:    "SquashAboveCommits",
+			Other: `Squash bovenstaande commits`,
+		}, &i18n.Message{
+			ID:    "SureSquashAboveCommits",
+			Other: `Weet je zeker dat je alles wil squash/fixup! voor de bovenstaand commits {{.commit}}?`,
+		}, &i18n.Message{
+			ID:    "CreateFixupCommit",
+			Other: `Creëer fixup commit`,
+		}, &i18n.Message{
+			ID:    "SureCreateFixupCommit",
+			Other: `Weet je zeker dat je een fixup wil maken! commit voor commit {{.commit}}?`,
+		}, &i18n.Message{
+			ID:    "executeCustomCommand",
+			Other: "voor aangepast commando uit",
+		}, &i18n.Message{
+			ID:    "CustomCommand",
+			Other: "Aangepast commando:",
+		}, &i18n.Message{
+			ID:    "commitChangesWithoutHook",
+			Other: "commit veranderingen zonder pre-commit hook",
+		}, &i18n.Message{
+			ID:    "SkipHookPrefixNotConfigured",
+			Other: "Je hebt nog niet een commit bericht voorvoegsel ingesteld voor het overslaan van hooks. Set `git.skipHookPrefix = 'WIP'` in je config",
+		}, &i18n.Message{
+			ID:    "resetTo",
+			Other: `reset to`,
+		}, &i18n.Message{
+			ID:    "pressEnterToReturn",
+			Other: "Press enter to return to lazygit",
+		}, &i18n.Message{
+			ID:    "viewStashOptions",
+			Other: "view stash options",
+		}, &i18n.Message{
+			ID:    "stashAllChanges",
+			Other: "stash-bestanden",
+		}, &i18n.Message{
+			ID:    "stashStagedChanges",
+			Other: "stash staged changes",
+		}, &i18n.Message{
+			ID:    "stashOptions",
+			Other: "Stash options",
+		}, &i18n.Message{
+			ID:    "notARepository",
+			Other: "Error: must be run inside a git repository",
+		}, &i18n.Message{
+			ID:    "jump",
+			Other: "jump to panel",
+		}, &i18n.Message{
+			ID:    "ExitLineByLineMode",
+			Other: `exit line-by-line mode`,
+		}, &i18n.Message{
+			ID:    "EnterUpstream",
+			Other: `Enter upstream as '<remote> <branchname>'`,
+		}, &i18n.Message{
+			ID:    "ReturnToRemotesList",
+			Other: `return to remotes list`,
 		},
 	)
 }

pkg/i18n/english.go

@@ -36,12 +36,24 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CommitsTitle",
 			Other: "Commits",
+		}, &i18n.Message{
+			ID:    "CommitsDiffTitle",
+			Other: "Commits (specific diff mode)",
+		}, &i18n.Message{
+			ID:    "CommitsDiff",
+			Other: "select commit to diff with another commit",
 		}, &i18n.Message{
 			ID:    "StashTitle",
 			Other: "Stash",
 		}, &i18n.Message{
-			ID:    "StagingMainTitle",
-			Other: `Stage Lines/Hunks`,
+			ID:    "UnstagedChanges",
+			Other: `Unstaged Changes`,
+		}, &i18n.Message{
+			ID:    "StagedChanges",
+			Other: `Staged Changes`,
+		}, &i18n.Message{
+			ID:    "PatchBuildingMainTitle",
+			Other: `Add Lines/Hunks To Patch`,
 		}, &i18n.Message{
 			ID:    "MergingMainTitle",
 			Other: "Resolve merge conflicts",
@@ -99,12 +111,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "execute",
 			Other: "execute",
-		}, &i18n.Message{
-			ID:    "stashFiles",
-			Other: "stash files",
-		}, &i18n.Message{
-			ID:    "softReset",
-			Other: "soft reset to last commit",
 		}, &i18n.Message{
 			ID:    "open",
 			Other: "open",
@@ -129,9 +135,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "pull",
 			Other: "pull",
-		}, &i18n.Message{
-			ID:    "addPatch",
-			Other: "add patch",
 		}, &i18n.Message{
 			ID:    "edit",
 			Other: "edit",
@@ -144,6 +147,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "resolveMergeConflicts",
 			Other: "resolve merge conflicts",
+		}, &i18n.Message{
+			ID:    "MergeConflictsTitle",
+			Other: "Merge Conflicts",
 		}, &i18n.Message{
 			ID:    "checkout",
 			Other: "checkout",
@@ -181,14 +187,8 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			ID:    "FileNoMergeCons",
 			Other: "This file has no inline merge conflicts",
 		}, &i18n.Message{
-			ID:    "SureResetHardHead",
-			Other: "Are you sure you want to `reset --hard HEAD` and `clean -fd`? You may lose changes",
-		}, &i18n.Message{
-			ID:    "SoftReset",
-			Other: "Soft reset",
-		}, &i18n.Message{
-			ID:    "ConfirmSoftReset",
-			Other: "Are you sure you want to `reset --soft HEAD^`? The changes in your topmost commit will be placed in your working tree",
+			ID:    "softReset",
+			Other: "soft reset",
 		}, &i18n.Message{
 			ID:    "SureTo",
 			Other: "Are you sure you want to {{.deleteVerb}} {{.fileName}} (you will lose your changes)?",
@@ -221,7 +221,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: "{{.selectedBranchName}} is not fully merged. Are you sure you want to delete it?",
 		}, &i18n.Message{
 			ID:    "rebaseBranch",
-			Other: "rebase branch",
+			Other: "rebase checked-out branch onto this branch",
 		}, &i18n.Message{
 			ID:    "CantRebaseOntoSelf",
 			Other: "You cannot rebase a branch onto itself",
@@ -399,15 +399,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "newFocusedViewIs",
 			Other: "new focused view is {{.newFocusedView}}",
-		}, &i18n.Message{
-			ID:    "CantCloseConfirmationPrompt",
-			Other: "Could not close confirmation prompt: {{.error}}",
 		}, &i18n.Message{
 			ID:    "NoChangedFiles",
 			Other: "No changed files",
-		}, &i18n.Message{
-			ID:    "ClearFilePanel",
-			Other: "Clear file panel",
 		}, &i18n.Message{
 			ID:    "MergeAborted",
 			Other: "Merge aborted",
@@ -444,12 +438,22 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "AnonymousReportingPrompt",
 			Other: "Would you like to enable anonymous reporting data to help improve lazygit? (enter/esc)",
+		}, &i18n.Message{
+			ID:    "ShamelessSelfPromotionTitle",
+			Other: "Shameless Self Promotion",
+		}, &i18n.Message{
+			ID: "ShamelessSelfPromotionMessage",
+			Other: `Thanks for using lazygit! Three things to share with you:
+
+1) lazygit now has basic mouse support!
+
+2) If you want to learn about lazygit's features, watch this vid:
+   https://youtu.be/CPLdltN7wgE
+
+3) Github are now matching any donations dollar-for-dollar for the next 12 months, so if you've been tossing up over whether to click the donate link in the bottom right corner, now is the time!`,
 		}, &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`,
@@ -462,9 +466,6 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "refreshFiles",
 			Other: `refresh files`,
-		}, &i18n.Message{
-			ID:    "resetHard",
-			Other: `reset hard and remove untracked files`,
 		}, &i18n.Message{
 			ID:    "mergeIntoCurrentBranch",
 			Other: `merge into currently checked out branch`,
@@ -497,15 +498,32 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: `stage individual hunks/lines`,
 		}, &i18n.Message{
 			ID:    "FileStagingRequirements",
-			Other: `Can only stage individual lines for tracked files with unstaged changes`,
+			Other: `Can only stage individual lines for tracked files`,
 		}, &i18n.Message{
-			ID:    "StageHunk",
-			Other: `stage hunk`,
+			ID:    "SelectHunk",
+			Other: `select hunk`,
 		}, &i18n.Message{
-			ID:    "StageLine",
-			Other: `stage line`,
+			ID:    "StageSelection",
+			Other: `stage selection`,
 		}, &i18n.Message{
-			ID:    "EscapeStaging",
+			ID:    "ResetSelection",
+			Other: `reset selection`,
+		}, &i18n.Message{
+			ID:    "ToggleDragSelect",
+			Other: `toggle drag select`,
+		}, &i18n.Message{
+			ID:    "ToggleSelectHunk",
+			Other: `toggle select hunk`,
+		},
+		&i18n.Message{
+			ID:    "TogglePanel",
+			Other: `switch to other panel`,
+		},
+		&i18n.Message{
+			ID:    "CantStageStaged",
+			Other: `You can't stage an already staged change!`,
+		}, &i18n.Message{
+			ID:    "ReturnToFilesPanel",
 			Other: `return to files panel`,
 		}, &i18n.Message{
 			ID:    "CantFindHunks",
@@ -521,7 +539,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: "fetching and fast-forwarding {{.from}} -> {{.to}} ...",
 		}, &i18n.Message{
 			ID:    "FoundConflicts",
-			Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'",
+			Other: "Conflicts! To abort press 'esc', otherwise press 'enter'",
 		}, &i18n.Message{
 			ID:    "FoundConflictsTitle",
 			Other: "Auto-merge failed",
@@ -600,6 +618,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotRebaseOntoFirstCommit",
 			Other: "You cannot interactive rebase onto the first commit",
+		}, &i18n.Message{
+			ID:    "CannotSquashOntoSecondCommit",
+			Other: "You cannot squash/fixup onto the second commit",
 		}, &i18n.Message{
 			ID:    "Donate",
 			Other: "Donate",
@@ -666,6 +687,258 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CherryPickingStatus",
 			Other: "cherry-picking",
+		}, &i18n.Message{
+			ID:    "CommitFiles",
+			Other: "Commit files",
+		}, &i18n.Message{
+			ID:    "viewCommitFiles",
+			Other: "view commit's files",
+		}, &i18n.Message{
+			ID:    "CommitFilesTitle",
+			Other: "Commit files",
+		}, &i18n.Message{
+			ID:    "goBack",
+			Other: "go back",
+		}, &i18n.Message{
+			ID:    "NoCommiteFiles",
+			Other: "No files for this commit",
+		}, &i18n.Message{
+			ID:    "checkoutCommitFile",
+			Other: "checkout file",
+		}, &i18n.Message{
+			ID:    "discardOldFileChange",
+			Other: "discard this commit's changes to this file",
+		}, &i18n.Message{
+			ID:    "DiscardFileChangesTitle",
+			Other: "Discard file changes",
+		}, &i18n.Message{
+			ID:    "DiscardFileChangesPrompt",
+			Other: "Are you sure you want to discard this commit's changes to this file? If this file was created in this commit, it will be deleted",
+		}, &i18n.Message{
+			ID:    "DisabledForGPG",
+			Other: "Feature not available for users using GPG",
+		}, &i18n.Message{
+			ID:    "CreateRepo",
+			Other: "Not in a git repository. Create a new git repository? (y/n): ",
+		}, &i18n.Message{
+			ID:    "AutoStashTitle",
+			Other: "Autostash?",
+		}, &i18n.Message{
+			ID:    "AutoStashPrompt",
+			Other: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)",
+		}, &i18n.Message{
+			ID:    "StashPrefix",
+			Other: "Auto-stashing changes for ",
+		}, &i18n.Message{
+			ID:    "viewDiscardOptions",
+			Other: "view 'discard changes' options",
+		}, &i18n.Message{
+			ID:    "cancel",
+			Other: "cancel",
+		}, &i18n.Message{
+			ID:    "discardAllChanges",
+			Other: "discard all changes",
+		}, &i18n.Message{
+			ID:    "discardUnstagedChanges",
+			Other: "discard unstaged changes",
+		}, &i18n.Message{
+			ID:    "discardAllChangesToAllFiles",
+			Other: "nuke working tree",
+		}, &i18n.Message{
+			ID:    "discardAnyUnstagedChanges",
+			Other: "discard unstaged changes",
+		}, &i18n.Message{
+			ID:    "discardUntrackedFiles",
+			Other: "discard untracked files",
+		}, &i18n.Message{
+			ID:    "hardReset",
+			Other: "hard reset",
+		}, &i18n.Message{
+			ID:    "hardResetUpstream",
+			Other: "hard reset to upstream branch",
+		}, &i18n.Message{
+			ID:    "viewResetOptions",
+			Other: `view reset options`,
+		}, &i18n.Message{
+			ID:    "createFixupCommit",
+			Other: `create fixup commit for this commit`,
+		}, &i18n.Message{
+			ID:    "squashAboveCommits",
+			Other: `squash above commits`,
+		}, &i18n.Message{
+			ID:    "SquashAboveCommits",
+			Other: `Squash above commits`,
+		}, &i18n.Message{
+			ID:    "SureSquashAboveCommits",
+			Other: `Are you sure you want to squash all fixup! commits above {{.commit}}?`,
+		}, &i18n.Message{
+			ID:    "CreateFixupCommit",
+			Other: `Create fixup commit`,
+		}, &i18n.Message{
+			ID:    "SureCreateFixupCommit",
+			Other: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`,
+		}, &i18n.Message{
+			ID:    "executeCustomCommand",
+			Other: "execute custom command",
+		}, &i18n.Message{
+			ID:    "CustomCommand",
+			Other: "Custom Command:",
+		}, &i18n.Message{
+			ID:    "commitChangesWithoutHook",
+			Other: "commit changes without pre-commit hook",
+		}, &i18n.Message{
+			ID:    "SkipHookPrefixNotConfigured",
+			Other: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config",
+		}, &i18n.Message{
+			ID:    "resetTo",
+			Other: `reset to`,
+		}, &i18n.Message{
+			ID:    "pressEnterToReturn",
+			Other: "Press enter to return to lazygit",
+		}, &i18n.Message{
+			ID:    "viewStashOptions",
+			Other: "view stash options",
+		}, &i18n.Message{
+			ID:    "stashAllChanges",
+			Other: "stash changes",
+		}, &i18n.Message{
+			ID:    "stashStagedChanges",
+			Other: "stash staged changes",
+		}, &i18n.Message{
+			ID:    "stashOptions",
+			Other: "Stash options",
+		}, &i18n.Message{
+			ID:    "notARepository",
+			Other: "Error: must be run inside a git repository",
+		}, &i18n.Message{
+			ID:    "jump",
+			Other: "jump to panel",
+		}, &i18n.Message{
+			ID:    "DiscardPatch",
+			Other: "Discard Patch",
+		}, &i18n.Message{
+			ID:    "DiscardPatchConfirm",
+			Other: "You can only build a patch from one commit at a time. Discard current patch?",
+		}, &i18n.Message{
+			ID:    "CantPatchWhileRebasingError",
+			Other: "You cannot build a patch or run patch commands while in a merging or rebasing state",
+		}, &i18n.Message{
+			ID:    "toggleAddToPatch",
+			Other: "toggle file included in patch",
+		}, &i18n.Message{
+			ID:    "ViewPatchOptions",
+			Other: "view custom patch options",
+		}, &i18n.Message{
+			ID:    "PatchOptionsTitle",
+			Other: "Patch Options",
+		}, &i18n.Message{
+			ID:    "NoPatchError",
+			Other: "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines",
+		}, &i18n.Message{
+			ID:    "enterFile",
+			Other: "enter file to add selected lines to the patch",
+		}, &i18n.Message{
+			ID:    "ExitLineByLineMode",
+			Other: `exit line-by-line mode`,
+		}, &i18n.Message{
+			ID:    "EnterUpstream",
+			Other: `Enter upstream as '<remote> <branchname>'`,
+		}, &i18n.Message{
+			ID:    "EnterUpstreamWithSlash",
+			Other: `Enter upstream as '<remote>/<branchname>'`,
+		}, &i18n.Message{
+			ID:    "notTrackingRemote",
+			Other: "(not tracking any remote)",
+		}, &i18n.Message{
+			ID:    "ReturnToRemotesList",
+			Other: `return to remotes list`,
+		}, &i18n.Message{
+			ID:    "addNewRemote",
+			Other: `add new remote`,
+		}, &i18n.Message{
+			ID:    "newRemoteName",
+			Other: `New remote name:`,
+		}, &i18n.Message{
+			ID:    "newRemoteUrl",
+			Other: `New remote url:`,
+		}, &i18n.Message{
+			ID:    "editRemoteName",
+			Other: `Enter updated remote name for {{ .remoteName }}:`,
+		}, &i18n.Message{
+			ID:    "editRemoteUrl",
+			Other: `Enter updated remote url for {{ .remoteName }}:`,
+		}, &i18n.Message{
+			ID:    "removeRemote",
+			Other: `remove remote`,
+		}, &i18n.Message{
+			ID:    "removeRemotePrompt",
+			Other: "Are you sure you want to remove remote",
+		}, &i18n.Message{
+			ID:    "DeleteRemoteBranch",
+			Other: "Delete Remote Branch",
+		}, &i18n.Message{
+			ID:    "DeleteRemoteBranchMessage",
+			Other: "Are you sure you want to delete remote branch",
+		}, &i18n.Message{
+			ID:    "setUpstream",
+			Other: "set as upstream of checked-out branch",
+		}, &i18n.Message{
+			ID:    "SetUpstreamTitle",
+			Other: "Set upstream branch",
+		}, &i18n.Message{
+			ID:    "SetUpstreamMessage",
+			Other: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'",
+		}, &i18n.Message{
+			ID:    "editRemote",
+			Other: "edit remote",
+		}, &i18n.Message{
+			ID:    "tagCommit",
+			Other: "tag commit",
+		}, &i18n.Message{
+			ID:    "TagNameTitle",
+			Other: "Tag name:",
+		}, &i18n.Message{
+			ID:    "deleteTag",
+			Other: "delete tag",
+		}, &i18n.Message{
+			ID:    "DeleteTagTitle",
+			Other: "Delete tag",
+		}, &i18n.Message{
+			ID:    "DeleteTagPrompt",
+			Other: "Are you sure you want to delete tag '{{.tagName}}'?",
+		}, &i18n.Message{
+			ID:    "PushTagTitle",
+			Other: "remote to push tag '{{.tagName}}' to:",
+		}, &i18n.Message{
+			ID:    "pushTag",
+			Other: "push tag",
+		}, &i18n.Message{
+			ID:    "createTag",
+			Other: "create tag",
+		}, &i18n.Message{
+			ID:    "CreateTagTitle",
+			Other: "Tag name:",
+		}, &i18n.Message{
+			ID:    "fetchRemote",
+			Other: "fetch remote",
+		}, &i18n.Message{
+			ID:    "FetchingRemoteStatus",
+			Other: "fetching remote",
+		}, &i18n.Message{
+			ID:    "checkoutCommit",
+			Other: "checkout commit",
+		}, &i18n.Message{
+			ID:    "SureCheckoutThisCommit",
+			Other: "Are you sure you want to checkout this commit?",
+		}, &i18n.Message{
+			ID:    "gitFlowOptions",
+			Other: "show git-flow options",
+		}, &i18n.Message{
+			ID:    "NotAGitFlowBranch",
+			Other: "This does not seem to be a git flow branch",
+		}, &i18n.Message{
+			ID:    "NewBranchNamePrompt",
+			Other: "new {{.branchType}} name:",
 		},
 	)
 }

pkg/i18n/i18n.go

@@ -87,7 +87,7 @@ func detectLanguage(langDetector func() (string, error)) string {
 // 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}
+	i18nBundle := i18n.NewBundle(language.English)
 
 	addBundles(log, i18nBundle)
 

pkg/i18n/polish.go

@@ -26,12 +26,21 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CommitsTitle",
 			Other: "Commity",
+		}, &i18n.Message{
+			ID:    "CommitsDiffTitle",
+			Other: "Commits (specific diff mode)",
+		}, &i18n.Message{
+			ID:    "CommitsDiff",
+			Other: "select commit to diff with another commit",
 		}, &i18n.Message{
 			ID:    "StashTitle",
 			Other: "Schowek",
 		}, &i18n.Message{
-			ID:    "StagingMainTitle",
-			Other: `Stage Lines/Hunks`,
+			ID:    "UnstagedChanges",
+			Other: `Unstaged Changes`,
+		}, &i18n.Message{
+			ID:    "StagedChanges",
+			Other: `Staged Changes`,
 		}, &i18n.Message{
 			ID:    "MergingMainTitle",
 			Other: "Resolve merge conflicts",
@@ -77,9 +86,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "execute",
 			Other: "wykonaj",
-		}, &i18n.Message{
-			ID:    "stashFiles",
-			Other: "przechowaj pliki",
 		}, &i18n.Message{
 			ID:    "open",
 			Other: "otwórz",
@@ -98,9 +104,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "refresh",
 			Other: "odśwież",
-		}, &i18n.Message{
-			ID:    "addPatch",
-			Other: "dodaj łatkę",
 		}, &i18n.Message{
 			ID:    "edit",
 			Other: "edytuj",
@@ -146,9 +149,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &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` i `clean -fd`? Możesz stracić wprowadzone zmiany",
 		}, &i18n.Message{
 			ID:    "SureTo",
 			Other: "Jesteś pewny, że chcesz {{.deleteVerb}} {{.fileName}} (stracisz swoje wprowadzone zmiany)?",
@@ -329,12 +329,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &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:    "ClearFilePanel",
-			Other: "Wyczyść panel plików",
 		}, &i18n.Message{
 			ID:    "MergeAborted",
 			Other: "Scalanie anulowane",
@@ -371,9 +365,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &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`,
@@ -386,9 +377,6 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "refreshFiles",
 			Other: `odśwież pliki`,
-		}, &i18n.Message{
-			ID:    "resetHard",
-			Other: `zresetuj twardo i usuń niepotwierdzone pliki`,
 		}, &i18n.Message{
 			ID:    "mergeIntoCurrentBranch",
 			Other: `scal do obecnej gałęzi`,
@@ -429,7 +417,7 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			ID:    "StageLine",
 			Other: `zatwierdź linię`,
 		}, &i18n.Message{
-			ID:    "EscapeStaging",
+			ID:    "ReturnToFilesPanel",
 			Other: `wróć do panelu plików`,
 		}, &i18n.Message{
 			ID:    "CantFindHunks",
@@ -466,13 +454,7 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			Other: "Normal",
 		}, &i18n.Message{
 			ID:    "softReset",
-			Other: "soft reset to last commit",
-		}, &i18n.Message{
-			ID:    "SoftReset",
-			Other: "Soft reset",
-		}, &i18n.Message{
-			ID:    "ConfirmSoftReset",
-			Other: "Are you sure you want to `reset --soft HEAD^`? The changes in your topmost commit will be placed in your working tree",
+			Other: "soft reset",
 		}, &i18n.Message{
 			ID:    "SureSquashThisCommit",
 			Other: "Are you sure you want to squash this commit into the commit below?",
@@ -502,7 +484,7 @@ func addPolish(i18nObject *i18n.Bundle) error {
 			Other: "amend commit with staged changes",
 		}, &i18n.Message{
 			ID:    "FoundConflicts",
-			Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'",
+			Other: "Conflicts! To abort press 'esc', otherwise press 'enter'",
 		}, &i18n.Message{
 			ID:    "FoundConflictsTitle",
 			Other: "Auto-merge failed",
@@ -560,6 +542,9 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CannotRebaseOntoFirstCommit",
 			Other: "You cannot interactive rebase onto the first commit",
+		}, &i18n.Message{
+			ID:    "CannotSquashOntoSecondCommit",
+			Other: "You cannot squash/fixup onto the second commit",
 		}, &i18n.Message{
 			ID:    "Donate",
 			Other: "Donate",
@@ -626,6 +611,138 @@ func addPolish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "CherryPickingStatus",
 			Other: "cherry-picking",
+		}, &i18n.Message{
+			ID:    "CommitFiles",
+			Other: "Commit files",
+		}, &i18n.Message{
+			ID:    "viewCommitFiles",
+			Other: "view commit's files",
+		}, &i18n.Message{
+			ID:    "CommitFilesTitle",
+			Other: "Commit files",
+		}, &i18n.Message{
+			ID:    "goBack",
+			Other: "go back",
+		}, &i18n.Message{
+			ID:    "NoCommiteFiles",
+			Other: "No files for this commit",
+		}, &i18n.Message{
+			ID:    "checkoutCommitFile",
+			Other: "checkout file",
+		}, &i18n.Message{
+			ID:    "discardOldFileChange",
+			Other: "discard this commit's changes to this file",
+		}, &i18n.Message{
+			ID:    "DiscardFileChangesTitle",
+			Other: "Discard file changes",
+		}, &i18n.Message{
+			ID:    "DiscardFileChangesPrompt",
+			Other: "Are you sure you want to discard this commit's changes to this file? If this file was created in this commit, it will be deleted",
+		}, &i18n.Message{
+			ID:    "DisabledForGPG",
+			Other: "Feature not available for users using GPG",
+		}, &i18n.Message{
+			ID:    "CreateRepo",
+			Other: "Not in a git repository. Create a new git repository? (y/n): ",
+		}, &i18n.Message{
+			ID:    "AutoStashTitle",
+			Other: "Autostash?",
+		}, &i18n.Message{
+			ID:    "AutoStashPrompt",
+			Other: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)",
+		}, &i18n.Message{
+			ID:    "StashPrefix",
+			Other: "Auto-stashing changes for ",
+		}, &i18n.Message{
+			ID:    "viewDiscardOptions",
+			Other: "view 'discard changes' options",
+		}, &i18n.Message{
+			ID:    "cancel",
+			Other: "cancel",
+		}, &i18n.Message{
+			ID:    "discardAllChanges",
+			Other: "discard all changes",
+		}, &i18n.Message{
+			ID:    "discardUnstagedChanges",
+			Other: "discard unstaged changes",
+		}, &i18n.Message{
+			ID:    "discardAllChangesToAllFiles",
+			Other: "nuke working tree",
+		}, &i18n.Message{
+			ID:    "discardAnyUnstagedChanges",
+			Other: "discard unstaged changes",
+		}, &i18n.Message{
+			ID:    "discardUntrackedFiles",
+			Other: "discard untracked files",
+		}, &i18n.Message{
+			ID:    "hardReset",
+			Other: "hard reset",
+		}, &i18n.Message{
+			ID:    "viewResetOptions",
+			Other: `view reset options`,
+		}, &i18n.Message{
+			ID:    "createFixupCommit",
+			Other: `create fixup commit for this commit`,
+		}, &i18n.Message{
+			ID:    "squashAboveCommits",
+			Other: `squash above commits`,
+		}, &i18n.Message{
+			ID:    "SquashAboveCommits",
+			Other: `Squash above commits`,
+		}, &i18n.Message{
+			ID:    "SureSquashAboveCommits",
+			Other: `Are you sure you want to squash all fixup! commits above {{.commit}}?`,
+		}, &i18n.Message{
+			ID:    "CreateFixupCommit",
+			Other: `Create fixup commit`,
+		}, &i18n.Message{
+			ID:    "SureCreateFixupCommit",
+			Other: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`,
+		}, &i18n.Message{
+			ID:    "executeCustomCommand",
+			Other: "execute custom command",
+		}, &i18n.Message{
+			ID:    "CustomCommand",
+			Other: "Custom Command:",
+		}, &i18n.Message{
+			ID:    "commitChangesWithoutHook",
+			Other: "commit changes without pre-commit hook",
+		}, &i18n.Message{
+			ID:    "SkipHookPrefixNotConfigured",
+			Other: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config",
+		}, &i18n.Message{
+			ID:    "resetTo",
+			Other: `reset to`,
+		}, &i18n.Message{
+			ID:    "pressEnterToReturn",
+			Other: "Press enter to return to lazygit",
+		}, &i18n.Message{
+			ID:    "viewStashOptions",
+			Other: "view stash options",
+		}, &i18n.Message{
+			ID:    "stashAllChanges",
+			Other: "przechowaj pliki",
+		}, &i18n.Message{
+			ID:    "stashStagedChanges",
+			Other: "stash staged changes",
+		}, &i18n.Message{
+			ID:    "stashOptions",
+			Other: "Stash options",
+		}, &i18n.Message{
+			ID:    "notARepository",
+			Other: "Error: must be run inside a git repository",
+		}, &i18n.Message{
+			ID:    "jump",
+			Other: "jump to panel",
+		}, &i18n.Message{
+			ID:    "ExitLineByLineMode",
+			Other: `exit line-by-line mode`,
+		}, &i18n.Message{
+			ID:    "EnterUpstream",
+			Other: `Enter upstream as '<remote> <branchname>'`,
+		}, &i18n.Message{
+			ID:    "ReturnToRemotesList",
+			Other: `return to remotes list`,
 		},
 	)
 }

pkg/theme/theme.go

@@ -0,0 +1,104 @@
+package theme
+
+import (
+	"github.com/fatih/color"
+	"github.com/jesseduffield/gocui"
+	"github.com/spf13/viper"
+)
+
+var (
+	// DefaultTextColor is the default text color
+	DefaultTextColor = color.FgWhite
+	// DefaultHiTextColor is the default highlighted text color
+	DefaultHiTextColor = color.FgHiWhite
+
+	// GocuiDefaultTextColor does the same as DefaultTextColor but this one only colors gocui default text colors
+	GocuiDefaultTextColor gocui.Attribute
+
+	// ActiveBorderColor is the border color of the active frame
+	ActiveBorderColor gocui.Attribute
+
+	// InactiveBorderColor is the border color of the inactive active frames
+	InactiveBorderColor gocui.Attribute
+)
+
+// UpdateTheme updates all theme variables
+func UpdateTheme(userConfig *viper.Viper) {
+	ActiveBorderColor = getColor(userConfig.GetStringSlice("gui.theme.activeBorderColor"))
+	InactiveBorderColor = getColor(userConfig.GetStringSlice("gui.theme.inactiveBorderColor"))
+
+	isLightTheme := userConfig.GetBool("gui.theme.lightTheme")
+	if isLightTheme {
+		DefaultTextColor = color.FgBlack
+		DefaultHiTextColor = color.FgHiBlack
+		GocuiDefaultTextColor = gocui.ColorBlack
+	} else {
+		DefaultTextColor = color.FgWhite
+		DefaultHiTextColor = color.FgHiWhite
+		GocuiDefaultTextColor = gocui.ColorWhite
+	}
+}
+
+// getAttribute gets the gocui color attribute from the string
+func getAttribute(key string) gocui.Attribute {
+	colorMap := map[string]gocui.Attribute{
+		"default":   gocui.ColorDefault,
+		"black":     gocui.ColorBlack,
+		"red":       gocui.ColorRed,
+		"green":     gocui.ColorGreen,
+		"yellow":    gocui.ColorYellow,
+		"blue":      gocui.ColorBlue,
+		"magenta":   gocui.ColorMagenta,
+		"cyan":      gocui.ColorCyan,
+		"white":     gocui.ColorWhite,
+		"bold":      gocui.AttrBold,
+		"reverse":   gocui.AttrReverse,
+		"underline": gocui.AttrUnderline,
+	}
+	value, present := colorMap[key]
+	if present {
+		return value
+	}
+	return gocui.ColorWhite
+}
+
+// getColor bitwise OR's a list of attributes obtained via the given keys
+func getColor(keys []string) gocui.Attribute {
+	var attribute gocui.Attribute
+	for _, key := range keys {
+		attribute |= getAttribute(key)
+	}
+	return attribute
+}
+
+// GetAttribute gets the gocui color attribute from the string
+func GetAttribute(key string) gocui.Attribute {
+	colorMap := map[string]gocui.Attribute{
+		"default":   gocui.ColorDefault,
+		"black":     gocui.ColorBlack,
+		"red":       gocui.ColorRed,
+		"green":     gocui.ColorGreen,
+		"yellow":    gocui.ColorYellow,
+		"blue":      gocui.ColorBlue,
+		"magenta":   gocui.ColorMagenta,
+		"cyan":      gocui.ColorCyan,
+		"white":     gocui.ColorWhite,
+		"bold":      gocui.AttrBold,
+		"reverse":   gocui.AttrReverse,
+		"underline": gocui.AttrUnderline,
+	}
+	value, present := colorMap[key]
+	if present {
+		return value
+	}
+	return gocui.ColorWhite
+}
+
+// GetColor bitwise OR's a list of attributes obtained via the given keys
+func GetColor(keys []string) gocui.Attribute {
+	var attribute gocui.Attribute
+	for _, key := range keys {
+		attribute |= GetAttribute(key)
+	}
+	return attribute
+}

pkg/updates/updates.go

@@ -3,9 +3,8 @@ package updates
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -16,7 +15,6 @@ import (
 
 	"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"
@@ -255,21 +253,34 @@ func (u *Updater) update(newVersion string) error {
 }
 
 func (u *Updater) downloadAndInstall(rawUrl string) error {
-	url, err := url.Parse(rawUrl)
+	configDir := u.Config.GetUserConfigDir()
+	u.Log.Info("Download directory is " + configDir)
+
+	tempPath := filepath.Join(configDir, "temp_lazygit")
+	u.Log.Info("Temp path to binary is " + tempPath)
+
+	// Create the file
+	out, err := os.Create(tempPath)
 	if err != nil {
 		return err
 	}
+	defer out.Close()
 
-	g := new(getter.HttpGetter)
-	tempDir, err := ioutil.TempDir("", "lazygit")
+	// Get the data
+	resp, err := http.Get(rawUrl)
 	if err != nil {
 		return err
 	}
-	defer os.RemoveAll(tempDir)
-	u.Log.Info("Temp directory is " + tempDir)
+	defer resp.Body.Close()
 
-	// Get it!
-	if err := g.Get(tempDir, url); err != nil {
+	// Check server response
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("error while trying to download latest lazygit: %s", resp.Status)
+	}
+
+	// Write the body to file
+	_, err = io.Copy(out, resp.Body)
+	if err != nil {
 		return err
 	}
 
@@ -280,12 +291,7 @@ func (u *Updater) downloadAndInstall(rawUrl string) error {
 	}
 	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
 	}

pkg/utils/utils.go

@@ -33,10 +33,11 @@ func SplitLines(multilineString string) []string {
 
 // WithPadding pads a string as much as you want
 func WithPadding(str string, padding int) string {
-	if padding-len(str) < 0 {
+	uncoloredStr := Decolorise(str)
+	if padding < len(uncoloredStr) {
 		return str
 	}
-	return str + strings.Repeat(" ", padding-len(str))
+	return str + strings.Repeat(" ", padding-len(uncoloredStr))
 }
 
 // ColoredString takes a string and a colour attribute and returns a colored
@@ -225,6 +226,16 @@ func IncludesString(list []string, a string) bool {
 	return false
 }
 
+// IncludesInt if the list contains the Int
+func IncludesInt(list []int, a int) bool {
+	for _, b := range list {
+		if b == a {
+			return true
+		}
+	}
+	return false
+}
+
 // NextIndex returns the index of the element that comes after the given number
 func NextIndex(numbers []int, currentNumber int) int {
 	for index, number := range numbers {
@@ -232,21 +243,70 @@ func NextIndex(numbers []int, currentNumber int) int {
 			return index
 		}
 	}
-	return 0
+	return len(numbers) - 1
 }
 
 // PrevIndex returns the index that comes before the given number, cycling if we reach the end
 func PrevIndex(numbers []int, currentNumber int) int {
 	end := len(numbers) - 1
-	for i := end; i >= 0; i -= 1 {
+	for i := end; i >= 0; i-- {
 		if numbers[i] < currentNumber {
 			return i
 		}
 	}
-	return end
+	return 0
 }
 
 func AsJson(i interface{}) string {
 	bytes, _ := json.MarshalIndent(i, "", "    ")
 	return string(bytes)
 }
+
+// UnionInt returns the union of two int arrays
+func UnionInt(a, b []int) []int {
+	m := make(map[int]bool)
+
+	for _, item := range a {
+		m[item] = true
+	}
+
+	for _, item := range b {
+		if _, ok := m[item]; !ok {
+			// this does not mutate the original a slice
+			// though it does mutate the backing array I believe
+			// but that doesn't matter because if you later want to append to the
+			// original a it must see that the backing array has been changed
+			// and create a new one
+			a = append(a, item)
+		}
+	}
+	return a
+}
+
+// DifferenceInt returns the difference of two int arrays
+func DifferenceInt(a, b []int) []int {
+	result := []int{}
+	m := make(map[int]bool)
+
+	for _, item := range b {
+		m[item] = true
+	}
+
+	for _, item := range a {
+		if _, ok := m[item]; !ok {
+			result = append(result, item)
+		}
+	}
+	return result
+}
+
+// used to keep a number n between 0 and max, allowing for wraparounds
+func ModuloWithWrap(n, max int) int {
+	if n >= max {
+		return n % max
+	} else if n < 0 {
+		return max + n
+	} else {
+		return n
+	}
+}

pkg/utils/utils_test.go

@@ -169,7 +169,7 @@ func TestResolvePlaceholderString(t *testing.T) {
 	}
 
 	for _, s := range scenarios {
-		assert.EqualValues(t, string(s.expected), ResolvePlaceholderString(s.templateString, s.arguments))
+		assert.EqualValues(t, s.expected, ResolvePlaceholderString(s.templateString, s.arguments))
 	}
 }
 
@@ -485,7 +485,7 @@ func TestNextIndex(t *testing.T) {
 			"no elements",
 			[]int{},
 			1,
-			0,
+			-1,
 		},
 		{
 			"one element",
@@ -503,7 +503,7 @@ func TestNextIndex(t *testing.T) {
 			"two elements, giving second one",
 			[]int{1, 2},
 			2,
-			0,
+			1,
 		},
 		{
 			"three elements, giving second one",
@@ -534,7 +534,7 @@ func TestPrevIndex(t *testing.T) {
 			"no elements",
 			[]int{},
 			1,
-			-1,
+			0,
 		},
 		{
 			"one element",
@@ -546,7 +546,7 @@ func TestPrevIndex(t *testing.T) {
 			"two elements",
 			[]int{1, 2},
 			1,
-			1,
+			0,
 		},
 		{
 			"three elements, giving second one",

scripts/generate_cheatsheet.go

@@ -25,16 +25,21 @@ type bindingSection struct {
 }
 
 func main() {
+	langs := []string{"pl", "nl", "en"}
 	mConfig, _ := config.NewAppConfig("", "", "", "", "", true)
-	mApp, _ := app.NewApp(mConfig)
-	lang := mApp.Tr.GetLanguage()
-	file, _ := os.Create("Keybindings_" + lang + ".md")
 
-	bindingSections := getBindingSections(mApp)
+	for _, lang := range langs {
+		os.Setenv("LC_ALL", lang)
+		mApp, _ := app.NewApp(mConfig)
+		file, err := os.Create(getProjectRoot() + "/docs/keybindings/Keybindings_" + lang + ".md")
+		if err != nil {
+			panic(err)
+		}
 
-	content := formatSections(mApp, bindingSections)
-
-	writeString(file, content)
+		bindingSections := getBindingSections(mApp)
+		content := formatSections(mApp, bindingSections)
+		writeString(file, content)
+	}
 }
 
 func writeString(file *os.File, str string) {
@@ -54,6 +59,9 @@ func formatTitle(title string) string {
 }
 
 func formatBinding(binding *gui.Binding) string {
+	if binding.Alternative != "" {
+		return fmt.Sprintf("  <kbd>%s</kbd>: %s (%s)\n", binding.GetKey(), binding.Description, binding.Alternative)
+	}
 	return fmt.Sprintf("  <kbd>%s</kbd>: %s\n", binding.GetKey(), binding.Description)
 }
 
@@ -75,15 +83,13 @@ func getBindingSections(mApp *app.App) []*bindingSection {
 		bindingSections = addBinding(title, bindingSections, binding)
 	}
 
-	for view, contexts := range mApp.Gui.GetContextMap() {
-		for contextName, contextBindings := range contexts {
-			translatedView := localisedTitle(mApp, view)
-			translatedContextName := localisedTitle(mApp, contextName)
-			title := fmt.Sprintf("%s (%s)", translatedView, translatedContextName)
+	for contextName, contextBindings := range mApp.Gui.GetContextMap() {
+		translatedView := localisedTitle(mApp, contextBindings[0].ViewName)
+		translatedContextName := localisedTitle(mApp, contextName)
+		title := fmt.Sprintf("%s (%s)", translatedView, translatedContextName)
 
-			for _, binding := range contextBindings {
-				bindingSections = addBinding(title, bindingSections, binding)
-			}
+		for _, binding := range contextBindings {
+			bindingSections = addBinding(title, bindingSections, binding)
 		}
 	}
 
@@ -91,7 +97,7 @@ func getBindingSections(mApp *app.App) []*bindingSection {
 }
 
 func addBinding(title string, bindingSections []*bindingSection, binding *gui.Binding) []*bindingSection {
-	if binding.Description == "" {
+	if binding.Description == "" && binding.Alternative == "" {
 		return bindingSections
 	}
 
@@ -124,3 +130,11 @@ func formatSections(mApp *app.App, bindingSections []*bindingSection) string {
 
 	return content
 }
+
+func getProjectRoot() string {
+	dir, err := os.Getwd()
+	if err != nil {
+		panic(err)
+	}
+	return strings.Split(dir, "lazygit")[0] + "lazygit"
+}