git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Fri, 13 Mar 2009 06:36:57 +0000 (23:36 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 13 Mar 2009 06:36:57 +0000 (23:36 -0700)
commit	bf0fe35c938ac9f03d1369600b0c76e428a57507
tree	528be1c6679b5f869d199e38be1777eac352eeb1	tree \| snapshot
parent	1e68adc1741efa8235054fe182ba9a52b347e78e	commit \| diff
parent	688ba09cad80b0821886ad78fec039092306cead	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
git-bisect.sh	diff1 \|	diff2 \|	blob \| history
t/t3001-ls-files-others-exclude.sh	diff1 \|	diff2 \|	blob \| history
t/t6030-bisect-porcelain.sh	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

dir.c	diff1 \|	diff2 \|	blob \| history
git-bisect.sh	diff1 \|	diff2 \|	blob \| history
t/t3001-ls-files-others-exclude.sh	diff1 \|	diff2 \|	blob \| history
t/t6030-bisect-porcelain.sh	diff1 \|	diff2 \|	blob \| history