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 /Documentation | |
| 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 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 10225cfaf7..c8abe86ed5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -143,7 +143,8 @@ advice.*:: pushUpdateRejected:: Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFDefault', - 'pushNonFFMatching', and 'pushAlreadyExists' + 'pushNonFFMatching', 'pushAlreadyExists', + 'pushFetchFirst', and 'pushNeedsForce' simultaneously. pushNonFFCurrent:: Advice shown when linkgit:git-push[1] fails due to a @@ -162,6 +163,15 @@ advice.*:: pushAlreadyExists:: Shown when linkgit:git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.) + pushFetchFirst:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object we do not have. + pushNeedsForce:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object that is not a committish, or make the remote + ref point at an object that is not a committish. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in |