.

.config/lazygit/config.yml

@@ -2,97 +2,72 @@
 gui:
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color
   authorColors: {}
-
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
   branchColorPatterns: {}
-
   # Custom icons for filenames and file extensions
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-files-icon--color
   customIcons:
     # Map of filenames to icon properties (icon and color)
     filenames: {}
-
     # Map of file extensions (including the dot) to icon properties (icon and color)
     extensions: {}
-
   # The number of lines you scroll by when scrolling the main window
   scrollHeight: 2
-
   # If true, allow scrolling past the bottom of the content in the main window
   scrollPastBottom: true
-
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#scroll-off-margin
   scrollOffMargin: 2
-
   # One of: 'margin' (default) | 'jump'
   scrollOffBehavior: margin
-
   # The number of spaces per tab; used for everything that's shown in the main view, but probably mostly relevant for diffs.
   # Note that when using a pager, the pager has its own tab width setting, so you need to pass it separately in the pager command.
   tabWidth: 2
-
   # If true, capture mouse events.
   # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
   mouseEvents: true
-
   # If true, do not show a warning when amending a commit.
   skipAmendWarning: false
-
   # If true, do not show a warning when discarding changes in the staging view.
   skipDiscardChangeWarning: false
-
   # If true, do not show warning when applying/popping the stash
   skipStashWarning: false
-
   # If true, do not show a warning when attempting to commit without any staged files; instead stage all unstaged files.
   skipNoStagedFilesWarning: false
-
   # If true, do not show a warning when rewording a commit via an external editor
   skipRewordInEditorWarning: false
-
   # Fraction of the total screen width to use for the left side section. You may want to pick a small number (e.g. 0.2) if you're using a narrow screen, so that you can see more of the main section.
   # Number from 0 to 1.0.
-  sidePanelWidth: 0.3333
+  sidePanelWidth: 0.2
-
   # If true, increase the height of the focused side window; creating an accordion effect.
   expandFocusedSidePanel: false
-
   # The weight of the expanded side panel, relative to the other panels. 2 means
   # twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.
   expandedSidePanelWeight: 2
-
   # Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split.
   # Options are:
   # - 'horizontal': split the window horizontally
   # - 'vertical': split the window vertically
   # - 'flexible': (default) split the window horizontally if the window is wide enough, otherwise split vertically
   mainPanelSplitMode: flexible
-
   # How the window is split when in half screen mode (i.e. after hitting '+' once).
   # Possible values:
   # - 'left': split the window horizontally (side panel on the left, main view on the right)
   # - 'top': split the window vertically (side panel on top, main view below)
   enlargedSideViewLocation: left
-
   # If true, wrap lines in the staging view to the width of the view. This
   # makes it much easier to work with diffs that have long lines, e.g.
   # paragraphs of markdown text.
   wrapLinesInStagingView: true
-
   # If true, hunk selection mode will be enabled by default when entering the staging view.
   useHunkModeInStagingView: false
-
   # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
   language: auto
-
   # Format used when displaying time e.g. commit time.
   # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
   timeFormat: 02 Jan 06
-
   # Format used when displaying time if the time is less than 24 hours ago.
   # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
   shortTimeFormat: 3:04PM
-
   # Config relating to colors and styles.
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes
   theme:
@@ -100,134 +75,99 @@ gui:
     activeBorderColor:
       - green
       - bold
-
     # Border color of non-focused windows
     inactiveBorderColor:
       - default
-
     # Border color of focused window when searching in that window
     searchingActiveBorderColor:
       - cyan
       - bold
-
     # Color of keybindings help text in the bottom line
     optionsTextColor:
       - blue
-
     # Background color of selected line.
     # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#highlighting-the-selected-line
     selectedLineBgColor:
       - blue
-
     # Background color of selected line when view doesn't have focus.
     inactiveViewSelectedLineBgColor:
       - bold
-
     # Foreground color of copied commit
     cherryPickedCommitFgColor:
       - blue
-
     # Background color of copied commit
     cherryPickedCommitBgColor:
       - cyan
-
     # Foreground color of marked base commit (for rebase)
     markedBaseCommitFgColor:
       - blue
-
     # Background color of marked base commit (for rebase)
     markedBaseCommitBgColor:
       - yellow
