Merge branch 'master' into next
commit10631b53b2e832a524c593b13500fd49a8aece49
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:00:29 +0000 (15 21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:00:29 +0000 (15 21:00 -0700)
treed81353eb77a94c14a8e3f1e4fdaacda0af73d9e7
parent7e340ff2559327c8b6902f673e7d8c6d8b0c205c
parent288396994f077eec7e7db0017838a5afbfbf81e3
Merge branch 'master' into next

* master:
  Prepare for 1.7.7.1
  grep: fix the error message that mentions --exclude