summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-11 20:05:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-11 20:05:28 (GMT)
commit04ce89389d37097da250c9879bddc9f59443a704 (patch)
treeae8d71cb03df34f91a2709008df1d0be6ad206f9 /contrib/completion
parent6af984043f121d2f80aeb837c0b2259ad254a829 (diff)
parent66fb37d0c62ef49c9d3506b10d2d7f5b33008484 (diff)
downloadgit-04ce89389d37097da250c9879bddc9f59443a704.zip
git-04ce89389d37097da250c9879bddc9f59443a704.tar.gz
git-04ce89389d37097da250c9879bddc9f59443a704.tar.bz2
Merge branch 'jk/bash-completion'
* jk/bash-completion: completion: learn about --man-path completion: handle unstuck form of base git options
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ebc40d4..fa3ae1e 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2490,9 +2490,10 @@ __git_main ()
i="${words[c]}"
case "$i" in
--git-dir=*) __git_dir="${i#--git-dir=}" ;;
+ --git-dir) ((c++)) ; __git_dir="${words[c]}" ;;
--bare) __git_dir="." ;;
--help) command="help"; break ;;
- -c) c=$((++c)) ;;
+ -c|--work-tree|--namespace) ((c++)) ;;
-*) ;;
*) command="$i"; break ;;
esac
@@ -2510,6 +2511,7 @@ __git_main ()
--exec-path
--exec-path=
--html-path
+ --man-path
--info-path
--work-tree=
--namespace=