diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-20 01:03:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-20 01:03:13 +0300 |
| commit | 9de14c71f720b1da50c95309fc06d30c8455aae2 (patch) | |
| tree | 4876b04221d79c5152e2f9ec4d1d3ffa4e1c0ad7 /Documentation | |
| parent | fc1a4ce043e4b07d1551a24ec224bd43b9405ec8 (diff) | |
| parent | 765071a8f27fcaae27ce940b3a784b9d586faa12 (diff) | |
Merge branch 'fc/advice-diverged-history'
After "git pull" that is configured with pull.rebase=false
merge.ff=only fails due to our end having our own development, give
advice messages to get out of the "Not possible to fast-forward"
state.
* fc/advice-diverged-history:
advice: add diverging advice for novices
Diffstat (limited to 'Documentation')
| -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. -- |