Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2008 07:59:50 +0000 (23:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2008 07:59:50 +0000 (23:59 -0800)
commit6b48990354b6380665565f21c3f89d2f7109c459
treec3eefde8d65ef12c7af7a68ba045cc55f98cd2b8
parent34cd62eb91600109378c8121c1fecd924a9af177
parentd3df4271b900c9bf529cf495afeb77fbbf621221
Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.4.4
  revert: actually check for a dirty index
  tests: introduce test_must_fail
  git-submodule: Fix typo 'url' which should be '$url'
  receive-pack: Initialize PATH to include exec-dir.

Conflicts:

builtin-revert.c
builtin-revert.c
receive-pack.c