summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@elego.de>2012-09-01 17:13:10 +0200
committerJunio C Hamano <gitster@pobox.com>2012-09-11 10:02:12 -0700
commit04308e9dc456472fb38cc43df6b350a64e54883a (patch)
treeb02fbbcbdeada17b92ecc4a9412a905ae8ec1823 /contrib
parentb347d06bf097aca5effd07871adf4d0c8a7c55bd (diff)
downloadgit-04308e9dc456472fb38cc43df6b350a64e54883a.tar.gz
completion: add --set-upstream-to and --unset-upstream
Remove --set-upstream as it's deprecated now. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ffedce751c..4a4d30af30 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -879,7 +879,8 @@ _git_branch ()
__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
"
;;
*)