Merge branch 'maint'
commit6ea71fe7d36cf5b81c2100d97a822ecf0bc04746
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:39:32 +0000 (6 00:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:39:32 +0000 (6 00:39 -0700)
tree5058d69aa6616677f6ea39ceae41eef1ed89959e
parent3fb9d58235ce4985689840b901aecacc6e3bd094
parent14b772a0d7cb983ab0c13d672ea89192c460d070
Merge branch 'maint'

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