Skip to content

Commit d238710

Browse files
andreas-schwabgitster
authored andcommitted
Documentation/config: fix formatting for branch.*.rebase and pull.rebase
Don't format the second paragraph as a literal block. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 66713ef commit d238710

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/config.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -766,9 +766,9 @@ branch.<name>.rebase::
766766
"git pull" is run. See "pull.rebase" for doing this in a non
767767
branch-specific manner.
768768
+
769-
When preserve, also pass `--preserve-merges` along to 'git rebase'
770-
so that locally committed merge commits will not be flattened
771-
by running 'git pull'.
769+
When preserve, also pass `--preserve-merges` along to 'git rebase'
770+
so that locally committed merge commits will not be flattened
771+
by running 'git pull'.
772772
+
773773
*NOTE*: this is a possibly dangerous operation; do *not* use
774774
it unless you understand the implications (see linkgit:git-rebase[1]
@@ -1830,9 +1830,9 @@ pull.rebase::
18301830
pull" is run. See "branch.<name>.rebase" for setting this on a
18311831
per-branch basis.
18321832
+
1833-
When preserve, also pass `--preserve-merges` along to 'git rebase'
1834-
so that locally committed merge commits will not be flattened
1835-
by running 'git pull'.
1833+
When preserve, also pass `--preserve-merges` along to 'git rebase'
1834+
so that locally committed merge commits will not be flattened
1835+
by running 'git pull'.
18361836
+
18371837
*NOTE*: this is a possibly dangerous operation; do *not* use
18381838
it unless you understand the implications (see linkgit:git-rebase[1]

0 commit comments

Comments
 (0)