diff options
| author | Uwe Kleine-König <uwe@kleine-koenig.org> | 2023-02-28 14:46:57 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2023-03-07 10:26:22 -0700 |
| commit | a414684e3b735a4114c19295a07e8cb2eb889dae (patch) | |
| tree | d030bdea3089b49e8ef3c4f46829768511fd4127 /Documentation | |
| parent | 0b02076f995332fe1e457da29dd61c3b66c862f7 (diff) | |
| download | lwn-a414684e3b735a4114c19295a07e8cb2eb889dae.tar.gz lwn-a414684e3b735a4114c19295a07e8cb2eb889dae.zip | |
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')
| -rw-r--r-- | Documentation/maintainer/rebasing-and-merging.rst | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/maintainer/rebasing-and-merging.rst b/Documentation/maintainer/rebasing-and-merging.rst index 09f988e7fa71..85800ce95ae5 100644 --- a/Documentation/maintainer/rebasing-and-merging.rst +++ b/Documentation/maintainer/rebasing-and-merging.rst @@ -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 forward with a command like:: - git merge v5.2-rc1^0 - -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. + git merge --ff-only v5.2-rc1 The guidelines laid out above are just that: guidelines. There will always be situations that call out for a different solution, and these guidelines |