diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:25:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:25:04 -0800 |
| commit | 370855e967e21d9c5b70df7b5cd3756c7bed5c7c (patch) | |
| tree | 80d1f70f82ec587ca4919d2289d6087d4979009c /builtin/help.c | |
| parent | Merge branch 'jk/config-parsing-cleanup' (diff) | |
| parent | push: finishing touches to explain REJECT_ALREADY_EXISTS better (diff) | |
| download | tgif-370855e967e21d9c5b70df7b5cd3756c7bed5c7c.tar.xz | |
Merge branch 'jc/push-reject-reasons'
Improve error and advice messages given locally when "git push"
refuses when it cannot compute fast-forwardness by separating these
cases from the normal "not a fast-forward; merge first and push
again" case.
* jc/push-reject-reasons:
push: finishing touches to explain REJECT_ALREADY_EXISTS better
push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
push: further simplify the logic to assign rejection reason
push: further clean up fields of "struct ref"
Diffstat (limited to 'builtin/help.c')
0 files changed, 0 insertions, 0 deletions