fix: show the correctly bound key for the top Status Hint

Fixes NeogitOrg#564 (partially)

lua/neogit/config.lua

@@ -1,5 +1,9 @@
 local M = {}
 
+function M.get_reversed_status_maps()
+  return vim.tbl_add_reverse_lookup(vim.tbl_deep_extend("force", M.values.mappings.status, {}))
+end
+
 M.values = {
   disable_hint = false,
   disable_context_highlighting = false,

lua/neogit/popups/help/actions.lua

@@ -4,9 +4,7 @@ local util = require("neogit.lib.util")
 local NONE = function() end
 
 -- Using deep extend this way creates a copy of the mapping values
-local status_mappings = vim.tbl_add_reverse_lookup(
-  vim.tbl_deep_extend("force", require("neogit.config").values.mappings.status, {})
-)
+local status_mappings = require("neogit.config").get_reversed_status_maps()
 
 local function present(commands)
   local presenter = util.map(commands, function(command)

lua/neogit/status.lua

@@ -152,7 +152,22 @@ local function draw_buffer()
 
   local output = LineBuffer.new()
   if not config.values.disable_hint then
-    output:append("Hint: [<tab>] toggle diff | [s]tage | [u]nstage | [x] discard | [c]ommit | [?] more help")
+    local reversed_status_map = config.get_reversed_status_maps()
+
+    local function hint_label(map_name, hint)
+      return "[" .. reversed_status_map[map_name] .. "] " .. hint
+    end
+
+    local hints = {
+      hint_label("Toggle", "toggle diff"),
+      hint_label("Stage", "stage"),
+      hint_label("Unstage", "unstage"),
+      hint_label("Discard", "discard"),
+      hint_label("CommitPopup", "commit"),
+      hint_label("HelpPopup", "HelpPopup"),
+    }
+
+    output:append("Hint: " .. table.concat(hints, " | "))
     output:append("")
   end