diff options
author | Uwe Kleine-König <uwe@kleine-koenig.org> | 2023-02-28 16:46:57 +0300 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2023-03-07 20:26:22 +0300 |
commit | a414684e3b735a4114c19295a07e8cb2eb889dae (patch) | |
tree | d030bdea3089b49e8ef3c4f46829768511fd4127 /Documentation/mm/physical_memory.rst | |
parent | 0b02076f995332fe1e457da29dd61c3b66c862f7 (diff) | |
download | linux-a414684e3b735a4114c19295a07e8cb2eb889dae.tar.xz |
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>
Diffstat (limited to 'Documentation/mm/physical_memory.rst')
0 files changed, 0 insertions, 0 deletions