From: Elijah Newren Date: Wed, 25 Jan 2023 04:03:52 +0000 (+0000) Subject: rebase: fix formatting of rebase --reapply-cherry-picks option in docs X-Git-Tag: v2.40.0-rc0~38^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a7d7ce9f6329e9455dc1c6b6c83e1409efef28b;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index d2b731bd60..99aadac28e 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -338,7 +338,6 @@ See also INCOMPATIBLE OPTIONS below. upstream changes, the behavior towards them is controlled by the `--empty` flag.) + - In the absence of `--keep-base` (or if `--no-reapply-cherry-picks` is given), these commits will be automatically dropped. Because this 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 dropped commit (unless `--quiet` is given). Advice will also be issued unless `advice.skippedCherryPicks` is set to false (see linkgit:git-config[1]). - + `--reapply-cherry-picks` allows rebase to forgo reading all upstream commits, potentially improving performance.