Git Config - pull.ff only

git/.gitconfig

@@ -25,3 +25,5 @@
 ;; This is last, take in any other local file overrides
 [include]
 	path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory
+[pull]
+	ff = only

nvim/.config/nvim/fnl/dotfiles/plugin/whichkey.fnl

@@ -0,0 +1,5 @@
+(module dotfiles.plugin.whichkey
+  {autoload {which-key which-key}})
+
+(which-key.setup {})
+

nvim/.config/nvim/fnl/dotfiles/plugins.fnl

@@ -35,6 +35,7 @@
    :clojure-vim/vim-jack-in {} ; Conjure support - jack-in with nrepl dependencies
    :dhruvasagar/vim-table-mode {} ; table creation and formatting
    :folke/lsp-colors.nvim {}
+   :folke/which-key.nvim {:mod :whichkey}
    :hashivim/vim-terraform {} ; Terraform
    :hrsh7th/nvim-cmp {:requires [:hrsh7th/cmp-buffer
                                  :hrsh7th/cmp-emoji