{"thread":{"id":"40339","subject":"[PATCH] Documentation/config: fix formatting for branch.*.rebase and pull.rebase","startedAt":"2015-09-12T14:26:53Z","lastAt":"2015-09-12T14:26:53Z","messageCount":1,"participants":["Andreas Schwab"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"269826","messageId":"87zj0r4ssy.fsf@igel.home","threadId":"40339","inReplyTo":null,"subject":"[PATCH] Documentation/config: fix formatting for branch.*.rebase and pull.rebase","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2015-09-12T14:26:53Z","receivedAt":"2015-09-12T14:26:53Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Don't format the second paragraph as a literal block.\n\nSigned-off-by: Andreas Schwab <schwab@linux-m68k.org>\n---\n Documentation/config.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 0c351b9..e0bd703 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -865,7 +865,7 @@ branch.<name>.rebase::\n \tinstead of merging the default branch from the default remote when\n \t\"git pull\" is run. See \"pull.rebase\" for doing this in a non\n \tbranch-specific manner.\n-+\n+\t+\n \tWhen preserve, also pass `--preserve-merges` along to 'git rebase'\n \tso that locally committed merge commits will not be flattened\n \tby running 'git pull'.\n@@ -2137,7 +2137,7 @@ pull.rebase::\n \tof merging the default branch from the default remote when \"git\n \tpull\" is run. See \"branch.<name>.rebase\" for setting this on a\n \tper-branch basis.\n-+\n+\t+\n \tWhen preserve, also pass `--preserve-merges` along to 'git rebase'\n \tso that locally committed merge commits will not be flattened\n \tby running 'git pull'.\n-- \n2.5.2\n\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}