diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-15 04:39:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-15 04:39:48 (GMT) |
| commit | 1b9696548b9c9110109110d546b5e779095ee1d9 (patch) | |
| tree | 934caea3e35e08f9af1814fdd6c81760f1129c2b /contrib/completion/git-completion.bash | |
| parent | ebf91ab3cba533a0338afa44cf9632f9191c2717 (diff) | |
| parent | ca45d0fa8400325df801cc911f3957d1ae246686 (diff) | |
| download | git-1b9696548b9c9110109110d546b5e779095ee1d9.zip git-1b9696548b9c9110109110d546b5e779095ee1d9.tar.gz git-1b9696548b9c9110109110d546b5e779095ee1d9.tar.bz2 | |
Merge branch 'cn/branch-set-upstream-to'
Finishing touches to the recently graduated topic to introduce
"git branch --set-upstream-to" option.
* cn/branch-set-upstream-to:
completion: complete branch name for "branch --set-upstream-to="
completion: add --set-upstream-to and --unset-upstream
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rw-r--r-- | contrib/completion/git-completion.bash | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0492db9..1b43329 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -875,11 +875,15 @@ _git_branch () done case "$cur" in + --set-upstream-to=*) + __gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}" + ;; --*) __gitcomp " --color --no-color --verbose --abbrev= --no-abbrev --track --no-track --contains --merged --no-merged - --set-upstream --edit-description --list + --set-upstream-to= --edit-description --list + --unset-upstream " ;; *) |