summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-17 17:35:38 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-17 17:35:38 -0700
commit6ed547b53b90bebd2371b086b83b416b22b243b2 (patch)
treed0b9cf755a58c5b9f6f460936e240bb44dd6274a /contrib
parent6dd5622f68157f471c4f784e8c41f39e8c5163fc (diff)
parentbf7930caa0da2fbd6def59a54608ac494c272197 (diff)
downloadgit-6ed547b53b90bebd2371b086b83b416b22b243b2.tar.gz
Merge branch 'js/ref-namespaces'
* js/ref-namespaces: ref namespaces: tests ref namespaces: documentation ref namespaces: Support remote repositories via upload-pack and receive-pack ref namespaces: infrastructure Fix prefix handling in ref iteration functions
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/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 5a8309076d..8648a36e7b 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1469,7 +1469,7 @@ _git_help ()
__gitcomp "$__git_all_commands $(__git_aliases)
attributes cli core-tutorial cvs-migration
diffcore gitk glossary hooks ignore modules
- repository-layout tutorial tutorial-2
+ namespaces repository-layout tutorial tutorial-2
workflows
"
}
@@ -2640,6 +2640,7 @@ _git ()
--exec-path
--html-path
--work-tree=
+ --namespace=
--help
"
;;