diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-29 09:57:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-29 09:57:38 -0700 |
| commit | 01449e314f383861f053786129120abdbeac3198 (patch) | |
| tree | f3ab44d855c7fc52286d87f93fd70a3273284996 /contrib/completion/git-completion.bash | |
| parent | 89740333e8d398f1da701e9023675321bbb9a85b (diff) | |
| parent | 8301b976ed461b5ab3b79a1ce0da1c13728e8149 (diff) | |
| download | git-01449e314f383861f053786129120abdbeac3198.tar.gz | |
Merge branch 'maint'
* maint:
complete: zsh: use zsh completion for the main cmd
complete: zsh: trivial simplification
git-completion.bash: complete branch.*.rebase as boolean
git-completion.bash: add diff.submodule to config list
git-completion.bash: lexical sorting for diff.statGraphWidth
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rw-r--r-- | contrib/completion/git-completion.bash | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3b20108cba..5dc54a340f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1819,6 +1819,10 @@ _git_config () __gitcomp_nl "$(__git_refs)" return ;; + branch.*.rebase) + __gitcomp "false true" + return + ;; remote.*.fetch) local remote="${prev#remote.}" remote="${remote%.fetch}" @@ -1858,6 +1862,10 @@ _git_config () " return ;; + diff.submodule) + __gitcomp "log short" + return + ;; help.format) __gitcomp "man info web html" return @@ -2052,13 +2060,14 @@ _git_config () core.whitespace core.worktree diff.autorefreshindex - diff.statGraphWidth diff.external diff.ignoreSubmodules diff.mnemonicprefix diff.noprefix diff.renameLimit diff.renames + diff.statGraphWidth + diff.submodule diff.suppressBlankEmpty diff.tool diff.wordRegex |