configure: rework pthread handling to allow for user defined flags

[git.git] / Documentation / git-config.txt

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 28e1861094a1689cdb042df6b1d788620ffdf213..82ce89eae849e5a1c697a3c7f659a80521600348 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -22,6 +22,7 @@ SYNOPSIS
 'git config' [<file-option>] [-z|--null] -l | --list
 'git config' [<file-option>] --get-color name [default]
 'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
 'git config' [<file-option>] [-z|--null] -l | --list
 'git config' [<file-option>] --get-color name [default]
 'git config' [<file-option>] --get-colorbool name [stdout-is-tty]

+'git config' [<file-option>] -e | --edit

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -130,6 +131,10 @@ See also <<FILES>>.
        in the config file will cause the value to be multiplied
        by 1024, 1048576, or 1073741824 prior to output.
 
        in the config file will cause the value to be multiplied
        by 1024, 1048576, or 1073741824 prior to output.
 

+--bool-or-int::
+       'git-config' will ensure that the output matches the format of
+       either --bool or --int, as described above.
+

 -z::
 --null::
        For all options that output values and/or keys, always
 -z::
 --null::
        For all options that output values and/or keys, always


@@ -157,6 +162,11 @@ See also <<FILES>>.
        output.  The optional `default` parameter is used instead, if
        there is no color configured for `name`.
 
        output.  The optional `default` parameter is used instead, if
        there is no color configured for `name`.
 

+-e::
+--edit::
+       Opens an editor to modify the specified config file; either
+       '--system', '--global', or repository (default).
+

 [[FILES]]
 FILES
 -----
 [[FILES]]
 FILES
 -----


@@ -279,7 +289,7 @@ If you want to know all the values for a multivar, do:
 % git config --get-all core.gitproxy
 ------------
 
 % git config --get-all core.gitproxy
 ------------
 

-If you like to live dangerous, you can replace *all* core.gitproxy by a
+If you like to live dangerously, you can replace *all* core.gitproxy by a

 new one with
 
 ------------
 new one with
 
 ------------