Skip to content

Commit e0d10e1

Browse files
tomprinceJunio C Hamano
tomprince
authored and
Junio C Hamano
committed
[PATCH] Rename git-repo-config to git-config.
Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 829a686 commit e0d10e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+460
-439
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ git-clean
2323
git-clone
2424
git-commit
2525
git-commit-tree
26+
git-config
2627
git-convert-objects
2728
git-count-objects
2829
git-cvsexportcommit

‎Documentation/cmd-list.perl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ sub format_one {
144144
git-reflog ancillarymanipulators
145145
git-relink ancillarymanipulators
146146
git-repack ancillarymanipulators
147-
git-repo-config ancillarymanipulators
147+
git-config ancillarymanipulators
148148
git-request-pull foreignscminterface
149149
git-rerere ancillaryinterrogators
150150
git-reset mainporcelain

‎Documentation/config.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The values following the equals sign in variable assign are all either
6262
a string, an integer, or a boolean. Boolean values may be given as yes/no,
6363
0/1 or true/false. Case is not significant in boolean values, when
6464
converting value to the canonical form using '--bool' type specifier;
65-
`git-repo-config` will ensure that the output is "true" or "false".
65+
`git-config` will ensure that the output is "true" or "false".
6666

6767
String values may be entirely or partially enclosed in double quotes.
6868
You need to enclose variable value in double quotes if you want to

‎Documentation/core-tutorial.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ the remote repository URL in the local repository's config file
11301130
like this:
11311131

11321132
------------------------------------------------
1133-
$ git repo-config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/
1133+
$ git config remote.linus.url http://www.kernel.org/pub/scm/git/git.git/
11341134
------------------------------------------------
11351135

11361136
and use the "linus" keyword with `git pull` instead of the full URL.

‎Documentation/cvs-migration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ them first before running git pull.
3636
================================
3737
The `pull` command knows where to get updates from because of certain
3838
configuration variables that were set by the first `git clone`
39-
command; see `git repo-config -l` and the gitlink:git-repo-config[1] man
39+
command; see `git config -l` and the gitlink:git-config[1] man
4040
page for details.
4141
================================
4242

‎Documentation/everyday.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ Push into another repository.::
212212
------------
213213
satellite$ git clone mothership:frotz frotz <1>
214214
satellite$ cd frotz
215-
satellite$ git repo-config --get-regexp '^(remote|branch)\.' <2>
215+
satellite$ git config --get-regexp '^(remote|branch)\.' <2>
216216
remote.origin.url mothership:frotz
217217
remote.origin.fetch refs/heads/*:refs/remotes/origin/*
218218
branch.master.remote origin
219219
branch.master.merge refs/heads/master
220-
satellite$ git repo-config remote.origin.push \
220+
satellite$ git config remote.origin.push \
221221
master:refs/remotes/satellite/master <3>
222222
satellite$ edit/compile/test/commit
223223
satellite$ git push origin <4>

‎Documentation/git-config.txt‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
git-config(1)
2+
=============
3+
4+
NAME
5+
----
6+
git-config - Get and set repository or global options
7+
8+
9+
SYNOPSIS
10+
--------
11+
[verse]
12+
'git-config' [--global] [type] name [value [value_regex]]
13+
'git-config' [--global] [type] --add name value
14+
'git-config' [--global] [type] --replace-all name [value [value_regex]]
15+
'git-config' [--global] [type] --get name [value_regex]
16+
'git-config' [--global] [type] --get-all name [value_regex]
17+
'git-config' [--global] [type] --unset name [value_regex]
18+
'git-config' [--global] [type] --unset-all name [value_regex]
19+
'git-config' [--global] -l | --list
20+
21+
DESCRIPTION
22+
-----------
23+
You can query/set/replace/unset options with this command. The name is
24+
actually the section and the key separated by a dot, and the value will be
25+
escaped.
26+
27+
Multiple lines can be added to an option by using the '--add' option.
28+
If you want to update or unset an option which can occur on multiple
29+
lines, a POSIX regexp `value_regex` needs to be given. Only the
30+
existing values that match the regexp are updated or unset. If
31+
you want to handle the lines that do *not* match the regex, just
32+
prepend a single exclamation mark in front (see EXAMPLES).
33+
34+
The type specifier can be either '--int' or '--bool', which will make
35+
'git-config' ensure that the variable(s) are of the given type and
36+
convert the value to the canonical form (simple decimal number for int,
37+
a "true" or "false" string for bool). If no type specifier is passed,
38+
no checks or transformations are performed on the value.
39+
40+
This command will fail if:
41+
42+
. The .git/config file is invalid,
43+
. Can not write to .git/config,
44+
. no section was provided,
45+
. the section or key is invalid,
46+
. you try to unset an option which does not exist,
47+
. you try to unset/set an option for which multiple lines match, or
48+
. you use --global option without $HOME being properly set.
49+
50+
51+
OPTIONS
52+
-------
53+
54+
--replace-all::
55+
Default behavior is to replace at most one line. This replaces
56+
all lines matching the key (and optionally the value_regex).
57+
58+
--add::
59+
Adds a new line to the option without altering any existing
60+
values. This is the same as providing '^$' as the value_regex.
61+
62+
--get::
63+
Get the value for a given key (optionally filtered by a regex
64+
matching the value). Returns error code 1 if the key was not
65+
found and error code 2 if multiple key values were found.
66+
67+
--get-all::
68+
Like get, but does not fail if the number of values for the key
69+
is not exactly one.
70+
71+
--get-regexp::
72+
Like --get-all, but interprets the name as a regular expression.
73+
74+
--global::
75+
Use global ~/.gitconfig file rather than the repository .git/config.
76+
77+
--unset::
78+
Remove the line matching the key from config file.
79+
80+
--unset-all::
81+
Remove all matching lines from config file.
82+
83+
-l, --list::
84+
List all variables set in config file.
85+
86+
--bool::
87+
git-config will ensure that the output is "true" or "false"
88+
89+
--int::
90+
git-config will ensure that the output is a simple
91+
decimal number. An optional value suffix of 'k', 'm', or 'g'
92+
in the config file will cause the value to be multiplied
93+
by 1024, 1048576, or 1073741824 prior to output.
94+
95+
96+
ENVIRONMENT
97+
-----------
98+
99+
GIT_CONFIG::
100+
Take the configuration from the given file instead of .git/config.
101+
Using the "--global" option forces this to ~/.gitconfig.
102+
103+
GIT_CONFIG_LOCAL::
104+
Currently the same as $GIT_CONFIG; when Git will support global
105+
configuration files, this will cause it to take the configuration
106+
from the global configuration file in addition to the given file.
107+
108+
109+
EXAMPLE
110+
-------
111+
112+
Given a .git/config like this:
113+
114+
#
115+
# This is the config file, and
116+
# a '#' or ';' character indicates
117+
# a comment
118+
#
119+
120+
; core variables
121+
[core]
122+
; Don't trust file modes
123+
filemode = false
124+
125+
; Our diff algorithm
126+
[diff]
127+
external = "/usr/local/bin/gnu-diff -u"
128+
renames = true
129+
130+
; Proxy settings
131+
[core]
132+
gitproxy="ssh" for "ssh://kernel.org/"
133+
gitproxy="proxy-command" for kernel.org
134+
gitproxy="myprotocol-command" for "my://"
135+
gitproxy=default-proxy ; for all the rest
136+
137+
you can set the filemode to true with
138+
139+
------------
140+
% git config core.filemode true
141+
------------
142+
143+
The hypothetical proxy command entries actually have a postfix to discern
144+
what URL they apply to. Here is how to change the entry for kernel.org
145+
to "ssh".
146+
147+
------------
148+
% git config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'
149+
------------
150+
151+
This makes sure that only the key/value pair for kernel.org is replaced.
152+
153+
To delete the entry for renames, do
154+
155+
------------
156+
% git config --unset diff.renames
157+
------------
158+
159+
If you want to delete an entry for a multivar (like core.gitproxy above),
160+
you have to provide a regex matching the value of exactly one line.
161+
162+
To query the value for a given key, do
163+
164+
------------
165+
% git config --get core.filemode
166+
------------
167+
168+
or
169+
170+
------------
171+
% git config core.filemode
172+
------------
173+
174+
or, to query a multivar:
175+
176+
------------
177+
% git config --get core.gitproxy "for kernel.org$"
178+
------------
179+
180+
If you want to know all the values for a multivar, do:
181+
182+
------------
183+
% git config --get-all core.gitproxy
184+
------------
185+
186+
If you like to live dangerous, you can replace *all* core.gitproxy by a
187+
new one with
188+
189+
------------
190+
% git config --replace-all core.gitproxy ssh
191+
------------
192+
193+
However, if you really only want to replace the line for the default proxy,
194+
i.e. the one without a "for ..." postfix, do something like this:
195+
196+
------------
197+
% git config core.gitproxy ssh '! for '
198+
------------
199+
200+
To actually match only values with an exclamation mark, you have to
201+
202+
------------
203+
% git config section.key value '[!]'
204+
------------
205+
206+
To add a new proxy, without altering any of the existing ones, use
207+
208+
------------
209+
% git config core.gitproxy '"proxy" for example.com'
210+
------------
211+
212+
213+
include::config.txt[]
214+
215+
216+
Author
217+
------
218+
Written by Johannes Schindelin <Johannes.Schindelin@gmx.de>
219+
220+
Documentation
221+
--------------
222+
Documentation by Johannes Schindelin, Petr Baudis and the git-list <git@vger.kernel.org>.
223+
224+
GIT
225+
---
226+
Part of the gitlink:git[7] suite
227+

‎Documentation/git-pull.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ git pull, git pull origin::
4242
current branch. Normally the branch merged in is
4343
the HEAD of the remote repository, but the choice is
4444
determined by the branch.<name>.remote and
45-
branch.<name>.merge options; see gitlink:git-repo-config[1]
45+
branch.<name>.merge options; see gitlink:git-config[1]
4646
for details.
4747

4848
git pull origin next::
@@ -94,7 +94,7 @@ gitlink:git-reset[1].
9494

9595
SEE ALSO
9696
--------
97-
gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-repo-config[1]
97+
gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
9898

9999

100100
Author

‎Documentation/git-remote.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ In the third form, gives some information about the remote <name>.
2828

2929
The remote configuration is achieved using the `remote.origin.url` and
3030
`remote.origin.fetch` configuration variables. (See
31-
gitlink:git-repo-config[1]).
31+
gitlink:git-config[1]).
3232

3333
Examples
3434
--------
@@ -58,7 +58,7 @@ See Also
5858
--------
5959
gitlink:git-fetch[1]
6060
gitlink:git-branch[1]
61-
gitlink:git-repo-config[1]
61+
gitlink:git-config[1]
6262

6363
Author
6464
------

0 commit comments

Comments
 (0)