]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc1a4ce 765071a)
Merge branch 'fc/advice-diverged-history'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:12 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:13 +0000 (15:03 -0700)
commit9de14c71f720b1da50c95309fc06d30c8455aae2
tree4876b04221d79c5152e2f9ec4d1d3ffa4e1c0ad7tree | snapshot
parentfc1a4ce043e4b07d1551a24ec224bd43b9405ec8commit | diff
parent765071a8f27fcaae27ce940b3a784b9d586faa12commit | 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
advice.c diff1 | diff2 | blob | history
advice.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.