diff options
author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-07-13 04:54:00 +0000 |
---|---|---|
committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-07-17 14:53:12 +0000 |
commit | d09cb7e979bc5186a8d322ef8977884371bbc462 (patch) | |
tree | fdb381993f5ef1eecbfa4451d2a8a83badfb1e4d /Completion | |
parent | 9991707b6bbdfe8940b2098128d85f61a966d758 (diff) | |
download | zsh-d09cb7e979bc5186a8d322ef8977884371bbc462.tar.gz zsh-d09cb7e979bc5186a8d322ef8977884371bbc462.tar.xz zsh-d09cb7e979bc5186a8d322ef8977884371bbc462.zip |
users/21750 (after users/21551): _git-subtree: Tweak -m,-P completions
Diffstat (limited to 'Completion')
-rw-r--r-- | Completion/Unix/Command/_git | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 73273ad43..98f06a3e2 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1755,7 +1755,7 @@ _git-subtree () { # TODO: -P should only complete paths inside the current repository. _arguments -C \ '(-q --quiet)'{-q,--quiet}'[suppress progress output]' \ - '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ + '(-P --prefix)'{-P+,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ '-d[show debug messages]' \ ': :->command' \ '*::: := ->option-or-argument' && ret=0 @@ -1779,8 +1779,8 @@ _git-subtree () { (add) _arguments \ '(-q --quiet)'{-q,--quiet}'[suppress progress output]' \ - '(-m --message)'{-m,--message}'[use the given message as the commit message for the merge commit]' \ - '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ + '(-m --message)'{-m+,--message=}'[use the given message as the commit message for the merge commit]:message' \ + '(-P --prefix)'{-P+,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ '--squash[import only a single commit from the subproject]' \ ': :__git_any_repositories_or_references' \ ':: :__git_ref_specs' && ret=0 @@ -1788,16 +1788,16 @@ _git-subtree () { (merge) _arguments -S \ '(-q --quiet)'{-q,--quiet}'[suppress progress output]' \ - '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ - '(-m --message)'{-m,--message}'[use the given message as the commit message for the merge commit]' \ + '(-P --prefix)'{-P+,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ + '(-m --message)'{-m+,--message=}'[use the given message as the commit message for the merge commit]:message' \ '--squash[import only a single commit from the subproject]' \ ': :__git_references' && ret=0 ;; (pull) _arguments -S \ '(-q --quiet)'{-q,--quiet}'[suppress progress output]' \ - '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ - '(-m --message)'{-m,--message}'[use the given message as the commit message for the merge commit]' \ + '(-P --prefix)'{-P+,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ + '(-m --message)'{-m+,--message=}'[use the given message as the commit message for the merge commit]:message' \ '--squash[import only a single commit from the subproject]' \ ': :__git_any_repositories' \ ':: :__git_ref_specs' && ret=0 @@ -1805,18 +1805,18 @@ _git-subtree () { (push) _arguments -S \ '(-q --quiet)'{-q,--quiet}'[suppress progress output]' \ - '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ - '(-m --message)'{-m,--message}'[use the given message as the commit message for the merge commit]' \ + '(-P --prefix)'{-P+,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ + '(-m --message)'{-m+,--message=}'[use the given message as the commit message for the merge commit]:message' \ ': :__git_any_repositories' \ ':: :__git_ref_specs' && ret=0 ;; (split) _arguments -S \ '(-q --quiet)'{-q,--quiet}'[suppress progress output]' \ - '(-P --prefix)'{-P,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ + '(-P --prefix)'{-P+,--prefix=}'[the path to the subtree in the repository to manipulate]: :_directories' \ '(-b --branch)'{-b,--branch=}'[create a new branch]' \ '--onto=[try connecting new tree to an existing one]: :__git_ref_specs' \ - '(-m --message)'{-m,--message}'[use the given message as the commit message for the merge commit]' \ + '(-m --message)'{-m+,--message=}'[use the given message as the commit message for the merge commit]:message' \ '--ignore-joins[ignore prior --rejoin commits]' \ '--onto=[try connecting new tree to an existing one]: :__git_ref_specs' \ '--rejoin[use the given message as the commit message for the merge commit]' \ |