Files
git/Documentation
Junio C Hamano 9de14c71f7 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
2023-03-19 15:03:13 -07:00
..
2023-03-17 14:03:20 -07:00
2023-02-15 17:11:52 -08:00
2022-10-30 21:04:44 -04:00
2023-01-05 14:52:25 +09:00
2023-02-18 09:29:13 -08:00
2022-10-25 15:44:18 -07:00
2022-02-02 14:50:09 -08:00
2021-09-28 10:31:02 -07:00
2021-12-10 14:35:03 -08:00
2023-01-30 14:24:24 -08:00
2019-05-07 13:04:48 +09:00
2022-11-30 10:57:19 +09:00
2019-10-21 12:02:39 +09:00