summaryrefslogtreecommitdiffstats
path: root/docs/Keybindings.md
blob: c46960676c027c09c7e760f3e66a9bfac7431ce8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
# Keybindings:

## Global:

      ← → ↑ ↓/h j k l:  navigate
      PgUp/PgDn:        scroll diff panel (use fn+up/down on osx)
      q:                quit
      p:                pull
      shift+P:          push

## Files Panel:

      space:    toggle staged
      c:        commit changes
      shift+S:  stash files
      t:        add patched (i.e. pick chunks of a file to add)
      o:        open
      e:        edit
      s:        open in sublime (requires 'subl' command)
      v:        open in vscode (requires 'code' command)
      i:        add to .gitignore
      d:        delete if untracked checkout if tracked (aka go away)
      shift+R:  refresh files

## Branches Panel:

      space:    checkout branch
      f:        force checkout branch
      m:        merge into currently checked out branch
      c:        checkout by name
      n:        new branch
      d:        delete branch

## Commits Panel:

      s:       squash down (only available for topmost commit)
      r:       rename commit
      g:       reset to this commit

## Stash Panel:

      space:   apply
      g:       pop
      d:       drop

## Popup Panel:

      esc:     close/cancel
      enter:   confirm

## Resolving Merge Conflicts (Diff Panel):

      ← →/h l:    navigate conflicts
      ↑ ↓/ k j:   select hunk
      space:      pick hunk
      b:          pick both hunks
      z:          undo (only available while still inside diff panel)