git-worktree.txt: keep subcommand listing in alphabetical order

This is probably not the best order. But it makes it no-brainer to know
where to insert new commands. At some point we might want to reorder at
least the synopsis part again, grouping commonly use subcommands together.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index c62234538ba6be8c82b9a5b86c362606b80cde2a..27feff6dba6f8b54ef0141f452b88203198fb283 100644 (file)
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -10,8 +10,8 @@ SYNOPSIS
 --------
 [verse]
 'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>]
 --------
 [verse]
 'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>]

-'git worktree prune' [-n] [-v] [--expire <expire>]

 'git worktree list' [--porcelain]
 'git worktree list' [--porcelain]

+'git worktree prune' [-n] [-v] [--expire <expire>]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -54,10 +54,6 @@ If `<branch>` is omitted and neither `-b` nor `-B` nor `--detached` used,
 then, as a convenience, a new branch based at HEAD is created automatically,
 as if `-b $(basename <path>)` was specified.
 
 then, as a convenience, a new branch based at HEAD is created automatically,
 as if `-b $(basename <path>)` was specified.
 

-prune::
-
-Prune working tree information in $GIT_DIR/worktrees.
-

 list::
 
 List details of each worktree.  The main worktree is listed first, followed by
 list::
 
 List details of each worktree.  The main worktree is listed first, followed by


@@ -65,6 +61,10 @@ each of the linked worktrees.  The output details include if the worktree is
 bare, the revision currently checked out, and the branch currently checked out
 (or 'detached HEAD' if none).
 
 bare, the revision currently checked out, and the branch currently checked out
 (or 'detached HEAD' if none).
 

+prune::
+
+Prune working tree information in $GIT_DIR/worktrees.
+

 OPTIONS
 -------
 
 OPTIONS
 -------
 

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 12c0af723e69b87c07cc152824fb2cff6930ee66..bf80111fd8934c5cc249618d0811fc0fac31e817 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -13,8 +13,8 @@
 
 static const char * const worktree_usage[] = {
        N_("git worktree add [<options>] <path> [<branch>]"),
 
 static const char * const worktree_usage[] = {
        N_("git worktree add [<options>] <path> [<branch>]"),

-       N_("git worktree prune [<options>]"),

        N_("git worktree list [<options>]"),
        N_("git worktree list [<options>]"),

+       N_("git worktree prune [<options>]"),

        NULL
 };
 
        NULL
 };