starred/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-08-24 02:24:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert the change of <ctrl+j>/<ctrl+k> to <alt+down>/<alt+up>

Browse Source 
While I strongly prefer the alt-arrow bindings myself, I'm worried that existing
users might not be happy about the change, so I'm reverting it.

I'm working on supporting multiple keybindings for every command, so once that's
in, we can change the default to include both.
This commit is contained in:
Stefan Haller
2026-05-04 18:17:37 +02:00
parent abe9e6c041
commit 2332d9b27b
13 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs-master/Config.md
+2 -2
View File
@@ -750,8 +750,8 @@ keybinding:
setFixupMessage: c
createFixupCommit: F
squashAboveCommits: S
moveDownCommit: <alt+down>
moveUpCommit: <alt+up>
moveDownCommit: <ctrl+j>
moveUpCommit: <ctrl+k>
amendToCommit: A
resetCommitAuthor: a
pickCommit: p
docs-master/keybindings/Keybindings_en.md
+2 -2
View File
@@ -96,8 +96,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. |
| `` F `` | Create fixup commit | Create 'fixup!' commit for the selected commit. Later on, you can press `S` on this same commit to apply all above fixup commits. |
| `` S `` | Apply fixup commits | Squash all 'fixup!' commits, either above the selected commit, or all in current branch (autosquash). |
| `` <alt+down> `` | Move commit down one | |
| `` <alt+up> `` | Move commit up one | |
| `` <ctrl+j> `` | Move commit down one | |
| `` <ctrl+k> `` | Move commit up one | |
| `` V `` | Paste (cherry-pick) | |
| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Amend | Amend commit with staged changes. If the selected commit is the HEAD commit, this will perform `git commit --amend`. Otherwise the commit will be amended via a rebase. |
docs-master/keybindings/Keybindings_ja.md
+2 -2
View File
@@ -76,8 +76,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | ピック | 選択したコミットをピックするようにマークします（リベース中）。これは、リベースを続行すると、コミットが保持されることを意味します。 |
| `` F `` | fixupコミットを作成 | 選択したコミットに対する「fixup!」コミットを作成します。fixupコミットは、選択したコミットの修正用コミットです。後で、同じコミットで `S` を押すと、上記のすべてのfixupコミットが適用されます。 |
| `` S `` | fixupコミットを適用 | すべての「fixup!」コミットを、選択したコミットの上部または現在のブランチ内のすべてをスカッシュします（autosquash）。 |
| `` <alt+down> `` | コミットを1つ下に移動 | |
| `` <alt+up> `` | コミットを1つ上に移動 | |
| `` <ctrl+j> `` | コミットを1つ下に移動 | |
| `` <ctrl+k> `` | コミットを1つ上に移動 | |
| `` V `` | ペースト（チェリーピック） | |
| `` B `` | リベース用のベースコミットとしてマーク | 次のリベース用のベースコミットを選択します。ブランチにリベースするとき、ベースコミットより上のコミットのみが持ち込まれます。これは `git rebase --onto` コマンドを使用します。 |
| `` A `` | 修正 | ステージされた変更でコミットを修正します。選択したコミットがHEADコミットの場合、これは `git commit --amend` を実行します。それ以外の場合、コミットはリベースを通じて修正されます。 |
docs-master/keybindings/Keybindings_ko.md
+2 -2
View File
@@ -308,8 +308,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | Pick | Pick commit (when mid-rebase) |
| `` F `` | Create fixup commit | Create fixup commit for this commit |
| `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash) |
| `` <alt+down> `` | 커밋을 1개 아래로 이동 | |
| `` <alt+up> `` | 커밋을 1개 위로 이동 | |
| `` <ctrl+j> `` | 커밋을 1개 아래로 이동 | |
| `` <ctrl+k> `` | 커밋을 1개 위로 이동 | |
| `` V `` | 커밋을 붙여넣기 (cherry-pick) | |
| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Amend | Amend commit with staged changes |
docs-master/keybindings/Keybindings_nl.md
+2 -2
View File
@@ -168,8 +168,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | Pick | Kies commit (wanneer midden in rebase) |
| `` F `` | Creëer fixup commit | Creëer fixup commit |
| `` S `` | Apply fixup commits | Squash bovenstaande commits |
| `` <alt+down> `` | Verplaats commit 1 naar beneden | |
| `` <alt+up> `` | Verplaats commit 1 naar boven | |
| `` <ctrl+j> `` | Verplaats commit 1 naar beneden | |
| `` <ctrl+k> `` | Verplaats commit 1 naar boven | |
| `` V `` | Plak commits (cherry-pick) | |
| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Amend | Wijzig commit met staged veranderingen |
docs-master/keybindings/Keybindings_pl.md
+2 -2
View File
@@ -69,8 +69,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | Wybierz | Oznacz wybrany commit do wybrania (podczas rebazowania). Oznacza to, że commit zostanie zachowany po kontynuacji rebazowania. |
| `` F `` | Utwórz commit fixup | Utwórz commit 'fixup!' dla wybranego commita. Później możesz nacisnąć `S` na tym samym commicie, aby zastosować wszystkie powyższe commity fixup. |
| `` S `` | Zastosuj commity fixup | Scal wszystkie commity 'fixup!', albo powyżej wybranego commita, albo wszystkie w bieżącej gałęzi (autosquash). |
| `` <alt+down> `` | Przesuń commit w dół | |
| `` <alt+up> `` | Przesuń commit w górę | |
| `` <ctrl+j> `` | Przesuń commit w dół | |
| `` <ctrl+k> `` | Przesuń commit w górę | |
| `` V `` | Wklej (cherry-pick) | |
| `` B `` | Oznacz jako bazowy commit dla rebase | Wybierz bazowy commit dla następnego rebase. Kiedy robisz rebase na branch, tylko commity powyżej bazowego commita zostaną przeniesione. Używa to polecenia `git rebase --onto`. |
| `` A `` | Popraw | Popraw commit ze zmianami zatwierdzonymi. Jeśli wybrany commit jest commit HEAD, to wykona `git commit --amend`. W przeciwnym razie commit zostanie poprawiony za pomocą rebazowania. |
docs-master/keybindings/Keybindings_pt.md
+2 -2
View File
@@ -172,8 +172,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | Escolher | Marque o commit selecionado para ser escolhido (quando meados da base). Isso significa que o commit será mantido ao continuar o rebase. |
| `` F `` | Criar commit de correção | Crie o commit 'correção!' para o commit selecionado. Mais tarde, você pode pressionar `S` neste mesmo commit para aplicar todas os commits de correção acima. |
| `` S `` | Aplicar commits de correções | Aplicar Squash all 'correção!', seja acima do commit selecionado, ou tudo no branch atual (autosquash). |
| `` <alt+down> `` | Mover commit um para baixo | |
| `` <alt+up> `` | Mover o commit um para cima | |
| `` <ctrl+j> `` | Mover commit um para baixo | |
| `` <ctrl+k> `` | Mover o commit um para cima | |
| `` V `` | Colar (cherry-pick) | |
| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Modificar | Alterar o commit com mudanças em sted. Se o commit selecionado for o commit HEAD, ele executará o `git commit --amend`. Caso contrário, o compromisso será alterado por meio de uma base de apoio. |
docs-master/keybindings/Keybindings_ru.md
+2 -2
View File
@@ -178,8 +178,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | Pick | Выбрать коммит (в середине перебазирования) |
| `` F `` | Создать fixup коммит | Создать fixup коммит для этого коммита |
| `` S `` | Apply fixup commits | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) |
| `` <alt+down> `` | Переместить коммит вниз на один | |
| `` <alt+up> `` | Переместить коммит вверх на один | |
| `` <ctrl+j> `` | Переместить коммит вниз на один | |
| `` <ctrl+k> `` | Переместить коммит вверх на один | |
| `` V `` | Вставить отобранные коммиты (cherry-pick) | |
| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Amend | Править последний коммит с проиндексированными изменениями |
docs-master/keybindings/Keybindings_zh-CN.md
+2 -2
View File
@@ -133,8 +133,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | 拣选(Pick) | 标记选中的提交为 picked（变基过程中）。这意味该提交将在后续的变基中保留。 |
| `` F `` | 为此提交创建修正 | 创建修正提交 |
| `` S `` | 应用该修复提交 | 压缩所选提交之上或当前分支的所有 “fixup!” 提交（自动压缩）。 |
| `` <alt+down> `` | 下移提交 | |
| `` <alt+up> `` | 上移提交 | |
| `` <ctrl+j> `` | 下移提交 | |
| `` <ctrl+k> `` | 上移提交 | |
| `` V `` | 粘贴提交(拣选) | |
| `` B `` | 标记一个主提交用于变基 | 选择下一次变基的主提交。当您变基到一个分支时，只有高于主提交的提交才会被引入。这使用“git rebase --onto”命令。 |
| `` A `` | 修补(Amend) | 用已暂存的变更来修补提交 |
docs-master/keybindings/Keybindings_zh-TW.md
+2 -2
View File
@@ -192,8 +192,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
| `` p `` | 挑選 | 挑選提交 (於變基過程中) |
| `` F `` | 建立修復提交 | 為此提交建立修復提交 |
| `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ |
| `` <alt+down> `` | 向下移動提交 | |
| `` <alt+up> `` | 向上移動提交 | |
| `` <ctrl+j> `` | 向下移動提交 | |
| `` <ctrl+k> `` | 向上移動提交 | |
| `` V `` | 貼上提交 (揀選) | |
| `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 |
| `` A `` | 修改 | 使用已預存的更改修正提交 |
pkg/config/user_config.go
+2 -2
View File
@@ -1047,8 +1047,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig {
SetFixupMessage: "c",
CreateFixupCommit: "F",
SquashAboveCommits: "S",
MoveDownCommit: "<alt+down>",
MoveUpCommit: "<alt+up>",
MoveDownCommit: "<ctrl+j>",
MoveUpCommit: "<ctrl+k>",
AmendToCommit: "A",
ResetCommitAuthor: "a",
PickCommit: "p",
pkg/i18n/english.go
+1 -4
View File
@@ -2263,12 +2263,9 @@ keybinding:
- The 'git.paging.useConfig' option has been removed. If you were relying on it to configure your pager, you'll have to explicitly set the pager again using the 'git.paging.pager' option.
`,
"0.62.0": `- The default keybindings for moving commits up and down have changed from ctrl-k/ctrl-j to alt-up/alt-down; this is mostly for personal preference, I find them easier to remember, and they are nicely similar to moving a line of code up and down in many code editors. Also, the default binding for submitting a commit from the commit description editor has changed from alt-enter to command-enter on Mac, or ctrl-enter on Linux and Windows; these are the same bindings that are used in many multi-line edit field situations, e.g. in GitHub comments. Unfortunately these are not supported by all terminals; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md#terminal-compatibility for more on that. If you want to revert these changes, you can do so by adding the following to your config:
"0.62.0": `- The default keybinding for submitting a commit from the commit description editor has changed from alt-enter to command-enter on Mac, or ctrl-enter on Linux and Windows; these are the same bindings that are used in many multi-line edit field situations, e.g. in GitHub comments. Unfortunately these are not supported by all terminals; see https://github.com/jesseduffield/lazygit/blob/master/docs/keybindings/Custom_Keybindings.md#terminal-compatibility for more on that. If you want to revert this change, you can do so by adding the following to your config:
keybinding:
commits:
moveDownCommit: <ctrl+j>
moveUpCommit: <ctrl+k>
universal:
confirmInEditor: <a-enter>
`,
schema-master/config.json
+2 -2
View File
@@ -996,11 +996,11 @@
},
"moveDownCommit": {
"type": "string",
"default": "\u003calt+down\u003e"
"default": "\u003cctrl+j\u003e"
},
"moveUpCommit": {
"type": "string",
"default": "\u003calt+up\u003e"
"default": "\u003cctrl+k\u003e"
},
"amendToCommit": {
"type": "string",