rebase: fix formatting of rebase --reapply-cherry-picks option in docs
Commit ce5238a690 ("rebase --keep-base: imply --reapply-cherry-picks", 2022-10-17) accidentally added some blank lines that cause extra paragraphs about --reapply-cherry-picks to be considered not part of the documentation of that option. Remove the blank lines to make it clear we are still discussing --reapply-cherry-picks. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Jan 25, 2023 at 04:03 UTC
9a7d7ce9f6329e9455dc1c6b6c83e1409efef28b
1 file changed
-2
Documentation/git-rebase.txt
-2
@@ -338,7 +338,6 @@ See also INCOMPATIBLE OPTIONS below.
338
upstream changes, the behavior towards them is controlled by
339
the `--empty` flag.)
340
+
341
-
341
In the absence of `--keep-base` (or if `--no-reapply-cherry-picks` is
342
given), these commits will be automatically dropped. Because this
343
necessitates reading all upstream commits, this can be expensive in
@@ -347,7 +346,6 @@ read. When using the 'merge' backend, warnings will be issued for each
346
dropped commit (unless `--quiet` is given). Advice will also be issued
347
unless `advice.skippedCherryPicks` is set to false (see
348
linkgit:git-config[1]).
350
-
349
+
350
`--reapply-cherry-picks` allows rebase to forgo reading all upstream
351
commits, potentially improving performance.