diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-28 01:09:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-28 01:09:47 +0300 |
| commit | 26bb5437f6defed72996b6a2bb1ff9121ec297ff (patch) | |
| tree | 49ff7b4d03f4d7b447a5575845491b764ba376c2 /Documentation | |
| parent | ae84e924dafbaf1eb907065e9fc9c246acb2c265 (diff) | |
| parent | c57b3367bed488469d24a21446731e9e71846ded (diff) | |
Merge branch 'rs/worktree-list-show-locked'
"git worktree list" now shows if each worktree is locked. This
possibly may open us to show other kinds of states in the future.
* rs/worktree-list-show-locked:
worktree: teach `list` to annotate locked worktree
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-worktree.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 32e8440cde..af06128cc9 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -96,8 +96,9 @@ list:: List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include -whether the working tree is bare, the revision currently checked out, and the -branch currently checked out (or "detached HEAD" if none). +whether the working tree is bare, the revision currently checked out, the +branch currently checked out (or "detached HEAD" if none), and "locked" if +the worktree is locked. lock:: |