diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:01:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:01:05 (GMT) |
| commit | bd0f794342d5b3921f2d5d4bffce87ec7b7e4d96 (patch) | |
| tree | f080814888dc0d530d2bc7fe3fa8fe21a136de7b /contrib | |
| parent | 436d18f2d00b61bea44be2f8d35a437172132873 (diff) | |
| parent | 7f19def0fc254829839495f7fb44a7d99b161d3d (diff) | |
| download | git-bd0f794342d5b3921f2d5d4bffce87ec7b7e4d96.zip git-bd0f794342d5b3921f2d5d4bffce87ec7b7e4d96.tar.gz git-bd0f794342d5b3921f2d5d4bffce87ec7b7e4d96.tar.bz2 | |
Merge branch 'nd/worktree-move'
"git worktree" learned move and remove subcommands.
* nd/worktree-move:
t2028: fix minor error and issues in newly-added "worktree move" tests
worktree remove: allow it when $GIT_WORK_TREE is already gone
worktree remove: new command
worktree move: refuse to move worktrees with submodules
worktree move: accept destination as directory
worktree move: new command
worktree.c: add update_worktree_location()
worktree.c: add validate_worktree()
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 91536d8..6601070 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3087,7 +3087,7 @@ _git_whatchanged () _git_worktree () { - local subcommands="add list lock prune unlock" + local subcommands="add list lock move prune remove unlock" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then __gitcomp "$subcommands" @@ -3105,6 +3105,9 @@ _git_worktree () prune,--*) __gitcomp "--dry-run --expire --verbose" ;; + remove,--*) + __gitcomp "--force" + ;; *) ;; esac |