Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:39:32 +0000 (00:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:39:32 +0000 (00:39 -0700)
* maint:
  push: re-flow non-fast-forward message
  push: fix english in non-fast-forward message

1  2 
builtin-push.c

diff --cc builtin-push.c
Simple merge