-
     # Color for file with unstaged changes
     unstagedChangesColor:
       - red
-
     # Default text color
     defaultFgColor:
       - default
-
   # Config relating to the commit length indicator
   commitLength:
     # If true, show an indicator of commit message length
     show: true
-
   # If true, show the '5 of 20' footer at the bottom of list views
   showListFooter: true
-
   # If true, display the files in the file views as a tree. If false, display the files as a flat list.
   # This can be toggled from within Lazygit with the '`' key, but that will not change the default.
   showFileTree: false
-
   # If true, add a "/" root item in the file tree representing the root of the repository. It is only added when necessary, i.e. when there is more than one item at top level.
   showRootItemInFileTree: true
-
   # If true, show the number of lines changed per file in the Files view
   showNumstatInFilesView: false
-
   # If true, show a random tip in the command log when Lazygit starts
   showRandomTip: true
-
   # If true, show the command log
   showCommandLog: true
-
   # If true, show the bottom line that contains keybinding info and useful buttons. If false, this line will be hidden except to display a loader for an in-progress action.
   showBottomLine: true
-
   # If true, show jump-to-window keybindings in window titles.
   showPanelJumps: true
-
   # Nerd fonts version to use.
   # One of: '2' | '3' | empty string (default)
   # If empty, do not show icons.
   nerdFontsVersion: ""
-
   # If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
   showFileIcons: true
-
   # Length of author name in (non-expanded) commits view. 2 means show initials only.
   commitAuthorShortLength: 2
-
   # Length of author name in expanded commits view. 2 means show initials only.
   commitAuthorLongLength: 17
-
   # Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
   commitHashLength: 8
-
   # If true, show commit hashes alongside branch names in the branches view.
   showBranchCommitHash: false
-
   # Whether to show the divergence from the base branch in the branches view.
   # One of: 'none' | 'onlyArrow'  | 'arrowAndNumber'
   showDivergenceFromBaseBranch: none
-
   # Height of the command log view
   commandLogSize: 8
-
   # Whether to split the main window when viewing file changes.
   # One of: 'auto' | 'always'
   # If 'auto', only split the main window when a file has both staged and unstaged changes
   splitDiff: auto
-
   # Default size for focused window. Can be changed from within Lazygit with '+' and '_' (but this won't change the default).
   # One of: 'normal' (default) | 'half' | 'full'
-  screenMode: normal
+  screenMode: half
-
   # Window border style.
   # One of 'rounded' (default) | 'single' | 'double' | 'hidden' | 'bold'
   border: rounded
-
   # If true, show a seriously epic explosion animation when nuking the working tree.
   animateExplosion: true
-
   # Whether to stack UI components on top of each other.
   # One of 'auto' (default) | 'always' | 'never'
   portraitMode: auto
-
   # How things are filtered when typing '/'.
   # One of 'substring' (default) | 'fuzzy'
   filterMode: substring
-
   # Config relating to the spinner.
   spinner:
     # The frames of the spinner animation.
@@ -236,151 +176,113 @@ gui:
       - /
       - '-'
       - \
-
     # The "speed" of the spinner in milliseconds.
     rate: 50
-
   # Status panel view.
   # One of 'dashboard' (default) | 'allBranchesLog'
   statusPanelView: dashboard
-
   # If true, jump to the Files panel after popping a stash
   switchToFilesAfterStashPop: true
-
   # If true, jump to the Files panel after applying a stash
   switchToFilesAfterStashApply: true
-
   # If true, when using the panel jump keys (default 1 through 5) and target panel is already active, go to next tab instead
   switchTabsWithPanelJumpKeys: false
-
 # Config relating to git
 git:
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
-  paging:
+  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'
+    - # 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
     signOff: false
-
     # Automatic WYSIWYG wrapping of the commit message as you type
     autoWrapCommitMessage: true
-
     # If autoWrapCommitMessage is true, the width to wrap to
     autoWrapWidth: 72
-
   # Config relating to merging
   merging:
     # If true, run merges in a subprocess so that if a commit message is required, Lazygit will not hang
     # Only applicable to unix users.
     manualCommit: false
-
     # Extra args passed to `git merge`, e.g. --no-ff
     args: ""
