mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2016-05-22 16:33:53 +07:00
committed by Junio C Hamano
parent 360af2dada
commit 7b722d906b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-worktree.txt
View File

@ -10,8 +10,8 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git worktree add' [-f] [--detach] [--checkout] [-b <new-branch>] <path> [<branch>] '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, then, as a convenience, a new branch based at HEAD is created automatically,
as if `-b $(basename <path>)` was specified. as if `-b $(basename <path>)` was specified.
prune::
Prune working tree information in $GIT_DIR/worktrees.
list:: list::
List details of each worktree. The main worktree is listed first, followed by 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 bare, the revision currently checked out, and the branch currently checked out
(or 'detached HEAD' if none). (or 'detached HEAD' if none).
prune::
Prune working tree information in $GIT_DIR/worktrees.
OPTIONS OPTIONS
------- -------

2
builtin/worktree.c
View File

@ -13,8 +13,8 @@
static const char * const worktree_usage[] = { static const char * const worktree_usage[] = {
N_("git worktree add [<options>] <path> [<branch>]"), 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
}; };