summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/keybindings/Keybindings_en.md9
-rw-r--r--docs/keybindings/Keybindings_nl.md9
-rw-r--r--docs/keybindings/Keybindings_pl.md9
-rw-r--r--docs/keybindings/Keybindings_zh.md7
-rw-r--r--pkg/gui/controllers/basic_commits_controller.go5
-rw-r--r--pkg/i18n/chinese.go1
-rw-r--r--pkg/i18n/dutch.go1
-rw-r--r--pkg/i18n/english.go2
-rw-r--r--pkg/i18n/polish.go1
9 files changed, 28 insertions, 16 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index eda2fa1a4..5966fd8fe 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -102,7 +102,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd>y</kbd>: copy commit attribute
<kbd>o</kbd>: open commit in browser
<kbd>n</kbd>: create new branch off of commit
- <kbd>g</kbd>: reset to this commit
+ <kbd>g</kbd>: view reset options
<kbd>c</kbd>: copy commit (cherry-pick)
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>enter</kbd>: view selected item's files
@@ -199,6 +199,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
<kbd>space</kbd>: checkout commit
+ <kbd>y</kbd>: copy commit attribute
+ <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)
@@ -254,8 +257,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
<kbd>space</kbd>: checkout commit
+ <kbd>y</kbd>: copy commit attribute
+ <kbd>o</kbd>: open commit in browser
+ <kbd>n</kbd>: create new branch off of commit
<kbd>g</kbd>: view reset options
- <kbd>n</kbd>: new branch
<kbd>c</kbd>: copy commit (cherry-pick)
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
index b6220463f..bb081e709 100644
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -129,7 +129,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd>y</kbd>: copy commit attribute
<kbd>o</kbd>: open commit in browser
<kbd>n</kbd>: creëer nieuwe branch van commit
- <kbd>g</kbd>: reset naar deze commit
+ <kbd>g</kbd>: bekijk reset opties
<kbd>c</kbd>: kopieer commit (cherry-pick)
<kbd>C</kbd>: kopieer commit reeks (cherry-pick)
<kbd>enter</kbd>: bekijk gecommite bestanden
@@ -177,6 +177,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
<kbd>space</kbd>: checkout commit
+ <kbd>y</kbd>: copy commit attribute
+ <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)
@@ -254,8 +257,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
<kbd>space</kbd>: checkout commit
+ <kbd>y</kbd>: copy commit attribute
+ <kbd>o</kbd>: open commit in browser
+ <kbd>n</kbd>: creëer nieuwe branch van commit
<kbd>g</kbd>: bekijk reset opties
- <kbd>n</kbd>: nieuwe branch
<kbd>c</kbd>: kopieer commit (cherry-pick)
<kbd>C</kbd>: kopieer commit reeks (cherry-pick)
<kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
index aa1b9295b..c4fe08d56 100644
--- a/docs/keybindings/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md
@@ -88,7 +88,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd>y</kbd>: copy commit attribute
<kbd>o</kbd>: open commit in browser
<kbd>n</kbd>: create new branch off of commit
- <kbd>g</kbd>: zresetuj do tego commita
+ <kbd>g</kbd>: wyświetl opcje resetu
<kbd>c</kbd>: kopiuj commit (przebieranie)
<kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
<kbd>enter</kbd>: przeglądaj pliki commita
@@ -178,6 +178,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
<kbd>space</kbd>: checkout commit
+ <kbd>y</kbd>: copy commit attribute
+ <kbd>o</kbd>: open commit in browser
+ <kbd>n</kbd>: create new branch off of commit
<kbd>g</kbd>: wyświetl opcje resetu
<kbd>c</kbd>: kopiuj commit (przebieranie)
<kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
@@ -247,8 +250,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
<kbd>space</kbd>: checkout commit
+ <kbd>y</kbd>: copy commit attribute
+ <kbd>o</kbd>: open commit in browser
+ <kbd>n</kbd>: create new branch off of commit
<kbd>g</kbd>: wyświetl opcje resetu
- <kbd>n</kbd>: nowa gałąź
<kbd>c</kbd>: kopiuj commit (przebieranie)
<kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
<kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md
index 3af2b795b..e4b23404a 100644
--- a/docs/keybindings/Keybindings_zh.md
+++ b/docs/keybindings/Keybindings_zh.md
@@ -46,6 +46,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<pre>
<kbd>ctrl+o</kbd>: 将提交的 SHA 复制到剪贴板
<kbd>space</kbd>: 检出提交
+ <kbd>y</kbd>: copy commit attribute
+ <kbd>o</kbd>: 在浏览器中打开提交
+ <kbd>n</kbd>: 从提交创建新分支
<kbd>g</kbd>: 查看重置选项
<kbd>c</kbd>: 复制提交（拣选）
<kbd>C</kbd>: 复制提交范围（拣选）
@@ -82,7 +85,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd>y</kbd>: copy commit attribute
<kbd>o</kbd>: 在浏览器中打开提交
<kbd>n</kbd>: 从提交创建新分支
- <kbd>g</kbd>: 重置为此提交
+ <kbd>g</kbd>: 查看重置选项
<kbd>c</kbd>: 复制提交（拣选）
<kbd>C</kbd>: 复制提交范围（拣选）
<kbd>ctrl+r</kbd>: 重置已拣选（复制）的提交
@@ -128,7 +131,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
<kbd>y</kbd>: copy commit attribute
<kbd>o</kbd>: 在浏览器中打开提交
<kbd>n</kbd>: 从提交创建新分支
- <kbd>g</kbd>: 重置为此提交
+ <kbd>g</kbd>: 查看重置选项
<kbd>c</kbd>: 复制提交（拣选）
<kbd>C</kbd>: 复制提交范围（拣选）
<kbd>enter</kbd>: 查看提交的文件
diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go
index 2065b54c5..68c2698fd 100644
--- a/pkg/gui/controllers/basic_commits_controller.go
+++ b/pkg/gui/controllers/basic_commits_controller.go
@@ -1,7 +1,6 @@
package controllers
import (
- "github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/types"
)
@@ -51,14 +50,14 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
},
{
Key: opts.GetKey(opts.Config.Universal.New),
- Modifier: gocui.ModNone,
Handler: self.checkSelected(self.newBranch),
Description: self.c.Tr.LcCreateNewBranchFromCommit,
},
{
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
Handler: self.checkSelected(self.createResetMenu),
- Description: self.c.Tr.LcResetToThisCommit,
+ Description: self.c.Tr.LcViewResetOptions,
+ OpensMenu: true,
},
{
Key: opts.GetKey(opts.Config.Commits.CherryPickCopy),
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go
index 3b33f3841..28d95443f 100644
--- a/pkg/i18n/chinese.go
+++ b/pkg/i18n/chinese.go
@@ -101,7 +101,6 @@ func chineseTranslationSet() TranslationSet {
LcClose: "关闭",
LcQuit: "退出",
LcSquashDown: "向下压缩",
- LcResetToThisCommit: "重置为此提交",
LcFixupCommit: "修正提交（fixup）",
NoCommitsThisBranch: "该分支没有提交",
OnlySquashTopmostCommit: "只能压缩最顶层的提交",
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 394b4abc4..6cbeddbb4 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -67,7 +67,6 @@ func dutchTranslationSet() TranslationSet {
LcClose: "sluiten",
LcQuit: "quit",
LcSquashDown: "squash beneden",
- LcResetToThisCommit: "reset naar deze commit",
LcFixupCommit: "Fixup commit",
OnlySquashTopmostCommit: "Kan alleen bovenste commit squashen",
YouNoCommitsToSquash: "Je hebt geen commits om mee te squashen",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 678b8cd18..02dce1416 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -82,7 +82,6 @@ type TranslationSet struct {
LcClose string
LcQuit string
LcSquashDown string
- LcResetToThisCommit string
LcFixupCommit string
OnlySquashTopmostCommit string
YouNoCommitsToSquash string
@@ -673,7 +672,6 @@ func EnglishTranslationSet() TranslationSet {
LcClose: "close",
LcQuit: "quit",
LcSquashDown: "squash down",
- LcResetToThisCommit: "reset to this commit",
LcFixupCommit: "fixup commit",
NoCommitsThisBranch: "No commits for this branch",
OnlySquashTopmostCommit: "Can only squash topmost commit",
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index ae6942abe..3ed130e05 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -60,7 +60,6 @@ func polishTranslationSet() TranslationSet {
CloseConfirm: "{{.keyBindClose}}: zamknij, {{.keyBindConfirm}}: potwierdź",
LcClose: "zamknij",
LcSquashDown: "ściśnij",
- LcResetToThisCommit: "zresetuj do tego commita",
LcFixupCommit: "napraw commit",
NoCommitsThisBranch: "Brak commitów dla tej gałęzi",
OnlySquashTopmostCommit: "Można tylko spłaszczyć najwyższy commit",
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 20:09:56 +0000