diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:34 -0800 |
commit | 0a84724bf8ed1240b61e2401aec8a6cab93111b1 (patch) | |
tree | d4e493eab3743100dda2293d8ee9790fe1bec5db /Documentation/config | |
parent | 4d59753227d6f86dec2b108704bc04e727c5347f (diff) | |
parent | 2219c09e23c39aed7c869c1f4dda28aec46da984 (diff) | |
download | git-0a84724bf8ed1240b61e2401aec8a6cab93111b1.tar.gz git-0a84724bf8ed1240b61e2401aec8a6cab93111b1.tar.xz |
Merge branch 'ab/push-dwim-dst'
"git push $there $src:$dst" rejects when $dst is not a fully
qualified refname and not clear what the end user meant. The
codepath has been taught to give a clearer error message, and also
guess where the push should go by taking the type of the pushed
object into account (e.g. a tag object would want to go under
refs/tags/).
* ab/push-dwim-dst:
push doc: document the DWYM behavior pushing to unqualified <dst>
push: test that <src> doesn't DWYM if <dst> is unqualified
push: add an advice on unqualified <dst> push
push: move unqualified refname error into a function
push: improve the error shown on unqualified <dst> push
i18n: remote.c: mark error(...) messages for translation
remote.c: add braces in anticipation of a follow-up change
Diffstat (limited to 'Documentation/config')
-rw-r--r-- | Documentation/config/advice.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 57fcd4c86..88620429e 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -30,6 +30,13 @@ advice.*:: tries to overwrite a remote ref that points at an object that is not a commit-ish, or make the remote ref point at an object that is not a commit-ish. + pushUnqualifiedRefname:: + Shown when linkgit:git-push[1] gives up trying to + guess based on the source and destination refs what + remote ref namespace the source belongs in, but where + we can still suggest that the user push to either + refs/heads/* or refs/tags/* based on the type of the + source object. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in |