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>
Andreas Schwab committed
Sep 12, 2015 at 16:26 UTC
d23871079f7b71abac55597e6ea2abc93ea3af36
1 file changed
+6
-6
Documentation/config.txt
+6
-6
@@ -766,9 +766,9 @@ branch.<name>.rebase::
766
"git pull" is run. See "pull.rebase" for doing this in a non
767
branch-specific manner.
768
+
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'.
772
+
773
*NOTE*: this is a possibly dangerous operation; do *not* use
774
it unless you understand the implications (see linkgit:git-rebase[1]
@@ -1830,9 +1830,9 @@ pull.rebase::
1830
pull" is run. See "branch.<name>.rebase" for setting this on a
1831
per-branch basis.
1832
+
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'.
1836
+
1837
*NOTE*: this is a possibly dangerous operation; do *not* use
1838
it unless you understand the implications (see linkgit:git-rebase[1]