aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-16 23:08:49 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-16 23:08:49 -0700
commit55524fcf9d6676ca3840227092bf3a14ba404615 (patch)
tree82e8251a255c5f962f1d5dce75fd14c97cbc3ba9 /contrib
parent671d1bc6a098d1015fbdd6e085d6daf12c1dce15 (diff)
parent076c32370d8a6ac2fb57b2a55c674942e106f8ab (diff)
downloadgit-55524fcf9d6676ca3840227092bf3a14ba404615.tar.gz
git-55524fcf9d6676ca3840227092bf3a14ba404615.tar.xz
Merge branch 'maint'
* maint: completion: add missing options to show-branch and show dir.c: clean up handling of 'path' parameter in read_directory_recursive() Fix type-punning issues
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b6bcd5cc2..f8d4cb2c7 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1837,7 +1837,7 @@ _git_show ()
return
;;
--*)
- __gitcomp "--pretty= --format=
+ __gitcomp "--pretty= --format= --abbrev-commit --oneline
$__git_diff_common_options
"
return
@@ -1854,7 +1854,7 @@ _git_show_branch ()
__gitcomp "
--all --remotes --topo-order --current --more=
--list --independent --merge-base --no-name
- --sha1-name --topics --reflog
+ --sha1-name --sparse --topics --reflog
"
return
;;