From 04308e9dc456472fb38cc43df6b350a64e54883a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sat, 1 Sep 2012 17:13:10 +0200 Subject: [PATCH 1/2] completion: add --set-upstream-to and --unset-upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove --set-upstream as it's deprecated now. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 " ;; *) From ca45d0fa8400325df801cc911f3957d1ae246686 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 11 Sep 2012 13:58:30 +0200 Subject: [PATCH 2/2] completion: complete branch name for "branch --set-upstream-to=" Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4a4d30af30..e48cf80012 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -875,6 +875,9 @@ _git_branch () done case "$cur" in + --set-upstream-to=*) + __gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}" + ;; --*) __gitcomp " --color --no-color --verbose --abbrev= --no-abbrev