1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-21 12:16:54 +02:00

Merge pull request #129 from ponsfrilus/patch-2

Use <kbd> tags
This commit is contained in:
Jesse Duffield 2018-08-12 00:42:50 +10:00 committed by GitHub
commit feba6b5318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,59 +1,66 @@
# Keybindings: # Keybindings:
## Global: ## Global:
<pre>
← → ↑ ↓/h j k l: navigate <kbd></kbd><kbd></kbd><kbd></kbd><kbd></kbd>/<kbd>h</kbd><kbd>j</kbd><kbd>k</kbd><kbd>l</kbd>: navigate
PgUp/PgDn: scroll diff panel (use fn+up/down on osx) <kbd>PgUp</kbd>/<kbd>PgDn</kbd>: scroll diff panel (use <kbd>fn</kbd>+<kbd>up</kbd>/<kbd>fn</kbd>+<kbd>down</kbd> on osx)
q: quit <kbd>q</kbd>: quit
p: pull <kbd>p</kbd>: pull
shift+P: push <kbd>shift</kbd>+<kbd>P</kbd>: push
</pre>
## Files Panel: ## Files Panel:
<pre>
space: toggle staged <kbd>space</kbd>: toggle staged
c: commit changes <kbd>c</kbd>: commit changes
shift+C: commit using git editor <kbd>shift</kbd>+<kbd>C</kbd>: commit using git editor
shift+S: stash files <kbd>shift</kbd>+<kbd>S</kbd>: stash files
t: add patched (i.e. pick chunks of a file to add) <kbd>t</kbd>: add patched (i.e. pick chunks of a file to add)
o: open <kbd>o</kbd>: open
e: edit <kbd>e</kbd>: edit
s: open in sublime (requires 'subl' command) <kbd>s</kbd>: open in sublime (requires 'subl' command)
v: open in vscode (requires 'code' command) <kbd>v</kbd>: open in vscode (requires 'code' command)
i: add to .gitignore <kbd>i</kbd>: add to .gitignore
d: delete if untracked checkout if tracked (aka go away) <kbd>d</kbd>: delete if untracked checkout if tracked (aka go away)
shift+R: refresh files <kbd>shift</kbd>+<kbd>R</kbd>: refresh files
</pre>
## Branches Panel: ## Branches Panel:
<pre>
space: checkout branch <kbd>space</kbd>: checkout branch
f: force checkout branch <kbd>f</kbd>: force checkout branch
m: merge into currently checked out branch <kbd>m</kbd>: merge into currently checked out branch
c: checkout by name <kbd>c</kbd>: checkout by name
n: new branch <kbd>n</kbd>: new branch
d: delete branch <kbd>d</kbd>: delete branch
</pre>
## Commits Panel: ## Commits Panel:
<pre>
s: squash down (only available for topmost commit) <kbd>s</kbd>: squash down (only available for topmost commit)
r: rename commit <kbd>r</kbd>: rename commit
g: reset to this commit <kbd>g</kbd>: reset to this commit
</pre>
## Stash Panel: ## Stash Panel:
<pre>
space: apply <kbd>space</kbd>: apply
g: pop <kbd>g</kbd>: pop
d: drop <kbd>d</kbd>: drop
</pre>
## Popup Panel: ## Popup Panel:
<pre>
esc: close/cancel <kbd>esc</kbd>: close/cancel
enter: confirm <kbd>enter</kbd>: confirm
tab: enter newline (if editing) <kbd>tab</kbd>: enter newline (if editing)
</pre>
## Resolving Merge Conflicts (Diff Panel): ## Resolving Merge Conflicts (Diff Panel):
<pre>
← →/h l: navigate conflicts <kbd></kbd><kbd></kbd>/<kbd>h</kbd><kbd>l</kbd>: navigate conflicts
↑ ↓/ k j: select hunk <kbd></kbd><kbd></kbd>/<kbd>k</kbd><kbd>j</kbd>: select hunk
space: pick hunk <kbd>space</kbd>: pick hunk
b: pick both hunks <kbd>b</kbd>: pick both hunks
z: undo (only available while still inside diff panel) <kbd>z</kbd>: undo (only available while still inside diff panel)
</pre>