From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Sep 2009 07:39:32 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ea71fe7d36cf5b81c2100d97a822ecf0bc04746;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  push: re-flow non-fast-forward message
  push: fix english in non-fast-forward message
---

6ea71fe7d36cf5b81c2100d97a822ecf0bc04746