Add range selection ability on list contexts

.vscode/launch.json

@@ -13,9 +13,6 @@
       ],
       "hideSystemGoroutines": true,
       "console": "integratedTerminal",
-      "presentation": {
-        "hidden": true
-      }
     },
     {
       "name": "Tail Lazygit logs",
@@ -28,9 +25,6 @@
         "--use-config-file=${workspaceFolder}/.vscode/debugger_config.yml"
       ],
       "console": "integratedTerminal",
-      "presentation": {
-        "hidden": true
-      }
     },
     {
       "name": "Attach to a running Lazygit",

README.md

@@ -122,7 +122,7 @@ You can also perform any these actions as a once-off (e.g. pressing `s` on a com
 
 ### Cherry-pick
 
-Press `c` on a commit to copy it and press `v` to paste (cherry-pick) it.
+Press `shift+c` on a commit to copy it and press `shift+v` to paste (cherry-pick) it.
 
 ![cherry_pick](../assets/demo/cherry_pick-compressed.gif)
 

docs/Config.md

@@ -57,8 +57,6 @@ gui:
       - blue
     selectedLineBgColor:
       - blue # set to `default` to have no background colour
-    selectedRangeBgColor:
-      - blue
     cherryPickedCommitBgColor:
       - cyan
     cherryPickedCommitFgColor:
@@ -201,6 +199,9 @@ keybinding:
     toggleWhitespaceInDiffView: '<c-w>'
     increaseContextInDiffView: '}'
     decreaseContextInDiffView: '{'
+    toggleRangeSelect: 'v'
+    rangeSelectUp: '<s-up>'
+    rangeSelectDown: '<s-down>'
   status:
     checkForUpdate: 'u'
     recentRepos: '<enter>'
@@ -248,9 +249,8 @@ keybinding:
     amendToCommit: 'A'
     pickCommit: 'p' # pick commit (when mid-rebase)
     revertCommit: 't'
-    cherryPickCopy: 'c'
-    cherryPickCopyRange: 'C'
-    pasteCommits: 'v'
+    cherryPickCopy: 'C'
+    pasteCommits: 'V'
     tagCommit: 'T'
     checkoutCommit: '<space>'
     resetCherryPick: '<c-R>'
@@ -263,8 +263,6 @@ keybinding:
   commitFiles:
     checkoutCommitFile: 'c'
   main:
-    toggleDragSelect: 'v'
-    toggleDragSelect-alt: 'V'
     toggleSelectHunk: 'a'
     pickBothHunks: 'b'
   submodules:
@@ -389,15 +387,13 @@ The available attributes are:
 
 ## Highlighting the selected line
 
-If you don't like the default behaviour of highlighting the selected line with a blue background, you can use the `selectedLineBgColor` and `selectedRangeBgColor` keys to customise the behaviour. If you just want to embolden the selected line (this was the original default), you can do the following:
+If you don't like the default behaviour of highlighting the selected line with a blue background, you can use the `selectedLineBgColor` key to customise the behaviour. If you just want to embolden the selected line (this was the original default), you can do the following:
 
 ```yaml
 gui:
   theme:
     selectedLineBgColor:
       - default
-    selectedRangeBgColor:
-      - default
 ```
 
 You can also use the reverse attribute like so:
@@ -407,8 +403,6 @@ gui:
   theme:
     selectedLineBgColor:
       - reverse
-    selectedRangeBgColor:
-      - reverse
 ```
 
 ## Custom Author Color

docs/README.md

@@ -3,8 +3,9 @@
 * [Configuration](./Config.md).
 * [Custom Commands](./Custom_Command_Keybindings.md)
 * [Custom Pagers](./Custom_Pagers.md)
+* [Dev docs](./dev)
 * [Keybindings](./keybindings)
 * [Undo/Redo](./Undoing.md)
+* [Range Select](./Range_Select.md)
 * [Searching/Filtering](./Searching.md)
 * [Stacked Branches](./Stacked_Branches.md)
-* [Dev docs](./dev)

docs/Range_Select.md

@@ -0,0 +1,14 @@
+# Range Select
+
+Some actions can be performed on a range of contiguous items. For example:
+* staging multiple files at once
+* squashing multiple commits at once
+* copying (for cherry-pick) multiple commits at once
+
+There are two ways to select a range of items:
+1. Sticky range select: Press 'v' to toggle range select, then expand the selection using the up/down arrow key. To reset the selection, press 'v' again.
+2. Non-sticky range select: Press shift+up or shift+down to expand the selection. To reset the selection, press up/down without shift.
+
+The sticky option will be more familiar to vim users, and the second option will feel more natural to users who aren't used to doing things in a modal way.
+
+In order to perform an action on a range of items, simply press the normal key for that action. If the action only works on individual items, it will raise an error. This is a new feature and the plan is to incrementally support range select for more and more actions. If there is an action you would like to support range select which currently does not, please raise an issue in the repo.

docs/dev/Codebase_Guide.md

@@ -58,6 +58,7 @@
 * `pkg/gui/gui_common.go`: defines gui-specific methods that all controllers and helpers have access to
 * `pkg/i18n/english.go`: defines the set of i18n strings and their English values
 * `pkg/gui/controllers/helpers/refresh_helper.go`: manages refreshing of models. The refresh helper is typically invoked at the end of an action to re-load affected models from git (e.g. re-load branches after doing a git pull)
+* `pkg/gui/controllers/quit_actions.go`: contains code that runs when you hit 'escape' on a view (assuming the view doesn't define its own escape handler)
 * `vendor/github.com/jesseduffield/gocui/gui.go`: defines the gocui gui struct
 * `vendor/github.com/jesseduffield/gocui/view.go`: defines the gocui view struct
 

docs/keybindings/Keybindings_en.md

@@ -37,6 +37,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>.</kbd>: Next page
   <kbd>&lt;</kbd>: Scroll to top
   <kbd>&gt;</kbd>: Scroll to bottom
+  <kbd>v</kbd>: Toggle range select
+  <kbd>&lt;s-down&gt;</kbd>: Range select down
+  <kbd>&lt;s-up&gt;</kbd>: Range select up
   <kbd>/</kbd>: Search the current view by text
   <kbd>H</kbd>: Scroll left
   <kbd>L</kbd>: Scroll right
@@ -85,7 +88,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
   <kbd>&lt;c-j&gt;</kbd>: Move commit down one
   <kbd>&lt;c-k&gt;</kbd>: Move commit up one
-  <kbd>v</kbd>: Paste commits (cherry-pick)
+  <kbd>V</kbd>: Paste commits (cherry-pick)
   <kbd>B</kbd>: Mark commit as base commit for rebase
   <kbd>A</kbd>: Amend commit with staged changes
   <kbd>a</kbd>: Set/Reset commit author
@@ -98,8 +101,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: Open commit in browser
   <kbd>n</kbd>: Create new branch off of commit
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: Copy commit (cherry-pick)
-  <kbd>C</kbd>: Copy commit range (cherry-pick)
+  <kbd>C</kbd>: Copy commit (cherry-pick)
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View selected item's files
   <kbd>/</kbd>: Search the current view by text
@@ -196,8 +198,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;left&gt;</kbd>: Select previous hunk
   <kbd>&lt;right&gt;</kbd>: Select next hunk
-  <kbd>v</kbd>: Toggle drag select
-  <kbd>V</kbd>: Toggle drag select
+  <kbd>v</kbd>: Toggle range select
   <kbd>a</kbd>: Toggle select hunk
   <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
   <kbd>o</kbd>: Open file
@@ -212,8 +213,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 <pre>
   <kbd>&lt;left&gt;</kbd>: Select previous hunk
   <kbd>&lt;right&gt;</kbd>: Select next hunk
-  <kbd>v</kbd>: Toggle drag select
-  <kbd>V</kbd>: Toggle drag select
+  <kbd>v</kbd>: Toggle range select
   <kbd>a</kbd>: Toggle select hunk
   <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
   <kbd>o</kbd>: Open file
@@ -247,8 +247,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: Open commit in browser
   <kbd>n</kbd>: Create new branch off of commit
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: Copy commit (cherry-pick)
-  <kbd>C</kbd>: Copy commit range (cherry-pick)
+  <kbd>C</kbd>: Copy commit (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View commits
@@ -315,8 +314,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: Open commit in browser
   <kbd>n</kbd>: Create new branch off of commit
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: Copy commit (cherry-pick)
-  <kbd>C</kbd>: Copy commit range (cherry-pick)
+  <kbd>C</kbd>: Copy commit (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View selected item's files

docs/keybindings/Keybindings_ja.md

@@ -37,6 +37,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>.</kbd>: 次のページ
   <kbd>&lt;</kbd>: 最上部までスクロール
   <kbd>&gt;</kbd>: 最下部までスクロール
+  <kbd>v</kbd>: 範囲選択を切り替え
+  <kbd>&lt;s-down&gt;</kbd>: Range select down
+  <kbd>&lt;s-up&gt;</kbd>: Range select up
   <kbd>/</kbd>: 検索を開始
   <kbd>H</kbd>: 左スクロール
   <kbd>L</kbd>: 右スクロール
@@ -67,8 +70,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: ブラウザでコミットを開く
   <kbd>n</kbd>: コミットにブランチを作成
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: コミットをコピー (cherry-pick)
-  <kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
+  <kbd>C</kbd>: コミットをコピー (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View selected item's files
@@ -104,7 +106,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
   <kbd>&lt;c-j&gt;</kbd>: コミットを1つ下に移動
   <kbd>&lt;c-k&gt;</kbd>: コミットを1つ上に移動
-  <kbd>v</kbd>: コミットを貼り付け (cherry-pick)
+  <kbd>V</kbd>: コミットを貼り付け (cherry-pick)
   <kbd>B</kbd>: Mark commit as base commit for rebase
   <kbd>A</kbd>: ステージされた変更でamendコミット
   <kbd>a</kbd>: Set/Reset commit author
@@ -117,8 +119,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: ブラウザでコミットを開く
   <kbd>n</kbd>: コミットにブランチを作成
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: コミットをコピー (cherry-pick)
-  <kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
+  <kbd>C</kbd>: コミットをコピー (cherry-pick)
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View selected item's files
   <kbd>/</kbd>: 検索を開始
@@ -270,7 +271,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;left&gt;</kbd>: 前のhunkを選択
   <kbd>&lt;right&gt;</kbd>: 次のhunkを選択
   <kbd>v</kbd>: 範囲選択を切り替え
-  <kbd>V</kbd>: 範囲選択を切り替え
   <kbd>a</kbd>: Hunk選択を切り替え
   <kbd>&lt;c-o&gt;</kbd>: 選択されたテキストをクリップボードにコピー
   <kbd>o</kbd>: ファイルを開く
@@ -286,7 +286,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;left&gt;</kbd>: 前のhunkを選択
   <kbd>&lt;right&gt;</kbd>: 次のhunkを選択
   <kbd>v</kbd>: 範囲選択を切り替え
-  <kbd>V</kbd>: 範囲選択を切り替え
   <kbd>a</kbd>: Hunk選択を切り替え
   <kbd>&lt;c-o&gt;</kbd>: 選択されたテキストをクリップボードにコピー
   <kbd>o</kbd>: ファイルを開く
@@ -347,8 +346,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: ブラウザでコミットを開く
   <kbd>n</kbd>: コミットにブランチを作成
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: コミットをコピー (cherry-pick)
-  <kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
+  <kbd>C</kbd>: コミットをコピー (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: コミットを閲覧

docs/keybindings/Keybindings_ko.md

@@ -37,6 +37,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>.</kbd>: 다음 페이지
   <kbd>&lt;</kbd>: 맨 위로 스크롤 
   <kbd>&gt;</kbd>: 맨 아래로 스크롤 
+  <kbd>v</kbd>: 드래그 선택 전환
+  <kbd>&lt;s-down&gt;</kbd>: Range select down
+  <kbd>&lt;s-up&gt;</kbd>: Range select up
   <kbd>/</kbd>: 검색 시작
   <kbd>H</kbd>: 우 스크롤
   <kbd>L</kbd>: 좌 스크롤
@@ -54,8 +57,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: 브라우저에서 커밋 열기
   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: 커밋을 복사 (cherry-pick)
-  <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
+  <kbd>C</kbd>: 커밋을 복사 (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: 커밋 보기
@@ -85,8 +87,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: 브라우저에서 커밋 열기
   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: 커밋을 복사 (cherry-pick)
-  <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
+  <kbd>C</kbd>: 커밋을 복사 (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View selected item's files
@@ -141,7 +142,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;left&gt;</kbd>: 이전 hunk를 선택
   <kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택
   <kbd>v</kbd>: 드래그 선택 전환
-  <kbd>V</kbd>: 드래그 선택 전환
   <kbd>a</kbd>: Toggle select hunk
   <kbd>&lt;c-o&gt;</kbd>: 선택한 텍스트를 클립보드에 복사
   <kbd>o</kbd>: 파일 닫기
@@ -157,7 +157,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;left&gt;</kbd>: 이전 hunk를 선택
   <kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택
   <kbd>v</kbd>: 드래그 선택 전환
-  <kbd>V</kbd>: 드래그 선택 전환
   <kbd>a</kbd>: Toggle select hunk
   <kbd>&lt;c-o&gt;</kbd>: 선택한 텍스트를 클립보드에 복사
   <kbd>o</kbd>: 파일 닫기
@@ -269,7 +268,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
   <kbd>&lt;c-j&gt;</kbd>: 커밋을 1개 아래로 이동
   <kbd>&lt;c-k&gt;</kbd>: 커밋을 1개 위로 이동
-  <kbd>v</kbd>: 커밋을 붙여넣기 (cherry-pick)
+  <kbd>V</kbd>: 커밋을 붙여넣기 (cherry-pick)
   <kbd>B</kbd>: Mark commit as base commit for rebase
   <kbd>A</kbd>: Amend commit with staged changes
   <kbd>a</kbd>: Set/Reset commit author
@@ -282,8 +281,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: 브라우저에서 커밋 열기
   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
   <kbd>g</kbd>: View reset options
-  <kbd>c</kbd>: 커밋을 복사 (cherry-pick)
-  <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
+  <kbd>C</kbd>: 커밋을 복사 (cherry-pick)
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: View selected item's files
   <kbd>/</kbd>: 검색 시작

docs/keybindings/Keybindings_nl.md

@@ -37,6 +37,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>.</kbd>: Volgende pagina
   <kbd>&lt;</kbd>: Scroll naar boven
   <kbd>&gt;</kbd>: Scroll naar beneden
+  <kbd>v</kbd>: Toggle drag selecteer
+  <kbd>&lt;s-down&gt;</kbd>: Range select down
+  <kbd>&lt;s-up&gt;</kbd>: Range select up
   <kbd>/</kbd>: Start met zoeken
   <kbd>H</kbd>: Scroll left
   <kbd>L</kbd>: Scroll right
@@ -148,7 +151,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>S</kbd>: Squash bovenstaande commits
   <kbd>&lt;c-j&gt;</kbd>: Verplaats commit 1 naar beneden
   <kbd>&lt;c-k&gt;</kbd>: Verplaats commit 1 naar boven
-  <kbd>v</kbd>: Plak commits (cherry-pick)
+  <kbd>V</kbd>: Plak commits (cherry-pick)
   <kbd>B</kbd>: Mark commit as base commit for rebase
   <kbd>A</kbd>: Wijzig commit met staged veranderingen
   <kbd>a</kbd>: Set/Reset commit author
@@ -161,8 +164,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: Open commit in browser
   <kbd>n</kbd>: Creëer nieuwe branch van commit
   <kbd>g</kbd>: Bekijk reset opties
-  <kbd>c</kbd>: Kopieer commit (cherry-pick)
-  <kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
+  <kbd>C</kbd>: Kopieer commit (cherry-pick)
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden
   <kbd>/</kbd>: Start met zoeken
@@ -205,7 +207,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;left&gt;</kbd>: Selecteer de vorige hunk
   <kbd>&lt;right&gt;</kbd>: Selecteer de volgende hunk
   <kbd>v</kbd>: Toggle drag selecteer
-  <kbd>V</kbd>: Toggle drag selecteer
   <kbd>a</kbd>: Toggle selecteer hunk
   <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
   <kbd>o</kbd>: Open bestand
@@ -225,8 +226,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: Open commit in browser
   <kbd>n</kbd>: Creëer nieuwe branch van commit
   <kbd>g</kbd>: Bekijk reset opties
-  <kbd>c</kbd>: Kopieer commit (cherry-pick)
-  <kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
+  <kbd>C</kbd>: Kopieer commit (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: Bekijk commits
@@ -266,7 +266,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>&lt;left&gt;</kbd>: Selecteer de vorige hunk
   <kbd>&lt;right&gt;</kbd>: Selecteer de volgende hunk
   <kbd>v</kbd>: Toggle drag selecteer
-  <kbd>V</kbd>: Toggle drag selecteer
   <kbd>a</kbd>: Toggle selecteer hunk
   <kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard
   <kbd>o</kbd>: Open bestand
@@ -315,8 +314,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
   <kbd>o</kbd>: Open commit in browser
   <kbd>n</kbd>: Creëer nieuwe branch van commit
   <kbd>g</kbd>: Bekijk reset opties
-  <kbd>c</kbd>: Kopieer commit (cherry-pick)
-  <kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
+  <kbd>C</kbd>: Kopieer commit (cherry-pick)
   <kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie
   <kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool)
   <kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden