Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

README.md

@@ -258,6 +258,14 @@ If you ever forget any of Projectile's keybindings just do a:
 
 <kbd>C-c p C-h</kbd>
 
+#### Key-chords
+
+Keybinding         | Description
+-------------------|----------------------------------------------
+<kbd>jj</kbd>      | ace-jump-mode
+<kbd>JJ</kbd>      | prelude-switch-to-previous-buffer
+<kbd>uu</kbd>      | undo-tree-visualize
+
 ### Automatic package installation
 
 The default Prelude installation comes with a bare minimum of

core/prelude-global-keybindings.el

@@ -116,6 +116,7 @@
 
 (key-chord-define-global "jj" 'ace-jump-mode)
 (key-chord-define-global "JJ" 'prelude-switch-to-previous-buffer)
+(key-chord-define-global "uu" 'undo-tree-visualize)
 
 (key-chord-mode +1)