From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Apr 2012 22:50:37 +0000 (-0700)
Subject: Merge branch 'ct/advise-push-default'
X-Git-Tag: v1.7.11-rc0~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5da24a73a96a9908ae715f6430e65294115646a;p=git.git

Merge branch 'ct/advise-push-default'

Break down the cases in which "git push" fails due to non-ff into
three categories, and give separate advise messages for each case.

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

c5da24a73a96a9908ae715f6430e65294115646a