diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 15:45:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 15:45:52 -0700 |
commit | 980e61ec567f55c9247391052477e61a32d24548 (patch) | |
tree | 6fe236d0a6fd3ffa6a1be9a52219ed50b7dfcd19 /git-worktree.txt | |
parent | a68ff6db4d42f41cb49143a5423fbe50f539043e (diff) | |
download | git-htmldocs-980e61ec567f55c9247391052477e61a32d24548.tar.gz |
Autogenerated HTML docs for v2.19.0-216-g2d3b1c
Diffstat (limited to 'git-worktree.txt')
-rw-r--r-- | git-worktree.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-worktree.txt b/git-worktree.txt index 29a5b7e25..e2ee9fc21 100644 --- a/git-worktree.txt +++ b/git-worktree.txt @@ -120,8 +120,16 @@ OPTIONS --force:: By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by - another working tree and `remove` refuses to remove an unclean - working tree. This option overrides these safeguards. + another working tree, or if `<path>` is already assigned to some + working tree but is missing (for instance, if `<path>` was deleted + manually). This option overrides these safeguards. To add a missing but + locked working tree path, specify `--force` twice. ++ +`move` refuses to move a locked working tree unless `--force` is specified +twice. ++ +`remove` refuses to remove an unclean working tree unless `--force` is used. +To remove a locked working tree, specify `--force` twice. -b <new-branch>:: -B <new-branch>:: |