# [PATCH] Fix formatting in git-config(1) 2 messages from 2012-06-23 to 2012-07-03. Participants: Andreas Schwab, Junio C Hamano. Thread: https://gitlist.dev/t/30879 ## Andreas Schwab, 2012-06-23 13:18 Subject: [PATCH] Fix formatting in git-config(1) Message-ID: URL: https://gitlist.dev/e/m27guy5fqv.fsf%40igel.home ``` This fixes two formatting bugs in the git-config documentation: - in the column.ui entry don't indent the last paragraph so that it isn't formatted as a literal paragraph - in the push.default entry separate the last paragraph from the nested list. Signed-off-by: Andreas Schwab --- Documentation/config.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 915cb5a..b059851 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -880,7 +880,7 @@ column.ui:: make equal size columns -- + - This option defaults to 'never'. +This option defaults to 'never'. column.branch:: Specify whether to output branch listing in `git branch` in columns. @@ -1720,6 +1720,7 @@ push.default:: no refspec is implied by any of the options given on the command line. Possible values are: + +-- * `nothing` - do not push anything. * `matching` - push all branches having the same name in both ends. This is for those who prepare all the branches into a publishable @@ -1739,12 +1740,13 @@ push.default:: option and is well-suited for beginners. It will become the default in Git 2.0. * `current` - push the current branch to a branch of the same name. - + - The `simple`, `current` and `upstream` modes are for those who want to - push out a single branch after finishing work, even when the other - branches are not yet ready to be pushed out. If you are working with - other people to push into the same shared repository, you would want - to use one of these. +-- ++ +The `simple`, `current` and `upstream` modes are for those who want to +push out a single branch after finishing work, even when the other +branches are not yet ready to be pushed out. If you are working with +other people to push into the same shared repository, you would want +to use one of these. rebase.stat:: Whether to show a diffstat of what changed upstream since the last -- 1.7.11.1 -- 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." ``` ## Junio C Hamano, 2012-07-03 19:23 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: <7vpq8cvec4.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vpq8cvec4.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Andreas Schwab writes: > This fixes two formatting bugs in the git-config documentation: > > - in the column.ui entry don't indent the last paragraph so that it isn't > formatted as a literal paragraph > - in the push.default entry separate the last paragraph from the > nested list. > > Signed-off-by: Andreas Schwab Thanks. ```