diff options
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 2478 |
1 files changed, 1239 insertions, 1239 deletions
diff --git a/git-config.html b/git-config.html index 7b99b74d6..1a2dc4c6c 100644 --- a/git-config.html +++ b/git-config.html @@ -1979,6 +1979,32 @@ names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
+add.ignoreErrors
+</dt>
+<dt class="hdlist1">
+add.ignore-errors (deprecated)
+</dt>
+<dd>
+<p>
+ Tells <em>git add</em> to continue adding files when some files cannot be
+ added due to indexing errors. Equivalent to the <code>--ignore-errors</code>
+ option of <a href="git-add.html">git-add(1)</a>. <code>add.ignore-errors</code> is deprecated,
+ as it does not follow the usual naming convention for configuration
+ variables.
+</p>
+</dd>
+<dt class="hdlist1">
+add.interactive.useBuiltin
+</dt>
+<dd>
+<p>
+ Unused configuration variable. Used in Git versions v2.25.0 to
+ v2.36.0 to enable the built-in version of <a href="git-add.html">git-add(1)</a>'s
+ interactive mode, which then became the default in Git
+ versions v2.37.0 to v2.39.0.
+</p>
+</dd>
+<dt class="hdlist1">
advice.*
</dt>
<dd>
@@ -2361,6 +2387,85 @@ worktreeAddOrphan </div></div>
</dd>
<dt class="hdlist1">
+alias.*
+</dt>
+<dd>
+<p>
+ Command aliases for the <a href="git.html">git(1)</a> command wrapper - e.g.
+ after defining <code>alias.last = cat-file commit HEAD</code>, the invocation
+ <code>git last</code> is equivalent to <code>git cat-file commit HEAD</code>. 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 are supported.
+ A quote pair or a backslash can be used to quote them.
+</p>
+<div class="paragraph"><p>Note that the first word of an alias does not necessarily have to be a
+command. It can be a command-line option that will be passed into the
+invocation of <code>git</code>. In particular, this is useful when used with <code>-c</code>
+to pass in one-time configurations or <code>-p</code> to force pagination. For example,
+<code>loud-rebase = -c commit.verbose=true rebase</code> can be defined such that
+running <code>git loud-rebase</code> would be equivalent to
+<code>git -c commit.verbose=true rebase</code>. Also, <code>ps = -p status</code> would be a
+helpful alias since <code>git ps</code> would paginate the output of <code>git status</code>
+where the original command does not.</p></div>
+<div class="paragraph"><p>If the alias expansion is prefixed with an exclamation point,
+it will be treated as a shell command. For example, defining
+<code>alias.new = !gitk --all --not ORIG_HEAD</code>, the invocation
+<code>git new</code> is equivalent to running the shell command
+<code>gitk --all --not ORIG_HEAD</code>. Note that shell commands will be
+executed from the top-level directory of a repository, which may
+not necessarily be the current directory.
+<code>GIT_PREFIX</code> is set as returned by running <code>git rev-parse --show-prefix</code>
+from the original current directory. See <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div>
+</dd>
+<dt class="hdlist1">
+am.keepcr
+</dt>
+<dd>
+<p>
+ If true, git-am will call git-mailsplit for patches in mbox format
+ with parameter <code>--keep-cr</code>. In this case git-mailsplit will
+ not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden
+ by giving <code>--no-keep-cr</code> from the command line.
+ See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+am.threeWay
+</dt>
+<dd>
+<p>
+ By default, <code>git am</code> will fail if the patch does not apply cleanly. When
+ set to true, this setting tells <code>git am</code> to fall back on 3-way merge if
+ the patch records the identity of blobs it is supposed to apply to and
+ we have those blobs available locally (equivalent to giving the <code>--3way</code>
+ option from the command line). Defaults to <code>false</code>.
+ See <a href="git-am.html">git-am(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+apply.ignoreWhitespace
+</dt>
+<dd>
+<p>
+ When set to <em>change</em>, tells <em>git apply</em> to ignore changes in
+ whitespace, in the same way as the <code>--ignore-space-change</code>
+ option.
+ When set to one of: no, none, never, false, it tells <em>git apply</em> to
+ respect all whitespace differences.
+ See <a href="git-apply.html">git-apply(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+apply.whitespace
+</dt>
+<dd>
+<p>
+ Tells <em>git apply</em> how to handle whitespace, in the same way
+ as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
attr.tree
</dt>
<dd>
@@ -2374,6 +2479,1026 @@ attr.tree </p>
</dd>
<dt class="hdlist1">
+blame.blankBoundary
+</dt>
+<dd>
+<p>
+ Show blank commit object name for boundary commits in
+ <a href="git-blame.html">git-blame(1)</a>. This option defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.coloring
+</dt>
+<dd>
+<p>
+ This determines the coloring scheme to be applied to blame
+ output. It can be <em>repeatedLines</em>, <em>highlightRecent</em>,
+ or <em>none</em> which is the default.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.date
+</dt>
+<dd>
+<p>
+ Specifies the format used to output dates in <a href="git-blame.html">git-blame(1)</a>.
+ If unset the iso format is used. For supported values,
+ see the discussion of the <code>--date</code> option at <a href="git-log.html">git-log(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.showEmail
+</dt>
+<dd>
+<p>
+ Show the author email instead of author name in <a href="git-blame.html">git-blame(1)</a>.
+ This option defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.showRoot
+</dt>
+<dd>
+<p>
+ Do not treat root commits as boundaries in <a href="git-blame.html">git-blame(1)</a>.
+ This option defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.ignoreRevsFile
+</dt>
+<dd>
+<p>
+ Ignore revisions listed in the file, one unabbreviated object name per
+ line, in <a href="git-blame.html">git-blame(1)</a>. Whitespace and comments beginning with
+ <code>#</code> are ignored. This option may be repeated multiple times. Empty
+ file names will reset the list of ignored revisions. This option will
+ be handled before the command line option <code>--ignore-revs-file</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.markUnblamableLines
+</dt>
+<dd>
+<p>
+ Mark lines that were changed by an ignored revision that we could not
+ attribute to another commit with a <em>*</em> in the output of
+ <a href="git-blame.html">git-blame(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+blame.markIgnoredLines
+</dt>
+<dd>
+<p>
+ Mark lines that were changed by an ignored revision that we attributed to
+ another commit with a <em>?</em> in the output of <a href="git-blame.html">git-blame(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.autoSetupMerge
+</dt>
+<dd>
+<p>
+ Tells <em>git branch</em>, <em>git switch</em> and <em>git checkout</em> to set up new branches
+ so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the
+ starting point branch. Note that even if this option is not set,
+ this behavior can be chosen per-branch using the <code>--track</code>
+ and <code>--no-track</code> options. The valid settings are: <code>false</code> — no
+ automatic setup is done; <code>true</code> — automatic setup is done when the
+ starting point is a remote-tracking branch; <code>always</code> —  automatic setup is done when the starting point is either a
+ local branch or remote-tracking branch; <code>inherit</code> — if the starting point
+ has a tracking configuration, it is copied to the new
+ branch; <code>simple</code> — automatic setup is done only when the starting point
+ is a remote-tracking branch and the new branch has the same name as the
+ remote branch. This option defaults to true.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.autoSetupRebase
+</dt>
+<dd>
+<p>
+ When a new branch is created with <em>git branch</em>, <em>git switch</em> or <em>git checkout</em>
+ that tracks another branch, this variable tells Git to set
+ up pull to rebase instead of merge (see "branch.<name>.rebase").
+ When <code>never</code>, rebase is never automatically set to true.
+ When <code>local</code>, rebase is set to true for tracked branches of
+ other local branches.
+ When <code>remote</code>, rebase is set to true for tracked branches of
+ remote-tracking branches.
+ When <code>always</code>, rebase will be set to true for all tracking
+ branches.
+ See "branch.autoSetupMerge" for details on how to set up a
+ branch to track another branch.
+ This option defaults to never.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.sort
+</dt>
+<dd>
+<p>
+ This variable controls the sort ordering of branches when displayed by
+ <a href="git-branch.html">git-branch(1)</a>. Without the "--sort=<value>" option provided, the
+ value of this variable will be used as the default.
+ See <a href="git-for-each-ref.html">git-for-each-ref(1)</a> field names for valid values.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.<name>.remote
+</dt>
+<dd>
+<p>
+ When on branch <name>, it tells <em>git fetch</em> and <em>git push</em>
+ which remote to fetch from or push to. The remote to push to
+ may be overridden with <code>remote.pushDefault</code> (for all branches).
+ The remote to push to, for the current branch, may be further
+ overridden by <code>branch.<name>.pushRemote</code>. If no remote is
+ configured, or if you are not on any branch and there is more than
+ one remote defined in the repository, it defaults to <code>origin</code> for
+ fetching and <code>remote.pushDefault</code> for pushing.
+ Additionally, <code>.</code> (a period) is the current local repository
+ (a dot-repository), see <code>branch.<name>.merge</code>'s final note below.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.<name>.pushRemote
+</dt>
+<dd>
+<p>
+ When on branch <name>, it overrides <code>branch.<name>.remote</code> for
+ pushing. It also overrides <code>remote.pushDefault</code> 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 <code>remote.pushDefault</code> to
+ specify the remote to push to for all branches, and use this
+ option to override it for a specific branch.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.<name>.merge
+</dt>
+<dd>
+<p>
+ Defines, together with branch.<name>.remote, the upstream branch
+ for the given branch. It tells <em>git fetch</em>/<em>git pull</em>/<em>git rebase</em> which
+ branch to merge and can also affect <em>git push</em> (see push.default).
+ When in branch <name>, it tells <em>git fetch</em> the default
+ refspec to be marked for merging in FETCH_HEAD. The value is
+ handled like the remote part of a refspec, and must match a
+ ref which is fetched from the remote given by
+ "branch.<name>.remote".
+ The merge information is used by <em>git pull</em> (which first calls
+ <em>git fetch</em>) to lookup the default branch for merging. Without
+ this option, <em>git pull</em> defaults to merge the first refspec fetched.
+ Specify multiple values to get an octopus merge.
+ If you wish to setup <em>git pull</em> so that it merges into <name> from
+ another branch in the local repository, you can point
+ branch.<name>.merge to the desired branch, and use the relative path
+ setting <code>.</code> (a period) for branch.<name>.remote.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.<name>.mergeOptions
+</dt>
+<dd>
+<p>
+ Sets default options for merging into branch <name>. The syntax and
+ supported options are the same as those of <a href="git-merge.html">git-merge(1)</a>, but
+ option values containing whitespace characters are currently not
+ supported.
+</p>
+</dd>
+<dt class="hdlist1">
+branch.<name>.rebase
+</dt>
+<dd>
+<p>
+ When true, rebase the branch <name> on top of the fetched branch,
+ instead of merging the default branch from the default remote when
+ "git pull" is run. See "pull.rebase" for doing this in a non
+ branch-specific manner.
+</p>
+<div class="paragraph"><p>When <code>merges</code> (or just <em>m</em>), pass the <code>--rebase-merges</code> option to <em>git rebase</em>
+so that the local merge commits are included in the rebase (see
+<a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>
+<div class="paragraph"><p>When the value is <code>interactive</code> (or just <em>i</em>), the rebase is run in interactive
+mode.</p></div>
+<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use
+it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>
+for details).</p></div>
+</dd>
+<dt class="hdlist1">
+branch.<name>.description
+</dt>
+<dd>
+<p>
+ Branch description, can be edited with
+ <code>git branch --edit-description</code>. Branch description is
+ automatically added to the format-patch cover letter or
+ request-pull summary.
+</p>
+</dd>
+<dt class="hdlist1">
+browser.<tool>.cmd
+</dt>
+<dd>
+<p>
+ Specify the command to invoke the specified browser. The
+ specified command is evaluated in shell with the URLs passed
+ as arguments. (See <a href="git-web--browse.html">git-web--browse(1)</a>.)
+</p>
+</dd>
+<dt class="hdlist1">
+browser.<tool>.path
+</dt>
+<dd>
+<p>
+ Override the path for the given tool that may be used to
+ browse HTML help (see <code>-w</code> option in <a href="git-help.html">git-help(1)</a>) or a
+ working repository in gitweb (see <a href="git-instaweb.html">git-instaweb(1)</a>).
+</p>
+</dd>
+<dt class="hdlist1">
+bundle.*
+</dt>
+<dd>
+<p>
+ The <code>bundle.*</code> keys may appear in a bundle list file found via the
+ <code>git clone --bundle-uri</code> option. These keys currently have no effect
+ if placed in a repository config file, though this will change in the
+ future. See <a href="technical/bundle-uri.html">the bundle URI design
+ document</a> for more details.
+</p>
+</dd>
+<dt class="hdlist1">
+bundle.version
+</dt>
+<dd>
+<p>
+ This integer value advertises the version of the bundle list format
+ used by the bundle list. Currently, the only accepted value is <code>1</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+bundle.mode
+</dt>
+<dd>
+<p>
+ This string value should be either <code>all</code> or <code>any</code>. This value describes
+ whether all of the advertised bundles are required to unbundle a
+ complete understanding of the bundled information (<code>all</code>) or if any one
+ of the listed bundle URIs is sufficient (<code>any</code>).
+</p>
+</dd>
+<dt class="hdlist1">
+bundle.heuristic
+</dt>
+<dd>
+<p>
+ If this string-valued key exists, then the bundle list is designed to
+ work well with incremental <code>git fetch</code> commands. The heuristic signals
+ that there are additional keys available for each bundle that help
+ determine which subset of bundles the client should download. The
+ only value currently understood is <code>creationToken</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+bundle.<id>.*
+</dt>
+<dd>
+<p>
+ The <code>bundle.<id>.*</code> keys are used to describe a single item in the
+ bundle list, grouped under <code><id></code> for identification purposes.
+</p>
+</dd>
+<dt class="hdlist1">
+bundle.<id>.uri
+</dt>
+<dd>
+<p>
+ This string value defines the URI by which Git can reach the contents
+ of this <code><id></code>. This URI may be a bundle file or another bundle list.
+</p>
+</dd>
+<dt class="hdlist1">
+checkout.defaultRemote
+</dt>
+<dd>
+<p>
+ When you run <code>git checkout <something></code>
+ or <code>git switch <something></code> and only have one
+ remote, it may implicitly fall back on checking out and
+ tracking e.g. <code>origin/<something></code>. This stops working as soon
+ as you have more than one remote with a <code><something></code>
+ reference. This setting allows for setting the name of a
+ preferred remote that should always win when it comes to
+ disambiguation. The typical use-case is to set this to
+ <code>origin</code>.
+</p>
+<div class="paragraph"><p>Currently this is used by <a href="git-switch.html">git-switch(1)</a> and
+<a href="git-checkout.html">git-checkout(1)</a> when <code>git checkout <something></code>
+or <code>git switch <something></code>
+will checkout the <code><something></code> branch on another remote,
+and by <a href="git-worktree.html">git-worktree(1)</a> when <code>git worktree add</code> refers to a
+remote branch. This setting might be used for other checkout-like
+commands or functionality in the future.</p></div>
+</dd>
+<dt class="hdlist1">
+checkout.guess
+</dt>
+<dd>
+<p>
+ Provides the default value for the <code>--guess</code> or <code>--no-guess</code>
+ option in <code>git checkout</code> and <code>git switch</code>. See
+ <a href="git-switch.html">git-switch(1)</a> and <a href="git-checkout.html">git-checkout(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+checkout.workers
+</dt>
+<dd>
+<p>
+ The number of parallel workers to use when updating the working tree.
+ The default is one, i.e. sequential execution. If set to a value less
+ than one, Git will use as many workers as the number of logical cores
+ available. This setting and <code>checkout.thresholdForParallelism</code> affect
+ all commands that perform checkout. E.g. checkout, clone, reset,
+ sparse-checkout, etc.
+</p>
+<div class="paragraph"><p>Note: Parallel checkout usually delivers better performance for repositories
+located on SSDs or over NFS. For repositories on spinning disks and/or machines
+with a small number of cores, the default sequential checkout often performs
+better. The size and compression level of a repository might also influence how
+well the parallel version performs.</p></div>
+</dd>
+<dt class="hdlist1">
+checkout.thresholdForParallelism
+</dt>
+<dd>
+<p>
+ When running parallel checkout with a small number of files, the cost
+ of subprocess spawning and inter-process communication might outweigh
+ the parallelization gains. This setting allows you to define the minimum
+ number of files for which parallel checkout should be attempted. The
+ default is 100.
+</p>
+</dd>
+<dt class="hdlist1">
+clean.requireForce
+</dt>
+<dd>
+<p>
+ A boolean to make git-clean do nothing unless given -f,
+ -i, or -n. Defaults to true.
+</p>
+</dd>
+<dt class="hdlist1">
+clone.defaultRemoteName
+</dt>
+<dd>
+<p>
+ The name of the remote to create when cloning a repository. Defaults to
+ <code>origin</code>, and can be overridden by passing the <code>--origin</code> command-line
+ option to <a href="git-clone.html">git-clone(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+clone.rejectShallow
+</dt>
+<dd>
+<p>
+ Reject cloning a repository if it is a shallow one; this can be overridden by
+ passing the <code>--reject-shallow</code> option on the command line. See <a href="git-clone.html">git-clone(1)</a>
+</p>
+</dd>
+<dt class="hdlist1">
+clone.filterSubmodules
+</dt>
+<dd>
+<p>
+ If a partial clone filter is provided (see <code>--filter</code> in
+ <a href="git-rev-list.html">git-rev-list(1)</a>) and <code>--recurse-submodules</code> is used, also apply
+ the filter to submodules.
+</p>
+</dd>
+<dt class="hdlist1">
+color.advice
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable color in hints (e.g. when a push
+ failed, see <code>advice.*</code> for a list). May be set to <code>always</code>,
+ <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors
+ are used only when the error output goes to a terminal. If
+ unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.advice.hint
+</dt>
+<dd>
+<p>
+ Use customized color for hints.
+</p>
+</dd>
+<dt class="hdlist1">
+color.blame.highlightRecent
+</dt>
+<dd>
+<p>
+ Specify the line annotation color for <code>git blame --color-by-age</code>
+ depending upon the age of the line.
+</p>
+<div class="paragraph"><p>This setting should be set to a comma-separated list of color and
+date settings, starting and ending with a color, the dates should be
+set from oldest to newest. The metadata will be colored with the
+specified colors if the line was introduced before the given
+timestamp, overwriting older timestamped colors.</p></div>
+<div class="paragraph"><p>Instead of an absolute timestamp relative timestamps work as well,
+e.g. <code>2.weeks.ago</code> is valid to address anything older than 2 weeks.</p></div>
+<div class="paragraph"><p>It defaults to <code>blue,12 month ago,white,1 month ago,red</code>, which
+colors everything older than one year blue, recent changes between
+one month and one year old are kept white, and lines introduced
+within the last month are colored red.</p></div>
+</dd>
+<dt class="hdlist1">
+color.blame.repeatedLines
+</dt>
+<dd>
+<p>
+ Use the specified color to colorize line annotations for
+ <code>git blame --color-lines</code>, if they come from the same commit as the
+ preceding line. Defaults to cyan.
+</p>
+</dd>
+<dt class="hdlist1">
+color.branch
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable color in the output of
+ <a href="git-branch.html">git-branch(1)</a>. May be set to <code>always</code>,
+ <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
+ only when the output is to a terminal. If unset, then the
+ value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.branch.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for branch coloration. <code><slot></code> is one of
+ <code>current</code> (the current branch), <code>local</code> (a local branch),
+ <code>remote</code> (a remote-tracking branch in refs/remotes/),
+ <code>upstream</code> (upstream tracking branch), <code>plain</code> (other
+ refs).
+</p>
+</dd>
+<dt class="hdlist1">
+color.diff
+</dt>
+<dd>
+<p>
+ Whether to use ANSI escape sequences to add color to patches.
+ If this is set to <code>always</code>, <a href="git-diff.html">git-diff(1)</a>,
+ <a href="git-log.html">git-log(1)</a>, and <a href="git-show.html">git-show(1)</a> will use color
+ for all patches. If it is set to <code>true</code> or <code>auto</code>, those
+ commands will only use color when output is to the terminal.
+ If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by
+ default).
+</p>
+<div class="paragraph"><p>This does not affect <a href="git-format-patch.html">git-format-patch(1)</a> or the
+<em>git-diff-*</em> plumbing commands. Can be overridden on the
+command line with the <code>--color[=<when>]</code> option.</p></div>
+</dd>
+<dt class="hdlist1">
+color.diff.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for diff colorization. <code><slot></code> specifies
+ which part of the patch to use the specified color, and is one
+ of <code>context</code> (context text - <code>plain</code> is a historical synonym),
+ <code>meta</code> (metainformation), <code>frag</code>
+ (hunk header), <em>func</em> (function in hunk header), <code>old</code> (removed lines),
+ <code>new</code> (added lines), <code>commit</code> (commit headers), <code>whitespace</code>
+ (highlighting whitespace errors), <code>oldMoved</code> (deleted lines),
+ <code>newMoved</code> (added lines), <code>oldMovedDimmed</code>, <code>oldMovedAlternative</code>,
+ <code>oldMovedAlternativeDimmed</code>, <code>newMovedDimmed</code>, <code>newMovedAlternative</code>
+ <code>newMovedAlternativeDimmed</code> (See the <em><mode></em>
+ setting of <em>--color-moved</em> in <a href="git-diff.html">git-diff(1)</a> for details),
+ <code>contextDimmed</code>, <code>oldDimmed</code>, <code>newDimmed</code>, <code>contextBold</code>,
+ <code>oldBold</code>, and <code>newBold</code> (see <a href="git-range-diff.html">git-range-diff(1)</a> for details).
+</p>
+</dd>
+<dt class="hdlist1">
+color.decorate.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for <em>git log --decorate</em> output. <code><slot></code> is one
+ of <code>branch</code>, <code>remoteBranch</code>, <code>tag</code>, <code>stash</code> or <code>HEAD</code> for local
+ branches, remote-tracking branches, tags, stash and HEAD, respectively
+ and <code>grafted</code> for grafted commits.
+</p>
+</dd>
+<dt class="hdlist1">
+color.grep
+</dt>
+<dd>
+<p>
+ When set to <code>always</code>, always highlight matches. When <code>false</code> (or
+ <code>never</code>), never. When set to <code>true</code> or <code>auto</code>, use color only
+ when the output is written to the terminal. If unset, then the
+ value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.grep.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for grep colorization. <code><slot></code> specifies which
+ part of the line to use the specified color, and is one of
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>context</code>
+</dt>
+<dd>
+<p>
+ non-matching text in context lines (when using <code>-A</code>, <code>-B</code>, or <code>-C</code>)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>filename</code>
+</dt>
+<dd>
+<p>
+ filename prefix (when not using <code>-h</code>)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>function</code>
+</dt>
+<dd>
+<p>
+ function name lines (when using <code>-p</code>)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>lineNumber</code>
+</dt>
+<dd>
+<p>
+ line number prefix (when using <code>-n</code>)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>column</code>
+</dt>
+<dd>
+<p>
+ column number prefix (when using <code>--column</code>)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>match</code>
+</dt>
+<dd>
+<p>
+ matching text (same as setting <code>matchContext</code> and <code>matchSelected</code>)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>matchContext</code>
+</dt>
+<dd>
+<p>
+ matching text in context lines
+</p>
+</dd>
+<dt class="hdlist1">
+<code>matchSelected</code>
+</dt>
+<dd>
+<p>
+ matching text in selected lines. Also, used to customize the following
+ <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code>, and <code>--committer</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>selected</code>
+</dt>
+<dd>
+<p>
+ non-matching text in selected lines. Also, used to customize the
+ following <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code> and
+ <code>--committer</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>separator</code>
+</dt>
+<dd>
+<p>
+ separators between fields on a line (<code>:</code>, <code>-</code>, and <code>=</code>)
+ and between hunks (<code>--</code>)
+</p>
+</dd>
+</dl></div>
+</div></div>
+</dd>
+<dt class="hdlist1">
+color.interactive
+</dt>
+<dd>
+<p>
+ When set to <code>always</code>, always use colors for interactive prompts
+ and displays (such as those used by "git-add --interactive" and
+ "git-clean --interactive"). When false (or <code>never</code>), never.
+ When set to <code>true</code> or <code>auto</code>, use colors only when the output is
+ to the terminal. If unset, then the value of <code>color.ui</code> is
+ used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.interactive.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for <em>git add --interactive</em> and <em>git clean
+ --interactive</em> output. <code><slot></code> may be <code>prompt</code>, <code>header</code>, <code>help</code>
+ or <code>error</code>, for four distinct types of normal output from
+ interactive commands.
+</p>
+</dd>
+<dt class="hdlist1">
+color.pager
+</dt>
+<dd>
+<p>
+ A boolean to specify whether <code>auto</code> color modes should colorize
+ output going to the pager. Defaults to true; set this to false
+ if your pager does not understand ANSI color codes.
+</p>
+</dd>
+<dt class="hdlist1">
+color.push
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable color in push errors. May be set to
+ <code>always</code>, <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which
+ case colors are used only when the error output goes to a terminal.
+ If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.push.error
+</dt>
+<dd>
+<p>
+ Use customized color for push errors.
+</p>
+</dd>
+<dt class="hdlist1">
+color.remote
+</dt>
+<dd>
+<p>
+ If set, keywords at the start of the line are highlighted. The
+ keywords are "error", "warning", "hint" and "success", and are
+ matched case-insensitively. May be set to <code>always</code>, <code>false</code> (or
+ <code>never</code>) or <code>auto</code> (or <code>true</code>). If unset, then the value of
+ <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.remote.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for each remote keyword. <code><slot></code> may be
+ <code>hint</code>, <code>warning</code>, <code>success</code> or <code>error</code> which match the
+ corresponding keyword.
+</p>
+</dd>
+<dt class="hdlist1">
+color.showBranch
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable color in the output of
+ <a href="git-show-branch.html">git-show-branch(1)</a>. May be set to <code>always</code>,
+ <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
+ only when the output is to a terminal. If unset, then the
+ value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.status
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable color in the output of
+ <a href="git-status.html">git-status(1)</a>. May be set to <code>always</code>,
+ <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
+ only when the output is to a terminal. If unset, then the
+ value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.status.<slot>
+</dt>
+<dd>
+<p>
+ Use customized color for status colorization. <code><slot></code> is
+ one of <code>header</code> (the header text of the status message),
+ <code>added</code> or <code>updated</code> (files which are added but not committed),
+ <code>changed</code> (files which are changed but not added in the index),
+ <code>untracked</code> (files which are not tracked by Git),
+ <code>branch</code> (the current branch),
+ <code>nobranch</code> (the color the <em>no branch</em> warning is shown in, defaulting
+ to red),
+ <code>localBranch</code> or <code>remoteBranch</code> (the local and remote branch names,
+ respectively, when branch and tracking information is displayed in the
+ status short-format), or
+ <code>unmerged</code> (files which have unmerged changes).
+</p>
+</dd>
+<dt class="hdlist1">
+color.transport
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable color when pushes are rejected. May be
+ set to <code>always</code>, <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which
+ case colors are used only when the error output goes to a terminal.
+ If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).
+</p>
+</dd>
+<dt class="hdlist1">
+color.transport.rejected
+</dt>
+<dd>
+<p>
+ Use customized color when a push was rejected.
+</p>
+</dd>
+<dt class="hdlist1">
+color.ui
+</dt>
+<dd>
+<p>
+ This variable determines the default value for variables such
+ as <code>color.diff</code> and <code>color.grep</code> that control the use of color
+ per command family. Its scope will expand as more commands learn
+ configuration to set a default for the <code>--color</code> option. Set it
+ to <code>false</code> or <code>never</code> if you prefer Git commands not to use
+ color unless enabled explicitly with some other configuration
+ or the <code>--color</code> option. Set it to <code>always</code> if you want all
+ output not intended for machine consumption to use color, to
+ <code>true</code> or <code>auto</code> (this is the default since Git 1.8.4) if you
+ want such output to use color when written to the terminal.
+</p>
+</dd>
+<dt class="hdlist1">
+column.ui
+</dt>
+<dd>
+<p>
+ Specify whether supported commands should output in columns.
+ This variable consists of a list of tokens separated by spaces
+ or commas:
+</p>
+<div class="paragraph"><p>These options control when the feature should be enabled
+(defaults to <em>never</em>):</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>always</code>
+</dt>
+<dd>
+<p>
+ always show in columns
+</p>
+</dd>
+<dt class="hdlist1">
+<code>never</code>
+</dt>
+<dd>
+<p>
+ never show in columns
+</p>
+</dd>
+<dt class="hdlist1">
+<code>auto</code>
+</dt>
+<dd>
+<p>
+ show in columns if the output is to the terminal
+</p>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>These options control layout (defaults to <em>column</em>). Setting any
+of these implies <em>always</em> if none of <em>always</em>, <em>never</em>, or <em>auto</em> are
+specified.</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>column</code>
+</dt>
+<dd>
+<p>
+ fill columns before rows
+</p>
+</dd>
+<dt class="hdlist1">
+<code>row</code>
+</dt>
+<dd>
+<p>
+ fill rows before columns
+</p>
+</dd>
+<dt class="hdlist1">
+<code>plain</code>
+</dt>
+<dd>
+<p>
+ show in one column
+</p>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>Finally, these options can be combined with a layout option (defaults
+to <em>nodense</em>):</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>dense</code>
+</dt>
+<dd>
+<p>
+ make unequal size columns to utilize more space
+</p>
+</dd>
+<dt class="hdlist1">
+<code>nodense</code>
+</dt>
+<dd>
+<p>
+ make equal size columns
+</p>
+</dd>
+</dl></div>
+</div></div>
+</dd>
+<dt class="hdlist1">
+column.branch
+</dt>
+<dd>
+<p>
+ Specify whether to output branch listing in <code>git branch</code> in columns.
+ See <code>column.ui</code> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+column.clean
+</dt>
+<dd>
+<p>
+ Specify the layout when listing items in <code>git clean -i</code>, which always
+ shows files and directories in columns. See <code>column.ui</code> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+column.status
+</dt>
+<dd>
+<p>
+ Specify whether to output untracked files in <code>git status</code> in columns.
+ See <code>column.ui</code> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+column.tag
+</dt>
+<dd>
+<p>
+ Specify whether to output tag listings in <code>git tag</code> in columns.
+ See <code>column.ui</code> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+commit.cleanup
+</dt>
+<dd>
+<p>
+ This setting overrides the default of the <code>--cleanup</code> option in
+ <code>git commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the
+ default can be useful when you always want to keep lines that begin
+ with the comment character <code>#</code> in your log message, in which case you
+ would do <code>git config commit.cleanup whitespace</code> (note that you will
+ have to remove the help lines that begin with <code>#</code> in the commit log
+ template yourself, if you do this).
+</p>
+</dd>
+<dt class="hdlist1">
+commit.gpgSign
+</dt>
+<dd>
+<p>
+ A boolean to specify whether all commits should be GPG signed.
+ Use of this option when doing operations such as rebase can
+ result in a large number of commits being signed. It may be
+ convenient to use an agent to avoid typing your GPG passphrase
+ several times.
+</p>
+</dd>
+<dt class="hdlist1">
+commit.status
+</dt>
+<dd>
+<p>
+ A boolean to enable/disable inclusion of status information in the
+ commit message template when using an editor to prepare the commit
+ message. Defaults to true.
+</p>
+</dd>
+<dt class="hdlist1">
+commit.template
+</dt>
+<dd>
+<p>
+ Specify the pathname of a file to use as the template for
+ new commit messages.
+</p>
+</dd>
+<dt class="hdlist1">
+commit.verbose
+</dt>
+<dd>
+<p>
+ A boolean or int to specify the level of verbosity with <code>git commit</code>.
+ See <a href="git-commit.html">git-commit(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+commitGraph.generationVersion
+</dt>
+<dd>
+<p>
+ Specifies the type of generation number version to use when writing
+ or reading the commit-graph file. If version 1 is specified, then
+ the corrected commit dates will not be written or read. Defaults to
+ 2.
+</p>
+</dd>
+<dt class="hdlist1">
+commitGraph.maxNewFilters
+</dt>
+<dd>
+<p>
+ Specifies the default value for the <code>--max-new-filters</code> option of <code>git
+ commit-graph write</code> (c.f., <a href="git-commit-graph.html">git-commit-graph(1)</a>).
+</p>
+</dd>
+<dt class="hdlist1">
+commitGraph.readChangedPaths
+</dt>
+<dd>
+<p>
+ If true, then git will use the changed-path Bloom filters in the
+ commit-graph file (if it exists, and they are present). Defaults to
+ true. See <a href="git-commit-graph.html">git-commit-graph(1)</a> for more information.
+</p>
+</dd>
+<dt class="hdlist1">
+completion.commands
+</dt>
+<dd>
+<p>
+ This is only used by git-completion.bash to add or remove
+ commands from the list of completed commands. Normally only
+ porcelain commands and a few select others are completed. You
+ can add more commands, separated by space, in this
+ variable. Prefixing the command with <em>-</em> will remove it from
+ the existing list.
+</p>
+</dd>
+<dt class="hdlist1">
core.fileMode
</dt>
<dd>
@@ -3484,1118 +4609,6 @@ core.maxTreeDepth </p>
</dd>
<dt class="hdlist1">
-add.ignoreErrors
-</dt>
-<dt class="hdlist1">
-add.ignore-errors (deprecated)
-</dt>
-<dd>
-<p>
- Tells <em>git add</em> to continue adding files when some files cannot be
- added due to indexing errors. Equivalent to the <code>--ignore-errors</code>
- option of <a href="git-add.html">git-add(1)</a>. <code>add.ignore-errors</code> is deprecated,
- as it does not follow the usual naming convention for configuration
- variables.
-</p>
-</dd>
-<dt class="hdlist1">
-add.interactive.useBuiltin
-</dt>
-<dd>
-<p>
- Unused configuration variable. Used in Git versions v2.25.0 to
- v2.36.0 to enable the built-in version of <a href="git-add.html">git-add(1)</a>'s
- interactive mode, which then became the default in Git
- versions v2.37.0 to v2.39.0.
-</p>
-</dd>
-<dt class="hdlist1">
-alias.*
-</dt>
-<dd>
-<p>
- Command aliases for the <a href="git.html">git(1)</a> command wrapper - e.g.
- after defining <code>alias.last = cat-file commit HEAD</code>, the invocation
- <code>git last</code> is equivalent to <code>git cat-file commit HEAD</code>. 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 are supported.
- A quote pair or a backslash can be used to quote them.
-</p>
-<div class="paragraph"><p>Note that the first word of an alias does not necessarily have to be a
-command. It can be a command-line option that will be passed into the
-invocation of <code>git</code>. In particular, this is useful when used with <code>-c</code>
-to pass in one-time configurations or <code>-p</code> to force pagination. For example,
-<code>loud-rebase = -c commit.verbose=true rebase</code> can be defined such that
-running <code>git loud-rebase</code> would be equivalent to
-<code>git -c commit.verbose=true rebase</code>. Also, <code>ps = -p status</code> would be a
-helpful alias since <code>git ps</code> would paginate the output of <code>git status</code>
-where the original command does not.</p></div>
-<div class="paragraph"><p>If the alias expansion is prefixed with an exclamation point,
-it will be treated as a shell command. For example, defining
-<code>alias.new = !gitk --all --not ORIG_HEAD</code>, the invocation
-<code>git new</code> is equivalent to running the shell command
-<code>gitk --all --not ORIG_HEAD</code>. Note that shell commands will be
-executed from the top-level directory of a repository, which may
-not necessarily be the current directory.
-<code>GIT_PREFIX</code> is set as returned by running <code>git rev-parse --show-prefix</code>
-from the original current directory. See <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div>
-</dd>
-<dt class="hdlist1">
-am.keepcr
-</dt>
-<dd>
-<p>
- If true, git-am will call git-mailsplit for patches in mbox format
- with parameter <code>--keep-cr</code>. In this case git-mailsplit will
- not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden
- by giving <code>--no-keep-cr</code> from the command line.
- See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-am.threeWay
-</dt>
-<dd>
-<p>
- By default, <code>git am</code> will fail if the patch does not apply cleanly. When
- set to true, this setting tells <code>git am</code> to fall back on 3-way merge if
- the patch records the identity of blobs it is supposed to apply to and
- we have those blobs available locally (equivalent to giving the <code>--3way</code>
- option from the command line). Defaults to <code>false</code>.
- See <a href="git-am.html">git-am(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-apply.ignoreWhitespace
-</dt>
-<dd>
-<p>
- When set to <em>change</em>, tells <em>git apply</em> to ignore changes in
- whitespace, in the same way as the <code>--ignore-space-change</code>
- option.
- When set to one of: no, none, never, false, it tells <em>git apply</em> to
- respect all whitespace differences.
- See <a href="git-apply.html">git-apply(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-apply.whitespace
-</dt>
-<dd>
-<p>
- Tells <em>git apply</em> how to handle whitespace, in the same way
- as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.blankBoundary
-</dt>
-<dd>
-<p>
- Show blank commit object name for boundary commits in
- <a href="git-blame.html">git-blame(1)</a>. This option defaults to false.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.coloring
-</dt>
-<dd>
-<p>
- This determines the coloring scheme to be applied to blame
- output. It can be <em>repeatedLines</em>, <em>highlightRecent</em>,
- or <em>none</em> which is the default.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.date
-</dt>
-<dd>
-<p>
- Specifies the format used to output dates in <a href="git-blame.html">git-blame(1)</a>.
- If unset the iso format is used. For supported values,
- see the discussion of the <code>--date</code> option at <a href="git-log.html">git-log(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.showEmail
-</dt>
-<dd>
-<p>
- Show the author email instead of author name in <a href="git-blame.html">git-blame(1)</a>.
- This option defaults to false.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.showRoot
-</dt>
-<dd>
-<p>
- Do not treat root commits as boundaries in <a href="git-blame.html">git-blame(1)</a>.
- This option defaults to false.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.ignoreRevsFile
-</dt>
-<dd>
-<p>
- Ignore revisions listed in the file, one unabbreviated object name per
- line, in <a href="git-blame.html">git-blame(1)</a>. Whitespace and comments beginning with
- <code>#</code> are ignored. This option may be repeated multiple times. Empty
- file names will reset the list of ignored revisions. This option will
- be handled before the command line option <code>--ignore-revs-file</code>.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.markUnblamableLines
-</dt>
-<dd>
-<p>
- Mark lines that were changed by an ignored revision that we could not
- attribute to another commit with a <em>*</em> in the output of
- <a href="git-blame.html">git-blame(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-blame.markIgnoredLines
-</dt>
-<dd>
-<p>
- Mark lines that were changed by an ignored revision that we attributed to
- another commit with a <em>?</em> in the output of <a href="git-blame.html">git-blame(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.autoSetupMerge
-</dt>
-<dd>
-<p>
- Tells <em>git branch</em>, <em>git switch</em> and <em>git checkout</em> to set up new branches
- so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the
- starting point branch. Note that even if this option is not set,
- this behavior can be chosen per-branch using the <code>--track</code>
- and <code>--no-track</code> options. The valid settings are: <code>false</code> — no
- automatic setup is done; <code>true</code> — automatic setup is done when the
- starting point is a remote-tracking branch; <code>always</code> —  automatic setup is done when the starting point is either a
- local branch or remote-tracking branch; <code>inherit</code> — if the starting point
- has a tracking configuration, it is copied to the new
- branch; <code>simple</code> — automatic setup is done only when the starting point
- is a remote-tracking branch and the new branch has the same name as the
- remote branch. This option defaults to true.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.autoSetupRebase
-</dt>
-<dd>
-<p>
- When a new branch is created with <em>git branch</em>, <em>git switch</em> or <em>git checkout</em>
- that tracks another branch, this variable tells Git to set
- up pull to rebase instead of merge (see "branch.<name>.rebase").
- When <code>never</code>, rebase is never automatically set to true.
- When <code>local</code>, rebase is set to true for tracked branches of
- other local branches.
- When <code>remote</code>, rebase is set to true for tracked branches of
- remote-tracking branches.
- When <code>always</code>, rebase will be set to true for all tracking
- branches.
- See "branch.autoSetupMerge" for details on how to set up a
- branch to track another branch.
- This option defaults to never.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.sort
-</dt>
-<dd>
-<p>
- This variable controls the sort ordering of branches when displayed by
- <a href="git-branch.html">git-branch(1)</a>. Without the "--sort=<value>" option provided, the
- value of this variable will be used as the default.
- See <a href="git-for-each-ref.html">git-for-each-ref(1)</a> field names for valid values.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.<name>.remote
-</dt>
-<dd>
-<p>
- When on branch <name>, it tells <em>git fetch</em> and <em>git push</em>
- which remote to fetch from or push to. The remote to push to
- may be overridden with <code>remote.pushDefault</code> (for all branches).
- The remote to push to, for the current branch, may be further
- overridden by <code>branch.<name>.pushRemote</code>. If no remote is
- configured, or if you are not on any branch and there is more than
- one remote defined in the repository, it defaults to <code>origin</code> for
- fetching and <code>remote.pushDefault</code> for pushing.
- Additionally, <code>.</code> (a period) is the current local repository
- (a dot-repository), see <code>branch.<name>.merge</code>'s final note below.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.<name>.pushRemote
-</dt>
-<dd>
-<p>
- When on branch <name>, it overrides <code>branch.<name>.remote</code> for
- pushing. It also overrides <code>remote.pushDefault</code> 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 <code>remote.pushDefault</code> to
- specify the remote to push to for all branches, and use this
- option to override it for a specific branch.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.<name>.merge
-</dt>
-<dd>
-<p>
- Defines, together with branch.<name>.remote, the upstream branch
- for the given branch. It tells <em>git fetch</em>/<em>git pull</em>/<em>git rebase</em> which
- branch to merge and can also affect <em>git push</em> (see push.default).
- When in branch <name>, it tells <em>git fetch</em> the default
- refspec to be marked for merging in FETCH_HEAD. The value is
- handled like the remote part of a refspec, and must match a
- ref which is fetched from the remote given by
- "branch.<name>.remote".
- The merge information is used by <em>git pull</em> (which first calls
- <em>git fetch</em>) to lookup the default branch for merging. Without
- this option, <em>git pull</em> defaults to merge the first refspec fetched.
- Specify multiple values to get an octopus merge.
- If you wish to setup <em>git pull</em> so that it merges into <name> from
- another branch in the local repository, you can point
- branch.<name>.merge to the desired branch, and use the relative path
- setting <code>.</code> (a period) for branch.<name>.remote.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.<name>.mergeOptions
-</dt>
-<dd>
-<p>
- Sets default options for merging into branch <name>. The syntax and
- supported options are the same as those of <a href="git-merge.html">git-merge(1)</a>, but
- option values containing whitespace characters are currently not
- supported.
-</p>
-</dd>
-<dt class="hdlist1">
-branch.<name>.rebase
-</dt>
-<dd>
-<p>
- When true, rebase the branch <name> on top of the fetched branch,
- instead of merging the default branch from the default remote when
- "git pull" is run. See "pull.rebase" for doing this in a non
- branch-specific manner.
-</p>
-<div class="paragraph"><p>When <code>merges</code> (or just <em>m</em>), pass the <code>--rebase-merges</code> option to <em>git rebase</em>
-so that the local merge commits are included in the rebase (see
-<a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>
-<div class="paragraph"><p>When the value is <code>interactive</code> (or just <em>i</em>), the rebase is run in interactive
-mode.</p></div>
-<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use
-it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>
-for details).</p></div>
-</dd>
-<dt class="hdlist1">
-branch.<name>.description
-</dt>
-<dd>
-<p>
- Branch description, can be edited with
- <code>git branch --edit-description</code>. Branch description is
- automatically added to the format-patch cover letter or
- request-pull summary.
-</p>
-</dd>
-<dt class="hdlist1">
-browser.<tool>.cmd
-</dt>
-<dd>
-<p>
- Specify the command to invoke the specified browser. The
- specified command is evaluated in shell with the URLs passed
- as arguments. (See <a href="git-web--browse.html">git-web--browse(1)</a>.)
-</p>
-</dd>
-<dt class="hdlist1">
-browser.<tool>.path
-</dt>
-<dd>
-<p>
- Override the path for the given tool that may be used to
- browse HTML help (see <code>-w</code> option in <a href="git-help.html">git-help(1)</a>) or a
- working repository in gitweb (see <a href="git-instaweb.html">git-instaweb(1)</a>).
-</p>
-</dd>
-<dt class="hdlist1">
-bundle.*
-</dt>
-<dd>
-<p>
- The <code>bundle.*</code> keys may appear in a bundle list file found via the
- <code>git clone --bundle-uri</code> option. These keys currently have no effect
- if placed in a repository config file, though this will change in the
- future. See <a href="technical/bundle-uri.html">the bundle URI design
- document</a> for more details.
-</p>
-</dd>
-<dt class="hdlist1">
-bundle.version
-</dt>
-<dd>
-<p>
- This integer value advertises the version of the bundle list format
- used by the bundle list. Currently, the only accepted value is <code>1</code>.
-</p>
-</dd>
-<dt class="hdlist1">
-bundle.mode
-</dt>
-<dd>
-<p>
- This string value should be either <code>all</code> or <code>any</code>. This value describes
- whether all of the advertised bundles are required to unbundle a
- complete understanding of the bundled information (<code>all</code>) or if any one
- of the listed bundle URIs is sufficient (<code>any</code>).
-</p>
-</dd>
-<dt class="hdlist1">
-bundle.heuristic
-</dt>
-<dd>
-<p>
- If this string-valued key exists, then the bundle list is designed to
- work well with incremental <code>git fetch</code> commands. The heuristic signals
- that there are additional keys available for each bundle that help
- determine which subset of bundles the client should download. The
- only value currently understood is <code>creationToken</code>.
-</p>
-</dd>
-<dt class="hdlist1">
-bundle.<id>.*
-</dt>
-<dd>
-<p>
- The <code>bundle.<id>.*</code> keys are used to describe a single item in the
- bundle list, grouped under <code><id></code> for identification purposes.
-</p>
-</dd>
-<dt class="hdlist1">
-bundle.<id>.uri
-</dt>
-<dd>
-<p>
- This string value defines the URI by which Git can reach the contents
- of this <code><id></code>. This URI may be a bundle file or another bundle list.
-</p>
-</dd>
-<dt class="hdlist1">
-checkout.defaultRemote
-</dt>
-<dd>
-<p>
- When you run <code>git checkout <something></code>
- or <code>git switch <something></code> and only have one
- remote, it may implicitly fall back on checking out and
- tracking e.g. <code>origin/<something></code>. This stops working as soon
- as you have more than one remote with a <code><something></code>
- reference. This setting allows for setting the name of a
- preferred remote that should always win when it comes to
- disambiguation. The typical use-case is to set this to
- <code>origin</code>.
-</p>
-<div class="paragraph"><p>Currently this is used by <a href="git-switch.html">git-switch(1)</a> and
-<a href="git-checkout.html">git-checkout(1)</a> when <code>git checkout <something></code>
-or <code>git switch <something></code>
-will checkout the <code><something></code> branch on another remote,
-and by <a href="git-worktree.html">git-worktree(1)</a> when <code>git worktree add</code> refers to a
-remote branch. This setting might be used for other checkout-like
-commands or functionality in the future.</p></div>
-</dd>
-<dt class="hdlist1">
-checkout.guess
-</dt>
-<dd>
-<p>
- Provides the default value for the <code>--guess</code> or <code>--no-guess</code>
- option in <code>git checkout</code> and <code>git switch</code>. See
- <a href="git-switch.html">git-switch(1)</a> and <a href="git-checkout.html">git-checkout(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-checkout.workers
-</dt>
-<dd>
-<p>
- The number of parallel workers to use when updating the working tree.
- The default is one, i.e. sequential execution. If set to a value less
- than one, Git will use as many workers as the number of logical cores
- available. This setting and <code>checkout.thresholdForParallelism</code> affect
- all commands that perform checkout. E.g. checkout, clone, reset,
- sparse-checkout, etc.
-</p>
-<div class="paragraph"><p>Note: Parallel checkout usually delivers better performance for repositories
-located on SSDs or over NFS. For repositories on spinning disks and/or machines
-with a small number of cores, the default sequential checkout often performs
-better. The size and compression level of a repository might also influence how
-well the parallel version performs.</p></div>
-</dd>
-<dt class="hdlist1">
-checkout.thresholdForParallelism
-</dt>
-<dd>
-<p>
- When running parallel checkout with a small number of files, the cost
- of subprocess spawning and inter-process communication might outweigh
- the parallelization gains. This setting allows you to define the minimum
- number of files for which parallel checkout should be attempted. The
- default is 100.
-</p>
-</dd>
-<dt class="hdlist1">
-clean.requireForce
-</dt>
-<dd>
-<p>
- A boolean to make git-clean do nothing unless given -f,
- -i, or -n. Defaults to true.
-</p>
-</dd>
-<dt class="hdlist1">
-clone.defaultRemoteName
-</dt>
-<dd>
-<p>
- The name of the remote to create when cloning a repository. Defaults to
- <code>origin</code>, and can be overridden by passing the <code>--origin</code> command-line
- option to <a href="git-clone.html">git-clone(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-clone.rejectShallow
-</dt>
-<dd>
-<p>
- Reject cloning a repository if it is a shallow one; this can be overridden by
- passing the <code>--reject-shallow</code> option on the command line. See <a href="git-clone.html">git-clone(1)</a>
-</p>
-</dd>
-<dt class="hdlist1">
-clone.filterSubmodules
-</dt>
-<dd>
-<p>
- If a partial clone filter is provided (see <code>--filter</code> in
- <a href="git-rev-list.html">git-rev-list(1)</a>) and <code>--recurse-submodules</code> is used, also apply
- the filter to submodules.
-</p>
-</dd>
-<dt class="hdlist1">
-color.advice
-</dt>
-<dd>
-<p>
- A boolean to enable/disable color in hints (e.g. when a push
- failed, see <code>advice.*</code> for a list). May be set to <code>always</code>,
- <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors
- are used only when the error output goes to a terminal. If
- unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.advice.hint
-</dt>
-<dd>
-<p>
- Use customized color for hints.
-</p>
-</dd>
-<dt class="hdlist1">
-color.blame.highlightRecent
-</dt>
-<dd>
-<p>
- Specify the line annotation color for <code>git blame --color-by-age</code>
- depending upon the age of the line.
-</p>
-<div class="paragraph"><p>This setting should be set to a comma-separated list of color and
-date settings, starting and ending with a color, the dates should be
-set from oldest to newest. The metadata will be colored with the
-specified colors if the line was introduced before the given
-timestamp, overwriting older timestamped colors.</p></div>
-<div class="paragraph"><p>Instead of an absolute timestamp relative timestamps work as well,
-e.g. <code>2.weeks.ago</code> is valid to address anything older than 2 weeks.</p></div>
-<div class="paragraph"><p>It defaults to <code>blue,12 month ago,white,1 month ago,red</code>, which
-colors everything older than one year blue, recent changes between
-one month and one year old are kept white, and lines introduced
-within the last month are colored red.</p></div>
-</dd>
-<dt class="hdlist1">
-color.blame.repeatedLines
-</dt>
-<dd>
-<p>
- Use the specified color to colorize line annotations for
- <code>git blame --color-lines</code>, if they come from the same commit as the
- preceding line. Defaults to cyan.
-</p>
-</dd>
-<dt class="hdlist1">
-color.branch
-</dt>
-<dd>
-<p>
- A boolean to enable/disable color in the output of
- <a href="git-branch.html">git-branch(1)</a>. May be set to <code>always</code>,
- <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
- only when the output is to a terminal. If unset, then the
- value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.branch.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for branch coloration. <code><slot></code> is one of
- <code>current</code> (the current branch), <code>local</code> (a local branch),
- <code>remote</code> (a remote-tracking branch in refs/remotes/),
- <code>upstream</code> (upstream tracking branch), <code>plain</code> (other
- refs).
-</p>
-</dd>
-<dt class="hdlist1">
-color.diff
-</dt>
-<dd>
-<p>
- Whether to use ANSI escape sequences to add color to patches.
- If this is set to <code>always</code>, <a href="git-diff.html">git-diff(1)</a>,
- <a href="git-log.html">git-log(1)</a>, and <a href="git-show.html">git-show(1)</a> will use color
- for all patches. If it is set to <code>true</code> or <code>auto</code>, those
- commands will only use color when output is to the terminal.
- If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by
- default).
-</p>
-<div class="paragraph"><p>This does not affect <a href="git-format-patch.html">git-format-patch(1)</a> or the
-<em>git-diff-*</em> plumbing commands. Can be overridden on the
-command line with the <code>--color[=<when>]</code> option.</p></div>
-</dd>
-<dt class="hdlist1">
-color.diff.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for diff colorization. <code><slot></code> specifies
- which part of the patch to use the specified color, and is one
- of <code>context</code> (context text - <code>plain</code> is a historical synonym),
- <code>meta</code> (metainformation), <code>frag</code>
- (hunk header), <em>func</em> (function in hunk header), <code>old</code> (removed lines),
- <code>new</code> (added lines), <code>commit</code> (commit headers), <code>whitespace</code>
- (highlighting whitespace errors), <code>oldMoved</code> (deleted lines),
- <code>newMoved</code> (added lines), <code>oldMovedDimmed</code>, <code>oldMovedAlternative</code>,
- <code>oldMovedAlternativeDimmed</code>, <code>newMovedDimmed</code>, <code>newMovedAlternative</code>
- <code>newMovedAlternativeDimmed</code> (See the <em><mode></em>
- setting of <em>--color-moved</em> in <a href="git-diff.html">git-diff(1)</a> for details),
- <code>contextDimmed</code>, <code>oldDimmed</code>, <code>newDimmed</code>, <code>contextBold</code>,
- <code>oldBold</code>, and <code>newBold</code> (see <a href="git-range-diff.html">git-range-diff(1)</a> for details).
-</p>
-</dd>
-<dt class="hdlist1">
-color.decorate.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for <em>git log --decorate</em> output. <code><slot></code> is one
- of <code>branch</code>, <code>remoteBranch</code>, <code>tag</code>, <code>stash</code> or <code>HEAD</code> for local
- branches, remote-tracking branches, tags, stash and HEAD, respectively
- and <code>grafted</code> for grafted commits.
-</p>
-</dd>
-<dt class="hdlist1">
-color.grep
-</dt>
-<dd>
-<p>
- When set to <code>always</code>, always highlight matches. When <code>false</code> (or
- <code>never</code>), never. When set to <code>true</code> or <code>auto</code>, use color only
- when the output is written to the terminal. If unset, then the
- value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.grep.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for grep colorization. <code><slot></code> specifies which
- part of the line to use the specified color, and is one of
-</p>
-<div class="openblock">
-<div class="content">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<code>context</code>
-</dt>
-<dd>
-<p>
- non-matching text in context lines (when using <code>-A</code>, <code>-B</code>, or <code>-C</code>)
-</p>
-</dd>
-<dt class="hdlist1">
-<code>filename</code>
-</dt>
-<dd>
-<p>
- filename prefix (when not using <code>-h</code>)
-</p>
-</dd>
-<dt class="hdlist1">
-<code>function</code>
-</dt>
-<dd>
-<p>
- function name lines (when using <code>-p</code>)
-</p>
-</dd>
-<dt class="hdlist1">
-<code>lineNumber</code>
-</dt>
-<dd>
-<p>
- line number prefix (when using <code>-n</code>)
-</p>
-</dd>
-<dt class="hdlist1">
-<code>column</code>
-</dt>
-<dd>
-<p>
- column number prefix (when using <code>--column</code>)
-</p>
-</dd>
-<dt class="hdlist1">
-<code>match</code>
-</dt>
-<dd>
-<p>
- matching text (same as setting <code>matchContext</code> and <code>matchSelected</code>)
-</p>
-</dd>
-<dt class="hdlist1">
-<code>matchContext</code>
-</dt>
-<dd>
-<p>
- matching text in context lines
-</p>
-</dd>
-<dt class="hdlist1">
-<code>matchSelected</code>
-</dt>
-<dd>
-<p>
- matching text in selected lines. Also, used to customize the following
- <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code>, and <code>--committer</code>.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>selected</code>
-</dt>
-<dd>
-<p>
- non-matching text in selected lines. Also, used to customize the
- following <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code> and
- <code>--committer</code>.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>separator</code>
-</dt>
-<dd>
-<p>
- separators between fields on a line (<code>:</code>, <code>-</code>, and <code>=</code>)
- and between hunks (<code>--</code>)
-</p>
-</dd>
-</dl></div>
-</div></div>
-</dd>
-<dt class="hdlist1">
-color.interactive
-</dt>
-<dd>
-<p>
- When set to <code>always</code>, always use colors for interactive prompts
- and displays (such as those used by "git-add --interactive" and
- "git-clean --interactive"). When false (or <code>never</code>), never.
- When set to <code>true</code> or <code>auto</code>, use colors only when the output is
- to the terminal. If unset, then the value of <code>color.ui</code> is
- used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.interactive.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for <em>git add --interactive</em> and <em>git clean
- --interactive</em> output. <code><slot></code> may be <code>prompt</code>, <code>header</code>, <code>help</code>
- or <code>error</code>, for four distinct types of normal output from
- interactive commands.
-</p>
-</dd>
-<dt class="hdlist1">
-color.pager
-</dt>
-<dd>
-<p>
- A boolean to specify whether <code>auto</code> color modes should colorize
- output going to the pager. Defaults to true; set this to false
- if your pager does not understand ANSI color codes.
-</p>
-</dd>
-<dt class="hdlist1">
-color.push
-</dt>
-<dd>
-<p>
- A boolean to enable/disable color in push errors. May be set to
- <code>always</code>, <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which
- case colors are used only when the error output goes to a terminal.
- If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.push.error
-</dt>
-<dd>
-<p>
- Use customized color for push errors.
-</p>
-</dd>
-<dt class="hdlist1">
-color.remote
-</dt>
-<dd>
-<p>
- If set, keywords at the start of the line are highlighted. The
- keywords are "error", "warning", "hint" and "success", and are
- matched case-insensitively. May be set to <code>always</code>, <code>false</code> (or
- <code>never</code>) or <code>auto</code> (or <code>true</code>). If unset, then the value of
- <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.remote.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for each remote keyword. <code><slot></code> may be
- <code>hint</code>, <code>warning</code>, <code>success</code> or <code>error</code> which match the
- corresponding keyword.
-</p>
-</dd>
-<dt class="hdlist1">
-color.showBranch
-</dt>
-<dd>
-<p>
- A boolean to enable/disable color in the output of
- <a href="git-show-branch.html">git-show-branch(1)</a>. May be set to <code>always</code>,
- <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
- only when the output is to a terminal. If unset, then the
- value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.status
-</dt>
-<dd>
-<p>
- A boolean to enable/disable color in the output of
- <a href="git-status.html">git-status(1)</a>. May be set to <code>always</code>,
- <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
- only when the output is to a terminal. If unset, then the
- value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.status.<slot>
-</dt>
-<dd>
-<p>
- Use customized color for status colorization. <code><slot></code> is
- one of <code>header</code> (the header text of the status message),
- <code>added</code> or <code>updated</code> (files which are added but not committed),
- <code>changed</code> (files which are changed but not added in the index),
- <code>untracked</code> (files which are not tracked by Git),
- <code>branch</code> (the current branch),
- <code>nobranch</code> (the color the <em>no branch</em> warning is shown in, defaulting
- to red),
- <code>localBranch</code> or <code>remoteBranch</code> (the local and remote branch names,
- respectively, when branch and tracking information is displayed in the
- status short-format), or
- <code>unmerged</code> (files which have unmerged changes).
-</p>
-</dd>
-<dt class="hdlist1">
-color.transport
-</dt>
-<dd>
-<p>
- A boolean to enable/disable color when pushes are rejected. May be
- set to <code>always</code>, <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which
- case colors are used only when the error output goes to a terminal.
- If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).
-</p>
-</dd>
-<dt class="hdlist1">
-color.transport.rejected
-</dt>
-<dd>
-<p>
- Use customized color when a push was rejected.
-</p>
-</dd>
-<dt class="hdlist1">
-color.ui
-</dt>
-<dd>
-<p>
- This variable determines the default value for variables such
- as <code>color.diff</code> and <code>color.grep</code> that control the use of color
- per command family. Its scope will expand as more commands learn
- configuration to set a default for the <code>--color</code> option. Set it
- to <code>false</code> or <code>never</code> if you prefer Git commands not to use
- color unless enabled explicitly with some other configuration
- or the <code>--color</code> option. Set it to <code>always</code> if you want all
- output not intended for machine consumption to use color, to
- <code>true</code> or <code>auto</code> (this is the default since Git 1.8.4) if you
- want such output to use color when written to the terminal.
-</p>
-</dd>
-<dt class="hdlist1">
-column.ui
-</dt>
-<dd>
-<p>
- Specify whether supported commands should output in columns.
- This variable consists of a list of tokens separated by spaces
- or commas:
-</p>
-<div class="paragraph"><p>These options control when the feature should be enabled
-(defaults to <em>never</em>):</p></div>
-<div class="openblock">
-<div class="content">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<code>always</code>
-</dt>
-<dd>
-<p>
- always show in columns
-</p>
-</dd>
-<dt class="hdlist1">
-<code>never</code>
-</dt>
-<dd>
-<p>
- never show in columns
-</p>
-</dd>
-<dt class="hdlist1">
-<code>auto</code>
-</dt>
-<dd>
-<p>
- show in columns if the output is to the terminal
-</p>
-</dd>
-</dl></div>
-</div></div>
-<div class="paragraph"><p>These options control layout (defaults to <em>column</em>). Setting any
-of these implies <em>always</em> if none of <em>always</em>, <em>never</em>, or <em>auto</em> are
-specified.</p></div>
-<div class="openblock">
-<div class="content">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<code>column</code>
-</dt>
-<dd>
-<p>
- fill columns before rows
-</p>
-</dd>
-<dt class="hdlist1">
-<code>row</code>
-</dt>
-<dd>
-<p>
- fill rows before columns
-</p>
-</dd>
-<dt class="hdlist1">
-<code>plain</code>
-</dt>
-<dd>
-<p>
- show in one column
-</p>
-</dd>
-</dl></div>
-</div></div>
-<div class="paragraph"><p>Finally, these options can be combined with a layout option (defaults
-to <em>nodense</em>):</p></div>
-<div class="openblock">
-<div class="content">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<code>dense</code>
-</dt>
-<dd>
-<p>
- make unequal size columns to utilize more space
-</p>
-</dd>
-<dt class="hdlist1">
-<code>nodense</code>
-</dt>
-<dd>
-<p>
- make equal size columns
-</p>
-</dd>
-</dl></div>
-</div></div>
-</dd>
-<dt class="hdlist1">
-column.branch
-</dt>
-<dd>
-<p>
- Specify whether to output branch listing in <code>git branch</code> in columns.
- See <code>column.ui</code> for details.
-</p>
-</dd>
-<dt class="hdlist1">
-column.clean
-</dt>
-<dd>
-<p>
- Specify the layout when listing items in <code>git clean -i</code>, which always
- shows files and directories in columns. See <code>column.ui</code> for details.
-</p>
-</dd>
-<dt class="hdlist1">
-column.status
-</dt>
-<dd>
-<p>
- Specify whether to output untracked files in <code>git status</code> in columns.
- See <code>column.ui</code> for details.
-</p>
-</dd>
-<dt class="hdlist1">
-column.tag
-</dt>
-<dd>
-<p>
- Specify whether to output tag listings in <code>git tag</code> in columns.
- See <code>column.ui</code> for details.
-</p>
-</dd>
-<dt class="hdlist1">
-commit.cleanup
-</dt>
-<dd>
-<p>
- This setting overrides the default of the <code>--cleanup</code> option in
- <code>git commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the
- default can be useful when you always want to keep lines that begin
- with the comment character <code>#</code> in your log message, in which case you
- would do <code>git config commit.cleanup whitespace</code> (note that you will
- have to remove the help lines that begin with <code>#</code> in the commit log
- template yourself, if you do this).
-</p>
-</dd>
-<dt class="hdlist1">
-commit.gpgSign
-</dt>
-<dd>
-<p>
- A boolean to specify whether all commits should be GPG signed.
- Use of this option when doing operations such as rebase can
- result in a large number of commits being signed. It may be
- convenient to use an agent to avoid typing your GPG passphrase
- several times.
-</p>
-</dd>
-<dt class="hdlist1">
-commit.status
-</dt>
-<dd>
-<p>
- A boolean to enable/disable inclusion of status information in the
- commit message template when using an editor to prepare the commit
- message. Defaults to true.
-</p>
-</dd>
-<dt class="hdlist1">
-commit.template
-</dt>
-<dd>
-<p>
- Specify the pathname of a file to use as the template for
- new commit messages.
-</p>
-</dd>
-<dt class="hdlist1">
-commit.verbose
-</dt>
-<dd>
-<p>
- A boolean or int to specify the level of verbosity with <code>git commit</code>.
- See <a href="git-commit.html">git-commit(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-commitGraph.generationVersion
-</dt>
-<dd>
-<p>
- Specifies the type of generation number version to use when writing
- or reading the commit-graph file. If version 1 is specified, then
- the corrected commit dates will not be written or read. Defaults to
- 2.
-</p>
-</dd>
-<dt class="hdlist1">
-commitGraph.maxNewFilters
-</dt>
-<dd>
-<p>
- Specifies the default value for the <code>--max-new-filters</code> option of <code>git
- commit-graph write</code> (c.f., <a href="git-commit-graph.html">git-commit-graph(1)</a>).
-</p>
-</dd>
-<dt class="hdlist1">
-commitGraph.readChangedPaths
-</dt>
-<dd>
-<p>
- If true, then git will use the changed-path Bloom filters in the
- commit-graph file (if it exists, and they are present). Defaults to
- true. See <a href="git-commit-graph.html">git-commit-graph(1)</a> for more information.
-</p>
-</dd>
-<dt class="hdlist1">
credential.helper
</dt>
<dd>
@@ -4662,19 +4675,6 @@ credentialStore.lockTimeoutMS </p>
</dd>
<dt class="hdlist1">
-completion.commands
-</dt>
-<dd>
-<p>
- This is only used by git-completion.bash to add or remove
- commands from the list of completed commands. Normally only
- porcelain commands and a few select others are completed. You
- can add more commands, separated by space, in this
- variable. Prefixing the command with <em>-</em> will remove it from
- the existing list.
-</p>
-</dd>
-<dt class="hdlist1">
diff.autoRefreshIndex
</dt>
<dd>
@@ -5768,6 +5768,26 @@ bundle URI. If you modify the URI at <code>fetch.bundleURI</code>, then be sure remove the value for the <code>fetch.bundleCreationToken</code> value before fetching.</p></div>
</dd>
<dt class="hdlist1">
+filter.<driver>.clean
+</dt>
+<dd>
+<p>
+ The command which is used to convert the content of a worktree
+ file to a blob upon checkin. See <a href="gitattributes.html">gitattributes(5)</a> for
+ details.
+</p>
+</dd>
+<dt class="hdlist1">
+filter.<driver>.smudge
+</dt>
+<dd>
+<p>
+ The command which is used to convert the content of a blob
+ object to a worktree file upon checkout. See
+ <a href="gitattributes.html">gitattributes(5)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
format.attach
</dt>
<dd>
@@ -6030,26 +6050,6 @@ format.noprefix </p>
</dd>
<dt class="hdlist1">
-filter.<driver>.clean
-</dt>
-<dd>
-<p>
- The command which is used to convert the content of a worktree
- file to a blob upon checkin. See <a href="gitattributes.html">gitattributes(5)</a> for
- details.
-</p>
-</dd>
-<dt class="hdlist1">
-filter.<driver>.smudge
-</dt>
-<dd>
-<p>
- The command which is used to convert the content of a blob
- object to a worktree file upon checkout. See
- <a href="gitattributes.html">gitattributes(5)</a> for details.
-</p>
-</dd>
-<dt class="hdlist1">
fsck.<msg-id>
</dt>
<dd>
@@ -6582,70 +6582,6 @@ gitweb.snapshot </p>
</dd>
<dt class="hdlist1">
-grep.lineNumber
-</dt>
-<dd>
-<p>
- If set to true, enable <code>-n</code> option by default.
-</p>
-</dd>
-<dt class="hdlist1">
-grep.column
-</dt>
-<dd>
-<p>
- If set to true, enable the <code>--column</code> option by default.
-</p>
-</dd>
-<dt class="hdlist1">
-grep.patternType
-</dt>
-<dd>
-<p>
- Set the default matching behavior. Using a value of <em>basic</em>, <em>extended</em>,
- <em>fixed</em>, or <em>perl</em> will enable the <code>--basic-regexp</code>, <code>--extended-regexp</code>,
- <code>--fixed-strings</code>, or <code>--perl-regexp</code> option accordingly, while the
- value <em>default</em> will use the <code>grep.extendedRegexp</code> option to choose
- between <em>basic</em> and <em>extended</em>.
-</p>
-</dd>
-<dt class="hdlist1">
-grep.extendedRegexp
-</dt>
-<dd>
-<p>
- If set to true, enable <code>--extended-regexp</code> option by default. This
- option is ignored when the <code>grep.patternType</code> option is set to a value
- other than <em>default</em>.
-</p>
-</dd>
-<dt class="hdlist1">
-grep.threads
-</dt>
-<dd>
-<p>
- Number of grep worker threads to use. If unset (or set to 0), Git will
- use as many threads as the number of logical cores available.
-</p>
-</dd>
-<dt class="hdlist1">
-grep.fullName
-</dt>
-<dd>
-<p>
- If set to true, enable <code>--full-name</code> option by default.
-</p>
-</dd>
-<dt class="hdlist1">
-grep.fallbackToNoIndex
-</dt>
-<dd>
-<p>
- If set to true, fall back to git grep --no-index if git grep
- is executed outside of a git repository. Defaults to false.
-</p>
-</dd>
-<dt class="hdlist1">
gpg.program
</dt>
<dd>
@@ -6782,6 +6718,70 @@ gpg.ssh.revocationFile </p>
</dd>
<dt class="hdlist1">
+grep.lineNumber
+</dt>
+<dd>
+<p>
+ If set to true, enable <code>-n</code> option by default.
+</p>
+</dd>
+<dt class="hdlist1">
+grep.column
+</dt>
+<dd>
+<p>
+ If set to true, enable the <code>--column</code> option by default.
+</p>
+</dd>
+<dt class="hdlist1">
+grep.patternType
+</dt>
+<dd>
+<p>
+ Set the default matching behavior. Using a value of <em>basic</em>, <em>extended</em>,
+ <em>fixed</em>, or <em>perl</em> will enable the <code>--basic-regexp</code>, <code>--extended-regexp</code>,
+ <code>--fixed-strings</code>, or <code>--perl-regexp</code> option accordingly, while the
+ value <em>default</em> will use the <code>grep.extendedRegexp</code> option to choose
+ between <em>basic</em> and <em>extended</em>.
+</p>
+</dd>
+<dt class="hdlist1">
+grep.extendedRegexp
+</dt>
+<dd>
+<p>
+ If set to true, enable <code>--extended-regexp</code> option by default. This
+ option is ignored when the <code>grep.patternType</code> option is set to a value
+ other than <em>default</em>.
+</p>
+</dd>
+<dt class="hdlist1">
+grep.threads
+</dt>
+<dd>
+<p>
+ Number of grep worker threads to use. If unset (or set to 0), Git will
+ use as many threads as the number of logical cores available.
+</p>
+</dd>
+<dt class="hdlist1">
+grep.fullName
+</dt>
+<dd>
+<p>
+ If set to true, enable <code>--full-name</code> option by default.
+</p>
+</dd>
+<dt class="hdlist1">
+grep.fallbackToNoIndex
+</dt>
+<dd>
+<p>
+ If set to true, fall back to git grep --no-index if git grep
+ is executed outside of a git repository. Defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
gui.commitMsgWidth
</dt>
<dd>
@@ -10825,6 +10825,36 @@ follows:</p></div> change as git gains new features.</p></div>
</dd>
<dt class="hdlist1">
+stash.showIncludeUntracked
+</dt>
+<dd>
+<p>
+ If this is set to true, the <code>git stash show</code> command will show
+ the untracked files of a stash entry. Defaults to false. See
+ the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+stash.showPatch
+</dt>
+<dd>
+<p>
+ If this is set to true, the <code>git stash show</code> command without an
+ option will show the stash entry in patch form. Defaults to false.
+ See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+stash.showStat
+</dt>
+<dd>
+<p>
+ If this is set to true, the <code>git stash show</code> command without an
+ option will show a diffstat of the stash entry. Defaults to true.
+ See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
status.relativePaths
</dt>
<dd>
@@ -10966,36 +10996,6 @@ status.submoduleSummary </p>
</dd>
<dt class="hdlist1">
-stash.showIncludeUntracked
-</dt>
-<dd>
-<p>
- If this is set to true, the <code>git stash show</code> command will show
- the untracked files of a stash entry. Defaults to false. See
- the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-stash.showPatch
-</dt>
-<dd>
-<p>
- If this is set to true, the <code>git stash show</code> command without an
- option will show the stash entry in patch form. Defaults to false.
- See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
-stash.showStat
-</dt>
-<dd>
-<p>
- If this is set to true, the <code>git stash show</code> command without an
- option will show a diffstat of the stash entry. Defaults to true.
- See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
-</p>
-</dd>
-<dt class="hdlist1">
submodule.<name>.url
</dt>
<dd>
|