diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-20 19:57:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 19:57:00 -0700 |
| commit | 7df6ddf51ea71d81874ecfa34f670f50a3d45103 (patch) | |
| tree | 479b8f75453017af3076f9e246facdb5f9b7917b /Documentation | |
| parent | aba170cdb4874b72dd619e6f7bbc13c33295f831 (diff) | |
| parent | 5b6dedd6a0b7566f7e8466b6aefe8f019c52f5d3 (diff) | |
| download | git-7df6ddf51ea71d81874ecfa34f670f50a3d45103.tar.gz | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
annotate: make it work from subdirectories.
git-config: Correct asciidoc documentation for --int/--bool
t1300: Add tests for git-config --bool --get
unpack-trees.c: verify_uptodate: remove dead code
Use PATH_MAX instead of TEMPFILE_PATH_LEN
branch: fix segfault when resolving an invalid HEAD
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-config.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 280ef2058c..827a49970d 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -9,15 +9,15 @@ git-config - Get and set repository or global options SYNOPSIS -------- [verse] -'git-config' [--system | --global] [type] name [value [value_regex]] -'git-config' [--system | --global] [type] --add name value -'git-config' [--system | --global] [type] --replace-all name [value [value_regex]] +'git-config' [--system | --global] name [value [value_regex]] +'git-config' [--system | --global] --add name value +'git-config' [--system | --global] --replace-all name [value [value_regex]] 'git-config' [--system | --global] [type] --get name [value_regex] 'git-config' [--system | --global] [type] --get-all name [value_regex] -'git-config' [--system | --global] [type] --unset name [value_regex] -'git-config' [--system | --global] [type] --unset-all name [value_regex] -'git-config' [--system | --global] [type] --rename-section old_name new_name -'git-config' [--system | --global] [type] --remove-section name +'git-config' [--system | --global] --unset name [value_regex] +'git-config' [--system | --global] --unset-all name [value_regex] +'git-config' [--system | --global] --rename-section old_name new_name +'git-config' [--system | --global] --remove-section name 'git-config' [--system | --global] -l | --list DESCRIPTION @@ -36,7 +36,8 @@ prepend a single exclamation mark in front (see EXAMPLES). The type specifier can be either '--int' or '--bool', which will make 'git-config' ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, -a "true" or "false" string for bool). If no type specifier is passed, +a "true" or "false" string for bool). Type specifiers currently only +take effect for reading operations. If no type specifier is passed, no checks or transformations are performed on the value. This command will fail if: |