Fix formatting in git-config(1)

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 <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ccce4f6697439a6533825bdb8e3fcd1a3bf1bc14..0bcea8a949e96d53ebc7aa956d70ef7873551320 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -881,7 +881,7 @@ column.ui::
        make equal size columns
 --
 +
        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.
 
 column.branch::
        Specify whether to output branch listing in `git branch` in columns.


@@ -1721,6 +1721,7 @@ push.default::
        no refspec is implied by any of the options given on the command
        line. Possible values are:
 +
        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
 * `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


@@ -1740,12 +1741,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.
   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
 
 rebase.stat::
        Whether to show a diffstat of what changed upstream since the last