diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 13:25:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 13:25:23 -0700 |
| commit | ba8baee8618696a4405a1c7feb93ce8d3b089795 (patch) | |
| tree | 36a0a7f824df6259cd09b0081e297b366279ab46 | |
| parent | b2e63923b4a1650cdd5c8d919dacf6c650940a92 (diff) | |
| download | git-htmldocs-ba8baee8618696a4405a1c7feb93ce8d3b089795.tar.gz | |
Autogenerated HTML docs for v2.37.3-662-g36f8e7e
84 files changed, 2892 insertions, 367 deletions
diff --git a/RelNotes/2.38.0.txt b/RelNotes/2.38.0.txt index 311d9224c..fe04b31b6 100644 --- a/RelNotes/2.38.0.txt +++ b/RelNotes/2.38.0.txt @@ -165,6 +165,13 @@ Performance, Internal Implementation, Development Support etc. request has been optimized by allowing it to send objects in its object store without recomputing and validating the object names. + * Annotate function parameters that are not used (but cannot be + removed for structural reasons), to prepare us to later compile + with -Wunused warning turned on. + + * Share the text used to explain configuration variables used by "git + <subcmd>" in "git help <subcmd>" with the text from "git help config". + Fixes since v2.37 ----------------- @@ -367,6 +374,10 @@ Fixes since v2.37 rev-parse" has been updated to diagnose a bogus input correctly. (merge f20b9c36d0 ow/rev-parse-parseopt-fix later to maint). + * The code that manages list-object-filter structure, used in partial + clones, leaked the instances, which has been plugged. + (merge 66eede4a37 jk/plug-list-object-filter-leaks later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 77b9e85c0f vd/fix-perf-tests later to maint). (merge 0682bc43f5 jk/test-crontab-fixes later to maint). diff --git a/git-add.html b/git-add.html index 33c9770e9..2e57f689e 100644 --- a/git-add.html +++ b/git-add.html @@ -1368,6 +1368,41 @@ modifying the contents of context or removal lines </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</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>
+ Set to <code>false</code> to fall back to the original Perl implementation of
+ the interactive version of <a href="git-add.html">git-add(1)</a> instead of the built-in
+ version. Is <code>true</code> by default.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-status.html">git-status(1)</a>
@@ -1389,7 +1424,7 @@ modifying the contents of context or removal lines <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-add.txt b/git-add.txt index 9b37f3565..a030d33c6 100644 --- a/git-add.txt +++ b/git-add.txt @@ -433,6 +433,13 @@ they will make the patch impossible to apply: * deleting context or removal lines * modifying the contents of context or removal lines +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/add.txt[] + SEE ALSO -------- linkgit:git-status[1] diff --git a/git-am.html b/git-am.html index 80551be05..452d93395 100644 --- a/git-am.html +++ b/git-am.html @@ -1222,6 +1222,41 @@ information.</p></div> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>
@@ -1238,7 +1273,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-am.txt b/git-am.txt index 320da6c4f..326276e51 100644 --- a/git-am.txt +++ b/git-am.txt @@ -258,6 +258,13 @@ This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/am.txt[] + SEE ALSO -------- linkgit:git-apply[1]. diff --git a/git-apply.html b/git-apply.html index d83172a4e..189a2673c 100644 --- a/git-apply.html +++ b/git-apply.html @@ -1187,15 +1187,21 @@ has no effect when <code>--index</code> or <code>--cached</code> is in use.</p>< <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
apply.ignoreWhitespace
</dt>
<dd>
<p>
- Set to <em>change</em> if you want changes in whitespace to be ignored by default.
- Set to one of: no, none, never, false if you want changes in
- whitespace to be significant.
+ 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 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">
@@ -1203,8 +1209,8 @@ apply.whitespace </dt>
<dd>
<p>
- When no <code>--whitespace</code> flag is given from the command
- line, this configuration item is used as the default.
+ Tells <em>git apply</em> how to handle whitespaces, in the same way
+ as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.
</p>
</dd>
</dl></div>
@@ -1242,7 +1248,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-23 00:29:30 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-apply.txt b/git-apply.txt index b6d77f420..1d478cbe9 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -263,13 +263,9 @@ has no effect when `--index` or `--cached` is in use. CONFIGURATION ------------- -apply.ignoreWhitespace:: - Set to 'change' if you want changes in whitespace to be ignored by default. - Set to one of: no, none, never, false if you want changes in - whitespace to be significant. -apply.whitespace:: - When no `--whitespace` flag is given from the command - line, this configuration item is used as the default. +include::includes/cmd-config-section-all.txt[] + +include::config/apply.txt[] SUBMODULES ---------- diff --git a/git-blame.html b/git-blame.html index 72ae5aa03..cb1eca644 100644 --- a/git-blame.html +++ b/git-blame.html @@ -1396,6 +1396,94 @@ commit commentary), a blame viewer will not care.</td> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-annotate.html">git-annotate(1)</a></p></div>
@@ -1412,7 +1500,7 @@ commit commentary), a blame viewer will not care.</td> <div id="footer">
<div id="footer-text">
Last updated
- 2021-10-18 17:00:13 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-blame.txt b/git-blame.txt index d7a46cc67..4400a1733 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -241,6 +241,12 @@ MAPPING AUTHORS See linkgit:gitmailmap[5]. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/blame.txt[] SEE ALSO -------- diff --git a/git-branch.html b/git-branch.html index 4287ff279..7321da0be 100644 --- a/git-branch.html +++ b/git-branch.html @@ -1286,6 +1286,156 @@ superproject’s "origin/main", but tracks the submodule’s "origin/mai <div class="paragraph"><p><code>pager.branch</code> is only respected when listing branches, i.e., when
<code>--list</code> is used or implied. The default is to use a pager.
See <a href="git-config.html">git-config(1)</a>.</p></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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/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 at 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 in the format-patch cover letter or
+ request-pull summary.
+</p>
+</dd>
+</dl></div>
</div>
</div>
<div class="sect1">
@@ -1430,7 +1580,7 @@ a branch?”</a> in the Git User’s Manual.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-05-26 16:11:01 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-branch.txt b/git-branch.txt index ae8237834..12c5f84e3 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -336,6 +336,10 @@ CONFIGURATION `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]. +include::includes/cmd-config-section-rest.txt[] + +include::config/branch.txt[] + EXAMPLES -------- diff --git a/git-checkout.html b/git-checkout.html index e93d16757..397de991f 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -1543,6 +1543,79 @@ $ git add frotz</code></pre> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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 to define the minimum
+ number of files for which parallel checkout should be attempted. The
+ default is 100.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-switch.html">git-switch(1)</a>,
@@ -1560,7 +1633,7 @@ $ git add frotz</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-20 16:14:41 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-checkout.txt b/git-checkout.txt index 9f37e22e1..4cb9d555b 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -600,6 +600,13 @@ $ edit frotz $ git add frotz ------------ +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/checkout.txt[] + SEE ALSO -------- linkgit:git-switch[1], diff --git a/git-clean.html b/git-clean.html index e8f1b908b..7fdfbdc21 100644 --- a/git-clean.html +++ b/git-clean.html @@ -957,6 +957,25 @@ help </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="gitignore.html">gitignore(5)</a></p></div>
@@ -973,7 +992,7 @@ help <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-clean.txt b/git-clean.txt index a7f309dff..91742633f 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -133,6 +133,13 @@ help:: Show brief usage of interactive git-clean. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/clean.txt[] + SEE ALSO -------- linkgit:gitignore[5] diff --git a/git-clone.html b/git-clone.html index 36ef0a7bd..8f6f3210e 100644 --- a/git-clone.html +++ b/git-clone.html @@ -1442,6 +1442,63 @@ Create a bare repository to publish your changes to the public: </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+init.templateDir
+</dt>
+<dd>
+<p>
+ Specify the directory from which templates will be copied.
+ (See the "TEMPLATE DIRECTORY" section of <a href="git-init.html">git-init(1)</a>.)
+</p>
+</dd>
+<dt class="hdlist1">
+init.defaultBranch
+</dt>
+<dd>
+<p>
+ Allows overriding the default branch name e.g. when initializing
+ a new repository.
+</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 to clone a repository if it is a shallow one, can be overridden by
+ passing option <code>--reject-shallow</code> in 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>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -1452,7 +1509,7 @@ Create a bare repository to publish your changes to the public: <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-01 13:55:22 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-clone.txt b/git-clone.txt index d032d971d..d6434d262 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -370,6 +370,15 @@ $ cd my-linux $ git clone --bare -l /home/proj/.git /pub/scm/proj.git ------------ +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/init.txt[] + +include::config/clone.txt[] + GIT --- diff --git a/git-column.html b/git-column.html index e73477b74..42b82bcce 100644 --- a/git-column.html +++ b/git-column.html @@ -863,6 +863,148 @@ v2.4.8 v2.4.9</code></pre> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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 list 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 listing in <code>git tag</code> in columns.
+ See <code>column.ui</code> for details.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -873,7 +1015,7 @@ v2.4.8 v2.4.9</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2021-09-08 15:54:43 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-column.txt b/git-column.txt index 6cea9ab46..18431647a 100644 --- a/git-column.txt +++ b/git-column.txt @@ -74,6 +74,13 @@ v2.4.3 v2.4.4 v2.4.5 v2.4.6 v2.4.7 v2.4.8 v2.4.9 ------------ +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/column.txt[] + GIT --- Part of the linkgit:git[1] suite diff --git a/git-commit-graph.html b/git-commit-graph.html index 6d6c4192c..baa3342d2 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html @@ -930,6 +930,46 @@ Write a commit-graph file containing all commits in the current </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_file_format">FILE FORMAT</h2>
<div class="sectionbody">
<div class="paragraph"><p>see <a href="gitformat-commit-graph.html">gitformat-commit-graph(5)</a>.</p></div>
@@ -946,7 +986,7 @@ Write a commit-graph file containing all commits in the current <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-commit-graph.txt b/git-commit-graph.txt index 047decdb6..36fe56c2c 100644 --- a/git-commit-graph.txt +++ b/git-commit-graph.txt @@ -142,6 +142,13 @@ $ git show-ref -s | git commit-graph write --stdin-commits $ git rev-parse HEAD | git commit-graph write --stdin-commits --append ------------------------------------------------ +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/commitgraph.txt[] + FILE FORMAT ----------- diff --git a/git-commit.html b/git-commit.html index 4a1d78b01..db1e2e4a8 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1731,6 +1731,65 @@ reversible operation.</p></div> <code>GIT_EDITOR</code> environment variable, the core.editor configuration variable, the
<code>VISUAL</code> environment variable, or the <code>EDITOR</code> environment variable (in that
order). See <a href="git-var.html">git-var(1)</a> for details.</p></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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 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 verbose with <code>git commit</code>.
+ See <a href="git-commit.html">git-commit(1)</a>.
+</p>
+</dd>
+</dl></div>
</div>
</div>
<div class="sect1">
@@ -1781,7 +1840,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-11-04 13:20:34 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-commit.txt b/git-commit.txt index 6c60bf98f..225c6c9f2 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -557,6 +557,10 @@ The editor used to edit the commit log message will be chosen from the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details. +include::includes/cmd-config-section-rest.txt[] + +include::config/commit.txt[] + HOOKS ----- This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, diff --git a/git-config.html b/git-config.html index 8de112050..cd1bf2739 100644 --- a/git-config.html +++ b/git-config.html @@ -4902,31 +4902,6 @@ diff.<driver>.cachetextconv Set this option to true to make the diff driver cache the text
conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.
</p>
-</dd>
-<dt class="hdlist1">
-diff.tool
-</dt>
-<dd>
-<p>
- Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
- This variable overrides the value configured in <code>merge.tool</code>.
- The list below shows the valid built-in values.
- Any other value is treated as a custom diff tool and requires
- that a corresponding difftool.<tool>.cmd variable is defined.
-</p>
-</dd>
-<dt class="hdlist1">
-diff.guitool
-</dt>
-<dd>
-<p>
- Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
- the -g/--gui flag is specified. This variable overrides the value
- configured in <code>merge.guitool</code>. The list below shows the valid
- built-in values. Any other value is treated as a custom diff tool
- and requires that a corresponding difftool.<guitool>.cmd variable
- is defined.
-</p>
<div class="dlist"><dl>
<dt class="hdlist1">
<code>araxis</code>
@@ -5215,12 +5190,28 @@ diff.colorMovedWS </p>
</dd>
<dt class="hdlist1">
-difftool.<tool>.path
+diff.tool
</dt>
<dd>
<p>
- Override the path for the given tool. This is useful in case
- your tool is not in the PATH.
+ Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
+ This variable overrides the value configured in <code>merge.tool</code>.
+ The list below shows the valid built-in values.
+ Any other value is treated as a custom diff tool and requires
+ that a corresponding difftool.<tool>.cmd variable is defined.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.guitool
+</dt>
+<dd>
+<p>
+ Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
+ the -g/--gui flag is specified. This variable overrides the value
+ configured in <code>merge.guitool</code>. The list below shows the valid
+ built-in values. Any other value is treated as a custom diff tool
+ and requires that a corresponding difftool.<guitool>.cmd variable
+ is defined.
</p>
</dd>
<dt class="hdlist1">
@@ -5235,6 +5226,25 @@ difftool.<tool>.cmd is set to the name of the temporary file containing the contents
of the diff post-image.
</p>
+<div class="paragraph"><p>See the <code>--tool=<tool></code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
+</dd>
+<dt class="hdlist1">
+difftool.<tool>.path
+</dt>
+<dd>
+<p>
+ Override the path for the given tool. This is useful in case
+ your tool is not in the PATH.
+</p>
+</dd>
+<dt class="hdlist1">
+difftool.trustExitCode
+</dt>
+<dd>
+<p>
+ Exit difftool if the invoked diff tool returns a non-zero exit status.
+</p>
+<div class="paragraph"><p>See the <code>--trust-exit-code</code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
</dd>
<dt class="hdlist1">
difftool.prompt
@@ -6279,8 +6289,16 @@ grep.threads </dt>
<dd>
<p>
- Number of grep worker threads to use.
- See <code>grep.threads</code> in <a href="git-grep.html">git-grep(1)</a> for more information.
+ 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">
@@ -7596,6 +7614,9 @@ log.date Setting a value for log.date is similar to using <em>git log</em>'s
<code>--date</code> option. See <a href="git-log.html">git-log(1)</a> for details.
</p>
+<div class="paragraph"><p>If the format is set to "auto:foo" and the pager is in use, format
+"foo" will be the used for the date format. Otherwise "default" will
+be used.</p></div>
</dd>
<dt class="hdlist1">
log.decorate
@@ -8540,6 +8561,8 @@ notes.mergeStrategy <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See "NOTES MERGE STRATEGIES"
section of <a href="git-notes.html">git-notes(1)</a> for more information on each strategy.
</p>
+<div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to
+<a href="git-notes.html">git-notes(1)</a>.</p></div>
</dd>
<dt class="hdlist1">
notes.<name>.mergeStrategy
@@ -8557,17 +8580,19 @@ notes.displayRef </dt>
<dd>
<p>
- The (fully qualified) refname from which to show notes when
- showing commit messages. The value of this variable can be set
- to a glob, in which case notes from all matching refs will be
- shown. You may also specify this configuration variable
- several times. A warning will be issued for refs that do not
- exist, but a glob that does not match any refs is silently
- ignored.
+ Which ref (or refs, if a glob or specified more than once), in
+ addition to the default set by <code>core.notesRef</code> or
+ <code>GIT_NOTES_REF</code>, to read notes from when showing commit
+ messages with the <em>git log</em> family of commands.
</p>
<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_DISPLAY_REF</code>
environment variable, which must be a colon separated list of refs or
globs.</p></div>
+<div class="paragraph"><p>A warning will be issued for refs that do not exist,
+but a glob that does not match any refs is silently ignored.</p></div>
+<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option to the <em>git
+log</em> family of commands, or by the <code>--notes=<ref></code> option accepted by
+those commands.</p></div>
<div class="paragraph"><p>The effective value of "core.notesRef" (possibly overridden by
GIT_NOTES_REF) is also implicitly added to the list of refs to be
displayed.</p></div>
@@ -8578,11 +8603,13 @@ notes.rewrite.<command> <dd>
<p>
When rewriting commits with <command> (currently <code>amend</code> or
- <code>rebase</code>) and this variable is set to <code>true</code>, Git
- automatically copies your notes from the original to the
- rewritten commit. Defaults to <code>true</code>, but see
- "notes.rewriteRef" below.
+ <code>rebase</code>), if this variable is <code>false</code>, git will not copy
+ notes from the original to the rewritten commit. Defaults to
+ <code>true</code>. See also "<code>notes.rewriteRef</code>" below.
</p>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
</dd>
<dt class="hdlist1">
notes.rewriteMode
@@ -8604,16 +8631,15 @@ notes.rewriteRef <dd>
<p>
When copying notes during a rewrite, specifies the (fully
- qualified) ref whose notes should be copied. The ref may be a
- glob, in which case notes in all matching refs will be copied.
- You may also specify this configuration several times.
+ qualified) ref whose notes should be copied. May be a glob,
+ in which case notes in all matching refs will be copied. You
+ may also specify this configuration several times.
</p>
<div class="paragraph"><p>Does not have a default value; you must configure this variable to
enable note rewriting. Set it to <code>refs/notes/commits</code> to enable
rewriting for the default commit notes.</p></div>
-<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
-environment variable, which must be a colon separated list of refs or
-globs.</p></div>
+<div class="paragraph"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.
+See <code>notes.rewrite.<command></code> above for a further description of its format.</p></div>
</dd>
<dt class="hdlist1">
pack.window
@@ -10049,11 +10075,85 @@ sendemail.<identity>.* </p>
</dd>
<dt class="hdlist1">
+sendemail.multiEdit
+</dt>
+<dd>
+<p>
+ If true (default), a single editor instance will be spawned to edit
+ files you have to edit (patches when <code>--annotate</code> is used, and the
+ summary when <code>--compose</code> is used). If false, files will be edited one
+ after the other, spawning a new editor each time.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.confirm
+</dt>
+<dd>
+<p>
+ Sets the default for whether to confirm before sending. Must be
+ one of <em>always</em>, <em>never</em>, <em>cc</em>, <em>compose</em>, or <em>auto</em>. See <code>--confirm</code>
+ in the <a href="git-send-email.html">git-send-email(1)</a> documentation for the meaning of these
+ values.
+</p>
+</dd>
+<dt class="hdlist1">
sendemail.aliasesFile
</dt>
+<dd>
+<p>
+ To avoid typing long email addresses, point this to one or more
+ email aliases files. You must also supply <code>sendemail.aliasFileType</code>.
+</p>
+</dd>
<dt class="hdlist1">
sendemail.aliasFileType
</dt>
+<dd>
+<p>
+ Format of the file(s) specified in sendemail.aliasesFile. Must be
+ one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, <em>elm</em>, or <em>gnus</em>, or <em>sendmail</em>.
+</p>
+<div class="paragraph"><p>What an alias file in each format looks like can be found in
+the documentation of the email program of the same name. The
+differences and limitations from the standard formats are
+described below:</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+sendmail
+</dt>
+<dd>
+<div class="ulist"><ul>
+<li>
+<p>
+Quoted aliases and quoted addresses are not supported: lines that
+ contain a <code>"</code> symbol are ignored.
+</p>
+</li>
+<li>
+<p>
+Redirection to a file (<code>/path/name</code>) or pipe (<code>|command</code>) is not
+ supported.
+</p>
+</li>
+<li>
+<p>
+File inclusion (<code>:include: /path/name</code>) is not supported.
+</p>
+</li>
+<li>
+<p>
+Warnings are printed on the standard error output for any
+ explicitly unsupported constructs, and any other lines that are not
+ recognized by the parser.
+</p>
+</li>
+</ul></div>
+</dd>
+</dl></div>
+</div></div>
+</dd>
<dt class="hdlist1">
sendemail.annotate
</dt>
@@ -10070,18 +10170,12 @@ sendemail.ccCmd sendemail.chainReplyTo
</dt>
<dt class="hdlist1">
-sendemail.confirm
-</dt>
-<dt class="hdlist1">
sendemail.envelopeSender
</dt>
<dt class="hdlist1">
sendemail.from
</dt>
<dt class="hdlist1">
-sendemail.multiEdit
-</dt>
-<dt class="hdlist1">
sendemail.signedoffbycc
</dt>
<dt class="hdlist1">
@@ -10128,7 +10222,9 @@ sendemail.xmailer </dt>
<dd>
<p>
- See <a href="git-send-email.html">git-send-email(1)</a> for description.
+ These configuration variables all provide a default for
+ <a href="git-send-email.html">git-send-email(1)</a> command-line options. See its
+ documentation for details.
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-diff.html b/git-diff.html index 327823861..9081a4d2f 100644 --- a/git-diff.html +++ b/git-diff.html @@ -2975,6 +2975,655 @@ Output diff in reverse. </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+diff.autoRefreshIndex
+</dt>
+<dd>
+<p>
+ When using <em>git diff</em> to compare with work tree
+ files, do not consider stat-only change as changed.
+ Instead, silently run <code>git update-index --refresh</code> to
+ update the cached stat information for paths whose
+ contents in the work tree match the contents in the
+ index. This option defaults to true. Note that this
+ affects only <em>git diff</em> Porcelain, and not lower level
+ <em>diff</em> commands such as <em>git diff-files</em>.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.dirstat
+</dt>
+<dd>
+<p>
+ A comma separated list of <code>--dirstat</code> parameters specifying the
+ default behavior of the <code>--dirstat</code> option to <a href="git-diff.html">git-diff(1)</a>
+ and friends. The defaults can be overridden on the command line
+ (using <code>--dirstat=<param1,param2,...></code>). The fallback defaults
+ (when not changed by <code>diff.dirstat</code>) are <code>changes,noncumulative,3</code>.
+ The following parameters are available:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>changes</code>
+</dt>
+<dd>
+<p>
+ Compute the dirstat numbers by counting the lines that have been
+ removed from the source, or added to the destination. This ignores
+ the amount of pure code movements within a file. In other words,
+ rearranging lines in a file is not counted as much as other changes.
+ This is the default behavior when no parameter is given.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>lines</code>
+</dt>
+<dd>
+<p>
+ Compute the dirstat numbers by doing the regular line-based diff
+ analysis, and summing the removed/added line counts. (For binary
+ files, count 64-byte chunks instead, since binary files have no
+ natural concept of lines). This is a more expensive <code>--dirstat</code>
+ behavior than the <code>changes</code> behavior, but it does count rearranged
+ lines within a file as much as other changes. The resulting output
+ is consistent with what you get from the other <code>--*stat</code> options.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>files</code>
+</dt>
+<dd>
+<p>
+ Compute the dirstat numbers by counting the number of files changed.
+ Each changed file counts equally in the dirstat analysis. This is
+ the computationally cheapest <code>--dirstat</code> behavior, since it does
+ not have to look at the file contents at all.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>cumulative</code>
+</dt>
+<dd>
+<p>
+ Count changes in a child directory for the parent directory as well.
+ Note that when using <code>cumulative</code>, the sum of the percentages
+ reported may exceed 100%. The default (non-cumulative) behavior can
+ be specified with the <code>noncumulative</code> parameter.
+</p>
+</dd>
+<dt class="hdlist1">
+<limit>
+</dt>
+<dd>
+<p>
+ An integer parameter specifies a cut-off percent (3% by default).
+ Directories contributing less than this percentage of the changes
+ are not shown in the output.
+</p>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>Example: The following will count changed files, while ignoring
+directories with less than 10% of the total amount of changed files,
+and accumulating child directory counts in the parent directories:
+<code>files,10,cumulative</code>.</p></div>
+</dd>
+<dt class="hdlist1">
+diff.statGraphWidth
+</dt>
+<dd>
+<p>
+ Limit the width of the graph part in --stat output. If set, applies
+ to all commands generating --stat output except format-patch.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.context
+</dt>
+<dd>
+<p>
+ Generate diffs with <n> lines of context instead of the default
+ of 3. This value is overridden by the -U option.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.interHunkContext
+</dt>
+<dd>
+<p>
+ Show the context between diff hunks, up to the specified number
+ of lines, thereby fusing the hunks that are close to each other.
+ This value serves as the default for the <code>--inter-hunk-context</code>
+ command line option.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.external
+</dt>
+<dd>
+<p>
+ If this config variable is set, diff generation is not
+ performed using the internal diff machinery, but using the
+ given command. Can be overridden with the ‘GIT_EXTERNAL_DIFF’
+ environment variable. The command is called with parameters
+ as described under "git Diffs" in <a href="git.html">git(1)</a>. Note: if
+ you want to use an external diff program only on a subset of
+ your files, you might want to use <a href="gitattributes.html">gitattributes(5)</a> instead.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.ignoreSubmodules
+</dt>
+<dd>
+<p>
+ Sets the default value of --ignore-submodules. Note that this
+ affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em>
+ commands such as <em>git diff-files</em>. <em>git checkout</em>
+ and <em>git switch</em> also honor
+ this setting when reporting uncommitted changes. Setting it to
+ <em>all</em> disables the submodule summary normally shown by <em>git commit</em>
+ and <em>git status</em> when <code>status.submoduleSummary</code> is set unless it is
+ overridden by using the --ignore-submodules command-line option.
+ The <em>git submodule</em> commands are not affected by this setting.
+ By default this is set to untracked so that any untracked
+ submodules are ignored.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.mnemonicPrefix
+</dt>
+<dd>
+<p>
+ If set, <em>git diff</em> uses a prefix pair that is different from the
+ standard "a/" and "b/" depending on what is being compared. When
+ this configuration is in effect, reverse diff output also swaps
+ the order of the prefixes:
+</p>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>git diff</code>
+</dt>
+<dd>
+<p>
+ compares the (i)ndex and the (w)ork tree;
+</p>
+</dd>
+<dt class="hdlist1">
+<code>git diff HEAD</code>
+</dt>
+<dd>
+<p>
+ compares a (c)ommit and the (w)ork tree;
+</p>
+</dd>
+<dt class="hdlist1">
+<code>git diff --cached</code>
+</dt>
+<dd>
+<p>
+ compares a (c)ommit and the (i)ndex;
+</p>
+</dd>
+<dt class="hdlist1">
+<code>git diff HEAD:file1 file2</code>
+</dt>
+<dd>
+<p>
+ compares an (o)bject and a (w)ork tree entity;
+</p>
+</dd>
+<dt class="hdlist1">
+<code>git diff --no-index a b</code>
+</dt>
+<dd>
+<p>
+ compares two non-git things (1) and (2).
+</p>
+</dd>
+</dl></div>
+</dd>
+<dt class="hdlist1">
+diff.noprefix
+</dt>
+<dd>
+<p>
+ If set, <em>git diff</em> does not show any source or destination prefix.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.relative
+</dt>
+<dd>
+<p>
+ If set to <em>true</em>, <em>git diff</em> does not show changes outside of the directory
+ and show pathnames relative to the current directory.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.orderFile
+</dt>
+<dd>
+<p>
+ File indicating how to order files within a diff.
+ See the <em>-O</em> option to <a href="git-diff.html">git-diff(1)</a> for details.
+ If <code>diff.orderFile</code> is a relative pathname, it is treated as
+ relative to the top of the working tree.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.renameLimit
+</dt>
+<dd>
+<p>
+ The number of files to consider in the exhaustive portion of
+ copy/rename detection; equivalent to the <em>git diff</em> option
+ <code>-l</code>. If not set, the default value is currently 1000. This
+ setting has no effect if rename detection is turned off.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.renames
+</dt>
+<dd>
+<p>
+ Whether and how Git detects renames. If set to "false",
+ rename detection is disabled. If set to "true", basic rename
+ detection is enabled. If set to "copies" or "copy", Git will
+ detect copies, as well. Defaults to true. Note that this
+ affects only <em>git diff</em> Porcelain like <a href="git-diff.html">git-diff(1)</a> and
+ <a href="git-log.html">git-log(1)</a>, and not lower level commands such as
+ <a href="git-diff-files.html">git-diff-files(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.suppressBlankEmpty
+</dt>
+<dd>
+<p>
+ A boolean to inhibit the standard behavior of printing a space
+ before each empty output line. Defaults to false.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.submodule
+</dt>
+<dd>
+<p>
+ Specify the format in which differences in submodules are
+ shown. The "short" format just shows the names of the commits
+ at the beginning and end of the range. The "log" format lists
+ the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code>
+ does. The "diff" format shows an inline diff of the changed
+ contents of the submodule. Defaults to "short".
+</p>
+</dd>
+<dt class="hdlist1">
+diff.wordRegex
+</dt>
+<dd>
+<p>
+ A POSIX Extended Regular Expression used to determine what is a "word"
+ when performing word-by-word difference calculations. Character
+ sequences that match the regular expression are "words", all other
+ characters are <strong>ignorable</strong> whitespace.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.<driver>.command
+</dt>
+<dd>
+<p>
+ The custom diff driver command. See <a href="gitattributes.html">gitattributes(5)</a>
+ for details.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.<driver>.xfuncname
+</dt>
+<dd>
+<p>
+ The regular expression that the diff driver should use to
+ recognize the hunk header. A built-in pattern may also be used.
+ See <a href="gitattributes.html">gitattributes(5)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.<driver>.binary
+</dt>
+<dd>
+<p>
+ Set this option to true to make the diff driver treat files as
+ binary. See <a href="gitattributes.html">gitattributes(5)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.<driver>.textconv
+</dt>
+<dd>
+<p>
+ The command that the diff driver should call to generate the
+ text-converted version of a file. The result of the
+ conversion is used to generate a human-readable diff. See
+ <a href="gitattributes.html">gitattributes(5)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.<driver>.wordRegex
+</dt>
+<dd>
+<p>
+ The regular expression that the diff driver should use to
+ split words in a line. See <a href="gitattributes.html">gitattributes(5)</a> for
+ details.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.<driver>.cachetextconv
+</dt>
+<dd>
+<p>
+ Set this option to true to make the diff driver cache the text
+ conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.
+</p>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>araxis</code>
+</dt>
+<dd>
+<p>
+Use Araxis Merge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>bc</code>
+</dt>
+<dd>
+<p>
+Use Beyond Compare (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>bc3</code>
+</dt>
+<dd>
+<p>
+Use Beyond Compare (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>bc4</code>
+</dt>
+<dd>
+<p>
+Use Beyond Compare (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>codecompare</code>
+</dt>
+<dd>
+<p>
+Use Code Compare (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>deltawalker</code>
+</dt>
+<dd>
+<p>
+Use DeltaWalker (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>diffmerge</code>
+</dt>
+<dd>
+<p>
+Use DiffMerge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>diffuse</code>
+</dt>
+<dd>
+<p>
+Use Diffuse (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>ecmerge</code>
+</dt>
+<dd>
+<p>
+Use ECMerge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>emerge</code>
+</dt>
+<dd>
+<p>
+Use Emacs' Emerge
+</p>
+</dd>
+<dt class="hdlist1">
+<code>examdiff</code>
+</dt>
+<dd>
+<p>
+Use ExamDiff Pro (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>guiffy</code>
+</dt>
+<dd>
+<p>
+Use Guiffy’s Diff Tool (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>gvimdiff</code>
+</dt>
+<dd>
+<p>
+Use gVim (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>kdiff3</code>
+</dt>
+<dd>
+<p>
+Use KDiff3 (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>kompare</code>
+</dt>
+<dd>
+<p>
+Use Kompare (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>meld</code>
+</dt>
+<dd>
+<p>
+Use Meld (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>nvimdiff</code>
+</dt>
+<dd>
+<p>
+Use Neovim
+</p>
+</dd>
+<dt class="hdlist1">
+<code>opendiff</code>
+</dt>
+<dd>
+<p>
+Use FileMerge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>p4merge</code>
+</dt>
+<dd>
+<p>
+Use HelixCore P4Merge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>smerge</code>
+</dt>
+<dd>
+<p>
+Use Sublime Merge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>tkdiff</code>
+</dt>
+<dd>
+<p>
+Use TkDiff (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>vimdiff</code>
+</dt>
+<dd>
+<p>
+Use Vim
+</p>
+</dd>
+<dt class="hdlist1">
+<code>winmerge</code>
+</dt>
+<dd>
+<p>
+Use WinMerge (requires a graphical session)
+</p>
+</dd>
+<dt class="hdlist1">
+<code>xxdiff</code>
+</dt>
+<dd>
+<p>
+Use xxdiff (requires a graphical session)
+</p>
+</dd>
+</dl></div>
+</dd>
+<dt class="hdlist1">
+diff.indentHeuristic
+</dt>
+<dd>
+<p>
+ Set this option to <code>false</code> to disable the default heuristics
+ that shift diff hunk boundaries to make patches easier to read.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.algorithm
+</dt>
+<dd>
+<p>
+ Choose a diff algorithm. The variants are as follows:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>default</code>, <code>myers</code>
+</dt>
+<dd>
+<p>
+ The basic greedy diff algorithm. Currently, this is the default.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>minimal</code>
+</dt>
+<dd>
+<p>
+ Spend extra time to make sure the smallest possible diff is
+ produced.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>patience</code>
+</dt>
+<dd>
+<p>
+ Use "patience diff" algorithm when generating patches.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>histogram</code>
+</dt>
+<dd>
+<p>
+ This algorithm extends the patience algorithm to "support
+ low-occurrence common elements".
+</p>
+</dd>
+</dl></div>
+</div></div>
+</dd>
+<dt class="hdlist1">
+diff.wsErrorHighlight
+</dt>
+<dd>
+<p>
+ Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
+ lines of the diff. Multiple values are separated by comma,
+ <code>none</code> resets previous values, <code>default</code> reset the list to
+ <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. The
+ whitespace errors are colored with <code>color.diff.whitespace</code>.
+ The command line option <code>--ws-error-highlight=<kind></code>
+ overrides this setting.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.colorMoved
+</dt>
+<dd>
+<p>
+ If set to either a valid <code><mode></code> or a true value, moved lines
+ in a diff are colored differently, for details of valid modes
+ see <em>--color-moved</em> in <a href="git-diff.html">git-diff(1)</a>. If simply set to
+ true the default color mode will be used. When set to false,
+ moved lines are not colored.
+</p>
+</dd>
+<dt class="hdlist1">
+diff.colorMovedWS
+</dt>
+<dd>
+<p>
+ When moved lines are colored using e.g. the <code>diff.colorMoved</code> setting,
+ this option controls the <code><mode></code> how spaces are treated
+ for details of valid modes see <em>--color-moved-ws</em> in <a href="git-diff.html">git-diff(1)</a>.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p>diff(1),
@@ -2997,7 +3646,7 @@ Output diff in reverse. <div id="footer">
<div id="footer-text">
Last updated
- 2021-08-04 00:06:05 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-diff.txt b/git-diff.txt index 6236c75c9..85ae6d6d0 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -213,6 +213,13 @@ $ git diff -R <2> rewrites (very expensive). <2> Output diff in reverse. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/diff.txt[] + SEE ALSO -------- diff(1), diff --git a/git-difftool.html b/git-difftool.html index 47f9bfa60..303d7d64c 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -923,17 +923,24 @@ instead. <code>--no-symlinks</code> is the default on Windows.</p></div> </div>
</div>
<div class="sect1">
-<h2 id="_config_variables">CONFIG VARIABLES</h2>
+<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
<div class="paragraph"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the
difftool equivalents have not been defined.</p></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
diff.tool
</dt>
<dd>
<p>
- The default diff tool to use.
+ Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
+ This variable overrides the value configured in <code>merge.tool</code>.
+ The list below shows the valid built-in values.
+ Any other value is treated as a custom diff tool and requires
+ that a corresponding difftool.<tool>.cmd variable is defined.
</p>
</dd>
<dt class="hdlist1">
@@ -941,43 +948,53 @@ diff.guitool </dt>
<dd>
<p>
- The default diff tool to use when <code>--gui</code> is specified.
+ Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
+ the -g/--gui flag is specified. This variable overrides the value
+ configured in <code>merge.guitool</code>. The list below shows the valid
+ built-in values. Any other value is treated as a custom diff tool
+ and requires that a corresponding difftool.<guitool>.cmd variable
+ is defined.
</p>
</dd>
<dt class="hdlist1">
-difftool.<tool>.path
+difftool.<tool>.cmd
</dt>
<dd>
<p>
- Override the path for the given tool. This is useful in case
- your tool is not in the PATH.
+ Specify the command to invoke the specified diff tool.
+ The specified command is evaluated in shell with the following
+ variables available: <em>LOCAL</em> is set to the name of the temporary
+ file containing the contents of the diff pre-image and <em>REMOTE</em>
+ is set to the name of the temporary file containing the contents
+ of the diff post-image.
</p>
+<div class="paragraph"><p>See the <code>--tool=<tool></code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
</dd>
<dt class="hdlist1">
-difftool.<tool>.cmd
+difftool.<tool>.path
</dt>
<dd>
<p>
- Specify the command to invoke the specified diff tool.
+ Override the path for the given tool. This is useful in case
+ your tool is not in the PATH.
</p>
-<div class="paragraph"><p>See the <code>--tool=<tool></code> option above for more details.</p></div>
</dd>
<dt class="hdlist1">
-difftool.prompt
+difftool.trustExitCode
</dt>
<dd>
<p>
- Prompt before each invocation of the diff tool.
+ Exit difftool if the invoked diff tool returns a non-zero exit status.
</p>
+<div class="paragraph"><p>See the <code>--trust-exit-code</code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
</dd>
<dt class="hdlist1">
-difftool.trustExitCode
+difftool.prompt
</dt>
<dd>
<p>
- Exit difftool if the invoked diff tool returns a non-zero exit status.
+ Prompt before each invocation of the diff tool.
</p>
-<div class="paragraph"><p>See the <code>--trust-exit-code</code> option above for more details.</p></div>
</dd>
</dl></div>
</div>
@@ -1024,7 +1041,7 @@ difftool.trustExitCode <div id="footer">
<div id="footer-text">
Last updated
- 2021-02-26 23:35:19 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-difftool.txt b/git-difftool.txt index 143b0c49d..9d14c3c9f 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -113,33 +113,14 @@ instead. `--no-symlinks` is the default on Windows. See linkgit:git-diff[1] for the full list of supported options. -CONFIG VARIABLES ----------------- +CONFIGURATION +------------- 'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined. -diff.tool:: - The default diff tool to use. +include::includes/cmd-config-section-rest.txt[] -diff.guitool:: - The default diff tool to use when `--gui` is specified. - -difftool.<tool>.path:: - Override the path for the given tool. This is useful in case - your tool is not in the PATH. - -difftool.<tool>.cmd:: - Specify the command to invoke the specified diff tool. -+ -See the `--tool=<tool>` option above for more details. - -difftool.prompt:: - Prompt before each invocation of the diff tool. - -difftool.trustExitCode:: - Exit difftool if the invoked diff tool returns a non-zero exit status. -+ -See the `--trust-exit-code` option above for more details. +include::config/difftool.txt[] SEE ALSO -------- diff --git a/git-fast-import.html b/git-fast-import.html index 2509ddd7c..db44a65ee 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -2600,6 +2600,30 @@ compression.</p></div> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+fastimport.unpackLimit
+</dt>
+<dd>
+<p>
+ If the number of objects imported by <a href="git-fast-import.html">git-fast-import(1)</a>
+ is below this limit, then the objects will be unpacked into
+ loose object files. However if the number of imported objects
+ equals or exceeds this limit then the pack will be stored as a
+ pack. Storing the pack from a fast-import can make the import
+ operation complete faster, especially on slow filesystems. If
+ not set, the value of <code>transfer.unpackLimit</code> is used instead.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-fast-export.html">git-fast-export(1)</a></p></div>
@@ -2616,7 +2640,7 @@ compression.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-18 13:46:42 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-fast-import.txt b/git-fast-import.txt index 39cfa05b2..8b5dd6add 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -1564,6 +1564,13 @@ operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/fastimport.txt[] + SEE ALSO -------- linkgit:git-fast-export[1] diff --git a/git-fetch.html b/git-fetch.html index f52b984da..e4fc99601 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -1993,6 +1993,172 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+fetch.recurseSubmodules
+</dt>
+<dd>
+<p>
+ This option controls whether <code>git fetch</code> (and the underlying fetch
+ in <code>git pull</code>) will recursively fetch into populated submodules.
+ This option can be set either to a boolean value or to <em>on-demand</em>.
+ Setting it to a boolean changes the behavior of fetch and pull to
+ recurse unconditionally into submodules when set to true or to not
+ recurse at all when set to false. When set to <em>on-demand</em>, fetch and
+ pull will only recurse into a populated submodule when its
+ superproject retrieves a commit that updates the submodule’s
+ reference.
+ Defaults to <em>on-demand</em>, or to the value of <em>submodule.recurse</em> if set.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.fsckObjects
+</dt>
+<dd>
+<p>
+ If it is set to true, git-fetch-pack will check all fetched
+ objects. See <code>transfer.fsckObjects</code> for what’s
+ checked. Defaults to false. If not set, the value of
+ <code>transfer.fsckObjects</code> is used instead.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.fsck.<msg-id>
+</dt>
+<dd>
+<p>
+ Acts like <code>fsck.<msg-id></code>, but is used by
+ <a href="git-fetch-pack.html">git-fetch-pack(1)</a> instead of <a href="git-fsck.html">git-fsck(1)</a>. See
+ the <code>fsck.<msg-id></code> documentation for details.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.fsck.skipList
+</dt>
+<dd>
+<p>
+ Acts like <code>fsck.skipList</code>, but is used by
+ <a href="git-fetch-pack.html">git-fetch-pack(1)</a> instead of <a href="git-fsck.html">git-fsck(1)</a>. See
+ the <code>fsck.skipList</code> documentation for details.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.unpackLimit
+</dt>
+<dd>
+<p>
+ 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. If not set, the value of
+ <code>transfer.unpackLimit</code> is used instead.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.prune
+</dt>
+<dd>
+<p>
+ If true, fetch will automatically behave as if the <code>--prune</code>
+ option was given on the command line. See also <code>remote.<name>.prune</code>
+ and the PRUNING section of <a href="git-fetch.html">git-fetch(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.pruneTags
+</dt>
+<dd>
+<p>
+ If true, fetch will automatically behave as if the
+ <code>refs/tags/*:refs/tags/*</code> refspec was provided when pruning,
+ if not set already. This allows for setting both this option
+ and <code>fetch.prune</code> to maintain a 1=1 mapping to upstream
+ refs. See also <code>remote.<name>.pruneTags</code> and the PRUNING
+ section of <a href="git-fetch.html">git-fetch(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.output
+</dt>
+<dd>
+<p>
+ Control how ref update status is printed. Valid values are
+ <code>full</code> and <code>compact</code>. Default value is <code>full</code>. See section
+ OUTPUT in <a href="git-fetch.html">git-fetch(1)</a> for detail.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.negotiationAlgorithm
+</dt>
+<dd>
+<p>
+ Control how information about the commits in the local repository
+ is sent when negotiating the contents of the packfile to be sent by
+ the server. Set to "consecutive" to use an algorithm that walks
+ over consecutive commits checking each one. Set to "skipping" to
+ use an algorithm that skips commits in an effort to converge
+ faster, but may result in a larger-than-necessary packfile; or set
+ to "noop" to not send any information at all, which will almost
+ certainly result in a larger-than-necessary packfile, but will skip
+ the negotiation step. Set to "default" to override settings made
+ previously and use the default behaviour. The default is normally
+ "consecutive", but if <code>feature.experimental</code> is true, then the
+ default is "skipping". Unknown values will cause <em>git fetch</em> to
+ error out.
+</p>
+<div class="paragraph"><p>See also the <code>--negotiate-only</code> and <code>--negotiation-tip</code> options to
+<a href="git-fetch.html">git-fetch(1)</a>.</p></div>
+</dd>
+<dt class="hdlist1">
+fetch.showForcedUpdates
+</dt>
+<dd>
+<p>
+ Set to false to enable <code>--no-show-forced-updates</code> in
+ <a href="git-fetch.html">git-fetch(1)</a> and <a href="git-pull.html">git-pull(1)</a> commands.
+ Defaults to true.
+</p>
+</dd>
+<dt class="hdlist1">
+fetch.parallel
+</dt>
+<dd>
+<p>
+ Specifies the maximal number of fetch operations to be run in parallel
+ at a time (submodules, or remotes when the <code>--multiple</code> option of
+ <a href="git-fetch.html">git-fetch(1)</a> is in effect).
+</p>
+<div class="paragraph"><p>A value of 0 will give some reasonable default. If unset, it defaults to 1.</p></div>
+<div class="paragraph"><p>For submodules, this setting can be overridden using the <code>submodule.fetchJobs</code>
+config setting.</p></div>
+</dd>
+<dt class="hdlist1">
+fetch.writeCommitGraph
+</dt>
+<dd>
+<p>
+ Set to true to write a commit-graph after every <code>git fetch</code> command
+ that downloads a pack-file from a remote. Using the <code>--split</code> option,
+ most executions will create a very small commit-graph file on top of
+ the existing commit-graph file(s). Occasionally, these files will
+ merge and the write may take longer. Having an updated commit-graph
+ file helps performance of many Git commands, including <code>git merge-base</code>,
+ <code>git push -f</code>, and <code>git log --graph</code>. Defaults to false.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_bugs">BUGS</h2>
<div class="sectionbody">
<div class="paragraph"><p>Using --recurse-submodules can only fetch new commits in submodules that are
@@ -2018,7 +2184,7 @@ submodule update</code>. This is expected to be fixed in a future Git version.</ <div id="footer">
<div id="footer-text">
Last updated
- 2022-03-27 10:29:17 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-fetch.txt b/git-fetch.txt index e9d364669..63d9569e1 100644 --- a/git-fetch.txt +++ b/git-fetch.txt @@ -285,6 +285,13 @@ linkgit:git-gc[1]). include::transfer-data-leaks.txt[] +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/fetch.txt[] + BUGS ---- Using --recurse-submodules can only fetch new commits in submodules that are diff --git a/git-fsck.html b/git-fsck.html index 1eaa48278..0a795cace 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -925,6 +925,9 @@ care about this output and want to speed it up further.</p></div> <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
fsck.<msg-id>
@@ -1103,7 +1106,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-fsck.txt b/git-fsck.txt index 5088783dc..29318ea95 100644 --- a/git-fsck.txt +++ b/git-fsck.txt @@ -107,6 +107,8 @@ care about this output and want to speed it up further. CONFIGURATION ------------- +include::includes/cmd-config-section-all.txt[] + include::config/fsck.txt[] DISCUSSION diff --git a/git-gc.html b/git-gc.html index f5dc0a95e..26e76f03c 100644 --- a/git-gc.html +++ b/git-gc.html @@ -892,8 +892,9 @@ users and their repositories.</p></div> <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The below documentation is the same as what’s found in
-<a href="git-config.html">git-config(1)</a>:</p></div>
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
gc.aggressiveDepth
@@ -1186,7 +1187,7 @@ seems to be low in practice).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-06-22 12:22:32 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-gc.txt b/git-gc.txt index 0af7540a0..a65c9aa62 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -110,8 +110,7 @@ users and their repositories. CONFIGURATION ------------- -The below documentation is the same as what's found in -linkgit:git-config[1]: +include::includes/cmd-config-section-all.txt[] include::config/gc.txt[] diff --git a/git-grep.html b/git-grep.html index 8bfcda5d5..cee178ff1 100644 --- a/git-grep.html +++ b/git-grep.html @@ -1407,6 +1407,9 @@ performance in this case, it might be desirable to use <code>--threads=1</code>. <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
grep.lineNumber
@@ -1432,7 +1435,8 @@ grep.patternType 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 return to the default matching behavior.
+ 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">
@@ -1485,7 +1489,7 @@ grep.fallbackToNoIndex <div id="footer">
<div id="footer-text">
Last updated
- 2022-07-18 13:37:02 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-grep.txt b/git-grep.txt index 58d944bd5..dabdbe847 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -343,34 +343,9 @@ performance in this case, it might be desirable to use `--threads=1`. CONFIGURATION ------------- -grep.lineNumber:: - If set to true, enable `-n` option by default. - -grep.column:: - If set to true, enable the `--column` option by default. - -grep.patternType:: - Set the default matching behavior. Using a value of 'basic', 'extended', - 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, - `--fixed-strings`, or `--perl-regexp` option accordingly, while the - value 'default' will return to the default matching behavior. - -grep.extendedRegexp:: - If set to true, enable `--extended-regexp` option by default. This - option is ignored when the `grep.patternType` option is set to a value - other than 'default'. - -grep.threads:: - 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. - -grep.fullName:: - If set to true, enable `--full-name` option by default. - -grep.fallbackToNoIndex:: - If set to true, fall back to git grep --no-index if git grep - is executed outside of a git repository. Defaults to false. +include::includes/cmd-config-section-all.txt[] +include::config/grep.txt[] GIT --- diff --git a/git-imap-send.html b/git-imap-send.html index bef8fa654..f6c1f3b0e 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -821,6 +821,9 @@ that order.</p></div> <div class="sectionbody">
<div class="paragraph"><p>To use the tool, <code>imap.folder</code> and either <code>imap.tunnel</code> or <code>imap.host</code> must be set
to appropriate values.</p></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
imap.folder
@@ -1025,7 +1028,7 @@ users may wish to visit this web page for more information: <div id="footer">
<div id="footer-text">
Last updated
- 2020-09-11 23:36:57 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-imap-send.txt b/git-imap-send.txt index 63cf498ce..f7b185151 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt @@ -54,6 +54,8 @@ CONFIGURATION To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values. +include::includes/cmd-config-section-rest.txt[] + include::config/imap.txt[] EXAMPLES diff --git a/git-init.html b/git-init.html index 6aff4d9db..743f0cf01 100644 --- a/git-init.html +++ b/git-init.html @@ -996,6 +996,34 @@ Record the pristine state as the first commit in the history. </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+init.templateDir
+</dt>
+<dd>
+<p>
+ Specify the directory from which templates will be copied.
+ (See the "TEMPLATE DIRECTORY" section of <a href="git-init.html">git-init(1)</a>.)
+</p>
+</dd>
+<dt class="hdlist1">
+init.defaultBranch
+</dt>
+<dd>
+<p>
+ Allows overriding the default branch name e.g. when initializing
+ a new repository.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -1006,7 +1034,7 @@ Record the pristine state as the first commit in the history. <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-init.txt b/git-init.txt index ad921fe78..160dea137 100644 --- a/git-init.txt +++ b/git-init.txt @@ -169,6 +169,13 @@ $ git commit <3> <2> Add all existing files to the index. <3> Record the pristine state as the first commit in the history. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/init.txt[] + GIT --- Part of the linkgit:git[1] suite diff --git a/git-log.html b/git-log.html index 8ab3c3000..a1f3e1e16 100644 --- a/git-log.html +++ b/git-log.html @@ -5336,20 +5336,81 @@ i18n.logOutputEncoding otherwise.
</p>
</dd>
+</dl></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+log.abbrevCommit
+</dt>
+<dd>
+<p>
+ If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--abbrev-commit</code>. You may
+ override this option with <code>--no-abbrev-commit</code>.
+</p>
+</dd>
<dt class="hdlist1">
log.date
</dt>
<dd>
<p>
- Default format for human-readable dates. (Compare the
- <code>--date</code> option.) Defaults to "default", which means to write
- dates like <code>Sat May 8 19:35:34 2010 -0500</code>.
+ Set the default date-time mode for the <em>log</em> command.
+ Setting a value for log.date is similar to using <em>git log</em>'s
+ <code>--date</code> option. See <a href="git-log.html">git-log(1)</a> for details.
</p>
<div class="paragraph"><p>If the format is set to "auto:foo" and the pager is in use, format
"foo" will be the used for the date format. Otherwise "default" will
be used.</p></div>
</dd>
<dt class="hdlist1">
+log.decorate
+</dt>
+<dd>
+<p>
+ Print out the ref names of any commits that are shown by the log
+ command. If <em>short</em> is specified, the ref name prefixes <em>refs/heads/</em>,
+ <em>refs/tags/</em> and <em>refs/remotes/</em> will not be printed. If <em>full</em> is
+ specified, the full ref name (including prefix) will be printed.
+ If <em>auto</em> is specified, then if the output is going to a terminal,
+ the ref names are shown as if <em>short</em> were given, otherwise no ref
+ names are shown. This is the same as the <code>--decorate</code> option
+ of the <code>git log</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+log.initialDecorationSet
+</dt>
+<dd>
+<p>
+ By default, <code>git log</code> only shows decorations for certain known ref
+ namespaces. If <em>all</em> is specified, then show all refs as
+ decorations.
+</p>
+</dd>
+<dt class="hdlist1">
+log.excludeDecoration
+</dt>
+<dd>
+<p>
+ Exclude the specified patterns from the log decorations. This is
+ similar to the <code>--decorate-refs-exclude</code> command-line option, but
+ the config option can be overridden by the <code>--decorate-refs</code>
+ option.
+</p>
+</dd>
+<dt class="hdlist1">
+log.diffMerges
+</dt>
+<dd>
+<p>
+ Set default diff format to be used for merge commits. See
+ <code>--diff-merges</code> in <a href="git-log.html">git-log(1)</a> for details.
+ Defaults to <code>separate</code>.
+</p>
+</dd>
+<dt class="hdlist1">
log.follow
</dt>
<dd>
@@ -5361,14 +5422,23 @@ log.follow </p>
</dd>
<dt class="hdlist1">
+log.graphColors
+</dt>
+<dd>
+<p>
+ A list of colors, separated by commas, that can be used to draw
+ history lines in <code>git log --graph</code>.
+</p>
+</dd>
+<dt class="hdlist1">
log.showRoot
</dt>
<dd>
<p>
- If <code>false</code>, <code>git log</code> and related commands will not treat the
- initial commit as a big creation event. Any root commits in
- <code>git log -p</code> output would be shown without a diff attached.
- The default is <code>true</code>.
+ 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 <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
+ normally hide the root commit will now show it. True by default.
</p>
</dd>
<dt class="hdlist1">
@@ -5376,16 +5446,42 @@ log.showSignature </dt>
<dd>
<p>
- If <code>true</code>, <code>git log</code> and related commands will act as if the
- <code>--show-signature</code> option was passed to them.
+ If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--show-signature</code>.
</p>
</dd>
<dt class="hdlist1">
-mailmap.*
+log.mailmap
</dt>
<dd>
<p>
- See <a href="git-shortlog.html">git-shortlog(1)</a>.
+ If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
+ <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>, otherwise
+ assume <code>--no-use-mailmap</code>. True by default.
+</p>
+</dd>
+<dt class="hdlist1">
+notes.mergeStrategy
+</dt>
+<dd>
+<p>
+ Which merge strategy to choose by default when resolving notes
+ conflicts. Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or
+ <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See "NOTES MERGE STRATEGIES"
+ section of <a href="git-notes.html">git-notes(1)</a> for more information on each strategy.
+</p>
+<div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to
+<a href="git-notes.html">git-notes(1)</a>.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.<name>.mergeStrategy
+</dt>
+<dd>
+<p>
+ Which merge strategy to choose when doing a notes merge into
+ refs/notes/<name>. This overrides the more general
+ "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in
+ <a href="git-notes.html">git-notes(1)</a> for more information on the available strategies.
</p>
</dd>
<dt class="hdlist1">
@@ -5393,17 +5489,66 @@ notes.displayRef </dt>
<dd>
<p>
- Which refs, in addition to the default set by <code>core.notesRef</code>
- or <code>GIT_NOTES_REF</code>, to read notes from when showing commit
- messages with the <code>log</code> family of commands. See
- <a href="git-notes.html">git-notes(1)</a>.
+ Which ref (or refs, if a glob or specified more than once), in
+ addition to the default set by <code>core.notesRef</code> or
+ <code>GIT_NOTES_REF</code>, to read notes from when showing commit
+ messages with the <em>git log</em> family of commands.
</p>
-<div class="paragraph"><p>May be an unabbreviated ref name or a glob and may be specified
-multiple times. A warning will be issued for refs that do not exist,
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_DISPLAY_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
+<div class="paragraph"><p>A warning will be issued for refs that do not exist,
but a glob that does not match any refs is silently ignored.</p></div>
-<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option,
-overridden by the <code>GIT_NOTES_DISPLAY_REF</code> environment variable,
-and overridden by the <code>--notes=<ref></code> option.</p></div>
+<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option to the <em>git
+log</em> family of commands, or by the <code>--notes=<ref></code> option accepted by
+those commands.</p></div>
+<div class="paragraph"><p>The effective value of "core.notesRef" (possibly overridden by
+GIT_NOTES_REF) is also implicitly added to the list of refs to be
+displayed.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.rewrite.<command>
+</dt>
+<dd>
+<p>
+ When rewriting commits with <command> (currently <code>amend</code> or
+ <code>rebase</code>), if this variable is <code>false</code>, git will not copy
+ notes from the original to the rewritten commit. Defaults to
+ <code>true</code>. See also "<code>notes.rewriteRef</code>" below.
+</p>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.rewriteMode
+</dt>
+<dd>
+<p>
+ When copying notes during a rewrite (see the
+ "notes.rewrite.<command>" option), determines what to do if
+ the target commit already has a note. Must be one of
+ <code>overwrite</code>, <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>.
+ Defaults to <code>concatenate</code>.
+</p>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_MODE</code>
+environment variable.</p></div>
+</dd>
+<dt class="hdlist1">
+notes.rewriteRef
+</dt>
+<dd>
+<p>
+ When copying notes during a rewrite, specifies the (fully
+ qualified) ref whose notes should be copied. May be a glob,
+ in which case notes in all matching refs will be copied. You
+ may also specify this configuration several times.
+</p>
+<div class="paragraph"><p>Does not have a default value; you must configure this variable to
+enable note rewriting. Set it to <code>refs/notes/commits</code> to enable
+rewriting for the default commit notes.</p></div>
+<div class="paragraph"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.
+See <code>notes.rewrite.<command></code> above for a further description of its format.</p></div>
</dd>
</dl></div>
</div>
@@ -5419,7 +5564,7 @@ and overridden by the <code>--notes=<ref></code> option.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-30 10:56:31 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-log.txt b/git-log.txt index b1285aee3..2a66cf888 100644 --- a/git-log.txt +++ b/git-log.txt @@ -209,47 +209,11 @@ i18n.logOutputEncoding:: Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise. -log.date:: - Default format for human-readable dates. (Compare the - `--date` option.) Defaults to "default", which means to write - dates like `Sat May 8 19:35:34 2010 -0500`. -+ -If the format is set to "auto:foo" and the pager is in use, format -"foo" will be the used for the date format. Otherwise "default" will -be used. - -log.follow:: - If `true`, `git log` will act as if the `--follow` option was used when - a single <path> is given. This has the same limitations as `--follow`, - i.e. it cannot be used to follow multiple files and does not work well - on non-linear history. - -log.showRoot:: - If `false`, `git log` and related commands will not treat the - initial commit as a big creation event. Any root commits in - `git log -p` output would be shown without a diff attached. - The default is `true`. - -log.showSignature:: - If `true`, `git log` and related commands will act as if the - `--show-signature` option was passed to them. - -mailmap.*:: - See linkgit:git-shortlog[1]. - -notes.displayRef:: - Which refs, in addition to the default set by `core.notesRef` - or `GIT_NOTES_REF`, to read notes from when showing commit - messages with the `log` family of commands. See - linkgit:git-notes[1]. -+ -May be an unabbreviated ref name or a glob and may be specified -multiple times. A warning will be issued for refs that do not exist, -but a glob that does not match any refs is silently ignored. -+ -This setting can be disabled by the `--no-notes` option, -overridden by the `GIT_NOTES_DISPLAY_REF` environment variable, -and overridden by the `--notes=<ref>` option. +include::includes/cmd-config-section-rest.txt[] + +include::config/log.txt[] + +include::config/notes.txt[] GIT --- diff --git a/git-mailinfo.html b/git-mailinfo.html index 0fede5e3b..1daf955f3 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -940,6 +940,28 @@ If no such configuration option has been set, <code>warn</code> will be used.</p </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+mailinfo.scissors
+</dt>
+<dd>
+<p>
+ If true, makes <a href="git-mailinfo.html">git-mailinfo(1)</a> (and therefore
+ <a href="git-am.html">git-am(1)</a>) act by default as if the --scissors option
+ was provided on the command-line. When active, this features
+ removes everything from the message body before a scissors
+ line (i.e. consisting mainly of ">8", "8<" and "-").
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -950,7 +972,7 @@ If no such configuration option has been set, <code>warn</code> will be used.</p <div id="footer">
<div id="footer-text">
Last updated
- 2021-05-16 16:01:05 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 3fcfd965f..28060283c 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -115,6 +115,13 @@ If no such configuration option has been set, `warn` will be used. <patch>:: The patch extracted from e-mail. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/mailinfo.txt[] + GIT --- Part of the linkgit:git[1] suite diff --git a/git-maintenance.html b/git-maintenance.html index c7fadc0c0..eb388f895 100644 --- a/git-maintenance.html +++ b/git-maintenance.html @@ -1231,6 +1231,121 @@ custom tasks.</p></div> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+maintenance.auto
+</dt>
+<dd>
+<p>
+ This boolean config option controls whether some commands run
+ <code>git maintenance run --auto</code> after doing their normal work. Defaults
+ to true.
+</p>
+</dd>
+<dt class="hdlist1">
+maintenance.strategy
+</dt>
+<dd>
+<p>
+ This string config option provides a way to specify one of a few
+ recommended schedules for background maintenance. This only affects
+ which tasks are run during <code>git maintenance run --schedule=X</code>
+ commands, provided no <code>--task=<task></code> arguments are provided.
+ Further, if a <code>maintenance.<task>.schedule</code> config value is set,
+ then that value is used instead of the one provided by
+ <code>maintenance.strategy</code>. The possible strategy strings are:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<code>none</code>: This default setting implies no task are run at any schedule.
+</p>
+</li>
+<li>
+<p>
+<code>incremental</code>: This setting optimizes for performing small maintenance
+ activities that do not delete any data. This does not schedule the <code>gc</code>
+ task, but runs the <code>prefetch</code> and <code>commit-graph</code> tasks hourly, the
+ <code>loose-objects</code> and <code>incremental-repack</code> tasks daily, and the <code>pack-refs</code>
+ task weekly.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
+maintenance.<task>.enabled
+</dt>
+<dd>
+<p>
+ This boolean config option controls whether the maintenance task
+ with name <code><task></code> is run when no <code>--task</code> option is specified to
+ <code>git maintenance run</code>. These config values are ignored if a
+ <code>--task</code> option exists. By default, only <code>maintenance.gc.enabled</code>
+ is true.
+</p>
+</dd>
+<dt class="hdlist1">
+maintenance.<task>.schedule
+</dt>
+<dd>
+<p>
+ This config option controls whether or not the given <code><task></code> runs
+ during a <code>git maintenance run --schedule=<frequency></code> command. The
+ value must be one of "hourly", "daily", or "weekly".
+</p>
+</dd>
+<dt class="hdlist1">
+maintenance.commit-graph.auto
+</dt>
+<dd>
+<p>
+ This integer config option controls how often the <code>commit-graph</code> task
+ should be run as part of <code>git maintenance run --auto</code>. If zero, then
+ the <code>commit-graph</code> task will not run with the <code>--auto</code> option. A
+ negative value will force the task to run every time. Otherwise, a
+ positive value implies the command should run when the number of
+ reachable commits that are not in the commit-graph file is at least
+ the value of <code>maintenance.commit-graph.auto</code>. The default value is
+ 100.
+</p>
+</dd>
+<dt class="hdlist1">
+maintenance.loose-objects.auto
+</dt>
+<dd>
+<p>
+ This integer config option controls how often the <code>loose-objects</code> task
+ should be run as part of <code>git maintenance run --auto</code>. If zero, then
+ the <code>loose-objects</code> task will not run with the <code>--auto</code> option. A
+ negative value will force the task to run every time. Otherwise, a
+ positive value implies the command should run when the number of
+ loose objects is at least the value of <code>maintenance.loose-objects.auto</code>.
+ The default value is 100.
+</p>
+</dd>
+<dt class="hdlist1">
+maintenance.incremental-repack.auto
+</dt>
+<dd>
+<p>
+ This integer config option controls how often the <code>incremental-repack</code>
+ task should be run as part of <code>git maintenance run --auto</code>. If zero,
+ then the <code>incremental-repack</code> task will not run with the <code>--auto</code>
+ option. A negative value will force the task to run every time.
+ Otherwise, a positive value implies the command should run when the
+ number of pack-files not in the multi-pack-index is at least the value
+ of <code>maintenance.incremental-repack.auto</code>. The default value is 10.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -1241,7 +1356,7 @@ custom tasks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-03-27 10:29:17 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-maintenance.txt b/git-maintenance.txt index e56bad28c..9c630efe1 100644 --- a/git-maintenance.txt +++ b/git-maintenance.txt @@ -397,6 +397,13 @@ If you want to customize the background tasks, please rename the tasks so future calls to `git maintenance (start|stop)` do not overwrite your custom tasks. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/maintenance.txt[] + GIT --- diff --git a/git-merge.html b/git-merge.html index 70dd8fdb4..ef87f6c59 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1782,6 +1782,21 @@ substitutes the changed version instead.</p></div> <div class="sectionbody">
<div class="dlist"><dl>
<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 <em>git merge</em>, but option
+ values containing whitespace characters are currently not supported.
+</p>
+</dd>
+</dl></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
merge.conflictStyle
</dt>
<dd>
@@ -2286,16 +2301,6 @@ merge.<driver>.recursive See <a href="gitattributes.html">gitattributes(5)</a> for details.
</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 <em>git merge</em>, but option
- values containing whitespace characters are currently not supported.
-</p>
-</dd>
</dl></div>
</div>
</div>
@@ -2321,7 +2326,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-merge.txt b/git-merge.txt index fee1dc2df..2d6a1391c 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -383,13 +383,16 @@ include::merge-strategies.txt[] CONFIGURATION ------------- -include::config/merge.txt[] branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported. +include::includes/cmd-config-section-rest.txt[] + +include::config/merge.txt[] + SEE ALSO -------- linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], diff --git a/git-mergetool.html b/git-mergetool.html index ebbf1966b..f640addad 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -887,6 +887,9 @@ success of the resolution after the custom tool has exited.</p></div> <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
mergetool.<tool>.path
@@ -1326,7 +1329,7 @@ MERGED and REMOTE).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-05-10 17:54:15 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-mergetool.txt b/git-mergetool.txt index f784027bc..c44e20562 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -102,6 +102,9 @@ success of the resolution after the custom tool has exited. CONFIGURATION ------------- :git-mergetool: 1 + +include::includes/cmd-config-section-all.txt[] + include::config/mergetool.txt[] TEMPORARY FILES diff --git a/git-notes.html b/git-notes.html index 9e1177710..230ed94ac 100644 --- a/git-notes.html +++ b/git-notes.html @@ -784,7 +784,7 @@ message, after an unindented line saying "Notes (<refname>):" (or using the <code>--notes</code> option. Such notes are added as a patch commentary
after a three dash separator line.</p></div>
<div class="paragraph"><p>To change which notes are shown by <em>git log</em>, see the
-"notes.displayRef" configuration in <a href="git-log.html">git-log(1)</a>.</p></div>
+"notes.displayRef" discussion in <a href="#CONFIGURATION">[CONFIGURATION]</a>.</p></div>
<div class="paragraph"><p>See the "notes.rewrite.<command>" configuration for a way to carry
notes across commands that rewrite commits.</p></div>
</div>
@@ -1186,7 +1186,7 @@ some special-purpose tools to do something useful with them.</p></div> </div>
</div>
<div class="sect1">
-<h2 id="_configuration">CONFIGURATION</h2>
+<h2 id="CONFIGURATION">CONFIGURATION</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1200,6 +1200,11 @@ core.notesRef command line.
</p>
</dd>
+</dl></div>
+<div class="paragraph"><p>Everything above this line in this section isn’t included from the
+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
+same as what’s found there:</p></div>
+<div class="dlist"><dl>
<dt class="hdlist1">
notes.mergeStrategy
</dt>
@@ -1208,9 +1213,10 @@ notes.mergeStrategy Which merge strategy to choose by default when resolving notes
conflicts. Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or
<code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See "NOTES MERGE STRATEGIES"
- section above for more information on each strategy.
+ section of <a href="git-notes.html">git-notes(1)</a> for more information on each strategy.
</p>
-<div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option.</p></div>
+<div class="paragraph"><p>This setting can be overridden by passing the <code>--strategy</code> option to
+<a href="git-notes.html">git-notes(1)</a>.</p></div>
</dd>
<dt class="hdlist1">
notes.<name>.mergeStrategy
@@ -1219,8 +1225,8 @@ notes.<name>.mergeStrategy <p>
Which merge strategy to choose when doing a notes merge into
refs/notes/<name>. This overrides the more general
- "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section above
- for more information on each available strategy.
+ "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in
+ <a href="git-notes.html">git-notes(1)</a> for more information on the available strategies.
</p>
</dd>
<dt class="hdlist1">
@@ -1232,10 +1238,18 @@ notes.displayRef addition to the default set by <code>core.notesRef</code> or
<code>GIT_NOTES_REF</code>, to read notes from when showing commit
messages with the <em>git log</em> family of commands.
- This setting can be overridden on the command line or by the
- <code>GIT_NOTES_DISPLAY_REF</code> environment variable.
- See <a href="git-log.html">git-log(1)</a>.
</p>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_DISPLAY_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
+<div class="paragraph"><p>A warning will be issued for refs that do not exist,
+but a glob that does not match any refs is silently ignored.</p></div>
+<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option to the <em>git
+log</em> family of commands, or by the <code>--notes=<ref></code> option accepted by
+those commands.</p></div>
+<div class="paragraph"><p>The effective value of "core.notesRef" (possibly overridden by
+GIT_NOTES_REF) is also implicitly added to the list of refs to be
+displayed.</p></div>
</dd>
<dt class="hdlist1">
notes.rewrite.<command>
@@ -1247,18 +1261,20 @@ notes.rewrite.<command> notes from the original to the rewritten commit. Defaults to
<code>true</code>. See also "<code>notes.rewriteRef</code>" below.
</p>
-<div class="paragraph"><p>This setting can be overridden by the <code>GIT_NOTES_REWRITE_REF</code>
-environment variable.</p></div>
+<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
+environment variable, which must be a colon separated list of refs or
+globs.</p></div>
</dd>
<dt class="hdlist1">
notes.rewriteMode
</dt>
<dd>
<p>
- When copying notes during a rewrite, what to do if the target
- commit already has a note. Must be one of <code>overwrite</code>,
- <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>. Defaults to
- <code>concatenate</code>.
+ When copying notes during a rewrite (see the
+ "notes.rewrite.<command>" option), determines what to do if
+ the target commit already has a note. Must be one of
+ <code>overwrite</code>, <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>.
+ Defaults to <code>concatenate</code>.
</p>
<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_MODE</code>
environment variable.</p></div>
@@ -1274,8 +1290,10 @@ notes.rewriteRef may also specify this configuration several times.
</p>
<div class="paragraph"><p>Does not have a default value; you must configure this variable to
-enable note rewriting.</p></div>
-<div class="paragraph"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.</p></div>
+enable note rewriting. Set it to <code>refs/notes/commits</code> to enable
+rewriting for the default commit notes.</p></div>
+<div class="paragraph"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.
+See <code>notes.rewrite.<command></code> above for a further description of its format.</p></div>
</dd>
</dl></div>
</div>
@@ -1344,7 +1362,7 @@ on the <code>notes.rewrite.<command></code> and <code>notes.rewriteRef</co <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-10 16:45:05 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-notes.txt b/git-notes.txt index 0a4200674..efbc10f0f 100644 --- a/git-notes.txt +++ b/git-notes.txt @@ -44,7 +44,7 @@ using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line. To change which notes are shown by 'git log', see the -"notes.displayRef" configuration in linkgit:git-log[1]. +"notes.displayRef" discussion in <<CONFIGURATION>>. See the "notes.rewrite.<command>" configuration for a way to carry notes across commands that rewrite commits. @@ -307,6 +307,7 @@ with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them. +[[CONFIGURATION]] CONFIGURATION ------------- @@ -316,57 +317,9 @@ core.notesRef:: This setting can be overridden through the environment and command line. -notes.mergeStrategy:: - Which merge strategy to choose by default when resolving notes - conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or - `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" - section above for more information on each strategy. -+ -This setting can be overridden by passing the `--strategy` option. - -notes.<name>.mergeStrategy:: - Which merge strategy to choose when doing a notes merge into - refs/notes/<name>. This overrides the more general - "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section above - for more information on each available strategy. - -notes.displayRef:: - Which ref (or refs, if a glob or specified more than once), in - addition to the default set by `core.notesRef` or - `GIT_NOTES_REF`, to read notes from when showing commit - messages with the 'git log' family of commands. - This setting can be overridden on the command line or by the - `GIT_NOTES_DISPLAY_REF` environment variable. - See linkgit:git-log[1]. - -notes.rewrite.<command>:: - When rewriting commits with <command> (currently `amend` or - `rebase`), if this variable is `false`, git will not copy - notes from the original to the rewritten commit. Defaults to - `true`. See also "`notes.rewriteRef`" below. -+ -This setting can be overridden by the `GIT_NOTES_REWRITE_REF` -environment variable. +include::includes/cmd-config-section-rest.txt[] -notes.rewriteMode:: - When copying notes during a rewrite, what to do if the target - commit already has a note. Must be one of `overwrite`, - `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to - `concatenate`. -+ -This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` -environment variable. - -notes.rewriteRef:: - When copying notes during a rewrite, specifies the (fully - qualified) ref whose notes should be copied. May be a glob, - in which case notes in all matching refs will be copied. You - may also specify this configuration several times. -+ -Does not have a default value; you must configure this variable to -enable note rewriting. -+ -Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable. +include::config/notes.txt[] ENVIRONMENT diff --git a/git-push.html b/git-push.html index 99952234c..d32cbbf5e 100644 --- a/git-push.html +++ b/git-push.html @@ -1961,6 +1961,218 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+push.autoSetupRemote
+</dt>
+<dd>
+<p>
+ If set to "true" assume <code>--set-upstream</code> on default push when no
+ upstream tracking exists for the current branch; this option
+ takes effect with push.default options <em>simple</em>, <em>upstream</em>,
+ and <em>current</em>. It is useful if by default you want new branches
+ to be pushed to the default remote (like the behavior of
+ <em>push.default=current</em>) and you also want the upstream tracking
+ to be set. Workflows most likely to benefit from this option are
+ <em>simple</em> central workflows where all branches are expected to
+ have the same name on the remote.
+</p>
+</dd>
+<dt class="hdlist1">
+push.default
+</dt>
+<dd>
+<p>
+ Defines the action <code>git push</code> should take if no refspec is
+ given (whether from the command-line, config, or elsewhere).
+ Different values are well-suited for
+ specific workflows; for instance, in a purely central workflow
+ (i.e. the fetch source is equal to the push destination),
+ <code>upstream</code> is probably what you want. Possible values are:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="ulist"><ul>
+<li>
+<p>
+<code>nothing</code> - do not push anything (error out) unless a refspec is
+ given. This is primarily meant for people who want to
+ avoid mistakes by always being explicit.
+</p>
+</li>
+<li>
+<p>
+<code>current</code> - push the current branch to update a branch with the same
+ name on the receiving end. Works in both central and non-central
+ workflows.
+</p>
+</li>
+<li>
+<p>
+<code>upstream</code> - push the current branch back to the branch whose
+ changes are usually integrated into the current branch (which is
+ called <code>@{upstream}</code>). This mode only makes sense if you are
+ pushing to the same repository you would normally pull from
+ (i.e. central workflow).
+</p>
+</li>
+<li>
+<p>
+<code>tracking</code> - This is a deprecated synonym for <code>upstream</code>.
+</p>
+</li>
+<li>
+<p>
+<code>simple</code> - pushes the current branch with the same name on the remote.
+</p>
+<div class="paragraph"><p>If you are working on a centralized workflow (pushing to the same repository you
+pull from, which is typically <code>origin</code>), then you need to configure an upstream
+branch with the same name.</p></div>
+<div class="paragraph"><p>This mode is the default since Git 2.0, and is the safest option suited for
+beginners.</p></div>
+</li>
+<li>
+<p>
+<code>matching</code> - push all branches having the same name on both ends.
+ This makes the repository you are pushing to remember the set of
+ branches that will be pushed out (e.g. if you always push <em>maint</em>
+ and <em>master</em> there and no other branches, the repository you push
+ to will have these two branches, and your local <em>maint</em> and
+ <em>master</em> will be pushed there).
+</p>
+<div class="paragraph"><p>To use this mode effectively, you have to make sure <em>all</em> the
+branches you would push out are ready to be pushed out before
+running <em>git push</em>, as the whole point of this mode is to allow you
+to push all of the branches in one go. If you usually finish work
+on only one branch and push out the result, while other branches are
+unfinished, this mode is not for you. Also this mode is not
+suitable for pushing into a shared central repository, as other
+people may add new branches there, or update the tip of existing
+branches outside your control.</p></div>
+<div class="paragraph"><p>This used to be the default, but not since Git 2.0 (<code>simple</code> is the
+new default).</p></div>
+</li>
+</ul></div>
+</div></div>
+</dd>
+<dt class="hdlist1">
+push.followTags
+</dt>
+<dd>
+<p>
+ If set to true enable <code>--follow-tags</code> option by default. You
+ may override this configuration at time of push by specifying
+ <code>--no-follow-tags</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+push.gpgSign
+</dt>
+<dd>
+<p>
+ May be set to a boolean value, or the string <em>if-asked</em>. A true
+ value causes all pushes to be GPG signed, as if <code>--signed</code> is
+ passed to <a href="git-push.html">git-push(1)</a>. The string <em>if-asked</em> causes
+ pushes to be signed if the server supports it, as if
+ <code>--signed=if-asked</code> is passed to <em>git push</em>. A false value may
+ override a value from a lower-priority config file. An explicit
+ command-line flag always overrides this config option.
+</p>
+</dd>
+<dt class="hdlist1">
+push.pushOption
+</dt>
+<dd>
+<p>
+ When no <code>--push-option=<option></code> argument is given from the
+ command line, <code>git push</code> behaves as if each <value> of
+ this variable is given as <code>--push-option=<value></code>.
+</p>
+<div class="paragraph"><p>This is a multi-valued variable, and an empty value can be used in a
+higher priority configuration file (e.g. <code>.git/config</code> in a
+repository) to clear the values inherited from a lower priority
+configuration files (e.g. <code>$HOME/.gitconfig</code>).</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>Example:
+
+/etc/gitconfig
+ push.pushoption = a
+ push.pushoption = b
+
+~/.gitconfig
+ push.pushoption = c
+
+repo/.git/config
+ push.pushoption =
+ push.pushoption = b
+
+This will result in only b (a and c are cleared).</code></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
+push.recurseSubmodules
+</dt>
+<dd>
+<p>
+ Make sure all submodule commits used by the revisions to be pushed
+ are available on a remote-tracking branch. If the value is <em>check</em>
+ then Git will verify that all submodule commits that changed in the
+ revisions to be pushed are available on at least one remote of the
+ submodule. If any commits are missing, the push will be aborted and
+ exit with non-zero status. If the value is <em>on-demand</em> then all
+ submodules that changed in the revisions to be pushed will be
+ pushed. If on-demand was not able to push all necessary revisions
+ it will also be aborted and exit with non-zero status. If the value
+ is <em>no</em> then default behavior of ignoring submodules when pushing
+ is retained. You may override this configuration at time of push by
+ specifying <em>--recurse-submodules=check|on-demand|no</em>.
+ If not set, <em>no</em> is used by default, unless <em>submodule.recurse</em> is
+ set (in which case a <em>true</em> value means <em>on-demand</em>).
+</p>
+</dd>
+<dt class="hdlist1">
+push.useForceIfIncludes
+</dt>
+<dd>
+<p>
+ If set to "true", it is equivalent to specifying
+ <code>--force-if-includes</code> as an option to <a href="git-push.html">git-push(1)</a>
+ in the command line. Adding <code>--no-force-if-includes</code> at the
+ time of push overrides this configuration setting.
+</p>
+</dd>
+<dt class="hdlist1">
+push.negotiate
+</dt>
+<dd>
+<p>
+ If set to "true", attempt to reduce the size of the packfile
+ sent by rounds of negotiation in which the client and the
+ server attempt to find commits in common. If "false", Git will
+ rely solely on the server’s ref advertisement to find commits
+ in common.
+</p>
+</dd>
+<dt class="hdlist1">
+push.useBitmaps
+</dt>
+<dd>
+<p>
+ If set to "false", disable use of bitmaps for "git push" even if
+ <code>pack.useBitmaps</code> is "true", without preventing other git operations
+ from using bitmaps. Default is true.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -1971,7 +2183,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends <div id="footer">
<div id="footer-text">
Last updated
- 2021-07-20 18:15:40 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-push.txt b/git-push.txt index 2f25aa3a2..def7657ef 100644 --- a/git-push.txt +++ b/git-push.txt @@ -692,6 +692,13 @@ a `git gc` command on the origin repository. include::transfer-data-leaks.txt[] +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/push.txt[] + GIT --- Part of the linkgit:git[1] suite diff --git a/git-rebase.html b/git-rebase.html index b653e5862..6b97948bf 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -2610,6 +2610,9 @@ merge cmake</code></pre> <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
rebase.backend
@@ -2754,7 +2757,7 @@ sequence.editor <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-rebase.txt b/git-rebase.txt index 187794218..9cb8931c7 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -1259,6 +1259,8 @@ merge cmake CONFIGURATION ------------- +include::includes/cmd-config-section-all.txt[] + include::config/rebase.txt[] include::config/sequencer.txt[] diff --git a/git-revert.html b/git-revert.html index caa722d1e..35c9b38a0 100644 --- a/git-revert.html +++ b/git-revert.html @@ -1024,6 +1024,25 @@ effect to your index in a row.</p></div> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+revert.reference
+</dt>
+<dd>
+<p>
+ Setting this variable to true makes <code>git revert</code> behave
+ as if the <code>--reference</code> option is given.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a></p></div>
@@ -1040,7 +1059,7 @@ effect to your index in a row.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-revert.txt b/git-revert.txt index 0105a54c1..5016755ef 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -142,6 +142,13 @@ EXAMPLES changes. The revert only modifies the working tree and the index. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/revert.txt[] + SEE ALSO -------- linkgit:git-cherry-pick[1] diff --git a/git-send-email.html b/git-send-email.html index caebe9003..730286199 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -1507,8 +1507,73 @@ default to <code>--validate</code>.</p></div> <div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
+sendemail.identity
+</dt>
+<dd>
+<p>
+ A configuration identity. When given, causes values in the
+ <em>sendemail.<identity></em> subsection to take precedence over
+ values in the <em>sendemail</em> section. The default identity is
+ the value of <code>sendemail.identity</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.smtpEncryption
+</dt>
+<dd>
+<p>
+ See <a href="git-send-email.html">git-send-email(1)</a> for description. Note that this
+ setting is not subject to the <em>identity</em> mechanism.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.smtpsslcertpath
+</dt>
+<dd>
+<p>
+ Path to ca-certificates (either a directory or a single file).
+ Set it to an empty string to disable certificate verification.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.<identity>.*
+</dt>
+<dd>
+<p>
+ Identity-specific versions of the <em>sendemail.*</em> parameters
+ found below, taking precedence over those when this
+ identity is selected, through either the command-line or
+ <code>sendemail.identity</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.multiEdit
+</dt>
+<dd>
+<p>
+ If true (default), a single editor instance will be spawned to edit
+ files you have to edit (patches when <code>--annotate</code> is used, and the
+ summary when <code>--compose</code> is used). If false, files will be edited one
+ after the other, spawning a new editor each time.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.confirm
+</dt>
+<dd>
+<p>
+ Sets the default for whether to confirm before sending. Must be
+ one of <em>always</em>, <em>never</em>, <em>cc</em>, <em>compose</em>, or <em>auto</em>. See <code>--confirm</code>
+ in the <a href="git-send-email.html">git-send-email(1)</a> documentation for the meaning of these
+ values.
+</p>
+</dd>
+<dt class="hdlist1">
sendemail.aliasesFile
</dt>
<dd>
@@ -1567,24 +1632,114 @@ Warnings are printed on the standard error output for any </div></div>
</dd>
<dt class="hdlist1">
-sendemail.multiEdit
+sendemail.annotate
+</dt>
+<dt class="hdlist1">
+sendemail.bcc
+</dt>
+<dt class="hdlist1">
+sendemail.cc
+</dt>
+<dt class="hdlist1">
+sendemail.ccCmd
+</dt>
+<dt class="hdlist1">
+sendemail.chainReplyTo
+</dt>
+<dt class="hdlist1">
+sendemail.envelopeSender
+</dt>
+<dt class="hdlist1">
+sendemail.from
+</dt>
+<dt class="hdlist1">
+sendemail.signedoffbycc
+</dt>
+<dt class="hdlist1">
+sendemail.smtpPass
+</dt>
+<dt class="hdlist1">
+sendemail.suppresscc
+</dt>
+<dt class="hdlist1">
+sendemail.suppressFrom
+</dt>
+<dt class="hdlist1">
+sendemail.to
+</dt>
+<dt class="hdlist1">
+sendemail.tocmd
+</dt>
+<dt class="hdlist1">
+sendemail.smtpDomain
+</dt>
+<dt class="hdlist1">
+sendemail.smtpServer
+</dt>
+<dt class="hdlist1">
+sendemail.smtpServerPort
+</dt>
+<dt class="hdlist1">
+sendemail.smtpServerOption
+</dt>
+<dt class="hdlist1">
+sendemail.smtpUser
+</dt>
+<dt class="hdlist1">
+sendemail.thread
+</dt>
+<dt class="hdlist1">
+sendemail.transferEncoding
+</dt>
+<dt class="hdlist1">
+sendemail.validate
+</dt>
+<dt class="hdlist1">
+sendemail.xmailer
</dt>
<dd>
<p>
- If true (default), a single editor instance will be spawned to edit
- files you have to edit (patches when <code>--annotate</code> is used, and the
- summary when <code>--compose</code> is used). If false, files will be edited one
- after the other, spawning a new editor each time.
+ These configuration variables all provide a default for
+ <a href="git-send-email.html">git-send-email(1)</a> command-line options. See its
+ documentation for details.
</p>
</dd>
<dt class="hdlist1">
-sendemail.confirm
+sendemail.signedoffcc (deprecated)
</dt>
<dd>
<p>
- Sets the default for whether to confirm before sending. Must be
- one of <em>always</em>, <em>never</em>, <em>cc</em>, <em>compose</em>, or <em>auto</em>. See <code>--confirm</code>
- in the previous section for the meaning of these values.
+ Deprecated alias for <code>sendemail.signedoffbycc</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.smtpBatchSize
+</dt>
+<dd>
+<p>
+ Number of messages to be sent per connection, after that a relogin
+ will happen. If the value is 0 or undefined, send all messages in
+ one connection.
+ See also the <code>--batch-size</code> option of <a href="git-send-email.html">git-send-email(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.smtpReloginDelay
+</dt>
+<dd>
+<p>
+ Seconds wait before reconnecting to smtp server.
+ See also the <code>--relogin-delay</code> option of <a href="git-send-email.html">git-send-email(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+sendemail.forbidSendmailVariables
+</dt>
+<dd>
+<p>
+ To avoid common misconfiguration mistakes, <a href="git-send-email.html">git-send-email(1)</a>
+ will abort with a warning if any configuration options for "sendmail"
+ exist. Set this variable to bypass the check.
</p>
</dd>
</dl></div>
@@ -1648,7 +1803,7 @@ Authen::SASL and Mail::Address.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-11-29 15:54:03 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-send-email.txt b/git-send-email.txt index 41cd8cb42..329004305 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -456,41 +456,9 @@ Information CONFIGURATION ------------- -sendemail.aliasesFile:: - To avoid typing long email addresses, point this to one or more - email aliases files. You must also supply `sendemail.aliasFileType`. +include::includes/cmd-config-section-all.txt[] -sendemail.aliasFileType:: - Format of the file(s) specified in sendemail.aliasesFile. Must be - one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'. -+ -What an alias file in each format looks like can be found in -the documentation of the email program of the same name. The -differences and limitations from the standard formats are -described below: -+ --- -sendmail;; -* Quoted aliases and quoted addresses are not supported: lines that - contain a `"` symbol are ignored. -* Redirection to a file (`/path/name`) or pipe (`|command`) is not - supported. -* File inclusion (`:include: /path/name`) is not supported. -* Warnings are printed on the standard error output for any - explicitly unsupported constructs, and any other lines that are not - recognized by the parser. --- - -sendemail.multiEdit:: - If true (default), a single editor instance will be spawned to edit - files you have to edit (patches when `--annotate` is used, and the - summary when `--compose` is used). If false, files will be edited one - after the other, spawning a new editor each time. - -sendemail.confirm:: - Sets the default for whether to confirm before sending. Must be - one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` - in the previous section for the meaning of these values. +include::config/sendemail.txt[] EXAMPLES -------- diff --git a/git-show-branch.html b/git-show-branch.html index b221bb8c9..83a3312dc 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -1037,6 +1037,25 @@ topologically related with each other.</p></div> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+showBranch.default
+</dt>
+<dd>
+<p>
+ The default set of branches for <a href="git-show-branch.html">git-show-branch(1)</a>.
+ See <a href="git-show-branch.html">git-show-branch(1)</a>.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -1047,7 +1066,7 @@ topologically related with each other.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index 5cc2fcefb..e5ec6b467 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -199,6 +199,13 @@ shows 10 reflog entries going back from the tip as of 1 hour ago. Without `--list`, the output also shows how these tips are topologically related with each other. +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/showbranch.txt[] + GIT --- Part of the linkgit:git[1] suite diff --git a/git-stash.html b/git-stash.html index f17fd35ea..5a2eb3527 100644 --- a/git-stash.html +++ b/git-stash.html @@ -1264,6 +1264,46 @@ xargs git log --merges --no-walk --grep=WIP</code></pre> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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
+ description of <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 description of <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 diffstat of the stash entry. Defaults to true.
+ See description of <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>,
@@ -1284,7 +1324,7 @@ xargs git log --merges --no-walk --grep=WIP</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2021-11-29 15:54:03 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-stash.txt b/git-stash.txt index 6e15f4752..c5d709182 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -382,6 +382,13 @@ grep commit | cut -d\ -f3 | xargs git log --merges --no-walk --grep=WIP ---------------------------------------------------------------- +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/stash.txt[] + SEE ALSO -------- diff --git a/git-switch.html b/git-switch.html index dd407b75f..6106d7415 100644 --- a/git-switch.html +++ b/git-switch.html @@ -1109,6 +1109,79 @@ always create a new name for it (without switching away):</p></div> </div>
</div>
<div class="sect1">
+<h2 id="_configuration">CONFIGURATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what’s found there:</p></div>
+<div class="dlist"><dl>
+<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 to define the minimum
+ number of files for which parallel checkout should be attempted. The
+ default is 100.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>,
@@ -1126,7 +1199,7 @@ always create a new name for it (without switching away):</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-01-10 13:33:11 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
diff --git a/git-switch.txt b/git-switch.txt index bbcbdceb4..c60fc9c13 100644 --- a/git-switch.txt +++ b/git-switch.txt @@ -265,6 +265,13 @@ always create a new name for it (without switching away): $ git switch -c good-surprises ------------ +CONFIGURATION +------------- + +include::includes/cmd-config-section-all.txt[] + +include::config/checkout.txt[] + SEE ALSO -------- linkgit:git-checkout[1], diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 4fb49daf9..466249858 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:06 PDT
+ 2022-09-14 13:23:48 PDT
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 7beea33ef..43f60fc69 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:06 PDT
+ 2022-09-14 13:23:48 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 2420ae585..3b2a1a6de 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:06 PDT
+ 2022-09-14 13:23:48 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index fabcf1d7c..ec0c6d902 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:04 PDT
+ 2022-09-14 13:23:46 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 29274ac99..89670416d 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:06 PDT
+ 2022-09-14 13:23:48 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index b562d64ed..2320ba70d 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:06 PDT
+ 2022-09-14 13:23:47 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index f3b706786..be52fdb12 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:05 PDT
+ 2022-09-14 13:23:47 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 662f5edec..a2b2753a6 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:06 PDT
+ 2022-09-14 13:23:47 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index bb8f98ba5..19fbf5d4f 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:05 PDT
+ 2022-09-14 13:23:47 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index d6c016206..105e0d426 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:04 PDT
+ 2022-09-14 13:23:46 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 902fcde7e..0c7b6da11 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master"</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:05 PDT
+ 2022-09-14 13:23:47 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 95a25fe7d..16c0464cc 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:05 PDT
+ 2022-09-14 13:23:47 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 0343a5a67..e0b76e9e3 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:05 PDT
+ 2022-09-14 13:23:46 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 2ad97d709..22bca8336 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:05 PDT
+ 2022-09-14 13:23:46 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index f481e101c..979ec2bfc 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:04 PDT
+ 2022-09-14 13:23:46 PDT
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 714f7ff0b..f4cb38600 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-13 13:31:04 PDT
+ 2022-09-14 13:23:46 PDT
</div>
</div>
</body>
|