projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b02076) | patch
docs: rebasing-and-merging: Drop wrong statement about git
authorUwe Kleine-König <uwe@kleine-koenig.org>
Tue, 28 Feb 2023 13:46:57 +0000 (14:46 +0100)
committerJonathan Corbet <corbet@lwn.net>
Tue, 7 Mar 2023 17:26:22 +0000 (10:26 -0700)
commita414684e3b735a4114c19295a07e8cb2eb889dae
treed030bdea3089b49e8ef3c4f46829768511fd4127tree | snapshot
parent0b02076f995332fe1e457da29dd61c3b66c862f7commit | diff
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>
Documentation/maintainer/rebasing-and-merging.rst diff | blob | history
Domain: System / Kernel;