diff options
| author |  Cliff Frey <cliff@meraki.com> | 2010-10-17 20:10:45 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-19 14:15:30 -0700 |
| commit | 9373bdc402585963e58f57e75b6396dd08becc77 (patch) | |
| tree | 8170249bc344fe922e2d563eb3e3f291f84889a7 | |
| parent | Update test script annotate-tests.sh to handle missing/extra authors (diff) | |
| download | tgif-9373bdc402585963e58f57e75b6396dd08becc77.tar.xz | |
documentation: git-config minor cleanups
Change push.default's description to add hyphens between values and
descriptions to make the manpage easier to read. The html version is
readable either way.
Change status.showUntrackedFiles to make item descriptions be
sentences and to use the same asciidoc format as push.default. The
only visual change is the additions of "."
Signed-off-by: Cliff Frey <cliff@meraki.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d82c0da2cf..7f6b2109bd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1550,12 +1550,12 @@ 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 matching branches. +* `nothing` - do not push anything. +* `matching` - push all matching branches. All branches having the same name in both ends are considered to be matching. This is the default. -* `tracking` push the current branch to its upstream branch. -* `current` push the current branch to a branch of the same name. +* `tracking` - push the current branch to its upstream branch. +* `current` - push the current branch to a branch of the same name. rebase.stat:: Whether to show a diffstat of what changed upstream since the last @@ -1755,9 +1755,9 @@ status.showUntrackedFiles:: the untracked files. Possible values are: + -- - - 'no' - Show no untracked files - - 'normal' - Shows untracked files and directories - - 'all' - Shows also individual files in untracked directories. +* `no` - Show no untracked files. +* `normal` - Show untracked files and directories. +* `all` - Show also individual files in untracked directories. -- + If this variable is not specified, it defaults to 'normal'. |