зеркало из https://github.com/microsoft/git.git
Merge branch 'nd/config-doc-camelCase'
Documentation updates. * nd/config-doc-camelCase: *config.txt: stick to camelCase naming convention
This commit is contained in:
Коммит
aa65b86025
|
@ -526,7 +526,7 @@ Writing Documentation:
|
|||
`backticks around word phrases`, do so.
|
||||
`--pretty=oneline`
|
||||
`git rev-list`
|
||||
`remote.pushdefault`
|
||||
`remote.pushDefault`
|
||||
|
||||
Word phrases enclosed in `backtick characters` are rendered literally
|
||||
and will not be further expanded. The use of `backticks` to achieve the
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
--root::
|
||||
Do not treat root commits as boundaries. This can also be
|
||||
controlled via the `blame.showroot` config option.
|
||||
controlled via the `blame.showRoot` config option.
|
||||
|
||||
--show-stats::
|
||||
Include additional statistics at the end of blame output.
|
||||
|
|
|
@ -269,7 +269,7 @@ See linkgit:git-update-index[1].
|
|||
+
|
||||
The default is true (when core.filemode is not specified in the config file).
|
||||
|
||||
core.ignorecase::
|
||||
core.ignoreCase::
|
||||
If true, this option enables various workarounds to enable
|
||||
Git to work better on filesystems that are not case sensitive,
|
||||
like FAT. For example, if a directory listing finds
|
||||
|
@ -278,12 +278,12 @@ core.ignorecase::
|
|||
"Makefile".
|
||||
+
|
||||
The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
|
||||
will probe and set core.ignorecase true if appropriate when the repository
|
||||
will probe and set core.ignoreCase true if appropriate when the repository
|
||||
is created.
|
||||
|
||||
core.precomposeunicode::
|
||||
core.precomposeUnicode::
|
||||
This option is only used by Mac OS implementation of Git.
|
||||
When core.precomposeunicode=true, Git reverts the unicode decomposition
|
||||
When core.precomposeUnicode=true, Git reverts the unicode decomposition
|
||||
of filenames done by Mac OS. This is useful when sharing a repository
|
||||
between Mac OS and Linux or Windows.
|
||||
(Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7).
|
||||
|
@ -308,13 +308,13 @@ core.trustctime::
|
|||
crawlers and some backup systems).
|
||||
See linkgit:git-update-index[1]. True by default.
|
||||
|
||||
core.checkstat::
|
||||
core.checkStat::
|
||||
Determines which stat fields to match between the index
|
||||
and work tree. The user can set this to 'default' or
|
||||
'minimal'. Default (or explicitly 'default'), is to check
|
||||
all fields, including the sub-second part of mtime and ctime.
|
||||
|
||||
core.quotepath::
|
||||
core.quotePath::
|
||||
The commands that output paths (e.g. 'ls-files',
|
||||
'diff'), when not given the `-z` option, will quote
|
||||
"unusual" characters in the pathname by enclosing the
|
||||
|
@ -518,9 +518,9 @@ core.compression::
|
|||
-1 is the zlib default. 0 means no compression,
|
||||
and 1..9 are various speed/size tradeoffs, 9 being slowest.
|
||||
If set, this provides a default to other compression variables,
|
||||
such as 'core.loosecompression' and 'pack.compression'.
|
||||
such as 'core.looseCompression' and 'pack.compression'.
|
||||
|
||||
core.loosecompression::
|
||||
core.looseCompression::
|
||||
An integer -1..9, indicating the compression level for objects that
|
||||
are not in a pack file. -1 is the zlib default. 0 means no
|
||||
compression, and 1..9 are various speed/size tradeoffs, 9 being
|
||||
|
@ -581,7 +581,7 @@ be delta compressed, but larger binary media files won't be.
|
|||
+
|
||||
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
||||
|
||||
core.excludesfile::
|
||||
core.excludesFile::
|
||||
In addition to '.gitignore' (per-directory) and
|
||||
'.git/info/exclude', Git looks into this file for patterns
|
||||
of files which are not meant to be tracked. "`~/`" is expanded
|
||||
|
@ -590,7 +590,7 @@ core.excludesfile::
|
|||
If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore
|
||||
is used instead. See linkgit:gitignore[5].
|
||||
|
||||
core.askpass::
|
||||
core.askPass::
|
||||
Some commands (e.g. svn and http interfaces) that interactively
|
||||
ask for a password can be told to use an external program given
|
||||
via the value of this variable. Can be overridden by the 'GIT_ASKPASS'
|
||||
|
@ -599,11 +599,11 @@ core.askpass::
|
|||
prompt. The external program shall be given a suitable prompt as
|
||||
command-line argument and write the password on its STDOUT.
|
||||
|
||||
core.attributesfile::
|
||||
core.attributesFile::
|
||||
In addition to '.gitattributes' (per-directory) and
|
||||
'.git/info/attributes', Git looks into this file for attributes
|
||||
(see linkgit:gitattributes[5]). Path expansions are made the same
|
||||
way as for `core.excludesfile`. Its default value is
|
||||
way as for `core.excludesFile`. Its default value is
|
||||
$XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
|
||||
set or empty, $HOME/.config/git/attributes is used instead.
|
||||
|
||||
|
@ -613,7 +613,7 @@ core.editor::
|
|||
variable when it is set, and the environment variable
|
||||
`GIT_EDITOR` is not set. See linkgit:git-var[1].
|
||||
|
||||
core.commentchar::
|
||||
core.commentChar::
|
||||
Commands such as `commit` and `tag` that lets you edit
|
||||
messages consider a line that begins with this character
|
||||
commented, and removes them after the editor returns
|
||||
|
@ -682,7 +682,7 @@ core.whitespace::
|
|||
is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`
|
||||
errors. The default tab width is 8. Allowed values are 1 to 63.
|
||||
|
||||
core.fsyncobjectfiles::
|
||||
core.fsyncObjectFiles::
|
||||
This boolean will enable 'fsync()' when writing object files.
|
||||
+
|
||||
This is a total waste of time and effort on a filesystem that orders
|
||||
|
@ -690,7 +690,7 @@ data writes properly, but can be useful for filesystems that do not use
|
|||
journalling (traditional UNIX filesystems) or that only journal metadata
|
||||
and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
|
||||
|
||||
core.preloadindex::
|
||||
core.preloadIndex::
|
||||
Enable parallel index preload for operations like 'git diff'
|
||||
+
|
||||
This can speed up operations like 'git diff' and 'git status' especially
|
||||
|
@ -761,7 +761,7 @@ am.keepcr::
|
|||
by giving '--no-keep-cr' from the command line.
|
||||
See linkgit:git-am[1], linkgit:git-mailsplit[1].
|
||||
|
||||
apply.ignorewhitespace::
|
||||
apply.ignoreWhitespace::
|
||||
When set to 'change', tells 'git apply' to ignore changes in
|
||||
whitespace, in the same way as the '--ignore-space-change'
|
||||
option.
|
||||
|
@ -773,7 +773,7 @@ apply.whitespace::
|
|||
Tells 'git apply' how to handle whitespaces, in the same way
|
||||
as the '--whitespace' option. See linkgit:git-apply[1].
|
||||
|
||||
branch.autosetupmerge::
|
||||
branch.autoSetupMerge::
|
||||
Tells 'git branch' and 'git checkout' to set up new branches
|
||||
so that linkgit:git-pull[1] will appropriately merge from the
|
||||
starting point branch. Note that even if this option is not set,
|
||||
|
@ -785,7 +785,7 @@ branch.autosetupmerge::
|
|||
local branch or remote-tracking
|
||||
branch. This option defaults to true.
|
||||
|
||||
branch.autosetuprebase::
|
||||
branch.autoSetupRebase::
|
||||
When a new branch is created with 'git branch' or 'git checkout'
|
||||
that tracks another branch, this variable tells Git to set
|
||||
up pull to rebase instead of merge (see "branch.<name>.rebase").
|
||||
|
@ -796,27 +796,27 @@ branch.autosetuprebase::
|
|||
remote-tracking branches.
|
||||
When `always`, rebase will be set to true for all tracking
|
||||
branches.
|
||||
See "branch.autosetupmerge" for details on how to set up a
|
||||
See "branch.autoSetupMerge" for details on how to set up a
|
||||
branch to track another branch.
|
||||
This option defaults to never.
|
||||
|
||||
branch.<name>.remote::
|
||||
When on branch <name>, it tells 'git fetch' and 'git push'
|
||||
which remote to fetch from/push to. The remote to push to
|
||||
may be overridden with `remote.pushdefault` (for all branches).
|
||||
may be overridden with `remote.pushDefault` (for all branches).
|
||||
The remote to push to, for the current branch, may be further
|
||||
overridden by `branch.<name>.pushremote`. If no remote is
|
||||
overridden by `branch.<name>.pushRemote`. If no remote is
|
||||
configured, or if you are not on any branch, it defaults to
|
||||
`origin` for fetching and `remote.pushdefault` for pushing.
|
||||
`origin` for fetching and `remote.pushDefault` for pushing.
|
||||
Additionally, `.` (a period) is the current local repository
|
||||
(a dot-repository), see `branch.<name>.merge`'s final note below.
|
||||
|
||||
branch.<name>.pushremote::
|
||||
branch.<name>.pushRemote::
|
||||
When on branch <name>, it overrides `branch.<name>.remote` for
|
||||
pushing. It also overrides `remote.pushdefault` for pushing
|
||||
pushing. It also overrides `remote.pushDefault` for pushing
|
||||
from branch <name>. When you pull from one place (e.g. your
|
||||
upstream) and push to another place (e.g. your own publishing
|
||||
repository), you would want to set `remote.pushdefault` to
|
||||
repository), you would want to set `remote.pushDefault` to
|
||||
specify the remote to push to for all branches, and use this
|
||||
option to override it for a specific branch.
|
||||
|
||||
|
@ -838,7 +838,7 @@ branch.<name>.merge::
|
|||
branch.<name>.merge to the desired branch, and use the relative path
|
||||
setting `.` (a period) for branch.<name>.remote.
|
||||
|
||||
branch.<name>.mergeoptions::
|
||||
branch.<name>.mergeOptions::
|
||||
Sets default options for merging into branch <name>. The syntax and
|
||||
supported options are the same as those of linkgit:git-merge[1], but
|
||||
option values containing whitespace characters are currently not
|
||||
|
@ -964,7 +964,7 @@ color.pager::
|
|||
A boolean to enable/disable colored output when the pager is in
|
||||
use (default is true).
|
||||
|
||||
color.showbranch::
|
||||
color.showBranch::
|
||||
A boolean to enable/disable color in the output of
|
||||
linkgit:git-show-branch[1]. May be set to `always`,
|
||||
`false` (or `never`) or `auto` (or `true`), in which case colors are used
|
||||
|
@ -1064,7 +1064,7 @@ commit.cleanup::
|
|||
have to remove the help lines that begin with `#` in the commit log
|
||||
template yourself, if you do this).
|
||||
|
||||
commit.gpgsign::
|
||||
commit.gpgSign::
|
||||
|
||||
A boolean to specify whether all commits should be GPG signed.
|
||||
Use of this option when doing operations such as rebase can
|
||||
|
@ -1177,7 +1177,7 @@ format.cc::
|
|||
by mail. See the --to and --cc options in
|
||||
linkgit:git-format-patch[1].
|
||||
|
||||
format.subjectprefix::
|
||||
format.subjectPrefix::
|
||||
The default for format-patch is to output files with the '[PATCH]'
|
||||
subject prefix. Use this variable to change that prefix.
|
||||
|
||||
|
@ -1187,7 +1187,7 @@ format.signature::
|
|||
Set this variable to the empty string ("") to suppress
|
||||
signature generation.
|
||||
|
||||
format.signaturefile::
|
||||
format.signatureFile::
|
||||
Works just like format.signature except the contents of the
|
||||
file specified by this variable will be used as the signature.
|
||||
|
||||
|
@ -1211,7 +1211,7 @@ format.thread::
|
|||
A true boolean value is the same as `shallow`, and a false
|
||||
value disables threading.
|
||||
|
||||
format.signoff::
|
||||
format.signOff::
|
||||
A boolean value which lets you enable the `-s/--signoff` option of
|
||||
format-patch by default. *Note:* Adding the Signed-off-by: line to a
|
||||
patch should be a conscious act and means that you certify you have
|
||||
|
@ -1250,17 +1250,17 @@ gc.auto::
|
|||
light-weight garbage collection from time to time. The
|
||||
default value is 6700. Setting this to 0 disables it.
|
||||
|
||||
gc.autopacklimit::
|
||||
gc.autoPackLimit::
|
||||
When there are more than this many packs that are not
|
||||
marked with `*.keep` file in the repository, `git gc
|
||||
--auto` consolidates them into one larger pack. The
|
||||
default value is 50. Setting this to 0 disables it.
|
||||
|
||||
gc.autodetach::
|
||||
gc.autoDetach::
|
||||
Make `git gc --auto` return immediately and run in background
|
||||
if the system supports it. Default is true.
|
||||
|
||||
gc.packrefs::
|
||||
gc.packRefs::
|
||||
Running `git pack-refs` in a repository renders it
|
||||
unclonable by Git versions prior to 1.5.1.2 over dumb
|
||||
transports such as HTTP. This variable determines whether
|
||||
|
@ -1268,38 +1268,38 @@ gc.packrefs::
|
|||
to enable it within all non-bare repos or it can be set to a
|
||||
boolean value. The default is `true`.
|
||||
|
||||
gc.pruneexpire::
|
||||
gc.pruneExpire::
|
||||
When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
|
||||
Override the grace period with this config variable. The value
|
||||
"now" may be used to disable this grace period and always prune
|
||||
unreachable objects immediately.
|
||||
|
||||
gc.reflogexpire::
|
||||
gc.<pattern>.reflogexpire::
|
||||
gc.reflogExpire::
|
||||
gc.<pattern>.reflogExpire::
|
||||
'git reflog expire' removes reflog entries older than
|
||||
this time; defaults to 90 days. With "<pattern>" (e.g.
|
||||
"refs/stash") in the middle the setting applies only to
|
||||
the refs that match the <pattern>.
|
||||
|
||||
gc.reflogexpireunreachable::
|
||||
gc.<ref>.reflogexpireunreachable::
|
||||
gc.reflogExpireUnreachable::
|
||||
gc.<ref>.reflogExpireUnreachable::
|
||||
'git reflog expire' removes reflog entries older than
|
||||
this time and are not reachable from the current tip;
|
||||
defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
|
||||
in the middle, the setting applies only to the refs that
|
||||
match the <pattern>.
|
||||
|
||||
gc.rerereresolved::
|
||||
gc.rerereResolved::
|
||||
Records of conflicted merge you resolved earlier are
|
||||
kept for this many days when 'git rerere gc' is run.
|
||||
The default is 60 days. See linkgit:git-rerere[1].
|
||||
|
||||
gc.rerereunresolved::
|
||||
gc.rerereUnresolved::
|
||||
Records of conflicted merge you have not resolved are
|
||||
kept for this many days when 'git rerere gc' is run.
|
||||
The default is 15 days. See linkgit:git-rerere[1].
|
||||
|
||||
gitcvs.commitmsgannotation::
|
||||
gitcvs.commitMsgAnnotation::
|
||||
Append this string to each commit message. Set to empty string
|
||||
to disable this feature. Defaults to "via git-CVS emulator".
|
||||
|
||||
|
@ -1307,7 +1307,7 @@ gitcvs.enabled::
|
|||
Whether the CVS server interface is enabled for this repository.
|
||||
See linkgit:git-cvsserver[1].
|
||||
|
||||
gitcvs.logfile::
|
||||
gitcvs.logFile::
|
||||
Path to a log file where the CVS server interface well... logs
|
||||
various stuff. See linkgit:git-cvsserver[1].
|
||||
|
||||
|
@ -1319,10 +1319,10 @@ gitcvs.usecrlfattr::
|
|||
treat it as text. If they suppress text conversion, the file
|
||||
will be set with '-kb' mode, which suppresses any newline munging
|
||||
the client might otherwise do. If the attributes do not allow
|
||||
the file type to be determined, then 'gitcvs.allbinary' is
|
||||
the file type to be determined, then 'gitcvs.allBinary' is
|
||||
used. See linkgit:gitattributes[5].
|
||||
|
||||
gitcvs.allbinary::
|
||||
gitcvs.allBinary::
|
||||
This is used if 'gitcvs.usecrlfattr' does not resolve
|
||||
the correct '-kb' mode to use. If true, all
|
||||
unresolved files are sent to the client in
|
||||
|
@ -1332,7 +1332,7 @@ gitcvs.allbinary::
|
|||
then the contents of the file are examined to decide if
|
||||
it is binary, similar to 'core.autocrlf'.
|
||||
|
||||
gitcvs.dbname::
|
||||
gitcvs.dbName::
|
||||
Database used by git-cvsserver to cache revision information
|
||||
derived from the Git repository. The exact meaning depends on the
|
||||
used database driver, for SQLite (which is the default driver) this
|
||||
|
@ -1340,7 +1340,7 @@ gitcvs.dbname::
|
|||
linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
|
||||
Default: '%Ggitcvs.%m.sqlite'
|
||||
|
||||
gitcvs.dbdriver::
|
||||
gitcvs.dbDriver::
|
||||
Used Perl DBI driver. You can specify any available driver
|
||||
for this here, but it might not work. git-cvsserver is tested
|
||||
with 'DBD::SQLite', reported to work with 'DBD::Pg', and
|
||||
|
@ -1348,10 +1348,10 @@ gitcvs.dbdriver::
|
|||
May not contain double colons (`:`). Default: 'SQLite'.
|
||||
See linkgit:git-cvsserver[1].
|
||||
|
||||
gitcvs.dbuser, gitcvs.dbpass::
|
||||
Database user and password. Only useful if setting 'gitcvs.dbdriver',
|
||||
gitcvs.dbUser, gitcvs.dbPass::
|
||||
Database user and password. Only useful if setting 'gitcvs.dbDriver',
|
||||
since SQLite has no concept of database users and/or passwords.
|
||||
'gitcvs.dbuser' supports variable substitution (see
|
||||
'gitcvs.dbUser' supports variable substitution (see
|
||||
linkgit:git-cvsserver[1] for details).
|
||||
|
||||
gitcvs.dbTableNamePrefix::
|
||||
|
@ -1362,7 +1362,7 @@ gitcvs.dbTableNamePrefix::
|
|||
characters will be replaced with underscores.
|
||||
|
||||
All gitcvs variables except for 'gitcvs.usecrlfattr' and
|
||||
'gitcvs.allbinary' can also be specified as
|
||||
'gitcvs.allBinary' can also be specified as
|
||||
'gitcvs.<access_method>.<varname>' (where 'access_method'
|
||||
is one of "ext" and "pserver") to make them apply only for the given
|
||||
access method.
|
||||
|
@ -1380,7 +1380,7 @@ gitweb.highlight::
|
|||
gitweb.patches::
|
||||
gitweb.pickaxe::
|
||||
gitweb.remote_heads::
|
||||
gitweb.showsizes::
|
||||
gitweb.showSizes::
|
||||
gitweb.snapshot::
|
||||
See linkgit:gitweb.conf[5] for description.
|
||||
|
||||
|
@ -1409,15 +1409,15 @@ gpg.program::
|
|||
signed, and the program is expected to send the result to its
|
||||
standard output.
|
||||
|
||||
gui.commitmsgwidth::
|
||||
gui.commitMsgWidth::
|
||||
Defines how wide the commit message window is in the
|
||||
linkgit:git-gui[1]. "75" is the default.
|
||||
|
||||
gui.diffcontext::
|
||||
gui.diffContext::
|
||||
Specifies how many context lines should be used in calls to diff
|
||||
made by the linkgit:git-gui[1]. The default is "5".
|
||||
|
||||
gui.displayuntracked::
|
||||
gui.displayUntracked::
|
||||
Determines if linkgit::git-gui[1] shows untracked files
|
||||
in the file list. The default is "true".
|
||||
|
||||
|
@ -1429,16 +1429,16 @@ gui.encoding::
|
|||
If this option is not set, the tools default to the
|
||||
locale encoding.
|
||||
|
||||
gui.matchtrackingbranch::
|
||||
gui.matchTrackingBranch::
|
||||
Determines if new branches created with linkgit:git-gui[1] should
|
||||
default to tracking remote branches with matching names or
|
||||
not. Default: "false".
|
||||
|
||||
gui.newbranchtemplate::
|
||||
gui.newBranchTemplate::
|
||||
Is used as suggested name when creating new branches using the
|
||||
linkgit:git-gui[1].
|
||||
|
||||
gui.pruneduringfetch::
|
||||
gui.pruneDuringFetch::
|
||||
"true" if linkgit:git-gui[1] should prune remote-tracking branches when
|
||||
performing a fetch. The default value is "false".
|
||||
|
||||
|
@ -1446,17 +1446,17 @@ gui.trustmtime::
|
|||
Determines if linkgit:git-gui[1] should trust the file modification
|
||||
timestamp or not. By default the timestamps are not trusted.
|
||||
|
||||
gui.spellingdictionary::
|
||||
gui.spellingDictionary::
|
||||
Specifies the dictionary used for spell checking commit messages in
|
||||
the linkgit:git-gui[1]. When set to "none" spell checking is turned
|
||||
off.
|
||||
|
||||
gui.fastcopyblame::
|
||||
gui.fastCopyBlame::
|
||||
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
|
||||
location detection. It makes blame significantly faster on huge
|
||||
repositories at the expense of less thorough copy detection.
|
||||
|
||||
gui.copyblamethreshold::
|
||||
gui.copyBlameThreshold::
|
||||
Specifies the threshold to use in 'git gui blame' original location
|
||||
detection, measured in alphanumeric characters. See the
|
||||
linkgit:git-blame[1] manual for more information on copy detection.
|
||||
|
@ -1476,22 +1476,22 @@ guitool.<name>.cmd::
|
|||
'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
|
||||
the head is detached, 'CUR_BRANCH' is empty).
|
||||
|
||||
guitool.<name>.needsfile::
|
||||
guitool.<name>.needsFile::
|
||||
Run the tool only if a diff is selected in the GUI. It guarantees
|
||||
that 'FILENAME' is not empty.
|
||||
|
||||
guitool.<name>.noconsole::
|
||||
guitool.<name>.noConsole::
|
||||
Run the command silently, without creating a window to display its
|
||||
output.
|
||||
|
||||
guitool.<name>.norescan::
|
||||
guitool.<name>.noRescan::
|
||||
Don't rescan the working directory for changes after the tool
|
||||
finishes execution.
|
||||
|
||||
guitool.<name>.confirm::
|
||||
Show a confirmation dialog before actually running the tool.
|
||||
|
||||
guitool.<name>.argprompt::
|
||||
guitool.<name>.argPrompt::
|
||||
Request a string argument from the user, and pass it to the tool
|
||||
through the 'ARGS' environment variable. Since requesting an
|
||||
argument implies confirmation, the 'confirm' option has no effect
|
||||
|
@ -1499,13 +1499,13 @@ guitool.<name>.argprompt::
|
|||
the dialog uses a built-in generic prompt; otherwise the exact
|
||||
value of the variable is used.
|
||||
|
||||
guitool.<name>.revprompt::
|
||||
guitool.<name>.revPrompt::
|
||||
Request a single valid revision from the user, and set the
|
||||
'REVISION' environment variable. In other aspects this option
|
||||
is similar to 'argprompt', and can be used together with it.
|
||||
is similar to 'argPrompt', and can be used together with it.
|
||||
|
||||
guitool.<name>.revunmerged::
|
||||
Show only unmerged branches in the 'revprompt' subdialog.
|
||||
guitool.<name>.revUnmerged::
|
||||
Show only unmerged branches in the 'revPrompt' subdialog.
|
||||
This is useful for tools similar to merge or rebase, but not
|
||||
for things like checkout or reset.
|
||||
|
||||
|
@ -1515,7 +1515,7 @@ guitool.<name>.title::
|
|||
|
||||
guitool.<name>.prompt::
|
||||
Specifies the general prompt string to display at the top of
|
||||
the dialog, before subsections for 'argprompt' and 'revprompt'.
|
||||
the dialog, before subsections for 'argPrompt' and 'revPrompt'.
|
||||
The default value includes the actual command.
|
||||
|
||||
help.browser::
|
||||
|
@ -1527,7 +1527,7 @@ help.format::
|
|||
Values 'man', 'info', 'web' and 'html' are supported. 'man' is
|
||||
the default. 'web' and 'html' are the same.
|
||||
|
||||
help.autocorrect::
|
||||
help.autoCorrect::
|
||||
Automatically correct and execute mistyped commands after
|
||||
waiting for the given number of deciseconds (0.1 sec). If more
|
||||
than one command can be deduced from the entered text, nothing
|
||||
|
@ -1536,7 +1536,7 @@ help.autocorrect::
|
|||
value is 0 - the command will be just shown but not executed.
|
||||
This is the default.
|
||||
|
||||
help.htmlpath::
|
||||
help.htmlPath::
|
||||
Specify the path where the HTML documentation resides. File system paths
|
||||
and URLs are supported. HTML pages will be prefixed with this path when
|
||||
help is displayed in the 'web' format. This defaults to the documentation
|
||||
|
@ -1548,17 +1548,17 @@ http.proxy::
|
|||
`curl(1)`). This can be overridden on a per-remote basis; see
|
||||
remote.<name>.proxy
|
||||
|
||||
http.cookiefile::
|
||||
http.cookieFile::
|
||||
File containing previously stored cookie lines which should be used
|
||||
in the Git http session, if they match the server. The file format
|
||||
of the file to read cookies from should be plain HTTP headers or
|
||||
the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
|
||||
NOTE that the file specified with http.cookiefile is only used as
|
||||
NOTE that the file specified with http.cookieFile is only used as
|
||||
input unless http.saveCookies is set.
|
||||
|
||||
http.savecookies::
|
||||
http.saveCookies::
|
||||
If set, store cookies received during requests to the file specified by
|
||||
http.cookiefile. Has no effect if http.cookiefile is unset.
|
||||
http.cookieFile. Has no effect if http.cookieFile is unset.
|
||||
|
||||
http.sslVerify::
|
||||
Whether to verify the SSL certificate when fetching or pushing
|
||||
|
@ -1629,7 +1629,7 @@ http.noEPSV::
|
|||
support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
|
||||
environment variable. Default is false (curl will use EPSV).
|
||||
|
||||
http.useragent::
|
||||
http.userAgent::
|
||||
The HTTP USER_AGENT string presented to an HTTP server. The default
|
||||
value represents the version of the client Git such as git/1.7.1.
|
||||
This option allows you to override this value to a more common value
|
||||
|
@ -1702,7 +1702,7 @@ index.version::
|
|||
Specify the version with which new index files should be
|
||||
initialized. This does not affect existing repositories.
|
||||
|
||||
init.templatedir::
|
||||
init.templateDir::
|
||||
Specify the directory from which templates will be copied.
|
||||
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
|
||||
|
||||
|
@ -1718,7 +1718,7 @@ instaweb.local::
|
|||
If true the web server started by linkgit:git-instaweb[1] will
|
||||
be bound to the local IP (127.0.0.1).
|
||||
|
||||
instaweb.modulepath::
|
||||
instaweb.modulePath::
|
||||
The default module path for linkgit:git-instaweb[1] to use
|
||||
instead of /usr/lib/apache2/modules. Only used if httpd
|
||||
is Apache.
|
||||
|
@ -1727,7 +1727,7 @@ instaweb.port::
|
|||
The port number to bind the gitweb httpd to. See
|
||||
linkgit:git-instaweb[1].
|
||||
|
||||
interactive.singlekey::
|
||||
interactive.singleKey::
|
||||
In interactive commands, allow the user to provide one-letter
|
||||
input with a single key (i.e., without hitting enter).
|
||||
Currently this is used by the `--patch` mode of
|
||||
|
@ -1755,7 +1755,7 @@ log.decorate::
|
|||
specified, the full ref name (including prefix) will be printed.
|
||||
This is the same as the log commands '--decorate' option.
|
||||
|
||||
log.showroot::
|
||||
log.showRoot::
|
||||
If true, the initial commit will be shown as a big creation event.
|
||||
This is equivalent to a diff against an empty tree.
|
||||
Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
|
||||
|
@ -1992,7 +1992,7 @@ pack.useBitmaps::
|
|||
true. You should not generally need to turn this off unless
|
||||
you are debugging pack bitmaps.
|
||||
|
||||
pack.writebitmaps (deprecated)::
|
||||
pack.writeBitmaps (deprecated)::
|
||||
This is a deprecated synonym for `repack.writeBitmaps`.
|
||||
|
||||
pack.writeBitmapHashCache::
|
||||
|
@ -2115,10 +2115,10 @@ rebase.stat::
|
|||
Whether to show a diffstat of what changed upstream since the last
|
||||
rebase. False by default.
|
||||
|
||||
rebase.autosquash::
|
||||
rebase.autoSquash::
|
||||
If set to true enable '--autosquash' option by default.
|
||||
|
||||
rebase.autostash::
|
||||
rebase.autoStash::
|
||||
When set to true, automatically create a temporary stash
|
||||
before the operation begins, and apply it after the operation
|
||||
ends. This means that you can run rebase on a dirty worktree.
|
||||
|
@ -2126,7 +2126,7 @@ rebase.autostash::
|
|||
successful rebase might result in non-trivial conflicts.
|
||||
Defaults to false.
|
||||
|
||||
receive.advertiseatomic::
|
||||
receive.advertiseAtomic::
|
||||
By default, git-receive-pack will advertise the atomic push
|
||||
capability to its clients. If you don't want to this capability
|
||||
to be advertised, set this variable to false.
|
||||
|
@ -2136,13 +2136,13 @@ receive.autogc::
|
|||
receiving data from git-push and updating refs. You can stop
|
||||
it by setting this variable to false.
|
||||
|
||||
receive.certnonceseed::
|
||||
receive.certNonceSeed::
|
||||
By setting this variable to a string, `git receive-pack`
|
||||
will accept a `git push --signed` and verifies it by using
|
||||
a "nonce" protected by HMAC using this string as a secret
|
||||
key.
|
||||
|
||||
receive.certnonceslop::
|
||||
receive.certNonceSlop::
|
||||
When a `git push --signed` sent a push certificate with a
|
||||
"nonce" that was issued by a receive-pack serving the same
|
||||
repository within this many seconds, export the "nonce"
|
||||
|
@ -2206,7 +2206,7 @@ receive.denyNonFastForwards::
|
|||
even if that push is forced. This configuration variable is
|
||||
set when initializing a shared repository.
|
||||
|
||||
receive.hiderefs::
|
||||
receive.hideRefs::
|
||||
String(s) `receive-pack` uses to decide which refs to omit
|
||||
from its initial advertisement. Use more than one
|
||||
definitions to specify multiple prefix strings. A ref that
|
||||
|
@ -2215,18 +2215,18 @@ receive.hiderefs::
|
|||
push`, and an attempt to update or delete a hidden ref by
|
||||
`git push` is rejected.
|
||||
|
||||
receive.updateserverinfo::
|
||||
receive.updateServerInfo::
|
||||
If set to true, git-receive-pack will run git-update-server-info
|
||||
after receiving data from git-push and updating refs.
|
||||
|
||||
receive.shallowupdate::
|
||||
receive.shallowUpdate::
|
||||
If set to true, .git/shallow can be updated when new refs
|
||||
require new shallow roots. Otherwise those refs are rejected.
|
||||
|
||||
remote.pushdefault::
|
||||
remote.pushDefault::
|
||||
The remote to push to by default. Overrides
|
||||
`branch.<name>.remote` for all branches, and is overridden by
|
||||
`branch.<name>.pushremote` for specific branches.
|
||||
`branch.<name>.pushRemote` for specific branches.
|
||||
|
||||
remote.<name>.url::
|
||||
The URL of a remote repository. See linkgit:git-fetch[1] or
|
||||
|
@ -2270,7 +2270,7 @@ remote.<name>.uploadpack::
|
|||
The default program to execute on the remote side when fetching. See
|
||||
option \--upload-pack of linkgit:git-fetch-pack[1].
|
||||
|
||||
remote.<name>.tagopt::
|
||||
remote.<name>.tagOpt::
|
||||
Setting this value to \--no-tags disables automatic tag following when
|
||||
fetching from remote <name>. Setting it to \--tags will fetch every
|
||||
tag from remote <name>, even if they are not reachable from remote
|
||||
|
@ -2292,7 +2292,7 @@ remotes.<group>::
|
|||
The list of remotes which are fetched by "git remote update
|
||||
<group>". See linkgit:git-remote[1].
|
||||
|
||||
repack.usedeltabaseoffset::
|
||||
repack.useDeltaBaseOffset::
|
||||
By default, linkgit:git-repack[1] creates packs that use
|
||||
delta-base offset. If you need to share your repository with
|
||||
Git older than version 1.4.4, either directly or via a dumb
|
||||
|
@ -2315,7 +2315,7 @@ repack.writeBitmaps::
|
|||
space and extra time spent on the initial repack. Defaults to
|
||||
false.
|
||||
|
||||
rerere.autoupdate::
|
||||
rerere.autoUpdate::
|
||||
When set to true, `git-rerere` updates the index with the
|
||||
resulting contents after it cleanly resolves conflicts using
|
||||
previously recorded resolution. Defaults to false.
|
||||
|
@ -2334,12 +2334,12 @@ sendemail.identity::
|
|||
values in the 'sendemail' section. The default identity is
|
||||
the value of 'sendemail.identity'.
|
||||
|
||||
sendemail.smtpencryption::
|
||||
sendemail.smtpEncryption::
|
||||
See linkgit:git-send-email[1] for description. Note that this
|
||||
setting is not subject to the 'identity' mechanism.
|
||||
|
||||
sendemail.smtpssl (deprecated)::
|
||||
Deprecated alias for 'sendemail.smtpencryption = ssl'.
|
||||
Deprecated alias for 'sendemail.smtpEncryption = ssl'.
|
||||
|
||||
sendemail.smtpsslcertpath::
|
||||
Path to ca-certificates (either a directory or a single file).
|
||||
|
@ -2351,29 +2351,29 @@ sendemail.<identity>.*::
|
|||
identity is selected, through command-line or
|
||||
'sendemail.identity'.
|
||||
|
||||
sendemail.aliasesfile::
|
||||
sendemail.aliasfiletype::
|
||||
sendemail.aliasesFile::
|
||||
sendemail.aliasFileType::
|
||||
sendemail.annotate::
|
||||
sendemail.bcc::
|
||||
sendemail.cc::
|
||||
sendemail.cccmd::
|
||||
sendemail.chainreplyto::
|
||||
sendemail.ccCmd::
|
||||
sendemail.chainReplyTo::
|
||||
sendemail.confirm::
|
||||
sendemail.envelopesender::
|
||||
sendemail.envelopeSender::
|
||||
sendemail.from::
|
||||
sendemail.multiedit::
|
||||
sendemail.multiEdit::
|
||||
sendemail.signedoffbycc::
|
||||
sendemail.smtppass::
|
||||
sendemail.smtpPass::
|
||||
sendemail.suppresscc::
|
||||
sendemail.suppressfrom::
|
||||
sendemail.suppressFrom::
|
||||
sendemail.to::
|
||||
sendemail.smtpdomain::
|
||||
sendemail.smtpserver::
|
||||
sendemail.smtpserverport::
|
||||
sendemail.smtpserveroption::
|
||||
sendemail.smtpuser::
|
||||
sendemail.smtpDomain::
|
||||
sendemail.smtpServer::
|
||||
sendemail.smtpServerPort::
|
||||
sendemail.smtpServerOption::
|
||||
sendemail.smtpUser::
|
||||
sendemail.thread::
|
||||
sendemail.transferencoding::
|
||||
sendemail.transferEncoding::
|
||||
sendemail.validate::
|
||||
sendemail.xmailer::
|
||||
See linkgit:git-send-email[1] for description.
|
||||
|
@ -2425,7 +2425,7 @@ If this variable is not specified, it defaults to 'normal'.
|
|||
This variable can be overridden with the -u|--untracked-files option
|
||||
of linkgit:git-status[1] and linkgit:git-commit[1].
|
||||
|
||||
status.submodulesummary::
|
||||
status.submoduleSummary::
|
||||
Defaults to false.
|
||||
If this is set to a non zero number or true (identical to -1 or an
|
||||
unlimited number), the submodule summary will be enabled and a
|
||||
|
@ -2500,9 +2500,9 @@ transfer.fsckObjects::
|
|||
not set, the value of this variable is used instead.
|
||||
Defaults to false.
|
||||
|
||||
transfer.hiderefs::
|
||||
This variable can be used to set both `receive.hiderefs`
|
||||
and `uploadpack.hiderefs` at the same time to the same
|
||||
transfer.hideRefs::
|
||||
This variable can be used to set both `receive.hideRefs`
|
||||
and `uploadpack.hideRefs` at the same time to the same
|
||||
values. See entries for these other variables.
|
||||
|
||||
transfer.unpackLimit::
|
||||
|
@ -2517,7 +2517,7 @@ uploadarchive.allowUnreachable::
|
|||
linkgit:git-upload-archive[1] for more details. Defaults to
|
||||
`false`.
|
||||
|
||||
uploadpack.hiderefs::
|
||||
uploadpack.hideRefs::
|
||||
String(s) `upload-pack` uses to decide which refs to omit
|
||||
from its initial advertisement. Use more than one
|
||||
definitions to specify multiple prefix strings. A ref that
|
||||
|
@ -2527,12 +2527,12 @@ uploadpack.hiderefs::
|
|||
fetch` will fail. See also `uploadpack.allowtipsha1inwant`.
|
||||
|
||||
uploadpack.allowtipsha1inwant::
|
||||
When `uploadpack.hiderefs` is in effect, allow `upload-pack`
|
||||
When `uploadpack.hideRefs` is in effect, allow `upload-pack`
|
||||
to accept a fetch request that asks for an object at the tip
|
||||
of a hidden ref (by default, such a request is rejected).
|
||||
see also `uploadpack.hiderefs`.
|
||||
see also `uploadpack.hideRefs`.
|
||||
|
||||
uploadpack.keepalive::
|
||||
uploadpack.keepAlive::
|
||||
When `upload-pack` has started `pack-objects`, there may be a
|
||||
quiet period while `pack-objects` prepares the pack. Normally
|
||||
it would output progress information, but if `--quiet` was used
|
||||
|
@ -2540,7 +2540,7 @@ uploadpack.keepalive::
|
|||
the pack data begins. Some clients and networks may consider
|
||||
the server to be hung and give up. Setting this option instructs
|
||||
`upload-pack` to send an empty keepalive packet every
|
||||
`uploadpack.keepalive` seconds. Setting this option to 0
|
||||
`uploadpack.keepAlive` seconds. Setting this option to 0
|
||||
disables keepalive packets entirely. The default is 5 seconds.
|
||||
|
||||
url.<base>.insteadOf::
|
||||
|
@ -2577,7 +2577,7 @@ user.name::
|
|||
Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
|
||||
environment variables. See linkgit:git-commit-tree[1].
|
||||
|
||||
user.signingkey::
|
||||
user.signingKey::
|
||||
If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the
|
||||
key you want it to automatically when creating a signed tag or
|
||||
commit, you can override the default selection with this variable.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
diff.autorefreshindex::
|
||||
diff.autoRefreshIndex::
|
||||
When using 'git diff' to compare with work tree
|
||||
files, do not consider stat-only change as changed.
|
||||
Instead, silently run `git update-index --refresh` to
|
||||
|
@ -75,11 +75,11 @@ diff.ignoreSubmodules::
|
|||
commands such as 'git diff-files'. 'git checkout' also honors
|
||||
this setting when reporting uncommitted changes. Setting it to
|
||||
'all' disables the submodule summary normally shown by 'git commit'
|
||||
and 'git status' when 'status.submodulesummary' is set unless it is
|
||||
and 'git status' when 'status.submoduleSummary' is set unless it is
|
||||
overridden by using the --ignore-submodules command-line option.
|
||||
The 'git submodule' commands are not affected by this setting.
|
||||
|
||||
diff.mnemonicprefix::
|
||||
diff.mnemonicPrefix::
|
||||
If set, 'git diff' uses a prefix pair that is different from the
|
||||
standard "a/" and "b/" depending on what is being compared. When
|
||||
this configuration is in effect, reverse diff output also swaps
|
||||
|
@ -98,7 +98,7 @@ diff.mnemonicprefix::
|
|||
diff.noprefix::
|
||||
If set, 'git diff' does not show any source or destination prefix.
|
||||
|
||||
diff.orderfile::
|
||||
diff.orderFile::
|
||||
File indicating how to order files within a diff, using
|
||||
one shell glob pattern per line.
|
||||
Can be overridden by the '-O' option to linkgit:git-diff[1].
|
||||
|
@ -148,7 +148,7 @@ diff.<driver>.textconv::
|
|||
conversion is used to generate a human-readable diff. See
|
||||
linkgit:gitattributes[5] for details.
|
||||
|
||||
diff.<driver>.wordregex::
|
||||
diff.<driver>.wordRegex::
|
||||
The regular expression that the diff driver should use to
|
||||
split words in a line. See linkgit:gitattributes[5] for
|
||||
details.
|
||||
|
|
|
@ -432,8 +432,8 @@ endif::git-format-patch[]
|
|||
-O<orderfile>::
|
||||
Output the patch in the order specified in the
|
||||
<orderfile>, which has one shell glob pattern per line.
|
||||
This overrides the `diff.orderfile` configuration variable
|
||||
(see linkgit:git-config[1]). To cancel `diff.orderfile`,
|
||||
This overrides the `diff.orderFile` configuration variable
|
||||
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
|
||||
use `-O/dev/null`.
|
||||
|
||||
ifndef::git-format-patch[]
|
||||
|
|
|
@ -68,7 +68,7 @@ endif::git-pull[]
|
|||
By default, tags that point at objects that are downloaded
|
||||
from the remote repository are fetched and stored locally.
|
||||
This option disables this automatic tag following. The default
|
||||
behavior for a remote may be specified with the remote.<name>.tagopt
|
||||
behavior for a remote may be specified with the remote.<name>.tagOpt
|
||||
setting. See linkgit:git-config[1].
|
||||
|
||||
ifndef::git-pull[]
|
||||
|
|
|
@ -173,7 +173,7 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
|
|||
Configuration
|
||||
-------------
|
||||
|
||||
The optional configuration variable `core.excludesfile` indicates a path to a
|
||||
The optional configuration variable `core.excludesFile` indicates a path to a
|
||||
file containing patterns of file names to exclude from git-add, similar to
|
||||
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
|
||||
those in info/exclude. See linkgit:gitignore[5].
|
||||
|
@ -317,7 +317,7 @@ After deciding the fate for all hunks, if there is any hunk
|
|||
that was chosen, the index is updated with the selected hunks.
|
||||
+
|
||||
You can omit having to type return here, by setting the configuration
|
||||
variable `interactive.singlekey` to `true`.
|
||||
variable `interactive.singleKey` to `true`.
|
||||
|
||||
diff::
|
||||
|
||||
|
|
|
@ -242,7 +242,7 @@ has no effect when `--index` or `--cached` is in use.
|
|||
Configuration
|
||||
-------------
|
||||
|
||||
apply.ignorewhitespace::
|
||||
apply.ignoreWhitespace::
|
||||
Set to 'change' if you want changes in whitespace to be ignored by default.
|
||||
Set to one of: no, none, never, false if you want changes in
|
||||
whitespace to be significant.
|
||||
|
|
|
@ -51,7 +51,7 @@ When a local branch is started off a remote-tracking branch, Git sets up the
|
|||
branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
|
||||
configuration entries) so that 'git pull' will appropriately merge from
|
||||
the remote-tracking branch. This behavior may be changed via the global
|
||||
`branch.autosetupmerge` configuration flag. That setting can be
|
||||
`branch.autoSetupMerge` configuration flag. That setting can be
|
||||
overridden by using the `--track` and `--no-track` options, and
|
||||
changed later using `git branch --set-upstream-to`.
|
||||
|
||||
|
@ -166,14 +166,14 @@ This option is only applicable in non-verbose mode.
|
|||
upstream when the new branch is checked out.
|
||||
+
|
||||
This behavior is the default when the start point is a remote-tracking branch.
|
||||
Set the branch.autosetupmerge configuration variable to `false` if you
|
||||
Set the branch.autoSetupMerge configuration variable to `false` if you
|
||||
want `git checkout` and `git branch` to always behave as if '--no-track'
|
||||
were given. Set it to `always` if you want this behavior when the
|
||||
start-point is either a local or remote-tracking branch.
|
||||
|
||||
--no-track::
|
||||
Do not set up "upstream" configuration, even if the
|
||||
branch.autosetupmerge configuration variable is true.
|
||||
branch.autoSetupMerge configuration variable is true.
|
||||
|
||||
--set-upstream::
|
||||
If specified branch does not exist yet or if `--force` has been
|
||||
|
|
|
@ -72,7 +72,7 @@ matching pattern, <source> is the pattern's source file, and <linenum>
|
|||
is the line number of the pattern within that source. If the pattern
|
||||
contained a `!` prefix or `/` suffix, it will be preserved in the
|
||||
output. <source> will be an absolute path when referring to the file
|
||||
configured by `core.excludesfile`, or relative to the repository root
|
||||
configured by `core.excludesFile`, or relative to the repository root
|
||||
when referring to `.git/info/exclude` or a per-directory exclude file.
|
||||
|
||||
If `-z` is specified, the pathnames in the output are delimited by the
|
||||
|
|
|
@ -144,7 +144,7 @@ explicitly give a name with '-b' in such a case.
|
|||
|
||||
--no-track::
|
||||
Do not set up "upstream" configuration, even if the
|
||||
branch.autosetupmerge configuration variable is true.
|
||||
branch.autoSetupMerge configuration variable is true.
|
||||
|
||||
-l::
|
||||
Create the new branch's reflog; see linkgit:git-branch[1] for
|
||||
|
@ -210,7 +210,7 @@ the conflicted merge in the specified paths.
|
|||
--conflict=<style>::
|
||||
The same as --merge option above, but changes the way the
|
||||
conflicting hunks are presented, overriding the
|
||||
merge.conflictstyle configuration variable. Possible values are
|
||||
merge.conflictStyle configuration variable. Possible values are
|
||||
"merge" (default) and "diff3" (in addition to what is shown by
|
||||
"merge" style, shows the original contents).
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ OPTIONS
|
|||
GPG-sign commit.
|
||||
|
||||
--no-gpg-sign::
|
||||
Countermand `commit.gpgsign` configuration variable that is
|
||||
Countermand `commit.gpgSign` configuration variable that is
|
||||
set to force each and every commit to be signed.
|
||||
|
||||
|
||||
|
|
|
@ -314,7 +314,7 @@ changes to tracked files.
|
|||
GPG-sign commit.
|
||||
|
||||
--no-gpg-sign::
|
||||
Countermand `commit.gpgsign` configuration variable that is
|
||||
Countermand `commit.gpgSign` configuration variable that is
|
||||
set to force each and every commit to be signed.
|
||||
|
||||
\--::
|
||||
|
|
|
@ -405,7 +405,7 @@ true
|
|||
% git config --bool --get-urlmatch http.sslverify https://weak.example.com
|
||||
false
|
||||
% git config --get-urlmatch http https://weak.example.com
|
||||
http.cookiefile /tmp/cookie.txt
|
||||
http.cookieFile /tmp/cookie.txt
|
||||
http.sslverify false
|
||||
------------
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean
|
|||
[gitcvs]
|
||||
enabled=1
|
||||
# optional for debugging
|
||||
logfile=/path/to/logfile
|
||||
logFile=/path/to/logfile
|
||||
|
||||
------
|
||||
Note: you need to ensure each user that is going to invoke 'git-cvsserver' has
|
||||
|
@ -254,14 +254,14 @@ Configuring database backend
|
|||
its documentation if changing these variables, especially
|
||||
about `DBI->connect()`.
|
||||
|
||||
gitcvs.dbname::
|
||||
gitcvs.dbName::
|
||||
Database name. The exact meaning depends on the
|
||||
selected database driver, for SQLite this is a filename.
|
||||
Supports variable substitution (see below). May
|
||||
not contain semicolons (`;`).
|
||||
Default: '%Ggitcvs.%m.sqlite'
|
||||
|
||||
gitcvs.dbdriver::
|
||||
gitcvs.dbDriver::
|
||||
Used DBI driver. You can specify any available driver
|
||||
for this here, but it might not work. cvsserver is tested
|
||||
with 'DBD::SQLite', reported to work with
|
||||
|
@ -271,12 +271,12 @@ gitcvs.dbdriver::
|
|||
Default: 'SQLite'
|
||||
|
||||
gitcvs.dbuser::
|
||||
Database user. Only useful if setting `dbdriver`, since
|
||||
Database user. Only useful if setting `dbDriver`, since
|
||||
SQLite has no concept of database users. Supports variable
|
||||
substitution (see below).
|
||||
|
||||
gitcvs.dbpass::
|
||||
Database password. Only useful if setting `dbdriver`, since
|
||||
gitcvs.dbPass::
|
||||
Database password. Only useful if setting `dbDriver`, since
|
||||
SQLite has no concept of database passwords.
|
||||
|
||||
gitcvs.dbTableNamePrefix::
|
||||
|
@ -288,7 +288,7 @@ All variables can also be set per access method, see <<configaccessmethod,above>
|
|||
|
||||
Variable substitution
|
||||
^^^^^^^^^^^^^^^^^^^^^
|
||||
In `dbdriver` and `dbuser` you can use the following variables:
|
||||
In `dbDriver` and `dbUser` you can use the following variables:
|
||||
|
||||
%G::
|
||||
Git directory name
|
||||
|
@ -413,16 +413,16 @@ about end-of-line conversion.
|
|||
|
||||
Alternatively, if `gitcvs.usecrlfattr` config is not enabled
|
||||
or the attributes do not allow automatic detection for a filename, then
|
||||
the server uses the `gitcvs.allbinary` config for the default setting.
|
||||
If `gitcvs.allbinary` is set, then file not otherwise
|
||||
the server uses the `gitcvs.allBinary` config for the default setting.
|
||||
If `gitcvs.allBinary` is set, then file not otherwise
|
||||
specified will default to '-kb' mode. Otherwise the '-k' mode
|
||||
is left blank. But if `gitcvs.allbinary` is set to "guess", then
|
||||
is left blank. But if `gitcvs.allBinary` is set to "guess", then
|
||||
the correct '-k' mode will be guessed based on the contents of
|
||||
the file.
|
||||
|
||||
For best consistency with 'cvs', it is probably best to override the
|
||||
defaults by setting `gitcvs.usecrlfattr` to true,
|
||||
and `gitcvs.allbinary` to "guess".
|
||||
and `gitcvs.allBinary` to "guess".
|
||||
|
||||
Dependencies
|
||||
------------
|
||||
|
|
|
@ -26,7 +26,7 @@ By default, any tag that points into the histories being fetched is
|
|||
also fetched; the effect is to fetch tags that
|
||||
point at branches that you are interested in. This default behavior
|
||||
can be changed by using the --tags or --no-tags options or by
|
||||
configuring remote.<name>.tagopt. By using a refspec that fetches tags
|
||||
configuring remote.<name>.tagOpt. By using a refspec that fetches tags
|
||||
explicitly, you can fetch tags that do not point into branches you
|
||||
are interested in as well.
|
||||
|
||||
|
|
|
@ -273,13 +273,13 @@ attachments, and sign off patches with configuration variables.
|
|||
------------
|
||||
[format]
|
||||
headers = "Organization: git-foo\n"
|
||||
subjectprefix = CHANGE
|
||||
subjectPrefix = CHANGE
|
||||
suffix = .txt
|
||||
numbered = auto
|
||||
to = <email>
|
||||
cc = <email>
|
||||
attach [ = mime-boundary-string ]
|
||||
signoff = true
|
||||
signOff = true
|
||||
coverletter = auto
|
||||
------------
|
||||
|
||||
|
|
|
@ -54,10 +54,10 @@ all loose objects are combined into a single pack using
|
|||
`git repack -d -l`. Setting the value of `gc.auto` to 0
|
||||
disables automatic packing of loose objects.
|
||||
+
|
||||
If the number of packs exceeds the value of `gc.autopacklimit`,
|
||||
If the number of packs exceeds the value of `gc.autoPackLimit`,
|
||||
then existing packs (except those marked with a `.keep` file)
|
||||
are consolidated into a single pack by using the `-A` option of
|
||||
'git repack'. Setting `gc.autopacklimit` to 0 disables
|
||||
'git repack'. Setting `gc.autoPackLimit` to 0 disables
|
||||
automatic consolidation of packs.
|
||||
|
||||
--prune=<date>::
|
||||
|
@ -101,18 +101,18 @@ branches:
|
|||
------------
|
||||
[gc "refs/remotes/*"]
|
||||
reflogExpire = never
|
||||
reflogexpireUnreachable = 3 days
|
||||
reflogExpireUnreachable = 3 days
|
||||
------------
|
||||
|
||||
The optional configuration variable 'gc.rerereresolved' indicates
|
||||
The optional configuration variable 'gc.rerereResolved' indicates
|
||||
how long records of conflicted merge you resolved earlier are
|
||||
kept. This defaults to 60 days.
|
||||
|
||||
The optional configuration variable 'gc.rerereunresolved' indicates
|
||||
The optional configuration variable 'gc.rerereUnresolved' indicates
|
||||
how long records of conflicted merge you have not resolved are
|
||||
kept. This defaults to 15 days.
|
||||
|
||||
The optional configuration variable 'gc.packrefs' determines if
|
||||
The optional configuration variable 'gc.packRefs' determines if
|
||||
'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable
|
||||
it within all non-bare repos or it can be set to a boolean value.
|
||||
This defaults to true.
|
||||
|
|
|
@ -125,7 +125,7 @@ The template directory will be one of the following (in order):
|
|||
|
||||
- the contents of the `$GIT_TEMPLATE_DIR` environment variable;
|
||||
|
||||
- the `init.templatedir` configuration variable; or
|
||||
- the `init.templateDir` configuration variable; or
|
||||
|
||||
- the default template directory: `/usr/share/git-core/templates`.
|
||||
|
||||
|
|
|
@ -76,7 +76,7 @@ You may specify configuration in your .git/config
|
|||
httpd = apache2 -f
|
||||
port = 4321
|
||||
browser = konqueror
|
||||
modulepath = /usr/lib/apache2/modules
|
||||
modulePath = /usr/lib/apache2/modules
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -184,7 +184,7 @@ log.date::
|
|||
`--date` option.) Defaults to "default", which means to write
|
||||
dates like `Sat May 8 19:35:34 2010 -0500`.
|
||||
|
||||
log.showroot::
|
||||
log.showRoot::
|
||||
If `false`, `git log` and related commands will not treat the
|
||||
initial commit as a big creation event. Any root commits in
|
||||
`git log -p` output would be shown without a diff attached.
|
||||
|
|
|
@ -232,7 +232,7 @@ Barbie's remark on your side. The only thing you can tell is that your
|
|||
side wants to say it is hard and you'd prefer to go shopping, while the
|
||||
other side wants to claim it is easy.
|
||||
|
||||
An alternative style can be used by setting the "merge.conflictstyle"
|
||||
An alternative style can be used by setting the "merge.conflictStyle"
|
||||
configuration variable to "diff3". In "diff3" style, the above conflict
|
||||
may look like this:
|
||||
|
||||
|
@ -329,7 +329,7 @@ CONFIGURATION
|
|||
-------------
|
||||
include::merge-config.txt[]
|
||||
|
||||
branch.<name>.mergeoptions::
|
||||
branch.<name>.mergeOptions::
|
||||
Sets default options for merging into branch <name>. The syntax and
|
||||
supported options are the same as those of 'git merge', but option
|
||||
values containing whitespace characters are currently not supported.
|
||||
|
|
|
@ -117,7 +117,7 @@ locally created merge commits will not be flattened.
|
|||
+
|
||||
When false, merge the current branch into the upstream branch.
|
||||
+
|
||||
See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
|
||||
See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in
|
||||
linkgit:git-config[1] if you want to make `git pull` always use
|
||||
`--rebase` instead of merging.
|
||||
+
|
||||
|
|
|
@ -207,10 +207,10 @@ rebase.stat::
|
|||
Whether to show a diffstat of what changed upstream since the last
|
||||
rebase. False by default.
|
||||
|
||||
rebase.autosquash::
|
||||
rebase.autoSquash::
|
||||
If set to true enable '--autosquash' option by default.
|
||||
|
||||
rebase.autostash::
|
||||
rebase.autoStash::
|
||||
If set to true enable '--autostash' option by default.
|
||||
|
||||
OPTIONS
|
||||
|
@ -414,7 +414,7 @@ squash/fixup series.
|
|||
This option is only valid when the '--interactive' option is used.
|
||||
+
|
||||
If the '--autosquash' option is enabled by default using the
|
||||
configuration variable `rebase.autosquash`, this option can be
|
||||
configuration variable `rebase.autoSquash`, this option can be
|
||||
used to override and disable this setting.
|
||||
|
||||
--[no-]autostash::
|
||||
|
|
|
@ -100,7 +100,7 @@ the following environment variables:
|
|||
starting time is different by this many seconds from the
|
||||
current session. Only meaningful when
|
||||
`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`.
|
||||
Also read about `receive.certnonceslop` variable in
|
||||
Also read about `receive.certNonceSlop` variable in
|
||||
linkgit:git-config[1].
|
||||
|
||||
This hook is called before any refname is updated and before any
|
||||
|
|
|
@ -115,7 +115,7 @@ other objects in that pack they already have locally.
|
|||
Write a reachability bitmap index as part of the repack. This
|
||||
only makes sense when used with `-a` or `-A`, as the bitmaps
|
||||
must be able to refer to all reachable objects. This option
|
||||
overrides the setting of `pack.writebitmaps`.
|
||||
overrides the setting of `pack.writeBitmaps`.
|
||||
|
||||
--pack-kept-objects::
|
||||
Include objects in `.keep` files when repacking. Note that we
|
||||
|
@ -123,7 +123,7 @@ other objects in that pack they already have locally.
|
|||
This means that we may duplicate objects, but this makes the
|
||||
option safe to use when there are concurrent pushes or fetches.
|
||||
This option is generally only useful if you are writing bitmaps
|
||||
with `-b` or `pack.writebitmaps`, as it ensures that the
|
||||
with `-b` or `pack.writeBitmaps`, as it ensures that the
|
||||
bitmapped packfile has the necessary objects.
|
||||
|
||||
Configuration
|
||||
|
|
|
@ -69,7 +69,7 @@ Prune records of conflicted merges that
|
|||
occurred a long time ago. By default, unresolved conflicts older
|
||||
than 15 days and resolved conflicts older than 60
|
||||
days are pruned. These defaults are controlled via the
|
||||
`gc.rerereunresolved` and `gc.rerereresolved` configuration
|
||||
`gc.rerereUnresolved` and `gc.rerereResolved` configuration
|
||||
variables respectively.
|
||||
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ Composing
|
|||
--annotate::
|
||||
Review and edit each patch you're about to send. Default is the value
|
||||
of 'sendemail.annotate'. See the CONFIGURATION section for
|
||||
'sendemail.multiedit'.
|
||||
'sendemail.multiEdit'.
|
||||
|
||||
--bcc=<address>::
|
||||
Specify a "Bcc:" value for each email. Default is the value of
|
||||
|
@ -73,7 +73,7 @@ and In-Reply-To headers will be used unless they are removed.
|
|||
+
|
||||
Missing From or In-Reply-To headers will be prompted for.
|
||||
+
|
||||
See the CONFIGURATION section for 'sendemail.multiedit'.
|
||||
See the CONFIGURATION section for 'sendemail.multiEdit'.
|
||||
|
||||
--from=<address>::
|
||||
Specify the sender of the emails. If not specified on the command line,
|
||||
|
@ -156,31 +156,31 @@ Sending
|
|||
subscribed to a list. In order to use the 'From' address, set the
|
||||
value to "auto". If you use the sendmail binary, you must have
|
||||
suitable privileges for the -f parameter. Default is the value of the
|
||||
'sendemail.envelopesender' configuration variable; if that is
|
||||
'sendemail.envelopeSender' configuration variable; if that is
|
||||
unspecified, choosing the envelope sender is left to your MTA.
|
||||
|
||||
--smtp-encryption=<encryption>::
|
||||
Specify the encryption to use, either 'ssl' or 'tls'. Any other
|
||||
value reverts to plain SMTP. Default is the value of
|
||||
'sendemail.smtpencryption'.
|
||||
'sendemail.smtpEncryption'.
|
||||
|
||||
--smtp-domain=<FQDN>::
|
||||
Specifies the Fully Qualified Domain Name (FQDN) used in the
|
||||
HELO/EHLO command to the SMTP server. Some servers require the
|
||||
FQDN to match your IP address. If not set, git send-email attempts
|
||||
to determine your FQDN automatically. Default is the value of
|
||||
'sendemail.smtpdomain'.
|
||||
'sendemail.smtpDomain'.
|
||||
|
||||
--smtp-pass[=<password>]::
|
||||
Password for SMTP-AUTH. The argument is optional: If no
|
||||
argument is specified, then the empty string is used as
|
||||
the password. Default is the value of 'sendemail.smtppass',
|
||||
the password. Default is the value of 'sendemail.smtpPass',
|
||||
however '--smtp-pass' always overrides this value.
|
||||
+
|
||||
Furthermore, passwords need not be specified in configuration files
|
||||
or on the command line. If a username has been specified (with
|
||||
'--smtp-user' or a 'sendemail.smtpuser'), but no password has been
|
||||
specified (with '--smtp-pass' or 'sendemail.smtppass'), then
|
||||
'--smtp-user' or a 'sendemail.smtpUser'), but no password has been
|
||||
specified (with '--smtp-pass' or 'sendemail.smtpPass'), then
|
||||
a password is obtained using 'git-credential'.
|
||||
|
||||
--smtp-server=<host>::
|
||||
|
@ -188,7 +188,7 @@ a password is obtained using 'git-credential'.
|
|||
`smtp.example.com` or a raw IP address). Alternatively it can
|
||||
specify a full pathname of a sendmail-like program instead;
|
||||
the program must support the `-i` option. Default value can
|
||||
be specified by the 'sendemail.smtpserver' configuration
|
||||
be specified by the 'sendemail.smtpServer' configuration
|
||||
option; the built-in default is `/usr/sbin/sendmail` or
|
||||
`/usr/lib/sendmail` if such program is available, or
|
||||
`localhost` otherwise.
|
||||
|
@ -199,11 +199,11 @@ a password is obtained using 'git-credential'.
|
|||
submission port 587, or the common SSL smtp port 465);
|
||||
symbolic port names (e.g. "submission" instead of 587)
|
||||
are also accepted. The port can also be set with the
|
||||
'sendemail.smtpserverport' configuration variable.
|
||||
'sendemail.smtpServerPort' configuration variable.
|
||||
|
||||
--smtp-server-option=<option>::
|
||||
If set, specifies the outgoing SMTP server option to use.
|
||||
Default value can be specified by the 'sendemail.smtpserveroption'
|
||||
Default value can be specified by the 'sendemail.smtpServerOption'
|
||||
configuration option.
|
||||
+
|
||||
The --smtp-server-option option must be repeated for each option you want
|
||||
|
@ -225,8 +225,8 @@ must be used for each option.
|
|||
be the best choice on most platforms).
|
||||
|
||||
--smtp-user=<user>::
|
||||
Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser';
|
||||
if a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'),
|
||||
Username for SMTP-AUTH. Default is the value of 'sendemail.smtpUser';
|
||||
if a username is not specified (with '--smtp-user' or 'sendemail.smtpUser'),
|
||||
then authentication is not attempted.
|
||||
|
||||
--smtp-debug=0|1::
|
||||
|
@ -247,14 +247,14 @@ Automating
|
|||
Specify a command to execute once per patch file which
|
||||
should generate patch file specific "Cc:" entries.
|
||||
Output of this command must be single email address per line.
|
||||
Default is the value of 'sendemail.cccmd' configuration value.
|
||||
Default is the value of 'sendemail.ccCmd' configuration value.
|
||||
|
||||
--[no-]chain-reply-to::
|
||||
If this is set, each email will be sent as a reply to the previous
|
||||
email sent. If disabled with "--no-chain-reply-to", all emails after
|
||||
the first will be sent as replies to the first email sent. When using
|
||||
this, it is recommended that the first file given be an overview of the
|
||||
entire patch series. Disabled by default, but the 'sendemail.chainreplyto'
|
||||
entire patch series. Disabled by default, but the 'sendemail.chainReplyTo'
|
||||
configuration variable can be used to enable it.
|
||||
|
||||
--identity=<identity>::
|
||||
|
@ -304,7 +304,7 @@ specified, as well as 'body' if --no-signed-off-cc is specified.
|
|||
|
||||
--[no-]suppress-from::
|
||||
If this is set, do not add the From: address to the cc: list.
|
||||
Default is the value of 'sendemail.suppressfrom' configuration
|
||||
Default is the value of 'sendemail.suppressFrom' configuration
|
||||
value; if that is unspecified, default to --no-suppress-from.
|
||||
|
||||
--[no-]thread::
|
||||
|
@ -377,15 +377,15 @@ default to '--validate'.
|
|||
CONFIGURATION
|
||||
-------------
|
||||
|
||||
sendemail.aliasesfile::
|
||||
sendemail.aliasesFile::
|
||||
To avoid typing long email addresses, point this to one or more
|
||||
email aliases files. You must also supply 'sendemail.aliasfiletype'.
|
||||
email aliases files. You must also supply 'sendemail.aliasFileType'.
|
||||
|
||||
sendemail.aliasfiletype::
|
||||
Format of the file(s) specified in sendemail.aliasesfile. Must be
|
||||
sendemail.aliasFileType::
|
||||
Format of the file(s) specified in sendemail.aliasesFile. Must be
|
||||
one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus'.
|
||||
|
||||
sendemail.multiedit::
|
||||
sendemail.multiEdit::
|
||||
If true (default), a single editor instance will be spawned to edit
|
||||
files you have to edit (patches when '--annotate' is used, and the
|
||||
summary when '--compose' is used). If false, files will be edited one
|
||||
|
@ -404,10 +404,10 @@ To use 'git send-email' to send your patches through the GMail SMTP server,
|
|||
edit ~/.gitconfig to specify your account settings:
|
||||
|
||||
[sendemail]
|
||||
smtpencryption = tls
|
||||
smtpserver = smtp.gmail.com
|
||||
smtpuser = yourname@gmail.com
|
||||
smtpserverport = 587
|
||||
smtpEncryption = tls
|
||||
smtpServer = smtp.gmail.com
|
||||
smtpUser = yourname@gmail.com
|
||||
smtpServerPort = 587
|
||||
|
||||
Once your commits are ready to be sent to the mailing list, run the
|
||||
following commands:
|
||||
|
|
|
@ -77,7 +77,7 @@ configuration variable documented in linkgit:git-config[1].
|
|||
only changes to the commits stored in the superproject are shown (this was
|
||||
the behavior before 1.7.0). Using "all" hides all changes to submodules
|
||||
(and suppresses the output of submodule summaries when the config option
|
||||
`status.submodulesummary` is set).
|
||||
`status.submoduleSummary` is set).
|
||||
|
||||
--ignored::
|
||||
Show ignored files as well.
|
||||
|
@ -207,7 +207,7 @@ If the config variable `status.relativePaths` is set to false, then all
|
|||
paths shown are relative to the repository root, not to the current
|
||||
directory.
|
||||
|
||||
If `status.submodulesummary` is set to a non zero number or true (identical
|
||||
If `status.submoduleSummary` is set to a non zero number or true (identical
|
||||
to -1 or an unlimited number), the submodule summary will be enabled for
|
||||
the long format and a summary of commits for modified submodules will be
|
||||
shown (see --summary-limit option of linkgit:git-submodule[1]). Please note
|
||||
|
|
|
@ -161,7 +161,7 @@ it in the repository configuration as follows:
|
|||
|
||||
-------------------------------------
|
||||
[user]
|
||||
signingkey = <gpg-key-id>
|
||||
signingKey = <gpg-key-id>
|
||||
-------------------------------------
|
||||
|
||||
|
||||
|
|
|
@ -919,7 +919,7 @@ for further details.
|
|||
If this environment variable is set, then Git commands which need to
|
||||
acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
|
||||
will call this program with a suitable prompt as command-line argument
|
||||
and read the password from its STDOUT. See also the 'core.askpass'
|
||||
and read the password from its STDOUT. See also the 'core.askPass'
|
||||
option in linkgit:git-config[1].
|
||||
|
||||
'GIT_TERMINAL_PROMPT'::
|
||||
|
|
|
@ -80,7 +80,7 @@ Attributes which should be version-controlled and distributed to other
|
|||
repositories (i.e., attributes of interest to all users) should go into
|
||||
`.gitattributes` files. Attributes that should affect all repositories
|
||||
for a single user should be placed in a file specified by the
|
||||
`core.attributesfile` configuration option (see linkgit:git-config[1]).
|
||||
`core.attributesFile` configuration option (see linkgit:git-config[1]).
|
||||
Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME
|
||||
is either not set or empty, $HOME/.config/git/attributes is used instead.
|
||||
Attributes for all users on a system should be placed in the
|
||||
|
|
|
@ -32,7 +32,7 @@ strategies to ask the user for usernames and passwords:
|
|||
to the program on the command line, and the user's input is read
|
||||
from its standard output.
|
||||
|
||||
2. Otherwise, if the `core.askpass` configuration variable is set, its
|
||||
2. Otherwise, if the `core.askPass` configuration variable is set, its
|
||||
value is used as above.
|
||||
|
||||
3. Otherwise, if the `SSH_ASKPASS` environment variable is set, its
|
||||
|
|
|
@ -38,7 +38,7 @@ precedence, the last matching pattern decides the outcome):
|
|||
* Patterns read from `$GIT_DIR/info/exclude`.
|
||||
|
||||
* Patterns read from the file specified by the configuration
|
||||
variable 'core.excludesfile'.
|
||||
variable 'core.excludesFile'.
|
||||
|
||||
Which file to place a pattern in depends on how the pattern is meant to
|
||||
be used.
|
||||
|
@ -56,7 +56,7 @@ be used.
|
|||
* Patterns which a user wants Git to
|
||||
ignore in all situations (e.g., backup or temporary files generated by
|
||||
the user's editor of choice) generally go into a file specified by
|
||||
`core.excludesfile` in the user's `~/.gitconfig`. Its default value is
|
||||
`core.excludesFile` in the user's `~/.gitconfig`. Its default value is
|
||||
$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or
|
||||
empty, $HOME/.config/git/ignore is used instead.
|
||||
|
||||
|
|
|
@ -706,7 +706,7 @@ show-sizes::
|
|||
I/O. Enabled by default.
|
||||
+
|
||||
This feature can be configured on a per-repository basis via
|
||||
repository's `gitweb.showsizes` configuration variable (boolean).
|
||||
repository's `gitweb.showSizes` configuration variable (boolean).
|
||||
|
||||
patches::
|
||||
Enable and configure "patches" view, which displays list of commits in email
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
merge.conflictstyle::
|
||||
merge.conflictStyle::
|
||||
Specify the style in which conflicted hunks are written out to
|
||||
working tree files upon merge. The default is "merge", which
|
||||
shows a `<<<<<<<` conflict marker, changes made by one side,
|
||||
|
|
|
@ -1200,7 +1200,7 @@ for other users who clone your repository.
|
|||
If you wish the exclude patterns to affect only certain repositories
|
||||
(instead of every repository for a given project), you may instead put
|
||||
them in a file in your repository named `.git/info/exclude`, or in any
|
||||
file specified by the `core.excludesfile` configuration variable.
|
||||
file specified by the `core.excludesFile` configuration variable.
|
||||
Some Git commands can also take exclude patterns directly on the
|
||||
command line. See linkgit:gitignore[5] for the details.
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче