Skip to content

Commit 18b421d

Browse files
pcloudsgitster
authored andcommitted
config.txt: move user.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e4a7a7b commit 18b421d

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

Documentation/config.txt

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -429,32 +429,7 @@ include::config/uploadpack.txt[]
429429

430430
include::config/url.txt[]
431431

432-
user.email::
433-
Your email address to be recorded in any newly created commits.
434-
Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
435-
`EMAIL` environment variables. See linkgit:git-commit-tree[1].
436-
437-
user.name::
438-
Your full name to be recorded in any newly created commits.
439-
Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
440-
environment variables. See linkgit:git-commit-tree[1].
441-
442-
user.useConfigOnly::
443-
Instruct Git to avoid trying to guess defaults for `user.email`
444-
and `user.name`, and instead retrieve the values only from the
445-
configuration. For example, if you have multiple email addresses
446-
and would like to use a different one for each repository, then
447-
with this configuration option set to `true` in the global config
448-
along with a name, Git will prompt you to set up an email before
449-
making new commits in a newly cloned repository.
450-
Defaults to `false`.
451-
452-
user.signingKey::
453-
If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the
454-
key you want it to automatically when creating a signed tag or
455-
commit, you can override the default selection with this variable.
456-
This option is passed unchanged to gpg's --local-user parameter,
457-
so you may specify a key using any method that gpg supports.
432+
include::config/user.txt[]
458433

459434
versionsort.prereleaseSuffix (deprecated)::
460435
Deprecated alias for `versionsort.suffix`. Ignored if

Documentation/config/user.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
user.email::
2+
Your email address to be recorded in any newly created commits.
3+
Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
4+
`EMAIL` environment variables. See linkgit:git-commit-tree[1].
5+
6+
user.name::
7+
Your full name to be recorded in any newly created commits.
8+
Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
9+
environment variables. See linkgit:git-commit-tree[1].
10+
11+
user.useConfigOnly::
12+
Instruct Git to avoid trying to guess defaults for `user.email`
13+
and `user.name`, and instead retrieve the values only from the
14+
configuration. For example, if you have multiple email addresses
15+
and would like to use a different one for each repository, then
16+
with this configuration option set to `true` in the global config
17+
along with a name, Git will prompt you to set up an email before
18+
making new commits in a newly cloned repository.
19+
Defaults to `false`.
20+
21+
user.signingKey::
22+
If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the
23+
key you want it to automatically when creating a signed tag or
24+
commit, you can override the default selection with this variable.
25+
This option is passed unchanged to gpg's --local-user parameter,
26+
so you may specify a key using any method that gpg supports.

0 commit comments

Comments
 (0)