{"thread":{"id":"30879","subject":"[PATCH] Fix formatting in git-config(1)","startedAt":"2012-06-23T13:18:00Z","lastAt":"2012-07-03T19:23:23Z","messageCount":2,"participants":["Andreas Schwab","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"194133","messageId":"m27guy5fqv.fsf@igel.home","threadId":"30879","inReplyTo":null,"subject":"[PATCH] Fix formatting in git-config(1)","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-06-23T13:18:00Z","receivedAt":"2012-06-23T13:18:00Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"This fixes two formatting bugs in the git-config documentation:\n\n- in the column.ui entry don't indent the last paragraph so that it isn't\n  formatted as a literal paragraph\n- in the push.default entry separate the last paragraph from the\n  nested list.\n\nSigned-off-by: Andreas Schwab <schwab@linux-m68k.org>\n---\n Documentation/config.txt | 16 +++++++++-------\n 1 file changed, 9 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 915cb5a..b059851 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -880,7 +880,7 @@ column.ui::\n \tmake equal size columns\n --\n +\n-\tThis option defaults to 'never'.\n+This option defaults to 'never'.\n \n column.branch::\n \tSpecify whether to output branch listing in `git branch` in columns.\n@@ -1720,6 +1720,7 @@ push.default::\n \tno refspec is implied by any of the options given on the command\n \tline. Possible values are:\n +\n+--\n * `nothing` - do not push anything.\n * `matching` - push all branches having the same name in both ends.\n   This is for those who prepare all the branches into a publishable\n@@ -1739,12 +1740,13 @@ push.default::\n   option and is well-suited for beginners. It will become the default\n   in Git 2.0.\n * `current` - push the current branch to a branch of the same name.\n-  +\n-  The `simple`, `current` and `upstream` modes are for those who want to\n-  push out a single branch after finishing work, even when the other\n-  branches are not yet ready to be pushed out. If you are working with\n-  other people to push into the same shared repository, you would want\n-  to use one of these.\n+--\n++\n+The `simple`, `current` and `upstream` modes are for those who want to\n+push out a single branch after finishing work, even when the other\n+branches are not yet ready to be pushed out. If you are working with\n+other people to push into the same shared repository, you would want\n+to use one of these.\n \n rebase.stat::\n \tWhether to show a diffstat of what changed upstream since the last\n-- \n1.7.11.1\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"},{"id":"194546","messageId":"7vpq8cvec4.fsf@alter.siamese.dyndns.org","threadId":"30879","inReplyTo":"m27guy5fqv.fsf@igel.home","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-07-03T19:23:23Z","receivedAt":"2012-07-03T19:23:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab <schwab@linux-m68k.org> writes:\n\n> This fixes two formatting bugs in the git-config documentation:\n>\n> - in the column.ui entry don't indent the last paragraph so that it isn't\n>   formatted as a literal paragraph\n> - in the push.default entry separate the last paragraph from the\n>   nested list.\n>\n> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>\n\nThanks.\n"}]}