From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2012 22:53:02 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.10-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/556c5e030f17efb412a192a430fe9027840ed718?hp=--cc

Merge branch 'maint'

By Thomas Rast
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
---

556c5e030f17efb412a192a430fe9027840ed718