Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2008 07:19:50 +0000 (00:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2008 07:19:50 +0000 (00:19 -0700)
* 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

1  2 
builtin-clone.c
contrib/completion/git-completion.bash
refs.c

diff --cc builtin-clone.c
Simple merge
index cc75ad7ccdf2e68e4e73d448fc1baa8cdd712df4,cff28a88afe3262705acc3d9b47e97be65dbb8d1..27332ed8b1266604594d74b63d806bbaf98f8a88
@@@ -511,7 -525,9 +525,9 @@@ _git_add (
  
  _git_bisect ()
  {
 -      local subcommands="start bad good reset visualize replay log"
+       __git_has_doubledash && return
 +      local subcommands="start bad good skip reset visualize replay log run"
        local subcommand="$(__git_find_subcommand "$subcommands")"
        if [ -z "$subcommand" ]; then
                __gitcomp "$subcommands"
diff --cc refs.c
Simple merge