tree be3f24134f5956774c7d5407231a31bab33d5616
parent 9a10117560316ed22099f74583e56c1cc7c41394
parent 0aff719f489771c5e52259394d011c51317b118f
author Junio C Hamano <gitster@pobox.com> 1336760323 -0700
committer Junio C Hamano <gitster@pobox.com> 1336760323 -0700

Merge branch 'ct/advise-push-default' into maint

The cases "git push" fails due to non-ff can be broken into three
categories; each case is given a separate advise message.

By Christopher Tiwald (2) and Jeff King (1)
* ct/advise-push-default:
  Fix httpd tests that broke when non-ff push advice changed
  clean up struct ref's nonfastforward field
  push: Provide situational hints for non-fast-forward errors