diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:13 -0700 |
| commit | 9de14c71f720b1da50c95309fc06d30c8455aae2 (patch) | |
| tree | 4876b04221d79c5152e2f9ec4d1d3ffa4e1c0ad7 /builtin/index-pack.c | |
| parent | Merge branch 'ab/fix-strategy-opts-parsing' (diff) | |
| parent | advice: add diverging advice for novices (diff) | |
| download | git-9de14c71f720b1da50c95309fc06d30c8455aae2.tar.gz git-9de14c71f720b1da50c95309fc06d30c8455aae2.zip | |
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 'builtin/index-pack.c')
0 files changed, 0 insertions, 0 deletions