Merge branch 'maint-1.6.0' into maint-1.6.1
commitbf0fe35c938ac9f03d1369600b0c76e428a57507
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 06:36:57 +0000 (12 23:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 06:36:57 +0000 (12 23:36 -0700)
tree528be1c6679b5f869d199e38be1777eac352eeb1
parent1e68adc1741efa8235054fe182ba9a52b347e78e
parent688ba09cad80b0821886ad78fec039092306cead
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  bisect: fix another instance of eval'ed string
  bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
  Support "\" in non-wildcard exclusion entries

Conflicts:
git-bisect.sh
dir.c
git-bisect.sh
t/t3001-ls-files-others-exclude.sh
t/t6030-bisect-porcelain.sh