From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 May 2012 18:18:43 +0000 (-0700)
Subject: Merge branch 'ct/advise-push-default' into maint
X-Git-Tag: v1.7.10.2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07e74b0da2896ffa6acb5c33f56d7266b35b7ac9;p=git.git

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
---

07e74b0da2896ffa6acb5c33f56d7266b35b7ac9