summaryrefslogtreecommitdiff
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-20 21:29:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-20 21:29:03 (GMT)
commit17e46ea6fea5273b51b424a8016f9da3412792d4 (patch)
treeb394b7c1d2d280d7a8fac60ff63e741c310c5bbf /Documentation/git-config.txt
parent8f0246551c3964eeb16d9c9f39845bd53af8bda8 (diff)
parentbf71b4b3ee07291e97c4dabfb97e7397eec904e0 (diff)
downloadgit-17e46ea6fea5273b51b424a8016f9da3412792d4.zip
git-17e46ea6fea5273b51b424a8016f9da3412792d4.tar.gz
git-17e46ea6fea5273b51b424a8016f9da3412792d4.tar.bz2
Merge branch 'fc/parseopt-config'
* fc/parseopt-config: config: test for --replace-all with one argument and fix documentation. config: set help text for --bool-or-int git config: don't allow --get-color* and variable type git config: don't allow extra arguments for -e or -l. git config: don't allow multiple variable types git config: don't allow multiple config file locations git config: reorganize to use parseopt git config: reorganize get_color* git config: trivial rename in preparation for parseopt git_config(): not having a per-repo config file is not an error
Diffstat (limited to 'Documentation/git-config.txt')
-rw-r--r--Documentation/git-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 82ce89e..7131ee3 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -11,7 +11,7 @@ SYNOPSIS
[verse]
'git config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
'git config' [<file-option>] [type] --add name value
-'git config' [<file-option>] [type] --replace-all name [value [value_regex]]
+'git config' [<file-option>] [type] --replace-all name value [value_regex]
'git config' [<file-option>] [type] [-z|--null] --get name [value_regex]
'git config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
'git config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]