Skip to content
Commit a414684e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jonathan Corbet
Browse files

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: default avatarUwe 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: default avatarJonathan Corbet <corbet@lwn.net>
parent 0b02076f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment