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 /advice.h | |
| parent | fc1a4ce043e4b07d1551a24ec224bd43b9405ec8 (diff) | |
| parent | 765071a8f27fcaae27ce940b3a784b9d586faa12 (diff) | |
| download | git-9de14c71f720b1da50c95309fc06d30c8455aae2.tar.gz | |
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 'advice.h')
| -rw-r--r-- | advice.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -19,6 +19,7 @@ struct string_list; ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME, ADVICE_COMMIT_BEFORE_MERGE, ADVICE_DETACHED_HEAD, + ADVICE_DIVERGING, ADVICE_SUGGEST_DETACHING_HEAD, ADVICE_FETCH_SHOW_FORCED_UPDATES, ADVICE_GRAFT_FILE_DEPRECATED, |