summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-git.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 309fcd5..747f7df 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -567,6 +567,7 @@ _a_ keep all
(?> #'smerge-diff-base-other)
(?= #'smerge-diff-mine-other))))
("l" recenter-top-bottom "recenter")
- ("u" undo "undo")))
+ ("u" undo "undo")
+ ("q" nil "quit")))
(provide 'init-git)