X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=contrib%2Fcompletion%2Fgit-completion.bash;h=aebb0b689040c3f1c1023e3ddf07779178a6bdfb;hb=cecff3a45b4660f47a58746eae42b6ddb58e1919;hp=545bd4b38368e3c2a3958133bbeef6a19e831fff;hpb=3cc9caadf738c3b2cf7aa46364be173751912a10;p=git.git

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 545bd4b38..aebb0b689 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -797,6 +797,7 @@ _git_branch ()
 		__gitcomp "
 			--color --no-color --verbose --abbrev= --no-abbrev
 			--track --no-track --contains --merged --no-merged
+			--set-upstream
 			"
 		;;
 	*)
@@ -841,7 +842,7 @@ _git_checkout ()
 	--*)
 		__gitcomp "
 			--quiet --ours --theirs --track --no-track --merge
-			--conflict= --patch
+			--conflict= --orphan --patch
 			"
 		;;
 	*)