diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-13 14:02:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-13 14:02:02 -0700 |
| commit | 7783eb2e59684492e75068443e1f77f64fe37cc9 (patch) | |
| tree | 28abef68309c3b2cfcb3398955eb3e2d63da5479 /Documentation | |
| parent | Merge branch 'ss/clone-guess-dir-name-simplify' (diff) | |
| parent | worktree: new place for "git prune --worktrees" (diff) | |
| download | tgif-7783eb2e59684492e75068443e1f77f64fe37cc9.tar.xz | |
Merge branch 'nd/multiple-work-trees'
"git checkout [<tree-ish>] <paths>" spent unnecessary cycles
checking if the current branch was checked out elsewhere, when we
know we are not switching the branches ourselves.
* nd/multiple-work-trees:
worktree: new place for "git prune --worktrees"
checkout: don't check worktrees when not necessary
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-prune.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-worktree.txt | 48 |
2 files changed, 48 insertions, 3 deletions
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index 1cf3bed4ab..7a493c80f7 100644 --- a/Documentation/git-prune.txt +++ b/Documentation/git-prune.txt @@ -48,9 +48,6 @@ OPTIONS --expire <time>:: Only expire loose objects older than <time>. ---worktrees:: - Prune dead working tree information in $GIT_DIR/worktrees. - <head>...:: In addition to objects reachable from any of our references, keep objects diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt new file mode 100644 index 0000000000..41103e5485 --- /dev/null +++ b/Documentation/git-worktree.txt @@ -0,0 +1,48 @@ +git-worktree(1) +=============== + +NAME +---- +git-worktree - Manage multiple worktrees + + +SYNOPSIS +-------- +[verse] +'git worktree prune' [-n] [-v] [--expire <expire>] + +DESCRIPTION +----------- + +Manage multiple worktrees attached to the same repository. These are +created by the command `git checkout --to`. + +COMMANDS +-------- +prune:: + +Prune working tree information in $GIT_DIR/worktrees. + +OPTIONS +------- + +-n:: +--dry-run:: + Do not remove anything; just report what it would + remove. + +-v:: +--verbose:: + Report all removals. + +--expire <time>:: + Only expire unused worktrees older than <time>. + +SEE ALSO +-------- + +linkgit:git-checkout[1] + +GIT +--- +Part of the linkgit:git[1] suite |