# [PATCH] Documentation/config: fix formatting for branch.*.rebase and pull.rebase 1 messages from 2015-09-12 to 2015-09-12. Participants: Andreas Schwab. Thread: https://gitlist.dev/t/40339 ## Andreas Schwab, 2015-09-12 14:26 Subject: [PATCH] Documentation/config: fix formatting for branch.*.rebase and pull.rebase Message-ID: <87zj0r4ssy.fsf@igel.home> URL: https://gitlist.dev/e/87zj0r4ssy.fsf%40igel.home ``` Don't format the second paragraph as a literal block. Signed-off-by: Andreas Schwab --- Documentation/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 0c351b9..e0bd703 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -865,7 +865,7 @@ branch..rebase:: instead of merging the default branch from the default remote when "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. -+ + + When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. @@ -2137,7 +2137,7 @@ pull.rebase:: of merging the default branch from the default remote when "git pull" is run. See "branch..rebase" for setting this on a per-branch basis. -+ + + When preserve, also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. -- 2.5.2 -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ```