[nongnu] elpa/git-commit b514a66f4a 3/4: magit-log: Fix order in which suffixes are displayed

[ELPA Syncer]

branch: elpa/git-commit
commit b514a66f4a04979a565f80f6886635f4957de8cf
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-log: Fix order in which suffixes are displayed
    
    The "local branches" and "all branches" variants are obviously closely
    related and should not be separated by much less related variants.
    
    The "current" and "HEAD" variants are even more related and should not
    be separated by the very much not related "other" variant.
    
    Also change the order of the command definitions and in the manual.
---
 docs/magit.org    |  8 ++++----
 docs/magit.texi   | 14 +++++++-------
 lisp/magit-log.el | 24 ++++++++++++------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 115faf229c..d951258afe 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -2591,6 +2591,10 @@ The log transient also features several reflog commands. 
 See [[*Reflog]].
   prefix argument, show log for one or more revs read from the
   minibuffer.
 
+- Key: l h (magit-log-head) ::
+
+  Show log for ~HEAD~.
+
 - Key: l o (magit-log-other) ::
 
   Show log for one or more revs read from the minibuffer.  The user
@@ -2598,10 +2602,6 @@ The log transient also features several reflog commands. 
 See [[*Reflog]].
   ranges, but only branches, tags, and a representation of the
   commit at point are available as completion candidates.
 
-- Key: l h (magit-log-head) ::
-
-  Show log for ~HEAD~.
-
 - Key: l L (magit-log-branches) ::
 
   Show log for all local branches and ~HEAD~.
diff --git a/docs/magit.texi b/docs/magit.texi
index 202ae9e18a..7e6f49b6f4 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version v3.3.0-79-g2e73b66c2+1
+@subtitle for version v3.3.0-99-g2914b9202+1
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ directly from within Emacs.  While many fine Git clients 
exist, only
 Magit and Git itself deserve to be called porcelains.
 
 @noindent
-This manual is for Magit version v3.3.0-79-g2e73b66c2+1.
+This manual is for Magit version v3.3.0-99-g2914b9202+1.
 
 @quotation
 Copyright (C) 2015-2022 Jonas Bernoulli <jonas@@bernoul.li>
@@ -3225,6 +3225,11 @@ Show log for the current branch.  When @code{HEAD} is 
detached or with a
 prefix argument, show log for one or more revs read from the
 minibuffer.
 
+@item @kbd{l h} (@code{magit-log-head})
+@kindex l h
+@findex magit-log-head
+Show log for @code{HEAD}.
+
 @item @kbd{l o} (@code{magit-log-other})
 @kindex l o
 @findex magit-log-other
@@ -3233,11 +3238,6 @@ can input any revision or revisions separated by a 
space, or even
 ranges, but only branches, tags, and a representation of the
 commit at point are available as completion candidates.
 
-@item @kbd{l h} (@code{magit-log-head})
-@kindex l h
-@findex magit-log-head
-Show log for @code{HEAD}.
-
 @item @kbd{l L} (@code{magit-log-branches})
 @kindex l L
 @findex magit-log-branches
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 9e6710800e..59f4face72 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -438,19 +438,19 @@ the upstream isn't ahead of the current branch) show."
    ("-s" "Show diffstats"      "--stat")]          ;2
   [["Log"
     ("l" "current"             magit-log-current)
-    ("o" "other"               magit-log-other)
-    ("h" "HEAD"                magit-log-head)]
+    ("h" "HEAD"                magit-log-head)
+    ("o" "other"               magit-log-other)]
    [""
     ("L" "local branches"      magit-log-branches)
-    (7 "B" "matching branches" magit-log-matching-branches)
-    (7 "T" "matching tags"     magit-log-matching-tags)
     ("b" "all branches"        magit-log-all-branches)
     ("a" "all references"      magit-log-all)
+    (7 "B" "matching branches" magit-log-matching-branches)
+    (7 "T" "matching tags"     magit-log-matching-tags)
     (7 "m" "merged"            magit-log-merged)]
    ["Reflog"
     ("r" "current"             magit-reflog-current)
-    ("O" "other"               magit-reflog-other)
-    ("H" "HEAD"                magit-reflog-head)]
+    ("H" "HEAD"                magit-reflog-head)
+    ("O" "other"               magit-reflog-other)]
    [:if (lambda ()
           (require 'magit-wip)
           (magit--any-wip-mode-enabled-p))
@@ -634,6 +634,12 @@ one or more revs read from the minibuffer."
                      (magit-log-arguments)))
   (magit-log-setup-buffer revs args files))
 
+;;;###autoload
+(defun magit-log-head (&optional args files)
+  "Show log for `HEAD'."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (list "HEAD") args files))
+
 ;;;###autoload
 (defun magit-log-other (revs &optional args files)
   "Show log for one or more revs read from the minibuffer.
@@ -645,12 +651,6 @@ completion candidates."
                      (magit-log-arguments)))
   (magit-log-setup-buffer revs args files))
 
-;;;###autoload
-(defun magit-log-head (&optional args files)
-  "Show log for `HEAD'."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (list "HEAD") args files))
-
 ;;;###autoload
 (defun magit-log-branches (&optional args files)
   "Show log for all local branches and `HEAD'."