diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2023-03-07 20:48:33 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-08 09:28:42 -0800 |
| commit | 765071a8f27fcaae27ce940b3a784b9d586faa12 (patch) | |
| tree | 90867c1cb6189d7d8d8c6e3e11caa2782d4f56b9 /Documentation/config | |
| parent | 725f57037d81e24eacfda6e59a19c60c0b4c8062 (diff) | |
| download | git-765071a8f27fcaae27ce940b3a784b9d586faa12.tar.gz | |
advice: add diverging advice for novices
The user might not necessarily know why ff only was configured, maybe an
admin did it, or the installer (Git for Windows), or perhaps they just
followed some online advice.
This can happen not only on pull.ff=only, but merge.ff=only too.
Even worse if the user has configured pull.rebase=false and
merge.ff=only, because in those cases a diverging merge will constantly
keep failing. There's no trivial way to get out of this other than
`git merge --no-ff`.
Let's not assume our users are experts in git who completely understand
all their configurations.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index a00d0100a8..c96b5b2e5d 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -136,4 +136,6 @@ advice.*:: Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1] is asked to update index entries outside the current sparse checkout. + diverging:: + Advice shown when a fast-forward is not possible. -- |