diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-06-23 15:18:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-03 12:13:19 -0700 |
| commit | b12905140a8239ac687450ad43f18b5f0bcfb62e (patch) | |
| tree | 20501f59391afe0299bb5055c12540c377a86e10 | |
| parent | 726016725d45894c061e8d187385327f82803c9f (diff) | |
| download | git-b12905140a8239ac687450ad43f18b5f0bcfb62e.tar.gz | |
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>
| -rw-r--r-- | Documentation/config.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ccce4f6697..0bcea8a949 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -881,7 +881,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. @@ -1721,6 +1721,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 @@ -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. - + - 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 |