lazygit: update config

diff --git a/dot-config/lazygit/config.yml b/dot-config/lazygit/config.yml
index eb96dcd7ccaecd6594b26fca1961abf2eac69ada..61544b682b7341dcb53f44eddfd902067e1bb3df 100644 (file)
--- a/dot-config/lazygit/config.yml
+++ b/dot-config/lazygit/config.yml
@@ -164,18 +164,18 @@ gui:
 # Config relating to git
 git:
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
-  paging:
-    # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
-    colorArg: always
-    # e.g.
-    # diff-so-fancy
-    # delta --dark --paging=never
-    # ydiff -p cat -s --wrap --width={{columnWidth}}
-    pager: ""
-    # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
-    useConfig: false
-    # e.g. 'difft --color=always'
-    externalDiffCommand: ""
+  pagers:
+    - # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
+      colorArg: always
+      # e.g.
+      # diff-so-fancy
+      # delta --dark --paging=never
+      # ydiff -p cat -s --wrap --width={{columnWidth}}
+      pager: ""
+      # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
+      useConfig: false
+      # e.g. 'difft --color=always'
+      externalDiffCommand: ""
   # Config relating to committing
   commit:
     # If true, pass '--signoff' flag when committing
@@ -413,7 +413,7 @@ keybinding:
     viewResetOptions: D
     fetch: f
     toggleTreeView: '`'
-    openMergeTool: M
+    openMergeOptions: M
     openStatusFilter: <c-b>
     copyFileInfoToClipboard: "y"
   branches:

diff --git a/dot-config/lazygit/state.yml b/dot-config/lazygit/state.yml
index f28abfb70e1fd1fdfdc23f2c935edd0bb9c34512..2074a4bf8ad92ee9a8b13790e72101be7e5ad53a 100644 (file)
--- a/dot-config/lazygit/state.yml
+++ b/dot-config/lazygit/state.yml
@@ -2,13 +2,7 @@ lastupdatecheck: 0
 recentrepos:
     - /home/andy/dotfiles
 startuppopupversion: 5
-lastversion: 0.53.0
+didshowhunkstaginghint: false
+lastversion: 0.58.0
 customcommandshistory: []
 hidecommandlog: false
-ignorewhitespaceindiffview: false
-diffcontextsize: 3
-renamesimilaritythreshold: 50
-localbranchsortorder: recency
-remotebranchsortorder: alphabetical
-gitlogorder: topo-order
-gitlogshowgraph: always