| commit | 62764ae8654b1009e5466ef9fd7f55dbd6de92e9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Mar 2012 06:47:03 +0000 (28 23:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Mar 2012 06:47:03 +0000 (28 23:47 -0700) | ||
| tree | 09c418c8a10e81669f0c68e3652d6878c69af393 | treesnapshot (tar.gz zip) |
| parent | 59406684b6bbd073b171b4f8f3bc5b33966f3187 | commitdiff |
| parent | e339aa92ae2db194a3d5738cb3aee6d8b3bf7b10 | commitdiff |
Merge branch 'ct/advise-push-default' into next
Breaks down the cases in which "git push" fails due to non-ff into three
categories, and gives separate advise messages. This should be a good
change regardless of mm/push-default-switch-warning topic.
* ct/advise-push-default:
clean up struct ref's nonfastforward field
push: Provide situational hints for non-fast-forward errors
Breaks down the cases in which "git push" fails due to non-ff into three
categories, and gives separate advise messages. This should be a good
change regardless of mm/push-default-switch-warning topic.
* ct/advise-push-default:
clean up struct ref's nonfastforward field
push: Provide situational hints for non-fast-forward errors
| cache.h | diff1 | diff2 | blobhistory |
| transport.c | diff1 | diff2 | blobhistory |