| commit | 9de14c71f720b1da50c95309fc06d30c8455aae2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Mar 2023 22:03:12 +0000 (19 15:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Mar 2023 22:03:13 +0000 (19 15:03 -0700) | ||
| tree | 4876b04221d79c5152e2f9ec4d1d3ffa4e1c0ad7 | treesnapshot (tar.gz zip) |
| parent | fc1a4ce043e4b07d1551a24ec224bd43b9405ec8 | commitdiff |
| parent | 765071a8f27fcaae27ce940b3a784b9d586faa12 | commitdiff |
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
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
| advice.c | diff1 | diff2 | blobhistory |
| advice.h | diff1 | diff2 | blobhistory |