From: Junio C Hamano Date: Mon, 29 Jan 2007 02:56:35 +0000 (+0000) Subject: Autogenerated man pages for v1.5.0-rc2-72-gdf391 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af2134358f663d7f8aa4616a7f2b14a4466cf173;p=git.git Autogenerated man pages for v1.5.0-rc2-72-gdf391 --- diff --git a/man1/git-config.1 b/man1/git-config.1 new file mode 100644 index 000000000..59f6a28ed --- /dev/null +++ b/man1/git-config.1 @@ -0,0 +1,467 @@ +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "GIT\-CONFIG" "1" "01/29/2007" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +git\-config \- Get and set repository or global options +.SH "SYNOPSIS" +.sp +.nf +\fIgit\-config\fR [\-\-global] [type] name [value [value_regex]] +\fIgit\-config\fR [\-\-global] [type] \-\-add name value +\fIgit\-config\fR [\-\-global] [type] \-\-replace\-all name [value [value_regex]] +\fIgit\-config\fR [\-\-global] [type] \-\-get name [value_regex] +\fIgit\-config\fR [\-\-global] [type] \-\-get\-all name [value_regex] +\fIgit\-config\fR [\-\-global] [type] \-\-unset name [value_regex] +\fIgit\-config\fR [\-\-global] [type] \-\-unset\-all name [value_regex] +\fIgit\-config\fR [\-\-global] \-l | \-\-list +.fi +.SH "DESCRIPTION" +You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped. + +Multiple lines can be added to an option by using the \fI\-\-add\fR option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp value_regex needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do \fBnot\fR match the regex, just prepend a single exclamation mark in front (see EXAMPLES). + +The type specifier can be either \fI\-\-int\fR or \fI\-\-bool\fR, which will make \fIgit\-config\fR 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, no checks or transformations are performed on the value. + +This command will fail if: +.TP 3 +1. +The .git/config file is invalid, +.TP +2. +Can not write to .git/config, +.TP +3. +no section was provided, +.TP +4. +the section or key is invalid, +.TP +5. +you try to unset an option which does not exist, +.TP +6. +you try to unset/set an option for which multiple lines match, or +.TP +7. +you use \-\-global option without $HOME being properly set. +.SH "OPTIONS" +.TP +\-\-replace\-all +Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex). +.TP +\-\-add +Adds a new line to the option without altering any existing values. This is the same as providing \fI^$\fR as the value_regex. +.TP +\-\-get +Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and error code 2 if multiple key values were found. +.TP +\-\-get\-all +Like get, but does not fail if the number of values for the key is not exactly one. +.TP +\-\-get\-regexp +Like \-\-get\-all, but interprets the name as a regular expression. +.TP +\-\-global +Use global ~/.gitconfig file rather than the repository .git/config. +.TP +\-\-unset +Remove the line matching the key from config file. +.TP +\-\-unset\-all +Remove all matching lines from config file. +.TP +\-l, \-\-list +List all variables set in config file. +.TP +\-\-bool +git\-config will ensure that the output is "true" or "false" +.TP +\-\-int +git\-config will ensure that the output is a simple decimal number. An optional value suffix of \fIk\fR, \fIm\fR, or \fIg\fR in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. +.SH "ENVIRONMENT" +.TP +GIT_CONFIG +Take the configuration from the given file instead of .git/config. Using the "\-\-global" option forces this to ~/.gitconfig. +.TP +GIT_CONFIG_LOCAL +Currently the same as $GIT_CONFIG; when Git will support global configuration files, this will cause it to take the configuration from the global configuration file in addition to the given file. +.SH "EXAMPLE" +Given a .git/config like this: +.sp +.nf +# +# This is the config file, and +# a '#' or ';' character indicates +# a comment +# +.fi +.sp +.nf +; core variables +[core] + ; Don't trust file modes + filemode = false +.fi +.sp +.nf +; Our diff algorithm +[diff] + external = "/usr/local/bin/gnu\-diff \-u" + renames = true +.fi +.sp +.nf +; Proxy settings +[core] + gitproxy="ssh" for "ssh://kernel.org/" + gitproxy="proxy\-command" for kernel.org + gitproxy="myprotocol\-command" for "my://" + gitproxy=default\-proxy ; for all the rest +.fi +you can set the filemode to true with +.sp +.nf +% git config core.filemode true +.fi +The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to "ssh". +.sp +.nf +% git config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$' +.fi +This makes sure that only the key/value pair for kernel.org is replaced. + +To delete the entry for renames, do +.sp +.nf +% git config \-\-unset diff.renames +.fi +If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line. + +To query the value for a given key, do +.sp +.nf +% git config \-\-get core.filemode +.fi +or +.sp +.nf +% git config core.filemode +.fi +or, to query a multivar: +.sp +.nf +% git config \-\-get core.gitproxy "for kernel.org$" +.fi +If you want to know all the values for a multivar, do: +.sp +.nf +% git config \-\-get\-all core.gitproxy +.fi +If you like to live dangerous, you can replace \fBall\fR core.gitproxy by a new one with +.sp +.nf +% git config \-\-replace\-all core.gitproxy ssh +.fi +However, if you really only want to replace the line for the default proxy, i.e. the one without a "for \&..." postfix, do something like this: +.sp +.nf +% git config core.gitproxy ssh '! for ' +.fi +To actually match only values with an exclamation mark, you have to +.sp +.nf +% git config section.key value '[!]' +.fi +To add a new proxy, without altering any of the existing ones, use +.sp +.nf +% git config core.gitproxy '"proxy" for example.com' +.fi +.SH "CONFIGURATION FILE" +The git configuration file contains a number of variables that affect the git command's behavior. .git/config file for each repository is used to store the information for that repository, and $HOME/.gitconfig is used to store per user information to give fallback values for .git/config file. + +They can be used by both the git plumbing and the porcelains. The variables are divided into sections, where in the fully qualified variable name the variable itself is the last dot\-separated segment and the section name is everything before the last dot. The variable names are case\-insensitive and only alphanumeric characters are allowed. Some variables may appear multiple times. +.SS "Syntax" +The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The \fI#\fR and \fI;\fR characters begin comments to the end of line, blank lines are ignored. + +The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are not case sensitive. Only alphanumeric characters, \fI\-\fR and \fI.\fR are allowed in section names. Each variable must belong to some section, which means that there must be section header before first setting of a variable. + +Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in example below: +.sp +.nf + [section "subsection"] +.fi +Subsection names can contain any characters except newline (doublequote \fI"\fR and backslash have to be escaped as \fI\\"\fR and \fI\\\\\fR, respecitvely) and are case sensitive. Section header cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have [section] if you have [section "subsection"], but you don't need to. + +There is also (case insensitive) alternative [section.subsection] syntax. In this syntax subsection names follow the same restrictions as for section name. + +All the other lines are recognized as setting variables, in the form \fIname = value\fR. If there is no equal sign on the line, the entire line is taken as \fIname\fR and the variable is recognized as boolean "true". The variable names are case\-insensitive and only alphanumeric characters and \fI\-\fR are allowed. There can be more than one value for a given variable; we say then that variable is multivalued. + +Leading and trailing whitespace in a variable value is discarded. Internal whitespace within a variable value is retained verbatim. + +The values following the equals sign in variable assign are all either a string, an integer, or a boolean. Boolean values may be given as yes/no, 0/1 or true/false. Case is not significant in boolean values, when converting value to the canonical form using \fI\-\-bool\fR type specifier; git\-config will ensure that the output is "true" or "false". + +String values may be entirely or partially enclosed in double quotes. You need to enclose variable value in double quotes if you want to preserve leading or trailing whitespace, or if variable value contains beginning of comment characters (if it contains \fI#\fR or \fI;\fR). Double quote \fI"\fR and backslash \fI\\\fR characters in variable value must be escaped: use \fI\\"\fR for \fI"\fR and \fI\\\\\fR for \fI\\\fR. + +The following escape sequences (beside \fI\\"\fR and \fI\\\\\fR) are recognized: \fI\\n\fR for newline character (NL), \fI\\t\fR for horizontal tabulation (HT, TAB) and \fI\\b\fR for backspace (BS). No other char escape sequence, nor octal char sequences are valid. + +Variable value ending in a \fI\\\fR is continued on the next line in the customary UNIX fashion. + +Some variables may require special value format. +.SS "Example" +.sp +.nf +# Core variables +[core] + ; Don't trust file modes + filemode = false +.fi +.sp +.nf +# Our diff algorithm +[diff] + external = "/usr/local/bin/gnu\-diff \-u" + renames = true +.fi +.sp +.nf +[branch "devel"] + remote = origin + merge = refs/heads/devel +.fi +.sp +.nf +# Proxy settings +[core] + gitProxy="ssh" for "ssh://kernel.org/" + gitProxy=default\-proxy ; for the rest +.fi +.SS "Variables" +Note that this list is non\-comprehensive and not necessarily complete. For command\-specific variables, you will find a more detailed description in the appropriate manual page. You will find a description of non\-core porcelain configuration variables in the respective porcelain documentation. +.TP +core.fileMode +If false, the executable bit differences between the index and the working copy are ignored; useful on broken filesystems like FAT. See \fBgit\-update\-index\fR(1). True by default. +.TP +core.gitProxy +A "proxy command" to execute (as \fIcommand host port\fR) instead of establishing direct connection to the remote server when using the git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins. + +Can be overridden by the \fIGIT_PROXY_COMMAND\fR environment variable (which always applies universally, without the special "for" handling). +.TP +core.ignoreStat +The working copy files are assumed to stay unchanged until you mark them otherwise manually \- Git will not detect the file changes by lstat() calls. This is useful on systems where those are very slow, such as Microsoft Windows. See \fBgit\-update\-index\fR(1). False by default. +.TP +core.preferSymlinkRefs +Instead of the default "symref" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link. +.TP +core.logAllRefUpdates +Updates to a ref is logged to the file "$GIT_DIR/logs/", by appending the new and old SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/" file is automatically created for branch heads. + +This information can be used to determine what commit was the tip of a branch "2 days ago". + +This value is true by default in a repository that has a working directory associated with it, and false by default in a bare repository. +.TP +core.repositoryFormatVersion +Internal variable identifying the repository format and layout version. +.TP +core.sharedRepository +When \fIgroup\fR (or \fItrue\fR), the repository is made shareable between several users in a group (making sure all the files and objects are group\-writable). When \fIall\fR (or \fIworld\fR or \fIeverybody\fR), the repository will be readable by all users, additionally to being group\-shareable. When \fIumask\fR (or \fIfalse\fR), git will use permissions reported by umask(2). See \fBgit\-init\fR(1). False by default. +.TP +core.warnAmbiguousRefs +If true, git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the .git/refs/ tree. True by default. +.TP +core.compression +An integer \-1..9, indicating the compression level for objects that are not in a pack file. \-1 is the zlib and git default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. +.TP +core.legacyheaders +A boolean which enables the legacy object header format in case you want to interoperate with old clients accessing the object database directly (where the "http://" and "rsync://" protocols count as direct access). +.TP +core.packedGitWindowSize +Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files. + +Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should be reasonable for all users/operating systems. You probably do not need to adjust this value. + +Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported. +.TP +core.packedGitLimit +Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process. + +Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. This should be reasonable for all users/operating systems, except on the largest projects. You probably do not need to adjust this value. + +Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported. +.TP +alias.* +Command aliases for the \fBgit\fR(1) command wrapper \- e.g. after defining "alias.last = cat\-file commit HEAD", the invocation "git last" is equivalent to "git cat\-file commit HEAD". To avoid confusion and troubles with script usage, aliases that hide existing git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them. +.TP +apply.whitespace +Tells git\-apply how to handle whitespaces, in the same way as the \fI\-\-whitespace\fR option. See \fBgit\-apply\fR(1). +.TP +branch..remote +When in branch , it tells git fetch which remote to fetch. If this option is not given, git fetch defaults to remote "origin". +.TP +branch..merge +When in branch , it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value has exactly to match a remote part of one of the refspecs which are fetched from the remote given by "branch..remote". The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. +.TP +color.branch +A boolean to enable/disable color in the output of \fBgit\-branch\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false. +.TP +color.branch. +Use customized color for branch coloration. is one of current (the current branch), local (a local branch), remote (a tracking branch in refs/remotes/), plain (other refs). + +The value for these configuration variables is a list of colors (at most two) and attributes (at most one), separated by spaces. The colors accepted are normal, black, red, green, yellow, blue, magenta, cyan and white; the attributes are bold, dim, ul, blink and reverse. The first color given is the foreground; the second is the background. The position of the attribute, if any, doesn't matter. +.TP +color.diff +When true (or always), always use colors in patch. When false (or never), never. When set to auto, use colors only when the output is to the terminal. +.TP +color.diff. +Use customized color for diff colorization. specifies which part of the patch to use the specified color, and is one of plain (context text), meta (metainformation), frag (hunk header), old (removed lines), new (added lines), commit (commit headers), or whitespace (highlighting dubious whitespace). The values of these variables may be specified as in color.branch.. +.TP +color.pager +A boolean to enable/disable colored output when the pager is in use (default is true). +.TP +color.status +A boolean to enable/disable color in the output of \fBgit\-status\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false. +.TP +color.status. +Use customized color for status colorization. is one of header (the header text of the status message), added or updated (files which are added but not committed), changed (files which are changed but not added in the index), or untracked (files which are not tracked by git). The values of these variables may be specified as in color.branch.. +.TP +diff.renameLimit +The number of files to consider when performing the copy/rename detection; equivalent to the git diff option \fI\-l\fR. +.TP +diff.renames +Tells git to detect renames. If set to any boolean value, it will enable basic rename detection. If set to "copies" or "copy", it will detect copies, as well. +.TP +fetch.unpackLimit +If the number of objects fetched over the git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. +.TP +format.headers +Additional email headers to include in a patch to be submitted by mail. See \fBgit\-format\-patch\fR(1). +.TP +gc.reflogexpire +git reflog expire removes reflog entries older than this time; defaults to 90 days. +.TP +gc.reflogexpireunreachable +git reflog expire removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. +.TP +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 \fBgit\-rerere\fR(1). +.TP +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 \fBgit\-rerere\fR(1). +.TP +gitcvs.enabled +Whether the cvs pserver interface is enabled for this repository. See \fBgit\-cvsserver\fR(1). +.TP +gitcvs.logfile +Path to a log file where the cvs pserver interface well\&... logs various stuff. See \fBgit\-cvsserver\fR(1). +.TP +http.sslVerify +Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_NO_VERIFY\fR environment variable. +.TP +http.sslCert +File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_CERT\fR environment variable. +.TP +http.sslKey +File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_KEY\fR environment variable. +.TP +http.sslCAInfo +File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_CAINFO\fR environment variable. +.TP +http.sslCAPath +Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_CAPATH\fR environment variable. +.TP +http.maxRequests +How many HTTP requests to launch in parallel. Can be overridden by the \fIGIT_HTTP_MAX_REQUESTS\fR environment variable. Default is 5. +.TP +http.lowSpeedLimit, http.lowSpeedTime +If the HTTP transfer speed is less than \fIhttp.lowSpeedLimit\fR for longer than \fIhttp.lowSpeedTime\fR seconds, the transfer is aborted. Can be overridden by the \fIGIT_HTTP_LOW_SPEED_LIMIT\fR and \fIGIT_HTTP_LOW_SPEED_TIME\fR environment variables. +.TP +http.noEPSV +A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which doesn't support EPSV mode. Can be overridden by the \fIGIT_CURL_FTP_NO_EPSV\fR environment variable. Default is false (curl will use EPSV). +.TP +i18n.commitEncoding +Character encoding the commit messages are stored in; git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. \fBgit\-mailinfo\fR(1). Defaults to \fIutf\-8\fR. +.TP +i18n.logOutputEncoding +Character encoding the commit messages are converted to when running git\-log and friends. +.TP +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 \fBgit\-log\fR(1) or \fBgit\-whatchanged\fR(1), which normally hide the root commit will now show it. True by default. +.TP +merge.summary +Whether to include summaries of merged commits in newly created merge commit messages. False by default. +.TP +merge.verbosity +Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. +.TP +pack.window +The size of the window used by \fBgit\-pack\-objects\fR(1) when no window size is given on the command line. Defaults to 10. +.TP +pull.octopus +The default merge strategy to use when pulling multiple branches at once. +.TP +pull.twohead +The default merge strategy to use when pulling a single branch. +.TP +remote..url +The URL of a remote repository. See \fBgit\-fetch\fR(1) or \fBgit\-push\fR(1). +.TP +remote..fetch +The default set of "refspec" for \fBgit\-fetch\fR(1). See \fBgit\-fetch\fR(1). +.TP +remote..push +The default set of "refspec" for \fBgit\-push\fR(1). See \fBgit\-push\fR(1). +.TP +remote..receivepack +The default program to execute on the remote side when pushing. See option \-\-exec of \fBgit\-push\fR(1). +.TP +remote..uploadpack +The default program to execute on the remote side when fetching. See option \-\-exec of \fBgit\-fetch\-pack\fR(1). +.TP +repack.usedeltabaseoffset +Allow \fBgit\-repack\fR(1) to create packs that uses delta\-base offset. Defaults to false. +.TP +show.difftree +The default \fBgit\-diff\-tree\fR(1) arguments to be used for \fBgit\-show\fR(1). +.TP +showbranch.default +The default set of branches for \fBgit\-show\-branch\fR(1). See \fBgit\-show\-branch\fR(1). +.TP +tar.umask +By default, \fBgit\-tar\-tree\fR(1) sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects such as the Linux Kernel, it might be excessive for other projects. With this variable, it becomes possible to tell \fBgit\-tar\-tree\fR(1) to apply a specific umask to the modes above. The special value "user" indicates that the user's current umask will be used. This should be enough for most projects, as it will lead to the same permissions as \fBgit\-checkout\fR(1) would use. The default value remains 0, which means world read\-write. +.TP +user.email +Your email address to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_EMAIL\fR and \fIGIT_COMMITTER_EMAIL\fR environment variables. See \fBgit\-commit\-tree\fR(1). +.TP +user.name +Your full name to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_NAME\fR and \fIGIT_COMMITTER_NAME\fR environment variables. See \fBgit\-commit\-tree\fR(1). +.TP +user.signingkey +If \fBgit\-tag\fR(1) is not selecting the key you want it to automatically when creating a signed tag, you can override the default selection with this variable. This option is passed unchanged to gpg's \-\-local\-user parameter, so you may specify a key using any method that gpg supports. +.TP +whatchanged.difftree +The default \fBgit\-diff\-tree\fR(1) arguments to be used for \fBgit\-whatchanged\fR(1). +.TP +imap +The configuration variables in the \fIimap\fR section are described in \fBgit\-imap\-send\fR(1). +.TP +receive.unpackLimit +If the number of objects received in a push is below this limit then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. +.TP +receive.denyNonFastForwards +If set to true, git\-receive\-pack will deny a ref update which is not a fast forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository. +.TP +transfer.unpackLimit +When fetch.unpackLimit or receive.unpackLimit are not set, the value of this variable is used instead. +.SH "AUTHOR" +Written by Johannes Schindelin +.SH "DOCUMENTATION" +Documentation by Johannes Schindelin, Petr Baudis and the git\-list . +.SH "GIT" +Part of the \fBgit\fR(7) suite + diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index ee10f3736..839c7ad5d 100644 --- a/man1/git-for-each-ref.1 +++ b/man1/git-for-each-ref.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FOR\-EACH\-REF" "1" "01/17/2007" "" "" +.TH "GIT\-FOR\-EACH\-REF" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-for\-each\-ref \- Output information on each ref .SH "SYNOPSIS" -\fIgit\-for\-each\-ref\fR [\-\-count=]* [\-\-shell|\-\-perl|\-\-python] [\-\-sort=]* [\-\-format=] [] +\fIgit\-for\-each\-ref\fR [\-\-count=]* [\-\-shell|\-\-perl|\-\-python|\-\-tcl] [\-\-sort=]* [\-\-format=] [] .SH "DESCRIPTION" Iterate over all refs that match and show them according to the given , after sorting them according to the given set of . If is given, stop after showing that many refs. The interpolated values in can optionally be quoted as string literals in the specified host language allowing their direct evaluation in that language. .SH "OPTIONS" @@ -27,7 +27,7 @@ A string that interpolates %(fieldname) from the object pointed at by a ref bein If given, the name of the ref is matched against this using fnmatch(3). Refs that do not match the pattern are not shown. .TP -\-\-shell, \-\-perl, \-\-python +\-\-shell, \-\-perl, \-\-python, \-\-tcl If given, strings that substitute %(fieldname) placeholders are quoted as string literals suitable for the specified host language. This is meant to produce a scriptlet that can directly be `eval`ed. .SH "FIELD NAMES" Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort keys. diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index 35a06373e..f5cefc031 100644 --- a/man1/git-fsck-objects.1 +++ b/man1/git-fsck-objects.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FSCK\-OBJECTS" "1" "10/03/2006" "" "" +.TH "GIT\-FSCK\-OBJECTS" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,92 +10,7 @@ .SH "NAME" git\-fsck\-objects \- Verifies the connectivity and validity of the objects in the database .SH "SYNOPSIS" -.sp -.nf -\fIgit\-fsck\-objects\fR [\-\-tags] [\-\-root] [\-\-unreachable] [\-\-cache] - [\-\-full] [\-\-strict] [*] -.fi +\fIgit\-fsck\-objects\fR \&... .SH "DESCRIPTION" -Verifies the connectivity and validity of the objects in the database. -.sp -.SH "OPTIONS" -.TP - -An object to treat as the head of an unreachability trace. -.sp -If no objects are given, git\-fsck\-objects defaults to using the index file and all SHA1 references in .git/refs/* as heads. -.TP -\-\-unreachable -Print out objects that exist but that aren't readable from any of the reference nodes. -.TP -\-\-root -Report root nodes. -.TP -\-\-tags -Report tags. -.TP -\-\-cache -Consider any object recorded in the index also as a head node for an unreachability trace. -.TP -\-\-full -Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in packed git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. -.TP -\-\-strict -Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of git. Existing repositories, including the Linux kernel, git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag. -It tests SHA1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the \fI\-\-unreachable\fR flag it will also print out objects that exist but that aren't readable from any of the specified head nodes. -.sp -So for example -.sp -.sp -.nf -git\-fsck\-objects \-\-unreachable HEAD $(cat .git/refs/heads/*) -.fi -will do quite a _lot_ of verification on the tree. There are a few extra validity tests to be added (make sure that tree objects are sorted properly etc), but on the whole if "git\-fsck\-objects" is happy, you do have a valid tree. -.sp -Any corrupt objects you will have to find in backups or other archives (i.e., you can just remove them and do an "rsync" with some other site in the hopes that somebody else has the object you have corrupted). -.sp -Of course, "valid tree" doesn't mean that it wasn't generated by some evil person, and the end result might be crap. git is a revision tracking system, not a quality assurance system ;) -.sp -.SH "EXTRACTED DIAGNOSTICS" -.TP -expect dangling commits \- potential heads \- due to lack of head information -You haven't specified any nodes as heads so it won't be possible to differentiate between un\-parented commits and root nodes. -.TP -missing sha1 directory \fI\fR -The directory holding the sha1 objects is missing. -.TP -unreachable -The object , isn't actually referred to directly or indirectly in any of the trees or commits seen. This can mean that there's another root node that you're not specifying or that the tree is corrupt. If you haven't missed a root node then you might as well delete unreachable nodes since they can't be used. -.TP -missing -The object , is referred to but isn't present in the database. -.TP -dangling -The object , is present in the database but never -\fIdirectly\fR -used. A dangling commit could be a root node. -.TP -warning: git\-fsck\-objects: tree has full pathnames in it -And it shouldn't\&... -.TP -sha1 mismatch -The database has an object who's sha1 doesn't match the database value. This indicates a serious data integrity problem. -.SH "ENVIRONMENT VARIABLES" -.TP -GIT_OBJECT_DIRECTORY -used to specify the object database root (usually $GIT_DIR/objects) -.TP -GIT_INDEX_FILE -used to specify the index file of the index -.TP -GIT_ALTERNATE_OBJECT_DIRECTORIES -used to specify additional object database roots (usually unset) -.SH "AUTHOR" -Written by Linus Torvalds -.sp -.SH "DOCUMENTATION" -Documentation by David Greaves, Junio C Hamano and the git\-list . -.sp -.SH "GIT" -Part of the \fBgit\fR(7) suite -.sp +This is a synonym for \fBgit\-fsck\fR(1). Please refer to the documentation of that command. + diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 new file mode 100644 index 000000000..27aa0dff0 --- /dev/null +++ b/man1/git-fsck.1 @@ -0,0 +1,95 @@ +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "GIT\-FSCK" "1" "01/29/2007" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +git\-fsck \- Verifies the connectivity and validity of the objects in the database +.SH "SYNOPSIS" +.sp +.nf +\fIgit\-fsck\fR [\-\-tags] [\-\-root] [\-\-unreachable] [\-\-cache] + [\-\-full] [\-\-strict] [*] +.fi +.SH "DESCRIPTION" +Verifies the connectivity and validity of the objects in the database. +.SH "OPTIONS" +.TP + +An object to treat as the head of an unreachability trace. + +If no objects are given, git\-fsck defaults to using the index file and all SHA1 references in .git/refs/* as heads. +.TP +\-\-unreachable +Print out objects that exist but that aren't readable from any of the reference nodes. +.TP +\-\-root +Report root nodes. +.TP +\-\-tags +Report tags. +.TP +\-\-cache +Consider any object recorded in the index also as a head node for an unreachability trace. +.TP +\-\-full +Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in packed git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. +.TP +\-\-strict +Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of git. Existing repositories, including the Linux kernel, git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag. + +It tests SHA1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the \fI\-\-unreachable\fR flag it will also print out objects that exist but that aren't readable from any of the specified head nodes. + +So for example +.sp +.nf +git\-fsck \-\-unreachable HEAD $(cat .git/refs/heads/*) +.fi +will do quite a _lot_ of verification on the tree. There are a few extra validity tests to be added (make sure that tree objects are sorted properly etc), but on the whole if "git\-fsck" is happy, you do have a valid tree. + +Any corrupt objects you will have to find in backups or other archives (i.e., you can just remove them and do an "rsync" with some other site in the hopes that somebody else has the object you have corrupted). + +Of course, "valid tree" doesn't mean that it wasn't generated by some evil person, and the end result might be crap. git is a revision tracking system, not a quality assurance system ;) +.SH "EXTRACTED DIAGNOSTICS" +.TP +expect dangling commits \- potential heads \- due to lack of head information +You haven't specified any nodes as heads so it won't be possible to differentiate between un\-parented commits and root nodes. +.TP +missing sha1 directory \fI\fR +The directory holding the sha1 objects is missing. +.TP +unreachable +The object , isn't actually referred to directly or indirectly in any of the trees or commits seen. This can mean that there's another root node that you're not specifying or that the tree is corrupt. If you haven't missed a root node then you might as well delete unreachable nodes since they can't be used. +.TP +missing +The object , is referred to but isn't present in the database. +.TP +dangling +The object , is present in the database but never \fIdirectly\fR used. A dangling commit could be a root node. +.TP +warning: git\-fsck: tree has full pathnames in it +And it shouldn't\&... +.TP +sha1 mismatch +The database has an object who's sha1 doesn't match the database value. This indicates a serious data integrity problem. +.SH "ENVIRONMENT VARIABLES" +.TP +GIT_OBJECT_DIRECTORY +used to specify the object database root (usually $GIT_DIR/objects) +.TP +GIT_INDEX_FILE +used to specify the index file of the index +.TP +GIT_ALTERNATE_OBJECT_DIRECTORIES +used to specify additional object database roots (usually unset) +.SH "AUTHOR" +Written by Linus Torvalds +.SH "DOCUMENTATION" +Documentation by David Greaves, Junio C Hamano and the git\-list . +.SH "GIT" +Part of the \fBgit\fR(7) suite + diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index d5100374b..cafe77899 100644 --- a/man1/git-pack-redundant.1 +++ b/man1/git-pack-redundant.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-PACK\-REDUNDANT" "1" "01/19/2007" "" "" +.TH "GIT\-PACK\-REDUNDANT" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -16,7 +16,7 @@ This program computes which packs in your repository are redundant. The output i git\-pack\-redundant accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable objects. -git\-fsck\-objects \-\-full \-\-unreachable | cut \-d \fI \fR \-f3 | git\-pack\-redundant \-\-all | xargs rm +git\-fsck \-\-full \-\-unreachable | cut \-d \fI \fR \-f3 | git\-pack\-redundant \-\-all | xargs rm .SH "OPTIONS" .TP \-\-all diff --git a/man1/git-prune.1 b/man1/git-prune.1 index 49ffffcd5..f270a1394 100644 --- a/man1/git-prune.1 +++ b/man1/git-prune.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-PRUNE" "1" "01/22/2007" "" "" +.TH "GIT\-PRUNE" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-prune \- Prunes all unreachable objects from the object database .SH "SYNOPSIS" \fIgit\-prune\fR [\-n] [\-\-] [\&...] .SH "DESCRIPTION" -This runs git\-fsck\-objects \-\-unreachable using all the refs available in $GIT_DIR/refs, optionally with additional set of objects specified on the command line, and prunes all objects unreachable from any of these head objects from the object database. In addition, it prunes the unpacked objects that are also found in packs by running git prune\-packed. +This runs git\-fsck \-\-unreachable using all the refs available in $GIT_DIR/refs, optionally with additional set of objects specified on the command line, and prunes all objects unreachable from any of these head objects from the object database. In addition, it prunes the unpacked objects that are also found in packs by running git prune\-packed. .SH "OPTIONS" .TP \-n diff --git a/man1/git-pull.1 b/man1/git-pull.1 index df8f5a2fb..d4b67d6f1 100644 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-PULL" "1" "01/19/2007" "" "" +.TH "GIT\-PULL" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -182,7 +182,7 @@ This resolves any number of heads, but the result of the merge is always the cur .SH "EXAMPLES" .TP git pull, git pull origin -Update the remote\-tracking branches for the repository you cloned from, then merge one of them into your current branch. Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch..remote and branch..merge options; see \fBgit\-repo\-config\fR(1) for details. +Update the remote\-tracking branches for the repository you cloned from, then merge one of them into your current branch. Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch..remote and branch..merge options; see \fBgit\-config\fR(1) for details. .TP git pull origin next Merge into the current branch the remote branch next; leaves a copy of next temporarily in FETCH_HEAD, but does not update any remote\-tracking branches. @@ -213,7 +213,7 @@ The final command then merges the newly fetched tmp into master. If you tried a pull which resulted in a complex conflicts and would want to start over, you can recover with \fBgit\-reset\fR(1). .SH "SEE ALSO" -\fBgit\-fetch\fR(1), \fBgit\-merge\fR(1), \fBgit\-repo\-config\fR(1) +\fBgit\-fetch\fR(1), \fBgit\-merge\fR(1), \fBgit\-config\fR(1) .SH "AUTHOR" Written by Linus Torvalds and Junio C Hamano .SH "DOCUMENTATION" diff --git a/man1/git-remote.1 b/man1/git-remote.1 index 69eaaf643..5b0132476 100644 --- a/man1/git-remote.1 +++ b/man1/git-remote.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REMOTE" "1" "01/09/2007" "" "" +.TH "GIT\-REMOTE" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -25,7 +25,7 @@ In the second form, adds a remote named for the repository at . The In the third form, gives some information about the remote . -The remote configuration is achieved using the remote.origin.url and remote.origin.fetch configuration variables. (See \fBgit\-repo\-config\fR(1)). +The remote configuration is achieved using the remote.origin.url and remote.origin.fetch configuration variables. (See \fBgit\-config\fR(1)). .SH "EXAMPLES" Add a new remote, fetch, and check out a branch from it: .sp @@ -48,7 +48,7 @@ $ git checkout \-b nfs linux\-nfs/master ... .fi .SH "SEE ALSO" -\fBgit\-fetch\fR(1) \fBgit\-branch\fR(1) \fBgit\-repo\-config\fR(1) +\fBgit\-fetch\fR(1) \fBgit\-branch\fR(1) \fBgit\-config\fR(1) .SH "AUTHOR" Written by Junio Hamano .SH "DOCUMENTATION" diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index 4f1c19ca2..5d1ee8af8 100644 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REPO\-CONFIG" "1" "01/28/2007" "" "" +.TH "GIT\-REPO\-CONFIG" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,458 +10,7 @@ .SH "NAME" git\-repo\-config \- Get and set repository or global options .SH "SYNOPSIS" -.sp -.nf -\fIgit\-repo\-config\fR [\-\-global] [type] name [value [value_regex]] -\fIgit\-repo\-config\fR [\-\-global] [type] \-\-add name value -\fIgit\-repo\-config\fR [\-\-global] [type] \-\-replace\-all name [value [value_regex]] -\fIgit\-repo\-config\fR [\-\-global] [type] \-\-get name [value_regex] -\fIgit\-repo\-config\fR [\-\-global] [type] \-\-get\-all name [value_regex] -\fIgit\-repo\-config\fR [\-\-global] [type] \-\-unset name [value_regex] -\fIgit\-repo\-config\fR [\-\-global] [type] \-\-unset\-all name [value_regex] -\fIgit\-repo\-config\fR [\-\-global] \-l | \-\-list -.fi +\fIgit\-repo\-config\fR \&... .SH "DESCRIPTION" -You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped. - -Multiple lines can be added to an option by using the \fI\-\-add\fR option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp value_regex needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do \fBnot\fR match the regex, just prepend a single exclamation mark in front (see EXAMPLES). - -The type specifier can be either \fI\-\-int\fR or \fI\-\-bool\fR, which will make \fIgit\-repo\-config\fR 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, no checks or transformations are performed on the value. - -This command will fail if: -.TP 3 -1. -The .git/config file is invalid, -.TP -2. -Can not write to .git/config, -.TP -3. -no section was provided, -.TP -4. -the section or key is invalid, -.TP -5. -you try to unset an option which does not exist, -.TP -6. -you try to unset/set an option for which multiple lines match, or -.TP -7. -you use \-\-global option without $HOME being properly set. -.SH "OPTIONS" -.TP -\-\-replace\-all -Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex). -.TP -\-\-add -Adds a new line to the option without altering any existing values. This is the same as providing \fI^$\fR as the value_regex. -.TP -\-\-get -Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and error code 2 if multiple key values were found. -.TP -\-\-get\-all -Like get, but does not fail if the number of values for the key is not exactly one. -.TP -\-\-get\-regexp -Like \-\-get\-all, but interprets the name as a regular expression. -.TP -\-\-global -Use global ~/.gitconfig file rather than the repository .git/config. -.TP -\-\-unset -Remove the line matching the key from config file. -.TP -\-\-unset\-all -Remove all matching lines from config file. -.TP -\-l, \-\-list -List all variables set in config file. -.TP -\-\-bool -git\-repo\-config will ensure that the output is "true" or "false" -.TP -\-\-int -git\-repo\-config will ensure that the output is a simple decimal number. An optional value suffix of \fIk\fR, \fIm\fR, or \fIg\fR in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. -.SH "ENVIRONMENT" -.TP -GIT_CONFIG -Take the configuration from the given file instead of .git/config. Using the "\-\-global" option forces this to ~/.gitconfig. -.TP -GIT_CONFIG_LOCAL -Currently the same as $GIT_CONFIG; when Git will support global configuration files, this will cause it to take the configuration from the global configuration file in addition to the given file. -.SH "EXAMPLE" -Given a .git/config like this: -.sp -.nf -# -# This is the config file, and -# a '#' or ';' character indicates -# a comment -# -.fi -.sp -.nf -; core variables -[core] - ; Don't trust file modes - filemode = false -.fi -.sp -.nf -; Our diff algorithm -[diff] - external = "/usr/local/bin/gnu\-diff \-u" - renames = true -.fi -.sp -.nf -; Proxy settings -[core] - gitproxy="ssh" for "ssh://kernel.org/" - gitproxy="proxy\-command" for kernel.org - gitproxy="myprotocol\-command" for "my://" - gitproxy=default\-proxy ; for all the rest -.fi -you can set the filemode to true with -.sp -.nf -% git repo\-config core.filemode true -.fi -The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to "ssh". -.sp -.nf -% git repo\-config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$' -.fi -This makes sure that only the key/value pair for kernel.org is replaced. - -To delete the entry for renames, do -.sp -.nf -% git repo\-config \-\-unset diff.renames -.fi -If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line. - -To query the value for a given key, do -.sp -.nf -% git repo\-config \-\-get core.filemode -.fi -or -.sp -.nf -% git repo\-config core.filemode -.fi -or, to query a multivar: -.sp -.nf -% git repo\-config \-\-get core.gitproxy "for kernel.org$" -.fi -If you want to know all the values for a multivar, do: -.sp -.nf -% git repo\-config \-\-get\-all core.gitproxy -.fi -If you like to live dangerous, you can replace \fBall\fR core.gitproxy by a new one with -.sp -.nf -% git repo\-config \-\-replace\-all core.gitproxy ssh -.fi -However, if you really only want to replace the line for the default proxy, i.e. the one without a "for \&..." postfix, do something like this: -.sp -.nf -% git repo\-config core.gitproxy ssh '! for ' -.fi -To actually match only values with an exclamation mark, you have to -.sp -.nf -% git repo\-config section.key value '[!]' -.fi -To add a new proxy, without altering any of the existing ones, use -.sp -.nf -% git repo\-config core.gitproxy '"proxy" for example.com' -.fi -.SH "CONFIGURATION FILE" -The git configuration file contains a number of variables that affect the git command's behavior. .git/config file for each repository is used to store the information for that repository, and $HOME/.gitconfig is used to store per user information to give fallback values for .git/config file. - -They can be used by both the git plumbing and the porcelains. The variables are divided into sections, where in the fully qualified variable name the variable itself is the last dot\-separated segment and the section name is everything before the last dot. The variable names are case\-insensitive and only alphanumeric characters are allowed. Some variables may appear multiple times. -.SS "Syntax" -The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The \fI#\fR and \fI;\fR characters begin comments to the end of line, blank lines are ignored. - -The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are not case sensitive. Only alphanumeric characters, \fI\-\fR and \fI.\fR are allowed in section names. Each variable must belong to some section, which means that there must be section header before first setting of a variable. - -Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in example below: -.sp -.nf - [section "subsection"] -.fi -Subsection names can contain any characters except newline (doublequote \fI"\fR and backslash have to be escaped as \fI\\"\fR and \fI\\\\\fR, respecitvely) and are case sensitive. Section header cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have [section] if you have [section "subsection"], but you don't need to. - -There is also (case insensitive) alternative [section.subsection] syntax. In this syntax subsection names follow the same restrictions as for section name. - -All the other lines are recognized as setting variables, in the form \fIname = value\fR. If there is no equal sign on the line, the entire line is taken as \fIname\fR and the variable is recognized as boolean "true". The variable names are case\-insensitive and only alphanumeric characters and \fI\-\fR are allowed. There can be more than one value for a given variable; we say then that variable is multivalued. - -Leading and trailing whitespace in a variable value is discarded. Internal whitespace within a variable value is retained verbatim. - -The values following the equals sign in variable assign are all either a string, an integer, or a boolean. Boolean values may be given as yes/no, 0/1 or true/false. Case is not significant in boolean values, when converting value to the canonical form using \fI\-\-bool\fR type specifier; git\-repo\-config will ensure that the output is "true" or "false". - -String values may be entirely or partially enclosed in double quotes. You need to enclose variable value in double quotes if you want to preserve leading or trailing whitespace, or if variable value contains beginning of comment characters (if it contains \fI#\fR or \fI;\fR). Double quote \fI"\fR and backslash \fI\\\fR characters in variable value must be escaped: use \fI\\"\fR for \fI"\fR and \fI\\\\\fR for \fI\\\fR. - -The following escape sequences (beside \fI\\"\fR and \fI\\\\\fR) are recognized: \fI\\n\fR for newline character (NL), \fI\\t\fR for horizontal tabulation (HT, TAB) and \fI\\b\fR for backspace (BS). No other char escape sequence, nor octal char sequences are valid. - -Variable value ending in a \fI\\\fR is continued on the next line in the customary UNIX fashion. - -Some variables may require special value format. -.SS "Example" -.sp -.nf -# Core variables -[core] - ; Don't trust file modes - filemode = false -.fi -.sp -.nf -# Our diff algorithm -[diff] - external = "/usr/local/bin/gnu\-diff \-u" - renames = true -.fi -.sp -.nf -[branch "devel"] - remote = origin - merge = refs/heads/devel -.fi -.sp -.nf -# Proxy settings -[core] - gitProxy="ssh" for "ssh://kernel.org/" - gitProxy=default\-proxy ; for the rest -.fi -.SS "Variables" -Note that this list is non\-comprehensive and not necessarily complete. For command\-specific variables, you will find a more detailed description in the appropriate manual page. You will find a description of non\-core porcelain configuration variables in the respective porcelain documentation. -.TP -core.fileMode -If false, the executable bit differences between the index and the working copy are ignored; useful on broken filesystems like FAT. See \fBgit\-update\-index\fR(1). True by default. -.TP -core.gitProxy -A "proxy command" to execute (as \fIcommand host port\fR) instead of establishing direct connection to the remote server when using the git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins. - -Can be overridden by the \fIGIT_PROXY_COMMAND\fR environment variable (which always applies universally, without the special "for" handling). -.TP -core.ignoreStat -The working copy files are assumed to stay unchanged until you mark them otherwise manually \- Git will not detect the file changes by lstat() calls. This is useful on systems where those are very slow, such as Microsoft Windows. See \fBgit\-update\-index\fR(1). False by default. -.TP -core.preferSymlinkRefs -Instead of the default "symref" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link. -.TP -core.logAllRefUpdates -Updates to a ref is logged to the file "$GIT_DIR/logs/", by appending the new and old SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/" file is automatically created for branch heads. - -This information can be used to determine what commit was the tip of a branch "2 days ago". - -This value is true by default in a repository that has a working directory associated with it, and false by default in a bare repository. -.TP -core.repositoryFormatVersion -Internal variable identifying the repository format and layout version. -.TP -core.sharedRepository -When \fIgroup\fR (or \fItrue\fR), the repository is made shareable between several users in a group (making sure all the files and objects are group\-writable). When \fIall\fR (or \fIworld\fR or \fIeverybody\fR), the repository will be readable by all users, additionally to being group\-shareable. When \fIumask\fR (or \fIfalse\fR), git will use permissions reported by umask(2). See \fBgit\-init\fR(1). False by default. -.TP -core.warnAmbiguousRefs -If true, git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the .git/refs/ tree. True by default. -.TP -core.compression -An integer \-1..9, indicating the compression level for objects that are not in a pack file. \-1 is the zlib and git default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. -.TP -core.legacyheaders -A boolean which enables the legacy object header format in case you want to interoperate with old clients accessing the object database directly (where the "http://" and "rsync://" protocols count as direct access). -.TP -core.packedGitWindowSize -Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files. - -Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should be reasonable for all users/operating systems. You probably do not need to adjust this value. - -Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported. -.TP -core.packedGitLimit -Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process. - -Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. This should be reasonable for all users/operating systems, except on the largest projects. You probably do not need to adjust this value. - -Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported. -.TP -alias.* -Command aliases for the \fBgit\fR(1) command wrapper \- e.g. after defining "alias.last = cat\-file commit HEAD", the invocation "git last" is equivalent to "git cat\-file commit HEAD". To avoid confusion and troubles with script usage, aliases that hide existing git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them. -.TP -apply.whitespace -Tells git\-apply how to handle whitespaces, in the same way as the \fI\-\-whitespace\fR option. See \fBgit\-apply\fR(1). -.TP -branch..remote -When in branch , it tells git fetch which remote to fetch. If this option is not given, git fetch defaults to remote "origin". -.TP -branch..merge -When in branch , it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value has exactly to match a remote part of one of the refspecs which are fetched from the remote given by "branch..remote". The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. -.TP -color.branch -A boolean to enable/disable color in the output of \fBgit\-branch\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false. -.TP -color.branch. -Use customized color for branch coloration. is one of current (the current branch), local (a local branch), remote (a tracking branch in refs/remotes/), plain (other refs). - -The value for these configuration variables is a list of colors (at most two) and attributes (at most one), separated by spaces. The colors accepted are normal, black, red, green, yellow, blue, magenta, cyan and white; the attributes are bold, dim, ul, blink and reverse. The first color given is the foreground; the second is the background. The position of the attribute, if any, doesn't matter. -.TP -color.diff -When true (or always), always use colors in patch. When false (or never), never. When set to auto, use colors only when the output is to the terminal. -.TP -color.diff. -Use customized color for diff colorization. specifies which part of the patch to use the specified color, and is one of plain (context text), meta (metainformation), frag (hunk header), old (removed lines), new (added lines), commit (commit headers), or whitespace (highlighting dubious whitespace). The values of these variables may be specified as in color.branch.. -.TP -color.pager -A boolean to enable/disable colored output when the pager is in use (default is true). -.TP -color.status -A boolean to enable/disable color in the output of \fBgit\-status\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false. -.TP -color.status. -Use customized color for status colorization. is one of header (the header text of the status message), added or updated (files which are added but not committed), changed (files which are changed but not added in the index), or untracked (files which are not tracked by git). The values of these variables may be specified as in color.branch.. -.TP -diff.renameLimit -The number of files to consider when performing the copy/rename detection; equivalent to the git diff option \fI\-l\fR. -.TP -diff.renames -Tells git to detect renames. If set to any boolean value, it will enable basic rename detection. If set to "copies" or "copy", it will detect copies, as well. -.TP -fetch.unpackLimit -If the number of objects fetched over the git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. -.TP -format.headers -Additional email headers to include in a patch to be submitted by mail. See \fBgit\-format\-patch\fR(1). -.TP -gc.reflogexpire -git reflog expire removes reflog entries older than this time; defaults to 90 days. -.TP -gc.reflogexpireunreachable -git reflog expire removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. -.TP -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 \fBgit\-rerere\fR(1). -.TP -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 \fBgit\-rerere\fR(1). -.TP -gitcvs.enabled -Whether the cvs pserver interface is enabled for this repository. See \fBgit\-cvsserver\fR(1). -.TP -gitcvs.logfile -Path to a log file where the cvs pserver interface well\&... logs various stuff. See \fBgit\-cvsserver\fR(1). -.TP -http.sslVerify -Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_NO_VERIFY\fR environment variable. -.TP -http.sslCert -File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_CERT\fR environment variable. -.TP -http.sslKey -File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_KEY\fR environment variable. -.TP -http.sslCAInfo -File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_CAINFO\fR environment variable. -.TP -http.sslCAPath -Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_CAPATH\fR environment variable. -.TP -http.maxRequests -How many HTTP requests to launch in parallel. Can be overridden by the \fIGIT_HTTP_MAX_REQUESTS\fR environment variable. Default is 5. -.TP -http.lowSpeedLimit, http.lowSpeedTime -If the HTTP transfer speed is less than \fIhttp.lowSpeedLimit\fR for longer than \fIhttp.lowSpeedTime\fR seconds, the transfer is aborted. Can be overridden by the \fIGIT_HTTP_LOW_SPEED_LIMIT\fR and \fIGIT_HTTP_LOW_SPEED_TIME\fR environment variables. -.TP -http.noEPSV -A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which doesn't support EPSV mode. Can be overridden by the \fIGIT_CURL_FTP_NO_EPSV\fR environment variable. Default is false (curl will use EPSV). -.TP -i18n.commitEncoding -Character encoding the commit messages are stored in; git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. \fBgit\-mailinfo\fR(1). Defaults to \fIutf\-8\fR. -.TP -i18n.logOutputEncoding -Character encoding the commit messages are converted to when running git\-log and friends. -.TP -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 \fBgit\-log\fR(1) or \fBgit\-whatchanged\fR(1), which normally hide the root commit will now show it. True by default. -.TP -merge.summary -Whether to include summaries of merged commits in newly created merge commit messages. False by default. -.TP -merge.verbosity -Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. -.TP -pack.window -The size of the window used by \fBgit\-pack\-objects\fR(1) when no window size is given on the command line. Defaults to 10. -.TP -pull.octopus -The default merge strategy to use when pulling multiple branches at once. -.TP -pull.twohead -The default merge strategy to use when pulling a single branch. -.TP -remote..url -The URL of a remote repository. See \fBgit\-fetch\fR(1) or \fBgit\-push\fR(1). -.TP -remote..fetch -The default set of "refspec" for \fBgit\-fetch\fR(1). See \fBgit\-fetch\fR(1). -.TP -remote..push -The default set of "refspec" for \fBgit\-push\fR(1). See \fBgit\-push\fR(1). -.TP -remote..receivepack -The default program to execute on the remote side when pushing. See option \-\-exec of \fBgit\-push\fR(1). -.TP -remote..uploadpack -The default program to execute on the remote side when fetching. See option \-\-exec of \fBgit\-fetch\-pack\fR(1). -.TP -repack.usedeltabaseoffset -Allow \fBgit\-repack\fR(1) to create packs that uses delta\-base offset. Defaults to false. -.TP -show.difftree -The default \fBgit\-diff\-tree\fR(1) arguments to be used for \fBgit\-show\fR(1). -.TP -showbranch.default -The default set of branches for \fBgit\-show\-branch\fR(1). See \fBgit\-show\-branch\fR(1). -.TP -tar.umask -By default, \fBgit\-tar\-tree\fR(1) sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects such as the Linux Kernel, it might be excessive for other projects. With this variable, it becomes possible to tell \fBgit\-tar\-tree\fR(1) to apply a specific umask to the modes above. The special value "user" indicates that the user's current umask will be used. This should be enough for most projects, as it will lead to the same permissions as \fBgit\-checkout\fR(1) would use. The default value remains 0, which means world read\-write. -.TP -user.email -Your email address to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_EMAIL\fR and \fIGIT_COMMITTER_EMAIL\fR environment variables. See \fBgit\-commit\-tree\fR(1). -.TP -user.name -Your full name to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_NAME\fR and \fIGIT_COMMITTER_NAME\fR environment variables. See \fBgit\-commit\-tree\fR(1). -.TP -user.signingkey -If \fBgit\-tag\fR(1) is not selecting the key you want it to automatically when creating a signed tag, you can override the default selection with this variable. This option is passed unchanged to gpg's \-\-local\-user parameter, so you may specify a key using any method that gpg supports. -.TP -whatchanged.difftree -The default \fBgit\-diff\-tree\fR(1) arguments to be used for \fBgit\-whatchanged\fR(1). -.TP -imap -The configuration variables in the \fIimap\fR section are described in \fBgit\-imap\-send\fR(1). -.TP -receive.unpackLimit -If the number of objects received in a push is below this limit then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. -.TP -receive.denyNonFastForwards -If set to true, git\-receive\-pack will deny a ref update which is not a fast forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository. -.TP -transfer.unpackLimit -When fetch.unpackLimit or receive.unpackLimit are not set, the value of this variable is used instead. -.SH "AUTHOR" -Written by Johannes Schindelin -.SH "DOCUMENTATION" -Documentation by Johannes Schindelin, Petr Baudis and the git\-list . -.SH "GIT" -Part of the \fBgit\fR(7) suite +This is a synonym for \fBgit\-config\fR(1). Please refer to the documentation of that command. diff --git a/man1/git-svn.1 b/man1/git-svn.1 index a721bf541..1e4405971 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SVN" "1" "01/19/2007" "" "" +.TH "GIT\-SVN" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -110,14 +110,14 @@ Only used with the \fIdcommit\fR, \fIset\-tree\fR and \fIcommit\-diff\fR command Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. git cannot version empty directories. Enabling this flag will make the commit to SVN act like git. -repo\-config key: svn.rmdir +config key: svn.rmdir .TP \-e , \-\-edit Only used with the \fIdcommit\fR, \fIset\-tree\fR and \fIcommit\-diff\fR commands. Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects. -repo\-config key: svn.edit +config key: svn.edit .TP \-l , \-\-find\-copies\-harder Only used with the \fIdcommit\fR, \fIset\-tree\fR and \fIcommit\-diff\fR commands. @@ -125,8 +125,8 @@ Only used with the \fIdcommit\fR, \fIset\-tree\fR and \fIcommit\-diff\fR command They are both passed directly to git\-diff\-tree see \fBgit\-diff\-tree\fR(1) for more information. .sp .nf -repo\-config key: svn.l -repo\-config key: svn.findcopiesharder +config key: svn.l +config key: svn.findcopiesharder .fi .TP \-A , \-\-authors\-file= @@ -137,7 +137,7 @@ Syntax is compatible with the files used by git\-svnimport and git\-cvsimport: .fi If this option is specified and git\-svn encounters an SVN committer name that does not exist in the authors\-file, git\-svn will abort operation. The user will then have to add the appropriate entry. Re\-running the previous git\-svn command after the authors\-file is modified should continue operation. -repo\-config key: svn.authorsfile +config key: svn.authorsfile .TP \-q , \-\-quiet Make git\-svn less verbose. @@ -154,7 +154,7 @@ to fetch before repacking. This defaults to repacking every .nf \-\-repack\-flags are passed directly to gitlink:git\-repack[1]. .fi -repo\-config key: svn.repack repo\-config key: svn.repackflags +config key: svn.repack config key: svn.repackflags .TP \-m , \-\-merge , \-s , \-\-strategy= These are only used with the \fIdcommit\fR command. @@ -176,7 +176,7 @@ When used with different GIT_SVN_ID values, tags and branches in SVN can be trac This option may be specified multiple times, once for each branch. -repo\-config key: svn.branch +config key: svn.branch .TP \-i , \-\-id This sets GIT_SVN_ID (instead of using the environment). See the section on \fITracking Multiple Repositories or Branches\fR for more information on using GIT_SVN_ID. @@ -184,7 +184,7 @@ This sets GIT_SVN_ID (instead of using the environment). See the section on \fIT \-\-follow\-parent This is especially helpful when we're tracking a directory that has been moved around within the repository, or if we started tracking a branch and never tracked the trunk it was descended from. -repo\-config key: svn.followparent +config key: svn.followparent .TP \-\-no\-metadata This gets rid of the git\-svn\-id: lines at the end of every commit. @@ -199,7 +199,7 @@ able to fetch again, either. This is fine for one\-shot imports. The 'git\-svn log' command will not work on repositories using this, either. .fi -repo\-config key: svn.nometadata +config key: svn.nometadata .SH "COMPATIBILITY OPTIONS" .TP \-\-upgrade diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index cc143ea3f..6728a3f6d 100644 --- a/man1/git-update-index.1 +++ b/man1/git-update-index.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-UPDATE\-INDEX" "1" "01/19/2007" "" "" +.TH "GIT\-UPDATE\-INDEX" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -195,11 +195,11 @@ M foo.c \fB9. \fRnow it checks with lstat(2) and finds it has been changed. .br .SH "CONFIGURATION" -The command honors core.filemode configuration variable. If your repository is on an filesystem whose executable bits are unreliable, this should be set to \fIfalse\fR (see \fBgit\-repo\-config\fR(1)). This causes the command to ignore differences in file modes recorded in the index and the file mode on the filesystem if they differ only on executable bit. On such an unfortunate filesystem, you may need to use git\-update\-index \-\-chmod=. +The command honors core.filemode configuration variable. If your repository is on an filesystem whose executable bits are unreliable, this should be set to \fIfalse\fR (see \fBgit\-config\fR(1)). This causes the command to ignore differences in file modes recorded in the index and the file mode on the filesystem if they differ only on executable bit. On such an unfortunate filesystem, you may need to use git\-update\-index \-\-chmod=. The command looks at core.ignorestat configuration variable. See \fIUsing "assume unchanged" bit\fR section above. .SH "SEE ALSO" -\fBgit\-repo\-config\fR(1) +\fBgit\-config\fR(1) .SH "AUTHOR" Written by Linus Torvalds .SH "DOCUMENTATION" diff --git a/man1/git-var.1 b/man1/git-var.1 index 852a79ccf..b47de8727 100644 --- a/man1/git-var.1 +++ b/man1/git-var.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-VAR" "1" "01/19/2007" "" "" +.TH "GIT\-VAR" "1" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -16,7 +16,7 @@ Prints a git logical variable. .SH "OPTIONS" .TP \-l -Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of git\-repo\-config \-l.) +Cause the logical variables to be listed. In addition, all the variables of the git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of git\-config \-l.) .SH "EXAMPLE" .sp .nf @@ -41,7 +41,7 @@ The password(5) gecos field is longer than a giant static buffer. Your sysadmin must hate you! The password(5) name field is longer than a giant static buffer. .SH "SEE ALSO" -\fBgit\-commit\-tree\fR(1) \fBgit\-tag\fR(1) \fBgit\-repo\-config\fR(1) +\fBgit\-commit\-tree\fR(1) \fBgit\-tag\fR(1) \fBgit\-config\fR(1) .SH "AUTHOR" Written by Eric Biederman .SH "DOCUMENTATION" diff --git a/man7/git.7 b/man7/git.7 index c2d8c99ea..5a7cdf29a 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT" "7" "01/28/2007" "" "" +.TH "GIT" "7" "01/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -20,7 +20,7 @@ Git is a fast, scalable, distributed revision control system with an unusually r See this [1]\&\fItutorial\fR to get started, then see [2]\&\fIEveryday Git\fR for a useful minimum set of commands, and "man git\-commandname" for documentation of each command. CVS users may also want to read [3]\&\fICVS migration\fR. -The COMMAND is either a name of a Git command (see below) or an alias as defined in the configuration file (see \fBgit\-repo\-config\fR(1)). +The COMMAND is either a name of a Git command (see below) or an alias as defined in the configuration file (see \fBgit\-config\fR(1)). .SH "OPTIONS" .TP \-\-version @@ -171,7 +171,7 @@ Hardlink common objects in local repositories. \fBgit\-repack\fR(1) Pack unpacked objects in a repository. .TP -\fBgit\-repo\-config\fR(1) +\fBgit\-config\fR(1) Get and set repository or global options. Interrogators: @@ -191,7 +191,7 @@ Find commits not merged upstream. \fBgit\-count\-objects\fR(1) Count unpacked number of objects and their disk consumption. .TP -\fBgit\-fsck\-objects\fR(1) +\fBgit\-fsck\fR(1) Verifies the connectivity and validity of the objects in the database. .TP \fBgit\-get\-tar\-commit\-id\fR(1) @@ -607,7 +607,7 @@ Regardless of object type, all objects share the following characteristics: they As a result, the general consistency of an object can always be tested independently of the contents or the type of the object: all objects can be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that forms a sequence of + + + + . -The structured objects can further have their structure and connectivity to other objects verified. This is generally done with the git\-fsck\-objects program, which generates a full dependency graph of all objects, and verifies their internal consistency (in addition to just verifying their superficial consistency through the hash). +The structured objects can further have their structure and connectivity to other objects verified. This is generally done with the git\-fsck program, which generates a full dependency graph of all objects, and verifies their internal consistency (in addition to just verifying their superficial consistency through the hash). The object types in some more detail: .SS "Blob Object"