diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-16 14:46:53 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
commit | 1dd7307fde033dae5fececac15810a99e26c3d91 (patch) | |
tree | 4e851c9e3229a6fe3b4191f6311d05d7a9142960 | |
parent | a90b6efded49abcfa2516db794d7875b0396f558 (diff) |
start moving commit panel handlers into controller
more
and more
move rebase commit refreshing into existing abstraction
and more
and more
WIP
and more
handling clicks
properly fix merge conflicts
update cheatsheet
lots more preparation to start moving things into controllers
WIP
better typing
expand on remotes controller
moving more code into controllers
104 files changed, 4951 insertions, 4082 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 43e586897..09a933f81 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -123,30 +123,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Commits Panel (Commits) <pre> - <kbd>ctrl+l</kbd>: open log menu + <kbd>c</kbd>: copy commit (cherry-pick) + <kbd>ctrl+o</kbd>: copy commit SHA to clipboard + <kbd>C</kbd>: copy commit range (cherry-pick) + <kbd>v</kbd>: paste commits (cherry-pick) + <kbd>n</kbd>: create new branch off of commit + <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection <kbd>s</kbd>: squash down + <kbd>f</kbd>: fixup commit <kbd>r</kbd>: reword commit <kbd>R</kbd>: reword commit with editor - <kbd>g</kbd>: reset to this commit - <kbd>f</kbd>: fixup commit + <kbd>d</kbd>: delete commit + <kbd>e</kbd>: edit commit + <kbd>p</kbd>: pick commit (when mid-rebase) <kbd>F</kbd>: create fixup commit for this commit <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash) - <kbd>d</kbd>: delete commit <kbd>ctrl+j</kbd>: move commit down one <kbd>ctrl+k</kbd>: move commit up one - <kbd>e</kbd>: edit commit <kbd>A</kbd>: amend commit with staged changes - <kbd>p</kbd>: pick commit (when mid-rebase) <kbd>t</kbd>: revert commit - <kbd>c</kbd>: copy commit (cherry-pick) - <kbd>ctrl+o</kbd>: copy commit SHA to clipboard - <kbd>C</kbd>: copy commit range (cherry-pick) - <kbd>v</kbd>: paste commits (cherry-pick) + <kbd>ctrl+l</kbd>: open log menu + <kbd>g</kbd>: reset to this commit <kbd>enter</kbd>: view commit's files <kbd>space</kbd>: checkout commit - <kbd>n</kbd>: create new branch off of commit <kbd>T</kbd>: tag commit - <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection <kbd>ctrl+y</kbd>: copy commit message to clipboard <kbd>o</kbd>: open commit in browser <kbd>b</kbd>: view bisect options @@ -183,7 +183,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>w</kbd>: commit changes without pre-commit hook <kbd>A</kbd>: amend last commit <kbd>C</kbd>: commit changes using git editor - <kbd>space</kbd>: toggle staged <kbd>d</kbd>: view 'discard changes' options <kbd>e</kbd>: edit file <kbd>o</kbd>: open file @@ -200,6 +199,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>`</kbd>: toggle file tree view <kbd>M</kbd>: open external merge tool (git mergetool) <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view + <kbd>space</kbd>: toggle staged </pre> ## Files Panel (Submodules) diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 7d5b8f78c..5e0d62fac 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -123,30 +123,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Commits Paneel (Commits) <pre> - <kbd>ctrl+l</kbd>: open log menu + <kbd>c</kbd>: kopieer commit (cherry-pick) + <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord + <kbd>C</kbd>: kopieer commit reeks (cherry-pick) + <kbd>v</kbd>: plak commits (cherry-pick) + <kbd>n</kbd>: creëer nieuwe branch van commit + <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie <kbd>s</kbd>: squash beneden + <kbd>f</kbd>: Fixup commit <kbd>r</kbd>: hernoem commit <kbd>R</kbd>: hernoem commit met editor - <kbd>g</kbd>: reset naar deze commit - <kbd>f</kbd>: Fixup commit + <kbd>d</kbd>: verwijder commit + <kbd>e</kbd>: wijzig commit + <kbd>p</kbd>: kies commit (wanneer midden in rebase) <kbd>F</kbd>: creëer fixup commit voor deze commit <kbd>S</kbd>: squash bovenstaande commits - <kbd>d</kbd>: verwijder commit <kbd>ctrl+j</kbd>: verplaats commit 1 naar beneden <kbd>ctrl+k</kbd>: verplaats commit 1 naar boven - <kbd>e</kbd>: wijzig commit <kbd>A</kbd>: wijzig commit met staged veranderingen - <kbd>p</kbd>: kies commit (wanneer midden in rebase) <kbd>t</kbd>: commit ongedaan maken - <kbd>c</kbd>: kopieer commit (cherry-pick) - <kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord - <kbd>C</kbd>: kopieer commit reeks (cherry-pick) - <kbd>v</kbd>: plak commits (cherry-pick) + <kbd>ctrl+l</kbd>: open log menu + <kbd>g</kbd>: reset naar deze commit <kbd>enter</kbd>: bekijk gecommite bestanden <kbd>space</kbd>: checkout commit - <kbd>n</kbd>: creëer nieuwe branch van commit <kbd>T</kbd>: tag commit - <kbd>ctrl+r</kbd>: reset cherry-picked (gekopieerde) commits selectie <kbd>ctrl+y</kbd>: kopieer commit bericht naar klembord <kbd>o</kbd>: open commit in browser <kbd>b</kbd>: view bisect options @@ -183,7 +183,6 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>w</kbd>: commit veranderingen zonder pre-commit hook <kbd>A</kbd>: wijzig laatste commit <kbd>C</kbd>: commit veranderingen met de git editor - <kbd>space</kbd>: toggle staged <kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties <kbd>e</kbd>: verander bestand <kbd>o</kbd>: open bestand @@ -200,6 +199,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>`</kbd>: toggle bestandsboom weergave <kbd>M</kbd>: open external merge tool (git mergetool) <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view + <kbd>space</kbd>: toggle staged </pre> ## Bestanden Paneel (Submodules) |