diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-31 01:42:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-31 01:42:58 -0700 |
| commit | 933bb3ae5e6c83288ec7c80c2282984f4927cb48 (patch) | |
| tree | ddd8cba625475e53e370471f61ea0fcba2f64921 /contrib | |
| parent | compat/cygwin.c: make runtime detection of lstat/stat lessor impact (diff) | |
| parent | git-svn: change dashed git-commit-tree to git commit-tree (diff) | |
| download | tgif-933bb3ae5e6c83288ec7c80c2282984f4927cb48.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: change dashed git-commit-tree to git commit-tree
Documentation: clarify information about 'ident' attribute
bash completion: add doubledash to "git show"
Use test-chmtime -v instead of perl in t5000 to get mtime of a file
Add --verbose|-v to test-chmtime
asciidoc: add minor workaround to add an empty line after code blocks
Plug a memleak in builtin-revert
Add file delete/create info when we overflow rename_limit
Install git-cvsserver in $(bindir)
Install git-shell in bindir, too
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index eebe73409b..de193ba7c1 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1398,6 +1398,8 @@ _git_shortlog () _git_show () { + __git_has_doubledash && return + local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --pretty=*) |