Merge branch 'gp/bisect-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 May 2008 22:44:43 +0000 (15:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 May 2008 22:44:43 +0000 (15:44 -0700)
* gp/bisect-fix:
  bisect: print an error message when "git rev-list --bisect-vars" fails
  git-bisect.sh: don't accidentally override existing branch "bisect"

1  2 
Documentation/git-bisect.txt
git-bisect.sh

Simple merge
diff --cc git-bisect.sh
Simple merge