Skip to content

Commit 9a7d7ce

Browse files
newrengitster
authored andcommitted
rebase: fix formatting of rebase --reapply-cherry-picks option in docs
Commit ce5238a ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9253600 commit 9a7d7ce

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Documentation/git-rebase.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ See also INCOMPATIBLE OPTIONS below.
338338
upstream changes, the behavior towards them is controlled by
339339
the `--empty` flag.)
340340
+
341-
342341
In the absence of `--keep-base` (or if `--no-reapply-cherry-picks` is
343342
given), these commits will be automatically dropped. Because this
344343
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
347346
dropped commit (unless `--quiet` is given). Advice will also be issued
348347
unless `advice.skippedCherryPicks` is set to false (see
349348
linkgit:git-config[1]).
350-
351349
+
352350
`--reapply-cherry-picks` allows rebase to forgo reading all upstream
353351
commits, potentially improving performance.

0 commit comments

Comments
 (0)