diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-08-28 21:20:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-30 16:28:02 (GMT) |
| commit | 68a6b3a1bd45eb1814a0c1cedfe347692c3f2ff7 (patch) | |
| tree | 2179e2f878c546a9cbf6e803dd9d860dd0b08340 /Documentation/git-worktree.txt | |
| parent | e19831c94f91fd410fe001c0372b9c88b40d335b (diff) | |
| download | git-68a6b3a1bd45eb1814a0c1cedfe347692c3f2ff7.zip git-68a6b3a1bd45eb1814a0c1cedfe347692c3f2ff7.tar.gz git-68a6b3a1bd45eb1814a0c1cedfe347692c3f2ff7.tar.bz2 | |
worktree: teach 'move' to override lock when --force given twice
For consistency with "add -f -f", which allows a missing but locked
worktree path to be re-used, allow "move -f -f" to override a lock,
as well, as a convenience.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-worktree.txt')
| -rw-r--r-- | Documentation/git-worktree.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 8537692..d08b8d8 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -125,6 +125,9 @@ OPTIONS 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. -b <new-branch>:: |