Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

docs: rebasing-and-merging: Drop wrong statement about git

Browse Source 
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>
This commit is contained in:
Uwe Kleine-König 2023-02-28 14:46:57 +01:00 committed by Jonathan Corbet
parent 0b02076f99
commit a414684e3b
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/maintainer/rebasing-and-merging.rst
View File

@ -213,11 +213,7 @@ point rather than some random spot. If your upstream-bound branch has
emptied entirely into the mainline during the merge window, you can pull it emptied entirely into the mainline during the merge window, you can pull it
forward with a command like:: forward with a command like::
git merge v5.2-rc1^0 git merge --ff-only v5.2-rc1
The "^0" will cause Git to do a fast-forward merge (which should be
possible in this situation), thus avoiding the addition of a spurious merge
commit.
The guidelines laid out above are just that: guidelines. There will always The guidelines laid out above are just that: guidelines. There will always
be situations that call out for a different solution, and these guidelines be situations that call out for a different solution, and these guidelines