-
     # The commit message to use for a squash merge commit. Can contain "{{selectedRef}}" and "{{currentBranch}}" placeholders.
     squashMergeMessage: Squash merge {{selectedRef}} into {{currentBranch}}
-
   # list of branches that are considered 'main' branches, used when displaying commits
   mainBranches:
     - master
     - main
-
   # Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP'
   skipHookPrefix: WIP
-
   # If true, periodically fetch from remote
   autoFetch: true
-
   # If true, periodically refresh files and submodules
   autoRefresh: true
-
   # If not "none", lazygit will automatically fast-forward local branches to match their upstream after fetching. Applies to branches that are not the currently checked out branch, and only to those that are strictly behind their upstream (as opposed to diverged).
   # Possible values: 'none' | 'onlyMainBranches' | 'allBranches'
   autoForwardBranches: onlyMainBranches
-
   # If true, pass the --all arg to git fetch
   fetchAll: true
-
   # If true, lazygit will automatically stage files that used to have merge
   # conflicts but no longer do; and it will also ask you if you want to
   # continue a merge or rebase if you've resolved all conflicts. If false, it
   # won't do either of these things.
   autoStageResolvedConflicts: true
-
   # Command used when displaying the current branch git log in the main window
   branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
-
   # Commands used to display git log of all branches in the main window, they will be cycled in order of appearance (array of strings)
   allBranchesLogCmds:
     - git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
-
   # If true, do not spawn a separate process when using GPG
   overrideGpg: false
-
   # If true, do not allow force pushes
   disableForcePushing: false
-
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
   # commitPrefix: []
 
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
   commitPrefixes: {}
-
   # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-branch-name-prefix
   branchPrefix: ""
-
   # If true, parse emoji strings in commit messages e.g. render :rocket: as 🚀
   # (This should really be under 'gui', not 'git')
   parseEmoji: false
-
   # Config for showing the log in the commits view
   log:
     # displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
     showWholeGraph: false
-
   # When copying commit hashes to the clipboard, truncate them to this
   # length. Set to 40 to disable truncation.
   truncateCopiedCommitHashesTo: 12
-
 # Periodic update checks
 update:
   # One of: 'prompt' (default) | 'background' | 'never'
   method: prompt
-
   # Period in days between update checks
   days: 14
-
 # Background refreshes
 refresher:
   # File/submodule refresh interval in seconds.
   # Auto-refresh can be disabled via option 'git.autoRefresh'.
   refreshInterval: 10
-
   # Re-fetch interval in seconds.
   # Auto-fetch can be disabled via option 'git.autoFetch'.
   fetchInterval: 60
-
 # If true, show a confirmation popup before quitting Lazygit
 confirmOnQuit: false
-
 # If true, exit Lazygit when the user presses escape in a context where there is nothing to cancel/close
 quitOnTopLevelReturn: false
-
 # Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc
 os:
 # Command for editing a file. Should contain "{{filename}}".
@@ -425,24 +327,19 @@ os:
 
 # If true, don't display introductory popups upon opening Lazygit.
 disableStartupPopups: false
-
 # User-configured commands that can be invoked from within Lazygit
 # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Command_Keybindings.md
 customCommands: []
-
 # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-pull-request-urls
 services: {}
-
 # What to do when opening Lazygit outside of a git repo.
 # - 'prompt': (default) ask whether to initialize a new repo or open in the most recent repo
 # - 'create': initialize a new repo
 # - 'skip': open most recent repo
 # - 'quit': exit Lazygit
 notARepository: prompt
-
 # If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit.
 promptToReturnFromSubprocess: true
-
 # Keybindings
 keybinding:
   universal:
@@ -501,10 +398,8 @@ keybinding:
     scrollDownMain-alt2: <c-d>
     executeShellCommand: ':'
     createRebaseOptionsMenu: m
-
     # 'Files' appended for legacy reasons
     pushFiles: P
-
     # 'Files' appended for legacy reasons
     pullFiles: p
     refresh: R
@@ -547,7 +442,7 @@ keybinding:
     viewResetOptions: D
     fetch: f
     toggleTreeView: '`'
-    openMergeTool: M
+    openMergeOptions: M
     openStatusFilter: <c-b>
     copyFileInfoToClipboard: "y"
     collapseAll: '-'