Uwe Kleine-König a414684e3b docs: rebasing-and-merging: Drop wrong statement about git ... The "^0" syntax is no longer needed to fast-forward to a mainline commit; take that out and add --ff-only to force an error if fast-forward is not possible. Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> [jc: rewrote changelog] Link: https://lore.kernel.org/r/20230228134657.1797871-1-u.kleine-koenig@pengutronix.de Signed-off-by: Jonathan Corbet <corbet@lwn.net>		2023-03-07 10:26:22 -07:00
..
configure-git.rst	Documentation: Document how to get links with git am	2019-11-19 13:13:45 -07:00
index.rst	docs: Add a document on how to fix a messy diffstat	2022-03-30 13:45:15 -06:00
maintainer-entry-profile.rst	docs, nvme: add a feature and quirk policy document	2022-12-28 05:37:12 -10:00
messy-diffstat.rst	docs: Add a document on how to fix a messy diffstat	2022-03-30 13:45:15 -06:00
modifying-patches.rst	Documentation/maintainer: rehome sign-off process	2020-09-03 15:39:24 -06:00
pull-requests.rst	docs: use the lore redirector everywhere	2021-10-12 13:58:19 -06:00
rebasing-and-merging.rst	docs: rebasing-and-merging: Drop wrong statement about git	2023-03-07 10:26:22 -07:00