| commit | c5da24a73a96a9908ae715f6430e65294115646a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Apr 2012 22:50:37 +0000 (20 15:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Apr 2012 22:50:37 +0000 (20 15:50 -0700) | ||
| tree | 4db197f483c8fd331cc149869da44d02c9ecacb2 | treesnapshot (tar.gz zip) |
| parent | af78c317205ce254d9cc75fc0298ee86b579de73 | commitdiff |
| parent | 0aff719f489771c5e52259394d011c51317b118f | commitdiff |
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
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
| builtin/push.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| t/t5541-http-push.sh | diff1 | diff2 | blobhistory |
| transport.c | diff1 | diff2 | blobhistory |