diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:18:43 -0700 |
| commit | 07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (patch) | |
| tree | be3f24134f5956774c7d5407231a31bab33d5616 /lockfile.c | |
| parent | 9a10117560316ed22099f74583e56c1cc7c41394 (diff) | |
| parent | 0aff719f489771c5e52259394d011c51317b118f (diff) | |
| download | git-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.tar.gz | |
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
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions