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>
Andreas Schwab committed
Jun 23, 2012 at 15:18 UTC
b12905140a8239ac687450ad43f18b5f0bcfb62e
1 file changed
+9
-7
Documentation/config.txt
+9
-7
@@ -881,7 +881,7 @@ column.ui::
881
make equal size columns
882
--
883
+
884
- This option defaults to 'never'.
884
+This option defaults to 'never'.
885
886
column.branch::
887
Specify whether to output branch listing in `git branch` in columns.
@@ -1721,6 +1721,7 @@ push.default::
1721
no refspec is implied by any of the options given on the command
1722
line. Possible values are:
1723
+
1724
+--
1725
* `nothing` - do not push anything.
1726
* `matching` - push all branches having the same name in both ends.
1727
This is for those who prepare all the branches into a publishable
@@ -1740,12 +1741,13 @@ push.default::
1741
option and is well-suited for beginners. It will become the default
1742
in Git 2.0.
1743
* `current` - push the current branch to a branch of the same name.
1743
- +
1744
- The `simple`, `current` and `upstream` modes are for those who want to
1745
- push out a single branch after finishing work, even when the other
1746
- branches are not yet ready to be pushed out. If you are working with
1747
- other people to push into the same shared repository, you would want
1748
- to use one of these.
1744
+--
1745
++
1746
+The `simple`, `current` and `upstream` modes are for those who want to
1747
+push out a single branch after finishing work, even when the other
1748
+branches are not yet ready to be pushed out. If you are working with
1749
+other people to push into the same shared repository, you would want
1750
+to use one of these.
1751
1752
rebase.stat::
1753
Whether to show a diffstat of what changed upstream since the last