Merge pull request #660 from NeogitOrg/update-default-ignores

NeogitOrg · Jul 26, 2023 · 604be39 · 604be39
2 parents b57e3f2 + fa5ee54
commit 604be39
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/doc/neogit.txt b/doc/neogit.txt
@@ -41,9 +41,15 @@ Neogit is a magit clone for Neovim that is currently work in progress.
 ==============================================================================
 2. Commands                                     *neogit-commands*
 
-                                                *:Neogit*           
+                                                *:Neogit*
 :Neogit                 In a Git repository, opens a new NeogitStatus tab.
 
+                                                *:NeogitMessages*
+:NeogitMessages         Prints messages from neogit's messaging system.
+
+                                                *:NeogitResetState*
+:NeogitResetState       Performs a full reset of saved flags for all popups.
+
 ==============================================================================
 3. Mappings                                      *neogit-mappings*
 

diff --git a/lua/neogit/config.lua b/lua/neogit/config.lua
@@ -92,6 +92,7 @@ M.values = {
   ignored_settings = {
     "NeogitPushPopup--force-with-lease",
     "NeogitPushPopup--force",
+    "NeogitPullPopup--rebase",
     "NeogitCommitPopup--allow-empty",
     "NeogitRevertPopup--no-edit", -- TODO: Fix incompatible switches with default enables
   },

diff --git a/plugin/neogit.lua b/plugin/neogit.lua
@@ -20,3 +20,11 @@ end, {
   nargs = "*",
   desc = "Prints neogit message history",
 })
+
+api.nvim_create_user_command(
+  "NeogitResetState",
+  function()
+    require("neogit.lib.state")._reset()
+  end,
+  { nargs = "*", desc = "Reset any saved flags" }
+)