From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jul 2008 07:19:50 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc0~101
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bb293b831b9d0aade79c0acf5bf6091106e7d19b;p=git.git

Merge branch 'maint'

* maint:
  Start preparing release notes for 1.5.6.3
  git-submodule - Fix bugs in adding an existing repo as a module
  bash: offer only paths after '--'
  Remove unnecessary pack-*.keep file after successful git-clone
  make deleting a missing ref more quiet
---

bb293b831b9d0aade79c0acf5bf6091106e7d19b
diff --cc contrib/completion/git-completion.bash
index cc75ad7cc,cff28a88a..27332ed8b
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -511,7 -525,9 +525,9 @@@ _git_add (
  
  _git_bisect ()
  {
+ 	__git_has_doubledash && return
+ 
 -	local subcommands="start bad good reset visualize replay log"
 +	local subcommands="start bad good skip reset visualize replay log run"
  	local subcommand="$(__git_find_subcommand "$subcommands")"
  	if [ -z "$subcommand" ]; then
  		__gitcomp "$subcommands"