diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
| commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
| tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 | |
| parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
| download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz | |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
287 files changed, 1416 insertions, 1342 deletions
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 748a90128..edd7dca49 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>My First Contribution to the Git Project</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 42549d74d..c513f3ce4 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>My First Object Walk</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
diff --git a/RelNotes/2.43.0.txt b/RelNotes/2.43.0.txt index a1a2da191..a3644aba4 100644 --- a/RelNotes/2.43.0.txt +++ b/RelNotes/2.43.0.txt @@ -92,6 +92,9 @@ UI, Workflows & Features * "git merge-tree" learned to take strategy backend specific options via the "-X" option, like "git merge" does. + * "git log" and friends learned "--dd" that is a short-hand for + "--diff-merges=first-parent -p". + Performance, Internal Implementation, Development Support etc. @@ -133,6 +136,9 @@ Performance, Internal Implementation, Development Support etc. reduce the number of lstat() system calls. (merge 2cdb796101 vd/loose-ref-iteration-optimization later to maint). + * The codepaths that read "chunk" formatted files have been corrected + to pay attention to the chunk size and notice broken files. + Fixes since v2.42 ----------------- @@ -261,6 +267,17 @@ Fixes since v2.42 not auto-initialize the decoration subsystem, which has been corrected. + * Feeding "git stash store" with a random commit that was not created + by "git stash create" now errors out. + (merge d9b6634589 jc/fail-stash-to-store-non-stash later to maint). + + * The index file has room only for lower 32-bit of the file size in + the cached stat information, which means cached stat information + will have 0 in its sd_size member for a file whose size is multiple + of 4GiB. This is mistaken for a racily clean path. Avoid it by + storing a bogus sd_size value instead for such files. + (merge 5143ac07b1 bc/racy-4gb-files later to maint). + * Other code cleanup, docfix, build fix, etc. (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint). (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 9c3a0d8ba..726c955c2 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Reviewing Patches in the Git Project</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
@@ -757,7 +757,7 @@ resource to supplement your skills as a contributor.</p></div> <div class="sect2">
<h3 id="_selecting_patch_es_to_review">Selecting patch(es) to review</h3>
<div class="paragraph"><p>If you are looking for a patch series in need of review, start by checking
-latest "What’s cooking in git.git" email
+the latest "What’s cooking in git.git" email
(<a href="https://lore.kernel.org/git/xmqqilm1yp3m.fsf@gitster.g/">example</a>). The "What’s
cooking" emails & replies can be found using the query <code>s:"What's cooking"</code> on
the <a href="https://lore.kernel.org/git/"><code>lore.kernel.org</code> mailing list archive</a>;
@@ -906,7 +906,7 @@ nit: <dd>
<p>
Denotes a small issue that should be fixed, such as a typographical error
- or mis-alignment of conditions in an <code>if()</code> statement.
+ or misalignment of conditions in an <code>if()</code> statement.
</p>
</dd>
<dt class="hdlist1">
@@ -975,7 +975,7 @@ message (after the <code>---</code>) and the beginning of the diff.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-21 15:44:34 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/ReviewingGuidelines.txt b/ReviewingGuidelines.txt index 0e323d547..515d470d2 100644 --- a/ReviewingGuidelines.txt +++ b/ReviewingGuidelines.txt @@ -19,7 +19,7 @@ Principles Selecting patch(es) to review ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If you are looking for a patch series in need of review, start by checking -latest "What's cooking in git.git" email +the latest "What's cooking in git.git" email (https://lore.kernel.org/git/xmqqilm1yp3m.fsf@gitster.g/[example]). The "What's cooking" emails & replies can be found using the query `s:"What's cooking"` on the https://lore.kernel.org/git/[`lore.kernel.org` mailing list archive]; @@ -126,7 +126,7 @@ Terminology ----------- nit: :: Denotes a small issue that should be fixed, such as a typographical error - or mis-alignment of conditions in an `if()` statement. + or misalignment of conditions in an `if()` statement. aside: :: optional: :: diff --git a/SubmittingPatches.html b/SubmittingPatches.html index cda99ae6d..8bbe2ecf3 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Submitting Patches</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
@@ -846,7 +846,7 @@ maintainer.</p></div> <div class="paragraph"><p>Under truly exceptional circumstances where you absolutely must depend
on a select few topic branches that are already in <code>next</code> but not in
<code>master</code>, you may want to create your own custom base-branch by forking
-<code>master</code> and merging the required topic branches to it. You could then
+<code>master</code> and merging the required topic branches into it. You could then
work on top of this base-branch. But keep in mind that this base-branch
would only be known privately to you. So when you are ready to send
your patches to the list, be sure to communicate how you created it in
@@ -1518,7 +1518,7 @@ this problem around.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-08-21 10:25:10 PDT
+ 2023-10-23 14:43:47 PDT
</div>
</div>
</body>
diff --git a/SubmittingPatches.txt b/SubmittingPatches.txt index 973d7a81d..0e2d3fbb9 100644 --- a/SubmittingPatches.txt +++ b/SubmittingPatches.txt @@ -87,7 +87,7 @@ maintainer. Under truly exceptional circumstances where you absolutely must depend on a select few topic branches that are already in `next` but not in `master`, you may want to create your own custom base-branch by forking -`master` and merging the required topic branches to it. You could then +`master` and merging the required topic branches into it. You could then work on top of this base-branch. But keep in mind that this base-branch would only be known privately to you. So when you are ready to send your patches to the list, be sure to communicate how you created it in diff --git a/ToolsForGit.html b/ToolsForGit.html index 283f4e3e0..e3812515e 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -735,13 +735,13 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Tools for developing Git</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
<h2 id="summary">Summary</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This document gathers tips, scripts and configuration file to help people
+<div class="paragraph"><p>This document gathers tips, scripts, and configuration files to help people
working on Git’s codebase use their favorite tools while following Git’s
coding style.</p></div>
<div class="sect2">
@@ -777,7 +777,7 @@ information on using the script.</p></div> <div class="ulist"><ul>
<li>
<p>
-To follow rules of the CodingGuideline, it’s useful to put the following in
+To follow the rules in CodingGuidelines, it’s useful to put the following in
GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
</p>
</li>
@@ -806,7 +806,7 @@ document can be applied here too.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-05-26 16:11:01 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/ToolsForGit.txt b/ToolsForGit.txt index 5060d0d23..ae7690b45 100644 --- a/ToolsForGit.txt +++ b/ToolsForGit.txt @@ -5,7 +5,7 @@ Tools for developing Git [[summary]] == Summary -This document gathers tips, scripts and configuration file to help people +This document gathers tips, scripts, and configuration files to help people working on Git's codebase use their favorite tools while following Git's coding style. @@ -32,7 +32,7 @@ information on using the script. This is adapted from Linux's suggestion in its CodingStyle document: -- To follow rules of the CodingGuideline, it's useful to put the following in +- To follow the rules in CodingGuidelines, it's useful to put the following in GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode: ---- ;; note the first part is useful for C editing, too diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt index 670f13ac4..f13a36172 100644 --- a/cmds-ancillaryinterrogators.txt +++ b/cmds-ancillaryinterrogators.txt @@ -44,7 +44,7 @@ linkgit:git-version[1]:: Display version information about Git. linkgit:git-whatchanged[1]:: - Show logs with difference each commit introduces. + Show logs with differences each commit introduces. linkgit:gitweb[1]:: Git web interface (web frontend to Git repositories). diff --git a/config.txt b/config.txt index 229b63a45..b1dba1ae8 100644 --- a/config.txt +++ b/config.txt @@ -11,7 +11,7 @@ file. The file `/etc/gitconfig` can be used to store a system-wide default configuration. The configuration variables are used by both the Git plumbing -and the porcelains. The variables are divided into sections, wherein +and the porcelain commands. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric @@ -103,7 +103,7 @@ was found. See below for examples. Conditional includes ~~~~~~~~~~~~~~~~~~~~ -You can include a config file from another conditionally by setting a +You can conditionally include a config file from another by setting an `includeIf.<condition>.path` variable to the name of the file to be included. @@ -118,7 +118,7 @@ are: pattern, the include condition is met. + The .git location may be auto-discovered, or come from `$GIT_DIR` -environment variable. If the repository is auto discovered via a .git +environment variable. If the repository is auto-discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the .git file is. diff --git a/diff-generate-patch.txt b/diff-generate-patch.txt index 546adf79e..4b5aa5c2e 100644 --- a/diff-generate-patch.txt +++ b/diff-generate-patch.txt @@ -17,7 +17,7 @@ You can customize the creation of patch text via the What the -p option produces is slightly different from the traditional diff format: -1. It is preceded with a "git diff" header that looks like this: +1. It is preceded by a "git diff" header that looks like this: diff --git a/file1 b/file2 + @@ -25,9 +25,9 @@ The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames. + -When rename/copy is involved, `file1` and `file2` show the +When a rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of -the file that rename/copy produces, respectively. +the file that the rename/copy produces, respectively. 2. It is followed by one or more extended header lines: @@ -77,7 +77,7 @@ separate lines indicate the old and the new mode. 5. Hunk headers mention the name of the function to which the hunk applies. See "Defining a custom hunk-header" in - linkgit:gitattributes[5] for details of how to tailor to this to + linkgit:gitattributes[5] for details of how to tailor this to specific languages. @@ -89,7 +89,7 @@ produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of -diffs in specific format. +diffs in a specific format. A "combined diff" format looks like this: @@ -123,7 +123,7 @@ index fabadb8,cc95eb0..4866510 for_each_ref(get_name); ------------ -1. It is preceded with a "git diff" header, that looks like +1. It is preceded by a "git diff" header, that looks like this (when the `-c` option is used): diff --combined file @@ -142,22 +142,22 @@ or like this (when the `--cc` option is used): + The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with -information about detected contents movement (renames and -copying detection) are designed to work with diff of two +information about detected content movement (renames and +copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format. -3. It is followed by two-line from-file/to-file header +3. It is followed by a two-line from-file/to-file header: --- a/file +++ b/file + -Similar to two-line header for traditional 'unified' diff +Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files. + However, if the --combined-all-paths option is provided, instead of a -two-line from-file/to-file you get a N+1 line from-file/to-file header, -where N is the number of parents in the merge commit +two-line from-file/to-file, you get an N+1 line from-file/to-file header, +where N is the number of parents in the merge commit: --- a/file --- a/file @@ -197,7 +197,7 @@ added, from the point of view of that parent). In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear -in either file1 or file2). Also eight other lines are the same +in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`). When shown by `git diff-tree -c`, it compares the parents of a diff --git a/diff-options.txt b/diff-options.txt index 35fae7c87..1a75c28bc 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -37,66 +37,79 @@ endif::git-diff[] endif::git-format-patch[] ifdef::git-log[] ---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r):: +-m:: + Show diffs for merge commits in the default format. This is + similar to '--diff-merges=on', except `-m` will + produce no output unless `-p` is given as well. + +-c:: + Produce combined diff output for merge commits. + Shortcut for '--diff-merges=combined -p'. + +--cc:: + Produce dense combined diff output for merge commits. + Shortcut for '--diff-merges=dense-combined -p'. + +--dd:: + Produce diff with respect to first parent for both merge and + regular commits. + Shortcut for '--diff-merges=first-parent -p'. + +--remerge-diff:: + Produce remerge-diff output for merge commits. + Shortcut for '--diff-merges=remerge -p'. + --no-diff-merges:: + Synonym for '--diff-merges=off'. + +--diff-merges=<format>:: Specify diff format to be used for merge commits. Default is - {diff-merges-default} unless `--first-parent` is in use, in which case - `first-parent` is the default. + {diff-merges-default} unless `--first-parent` is in use, in + which case `first-parent` is the default. + ---diff-merges=(off|none)::: ---no-diff-merges::: +The following formats are supported: ++ +-- +off, none:: Disable output of diffs for merge commits. Useful to override implied value. + ---diff-merges=on::: ---diff-merges=m::: --m::: - This option makes diff output for merge commits to be shown in - the default format. `-m` will produce the output only if `-p` - is given as well. The default format could be changed using - `log.diffMerges` configuration parameter, which default value +on, m:: + Make diff output for merge commits to be shown in the default + format. The default format could be changed using + `log.diffMerges` configuration variable, whose default value is `separate`. + ---diff-merges=first-parent::: ---diff-merges=1::: - This option makes merge commits show the full diff with - respect to the first parent only. +first-parent, 1:: + Show full diff with respect to first parent. This is the same + format as `--patch` produces for non-merge commits. ++ +separate:: + Show full diff with respect to each of parents. + Separate log entry and diff is generated for each parent. + ---diff-merges=separate::: - This makes merge commits show the full diff with respect to - each of the parents. Separate log entry and diff is generated - for each parent. +combined, c:: + Show differences from each of the parents to the merge + result simultaneously instead of showing pairwise diff between + a parent and the result one at a time. Furthermore, it lists + only files which were modified from all parents. + ---diff-merges=remerge::: ---diff-merges=r::: ---remerge-diff::: - With this option, two-parent merge commits are remerged to - create a temporary tree object -- potentially containing files - with conflict markers and such. A diff is then shown between - that temporary tree and the actual merge commit. +dense-combined, cc:: + Further compress output produced by `--diff-merges=combined` + by omitting uninteresting hunks whose contents in the parents + have only two variants and the merge result picks one of them + without modification. ++ +remerge, r:: + Remerge two-parent merge commits to create a temporary tree + object--potentially containing files with conflict markers + and such. A diff is then shown between that temporary tree + and the actual merge commit. + The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented). -+ ---diff-merges=combined::: ---diff-merges=c::: --c::: - With this option, diff output for a merge commit shows the - differences from each of the parents to the merge result - simultaneously instead of showing pairwise diff between a - parent and the result one at a time. Furthermore, it lists - only files which were modified from all parents. `-c` implies - `-p`. -+ ---diff-merges=dense-combined::: ---diff-merges=cc::: ---cc::: - With this option the output produced by - `--diff-merges=combined` is further compressed by omitting - uninteresting hunks whose contents in the parents have only - two variants and the merge result picks one of them without - modification. `--cc` implies `-p`. +-- --combined-all-paths:: This flag causes combined diffs (used for merge commits) to @@ -733,7 +746,7 @@ matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". --rotate-to=<file>:: Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output - (i.e. 'rotate to'). These were invented primarily for use + (i.e. 'rotate to'). These options were invented primarily for the use of the `git difftool` command, and may not be very useful otherwise. diff --git a/everyday.html b/everyday.html index 6b3dfea1c..15c943fed 100644 --- a/everyday.html +++ b/everyday.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Everyday Git With 20 Commands Or So</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/fetch-options.txt b/fetch-options.txt index 41fc7ca3c..a1d6633a4 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -43,7 +43,7 @@ the current repository has the same history as the source repository. --update-shallow:: By default when fetching from a shallow repository, `git fetch` refuses refs that require updating - .git/shallow. This option updates .git/shallow and accept such + .git/shallow. This option updates .git/shallow and accepts such refs. --negotiation-tip=<commit|glob>:: @@ -96,7 +96,7 @@ endif::git-pull[] -f:: --force:: - When 'git fetch' is used with `<src>:<dst>` refspec it may + When 'git fetch' is used with `<src>:<dst>` refspec, it may refuse to update the local branch as discussed ifdef::git-pull[] in the `<refspec>` part of the linkgit:git-fetch[1] diff --git a/fsck-msgids.txt b/fsck-msgids.txt index 09b0aecbf..f643585a3 100644 --- a/fsck-msgids.txt +++ b/fsck-msgids.txt @@ -132,7 +132,7 @@ (ERROR) Missing space before date in an author/committer line. `missingSpaceBeforeEmail`:: - (ERROR) Missing space before the email in author/committer line. + (ERROR) Missing space before the email in an author/committer line. `missingTag`:: (ERROR) Unexpected end after `type` line in a tag object. @@ -174,7 +174,7 @@ (FATAL) Missing end-of-line in the object header. `zeroPaddedDate`:: - (ERROR) Found a zero padded date in an author/commiter line. + (ERROR) Found a zero padded date in an author/committer line. `zeroPaddedFilemode`:: (WARN) Found a zero padded filemode in a tree. diff --git a/git-am.html b/git-am.html index ff0f2d648..6f01b573c 100644 --- a/git-am.html +++ b/git-am.html @@ -766,8 +766,8 @@ git-am(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Splits mail messages in a mailbox into commit log message,
-authorship information and patches, and applies them to the
+<div class="paragraph"><p>Splits mail messages in a mailbox into commit log messages,
+authorship information, and patches, and applies them to the
current branch. You could think of it as a reverse operation
of <a href="git-format-patch.html">git-format-patch(1)</a> run on a branch with a straight
history without merges.</p></div>
@@ -866,7 +866,7 @@ history without merges.</p></div> <p>
By default, or when the option is set to <em>stop</em>, the command
errors out on an input e-mail message lacking a patch
- and stops into the middle of the current am session. When this
+ and stops in the middle of the current am session. When this
option is set to <em>drop</em>, skip such an e-mail message instead.
When this option is set to <em>keep</em>, create an empty commit,
recording the contents of the e-mail message as its log.
@@ -917,7 +917,7 @@ history without merges.</p></div> Pass <code>-u</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
The proposed commit log message taken from the e-mail
is re-coded into UTF-8 encoding (configuration variable
- <code>i18n.commitEncoding</code> can be used to specify project’s
+ <code>i18n.commitEncoding</code> can be used to specify the project’s
preferred encoding if it is not UTF-8).
</p>
<div class="paragraph"><p>This was optional in prior versions of git, but now it is the
@@ -1011,7 +1011,7 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> automatically. This option allows the user to bypass the automatic
detection and specify the patch format that the patch(es) should be
interpreted as. Valid formats are mbox, mboxrd,
- stgit, stgit-series and hg.
+ stgit, stgit-series, and hg.
</p>
</dd>
<dt class="hdlist1">
@@ -1126,7 +1126,7 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> <dd>
<p>
Restore the original branch and abort the patching operation.
- Revert contents of files involved in the am operation to their
+ Revert the contents of files involved in the am operation to their
pre-am state.
</p>
</dd>
@@ -1289,7 +1289,7 @@ am.threeWay <div id="footer">
<div id="footer-text">
Last updated
- 2023-03-30 15:50:48 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-am.txt b/git-am.txt index 900be198b..0390dab20 100644 --- a/git-am.txt +++ b/git-am.txt @@ -22,8 +22,8 @@ SYNOPSIS DESCRIPTION ----------- -Splits mail messages in a mailbox into commit log message, -authorship information and patches, and applies them to the +Splits mail messages in a mailbox into commit log messages, +authorship information, and patches, and applies them to the current branch. You could think of it as a reverse operation of linkgit:git-format-patch[1] run on a branch with a straight history without merges. @@ -69,7 +69,7 @@ OPTIONS --empty=(stop|drop|keep):: By default, or when the option is set to 'stop', the command errors out on an input e-mail message lacking a patch - and stops into the middle of the current am session. When this + and stops in the middle of the current am session. When this option is set to 'drop', skip such an e-mail message instead. When this option is set to 'keep', create an empty commit, recording the contents of the e-mail message as its log. @@ -94,7 +94,7 @@ OPTIONS Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable - `i18n.commitEncoding` can be used to specify project's + `i18n.commitEncoding` can be used to specify the project's preferred encoding if it is not UTF-8). + This was optional in prior versions of git, but now it is the @@ -134,7 +134,7 @@ include::rerere-options.txt[] automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, - stgit, stgit-series and hg. + stgit, stgit-series, and hg. -i:: --interactive:: @@ -192,7 +192,7 @@ include::rerere-options.txt[] --abort:: Restore the original branch and abort the patching operation. - Revert contents of files involved in the am operation to their + Revert the contents of files involved in the am operation to their pre-am state. --quit:: diff --git a/git-apply.html b/git-apply.html index b4c495cfe..cf6d549c1 100644 --- a/git-apply.html +++ b/git-apply.html @@ -767,8 +767,8 @@ git-apply(1) Manual Page <div class="paragraph"><p>Reads the supplied diff output (i.e. "a patch") and applies it to files.
When running from a subdirectory in a repository, patched paths
outside the directory are ignored.
-With the <code>--index</code> option the patch is also applied to the index, and
-with the <code>--cached</code> option the patch is only applied to the index.
+With the <code>--index</code> option, the patch is also applied to the index, and
+with the <code>--cached</code> option, the patch is only applied to the index.
Without these options, the command applies the patch only to files,
and does not require them to be in a Git repository.</p></div>
<div class="paragraph"><p>This command applies the patch but does not create a commit. Use
@@ -817,7 +817,7 @@ and does not require them to be in a Git repository.</p></div> <p>
Instead of applying the patch, output a condensed
summary of information obtained from git diff extended
- headers, such as creations, renames and mode changes.
+ headers, such as creations, renames, and mode changes.
Turns off "apply".
</p>
</dd>
@@ -967,7 +967,7 @@ explained for the configuration variable <code>core.quotePath</code> (see applying a diff generated with <code>--unified=0</code>. To bypass these
checks use <code>--unidiff-zero</code>.
</p>
-<div class="paragraph"><p>Note, for the reasons stated above usage of context-free patches is
+<div class="paragraph"><p>Note, for the reasons stated above, the usage of context-free patches is
discouraged.</p></div>
</dd>
<dt class="hdlist1">
@@ -1002,9 +1002,9 @@ discouraged.</p></div> </dt>
<dd>
<p>
- Historically we did not allow binary patch applied
+ Historically we did not allow binary patch application
without an explicit permission from the user, and this
- flag was the way to do so. Currently we always allow binary
+ flag was the way to do so. Currently, we always allow binary
patch application, so this is a no-op.
</p>
</dd>
@@ -1177,7 +1177,7 @@ has no effect when <code>--index</code> or <code>--cached</code> is in use.</p>< </dt>
<dd>
<p>
- Don’t return error for patches containing no diff. This includes
+ Don’t return an error for patches containing no diff. This includes
empty patches and patches with commit text only.
</p>
</dd>
@@ -1199,7 +1199,7 @@ apply.ignoreWhitespace 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
+ When set to one of: no, none, never, false, it tells <em>git apply</em> to
respect all whitespace differences.
See <a href="git-apply.html">git-apply(1)</a>.
</p>
@@ -1209,7 +1209,7 @@ apply.whitespace </dt>
<dd>
<p>
- Tells <em>git apply</em> how to handle whitespaces, in the same way
+ Tells <em>git apply</em> how to handle whitespace, in the same way
as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.
</p>
</dd>
@@ -1248,7 +1248,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-30 14:44:53 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-apply.txt b/git-apply.txt index 5e16e6db7..9cce68a38 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -23,8 +23,8 @@ DESCRIPTION Reads the supplied diff output (i.e. "a patch") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. -With the `--index` option the patch is also applied to the index, and -with the `--cached` option the patch is only applied to the index. +With the `--index` option, the patch is also applied to the index, and +with the `--cached` option, the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository. @@ -52,7 +52,7 @@ OPTIONS --summary:: Instead of applying the patch, output a condensed summary of information obtained from git diff extended - headers, such as creations, renames and mode changes. + headers, such as creations, renames, and mode changes. Turns off "apply". --check:: @@ -140,7 +140,7 @@ linkgit:git-config[1]). applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`. + -Note, for the reasons stated above usage of context-free patches is +Note, for the reasons stated above, the usage of context-free patches is discouraged. --apply:: @@ -159,9 +159,9 @@ discouraged. --allow-binary-replacement:: --binary:: - Historically we did not allow binary patch applied + Historically we did not allow binary patch application without an explicit permission from the user, and this - flag was the way to do so. Currently we always allow binary + flag was the way to do so. Currently, we always allow binary patch application, so this is a no-op. --exclude=<path-pattern>:: @@ -257,7 +257,7 @@ the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use. --allow-empty:: - Don't return error for patches containing no diff. This includes + Don't return an error for patches containing no diff. This includes empty patches and patches with commit text only. CONFIGURATION diff --git a/git-archive.html b/git-archive.html index a6088b0dc..16a1105f9 100644 --- a/git-archive.html +++ b/git-archive.html @@ -764,14 +764,14 @@ git-archive(1) Manual Page structure for the named tree, and writes it out to the standard
output. If <prefix> is specified it is
prepended to the filenames in the archive.</p></div>
-<div class="paragraph"><p><em>git archive</em> behaves differently when given a tree ID versus when
-given a commit ID or tag ID. In the first case the current time is
-used as the modification time of each file in the archive. In the latter
-case the commit time as recorded in the referenced commit object is
-used instead. Additionally the commit ID is stored in a global
-extended pax header if the tar format is used; it can be extracted
-using <em>git get-tar-commit-id</em>. In ZIP files it is stored as a file
-comment.</p></div>
+<div class="paragraph"><p><em>git archive</em> behaves differently when given a tree ID as opposed to a
+commit ID or tag ID. When a tree ID is provided, the current time is
+used as the modification time of each file in the archive. On the
+other hand, when a commit ID or tag ID is provided, the commit time as
+recorded in the referenced commit object is used instead.
+Additionally the commit ID is stored in a global extended pax header
+if the tar format is used; it can be extracted using <em>git
+get-tar-commit-id</em>. In ZIP files it is stored as a file comment.</p></div>
</div>
</div>
<div class="sect1">
@@ -1159,7 +1159,7 @@ while archiving any tree in your <code>$GIT_DIR/info/attributes</code> file.</p> <div id="footer">
<div id="footer-text">
Last updated
- 2023-02-27 10:47:08 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-archive.txt b/git-archive.txt index 6bab201d3..98526f2be 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -21,14 +21,14 @@ structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is prepended to the filenames in the archive. -'git archive' behaves differently when given a tree ID versus when -given a commit ID or tag ID. In the first case the current time is -used as the modification time of each file in the archive. In the latter -case the commit time as recorded in the referenced commit object is -used instead. Additionally the commit ID is stored in a global -extended pax header if the tar format is used; it can be extracted -using 'git get-tar-commit-id'. In ZIP files it is stored as a file -comment. +'git archive' behaves differently when given a tree ID as opposed to a +commit ID or tag ID. When a tree ID is provided, the current time is +used as the modification time of each file in the archive. On the +other hand, when a commit ID or tag ID is provided, the commit time as +recorded in the referenced commit object is used instead. +Additionally the commit ID is stored in a global extended pax header +if the tar format is used; it can be extracted using 'git +get-tar-commit-id'. In ZIP files it is stored as a file comment. OPTIONS ------- diff --git a/git-blame.html b/git-blame.html index f0b4415ab..9c0a73b7a 100644 --- a/git-blame.html +++ b/git-blame.html @@ -1153,7 +1153,7 @@ take effect.</p></div> </dt>
<dd>
<p>
- Show the author email instead of author name (Default: off).
+ Show the author email instead of the author name (Default: off).
This can also be controlled via the <code>blame.showEmail</code> config
option.
</p>
@@ -1195,7 +1195,7 @@ abbreviated object name for the commit the line came from; </li>
<li>
<p>
-author ident (by default author name and date, unless <code>-s</code> or <code>-e</code>
+author ident (by default the author name and date, unless <code>-s</code> or <code>-e</code>
is specified); and
</p>
</li>
@@ -1258,7 +1258,7 @@ the first line of the commit log message ("summary"). </p>
</li>
</ul></div>
-<div class="paragraph"><p>The contents of the actual line is output after the above
+<div class="paragraph"><p>The contents of the actual line are output after the above
header, prefixed by a TAB. This is to allow adding more
header elements later.</p></div>
<div class="paragraph"><p>The porcelain format generally suppresses commit information that has
@@ -1301,7 +1301,7 @@ git blame -L 40,+21 foo</code></pre> <div class="paragraph"><p>which limits the annotation to the body of the <code>hello</code> subroutine.</p></div>
<div class="paragraph"><p>When you are not interested in changes older than version
v2.6.18, or changes older than 3 weeks, you can use revision
-range specifiers similar to <em>git rev-list</em>:</p></div>
+range specifiers similar to <em>git rev-list</em>:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>git blame v2.6.18.. -- foo
@@ -1498,7 +1498,7 @@ blame.markIgnoredLines <div id="footer">
<div id="footer-text">
Last updated
- 2023-04-04 16:17:01 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-blame.txt b/git-blame.txt index f69a871a9..5720d04ff 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -77,7 +77,7 @@ include::blame-options.txt[] -e:: --show-email:: - Show the author email instead of author name (Default: off). + Show the author email instead of the author name (Default: off). This can also be controlled via the `blame.showEmail` config option. @@ -100,7 +100,7 @@ When neither `--porcelain` nor `--incremental` option is specified, `git blame` will output annotation for each line with: - abbreviated object name for the commit the line came from; -- author ident (by default author name and date, unless `-s` or `-e` +- author ident (by default the author name and date, unless `-s` or `-e` is specified); and - line number @@ -128,7 +128,7 @@ at least once for each commit: - the filename in the commit that the line is attributed to. - the first line of the commit log message ("summary"). -The contents of the actual line is output after the above +The contents of the actual line are output after the above header, prefixed by a TAB. This is to allow adding more header elements later. @@ -170,7 +170,7 @@ which limits the annotation to the body of the `hello` subroutine. When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision -range specifiers similar to 'git rev-list': +range specifiers similar to 'git rev-list': git blame v2.6.18.. -- foo git blame --since=3.weeks -- foo diff --git a/git-branch.html b/git-branch.html index 76182852b..f70785499 100644 --- a/git-branch.html +++ b/git-branch.html @@ -1358,7 +1358,7 @@ branch.<name>.remote <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
+ which remote to fetch from or push to. The remote to push to
may be overridden with <code>remote.pushDefault</code> (for all branches).
The remote to push to, for the current branch, may be further
overridden by <code>branch.<name>.pushRemote</code>. If no remote is
@@ -1396,7 +1396,7 @@ branch.<name>.merge 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
+ The merge information is used by <em>git pull</em> (which first calls
<em>git fetch</em>) to lookup the default branch for merging. Without
this option, <em>git pull</em> defaults to merge the first refspec fetched.
Specify multiple values to get an octopus merge.
@@ -1443,7 +1443,7 @@ branch.<name>.description <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
+ automatically added to the format-patch cover letter or
request-pull summary.
</p>
</dd>
diff --git a/git-bugreport.html b/git-bugreport.html index 4374c93c9..280115b7c 100644 --- a/git-bugreport.html +++ b/git-bugreport.html @@ -758,10 +758,11 @@ git-bugreport(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Captures information about the user’s machine, Git client, and repository state,
-as well as a form requesting information about the behavior the user observed,
-into a single text file which the user can then share, for example to the Git
-mailing list, in order to report an observed bug.</p></div>
+<div class="paragraph"><p>Collects information about the user’s machine, Git client, and repository
+state, in addition to a form requesting information about the behavior the
+user observed, and stores it in a single text file which the user can then
+share, for example to the Git mailing list, in order to report an observed
+bug.</p></div>
<div class="paragraph"><p>The following information is requested from the user:</p></div>
<div class="ulist"><ul>
<li>
@@ -879,7 +880,7 @@ about their usage.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-25 15:15:05 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-bugreport.txt b/git-bugreport.txt index eca726e57..392d9eb6a 100644 --- a/git-bugreport.txt +++ b/git-bugreport.txt @@ -13,10 +13,11 @@ SYNOPSIS DESCRIPTION ----------- -Captures information about the user's machine, Git client, and repository state, -as well as a form requesting information about the behavior the user observed, -into a single text file which the user can then share, for example to the Git -mailing list, in order to report an observed bug. +Collects information about the user's machine, Git client, and repository +state, in addition to a form requesting information about the behavior the +user observed, and stores it in a single text file which the user can then +share, for example to the Git mailing list, in order to report an observed +bug. The following information is requested from the user: diff --git a/git-check-attr.html b/git-check-attr.html index 6dc9cb7ea..be89417ed 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -790,7 +790,7 @@ git-check-attr(1) Manual Page <dd>
<p>
Read pathnames from the standard input, one per line,
- instead of from the command-line.
+ instead of from the command line.
</p>
</dd>
<dt class="hdlist1">
@@ -809,7 +809,7 @@ git-check-attr(1) Manual Page <dd>
<p>
Check attributes against the specified tree-ish. It is common to
- specify the source tree by naming a commit, branch or tag associated
+ specify the source tree by naming a commit, branch, or tag associated
with it.
</p>
</dd>
@@ -836,7 +836,7 @@ pathnames.</p></div> <div class="paragraph"><p>unless <code>-z</code> is in effect, in which case NUL is used as delimiter:
<path> NUL <attribute> NUL <info> NUL</p></div>
<div class="paragraph"><p><path> is the path of a file being queried, <attribute> is an attribute
-being queried and <info> can be either:</p></div>
+being queried, and <info> can be either:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<em>unspecified</em>
@@ -970,7 +970,7 @@ README: caveat: unspecified</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-23 14:32:38 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-check-attr.txt b/git-check-attr.txt index 6e4f3aaf3..cb5a6c8f3 100644 --- a/git-check-attr.txt +++ b/git-check-attr.txt @@ -29,7 +29,7 @@ OPTIONS --stdin:: Read pathnames from the standard input, one per line, - instead of from the command-line. + instead of from the command line. -z:: The output format is modified to be machine-parsable. @@ -38,7 +38,7 @@ OPTIONS --source=<tree-ish>:: Check attributes against the specified tree-ish. It is common to - specify the source tree by naming a commit, branch or tag associated + specify the source tree by naming a commit, branch, or tag associated with it. \--:: @@ -60,7 +60,7 @@ unless `-z` is in effect, in which case NUL is used as delimiter: <path> is the path of a file being queried, <attribute> is an attribute -being queried and <info> can be either: +being queried, and <info> can be either: 'unspecified';; when the attribute is not defined for the path. 'unset';; when the attribute is defined as false. diff --git a/git-check-ignore.html b/git-check-ignore.html index 715633e71..344c29e0b 100644 --- a/git-check-ignore.html +++ b/git-check-ignore.html @@ -924,7 +924,7 @@ buffer.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-02-17 16:38:18 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-check-ignore.txt b/git-check-ignore.txt index 2892799e3..3e3b4e344 100644 --- a/git-check-ignore.txt +++ b/git-check-ignore.txt @@ -50,7 +50,7 @@ linkgit:gitignore[5]. with a NUL character instead of a linefeed character. -n, --non-matching:: - Show given paths which don't match any pattern. This only + Show given paths which don't match any pattern. This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't. diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 639cb7ab0..abcf6ef65 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -808,7 +808,7 @@ They cannot have question-mark <code>?</code>, asterisk <code>*</code>, or open <p>
They cannot begin or end with a slash <code>/</code> or contain multiple
consecutive slashes (see the <code>--normalize</code> option below for an
- exception to this rule)
+ exception to this rule).
</p>
</li>
<li>
@@ -872,7 +872,7 @@ The rule <code>git check-ref-format --branch $name</code> implements may be stricter than what <code>git check-ref-format refs/heads/$name</code>
says (e.g. a dash may appear at the beginning of a ref component,
but it is explicitly forbidden at the beginning of a branch name).
-When run with <code>--branch</code> option in a repository, the input is first
+When run with the <code>--branch</code> option in a repository, the input is first
expanded for the “previous checkout syntax”
<code>@{-n}</code>. For example, <code>@{-1}</code> is a way to refer the last thing that
was checked out using "git switch" or "git checkout" operation.
@@ -963,7 +963,7 @@ Determine the reference name to use for a new branch: <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt index ee6a4144f..2aacfd180 100644 --- a/git-check-ref-format.txt +++ b/git-check-ref-format.txt @@ -48,7 +48,7 @@ Git imposes the following rules on how references are named: . They cannot begin or end with a slash `/` or contain multiple consecutive slashes (see the `--normalize` option below for an - exception to this rule) + exception to this rule). . They cannot end with a dot `.`. @@ -85,7 +85,7 @@ The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). -When run with `--branch` option in a repository, the input is first +When run with the `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using "git switch" or "git checkout" operation. diff --git a/git-checkout-index.html b/git-checkout-index.html index 3092e33bb..c4c0fd27d 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -762,7 +762,7 @@ git-checkout-index(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Will copy all files listed from the index to the working directory
+<div class="paragraph"><p>Copies all listed files from the index to the working directory
(not overwriting existing files).</p></div>
</div>
</div>
@@ -844,7 +844,7 @@ git-checkout-index(1) Manual Page <dd>
<p>
Instead of checking out unmerged entries, copy out the
- files from named stage. <number> must be between 1 and 3.
+ files from the named stage. <number> must be between 1 and 3.
Note: --stage=all automatically implies --temp.
</p>
</dd>
@@ -853,7 +853,7 @@ git-checkout-index(1) Manual Page </dt>
<dd>
<p>
- Instead of copying the files to the working directory
+ Instead of copying the files to the working directory,
write the content to temporary files. The temporary name
associations will be written to stdout.
</p>
@@ -872,8 +872,8 @@ git-checkout-index(1) Manual Page </dt>
<dd>
<p>
- Instead of taking list of paths from the command line,
- read list of paths from the standard input. Paths are
+ Instead of taking a list of paths from the command line,
+ read the list of paths from the standard input. Paths are
separated by LF (i.e. one path per line) by default.
</p>
</dd>
@@ -1020,7 +1020,7 @@ into the file <code>.merged-Makefile</code>.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-02-17 16:38:18 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-checkout-index.txt b/git-checkout-index.txt index 01dbd5cbf..faf8d6ca3 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION ----------- -Will copy all files listed from the index to the working directory +Copies all listed files from the index to the working directory (not overwriting existing files). OPTIONS @@ -53,11 +53,11 @@ OPTIONS --stage=<number>|all:: Instead of checking out unmerged entries, copy out the - files from named stage. <number> must be between 1 and 3. + files from the named stage. <number> must be between 1 and 3. Note: --stage=all automatically implies --temp. --temp:: - Instead of copying the files to the working directory + Instead of copying the files to the working directory, write the content to temporary files. The temporary name associations will be written to stdout. @@ -66,8 +66,8 @@ OPTIONS set. --stdin:: - Instead of taking list of paths from the command line, - read list of paths from the standard input. Paths are + Instead of taking a list of paths from the command line, + read the list of paths from the standard input. Paths are separated by LF (i.e. one path per line) by default. -z:: diff --git a/git-checkout.html b/git-checkout.html index 0f72e0a44..d9e0cf9bb 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -791,7 +791,7 @@ exactly one remote (call it <code><remote></code>) with a matching name an <div class="paragraph"><p>You could omit <code><branch></code>, in which case the command degenerates to
"check out the current branch", which is a glorified no-op with
rather expensive side-effects to show only the tracking information,
-if exists, for the current branch.</p></div>
+if it exists, for the current branch.</p></div>
</dd>
<dt class="hdlist1">
<em>git checkout</em> -b|-B <new-branch> [<start-point>]
@@ -1594,7 +1594,7 @@ checkout.workers 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
+<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
@@ -1607,7 +1607,7 @@ checkout.thresholdForParallelism <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
+ the parallelization gains. This setting allows you to define the minimum
number of files for which parallel checkout should be attempted. The
default is 100.
</p>
@@ -1633,7 +1633,7 @@ checkout.thresholdForParallelism <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-02 12:46:05 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-checkout.txt b/git-checkout.txt index a30e3ebc5..240c54639 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -43,7 +43,7 @@ $ git checkout -b <branch> --track <remote>/<branch> You could omit `<branch>`, in which case the command degenerates to "check out the current branch", which is a glorified no-op with rather expensive side-effects to show only the tracking information, -if exists, for the current branch. +if it exists, for the current branch. 'git checkout' -b|-B <new-branch> [<start-point>]:: diff --git a/git-clean.html b/git-clean.html index 50fba18e7..0e947da77 100644 --- a/git-clean.html +++ b/git-clean.html @@ -906,7 +906,7 @@ filter by pattern This shows the files and directories to be deleted and issues an
"Input ignore patterns>>" prompt. You can input space-separated
patterns to exclude files and directories from deletion.
- E.g. "*.c *.h" will excludes files end with ".c" and ".h" from
+ E.g. "*.c *.h" will exclude files ending with ".c" and ".h" from
deletion. When you are satisfied with the filtered result, press
ENTER (empty) back to the main menu.
</p>
@@ -969,7 +969,7 @@ clean.requireForce <dd>
<p>
A boolean to make git-clean do nothing unless given -f,
- -i or -n. Defaults to true.
+ -i, or -n. Defaults to true.
</p>
</dd>
</dl></div>
@@ -992,7 +992,7 @@ clean.requireForce <div id="footer">
<div id="footer-text">
Last updated
- 2023-09-22 17:04:28 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-clean.txt b/git-clean.txt index 5e1a3d514..69331e3f0 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -103,7 +103,7 @@ filter by pattern:: This shows the files and directories to be deleted and issues an "Input ignore patterns>>" prompt. You can input space-separated patterns to exclude files and directories from deletion. - E.g. "*.c *.h" will excludes files end with ".c" and ".h" from + E.g. "*.c *.h" will exclude files ending with ".c" and ".h" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu. diff --git a/git-clone.html b/git-clone.html index c87a956e5..39b3f6c92 100644 --- a/git-clone.html +++ b/git-clone.html @@ -1268,9 +1268,9 @@ or <code>--mirror</code> is given)</p></div> address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.</p></div>
-<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
+<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp
and ftps can be used for fetching, but this is inefficient and
-deprecated; do not use it).</p></div>
+deprecated; do not use them).</p></div>
<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1485,8 +1485,8 @@ 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>
+ Reject cloning a repository if it is a shallow one; this can be overridden by
+ passing the <code>--reject-shallow</code> option on the command line. See <a href="git-clone.html">git-clone(1)</a>
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-column.html b/git-column.html index 42b82bcce..bf89dcc59 100644 --- a/git-column.html +++ b/git-column.html @@ -979,7 +979,7 @@ column.clean </dt>
<dd>
<p>
- Specify the layout when list items in <code>git clean -i</code>, which always
+ Specify the layout when listing items in <code>git clean -i</code>, which always
shows files and directories in columns. See <code>column.ui</code> for details.
</p>
</dd>
@@ -997,7 +997,7 @@ column.tag </dt>
<dd>
<p>
- Specify whether to output tag listing in <code>git tag</code> in columns.
+ Specify whether to output tag listings in <code>git tag</code> in columns.
See <code>column.ui</code> for details.
</p>
</dd>
diff --git a/git-commit-tree.html b/git-commit-tree.html index 30a01ca6a..39a88be85 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -966,7 +966,7 @@ mind.</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-<em>git commit</em> and <em>git commit-tree</em> issues
+<em>git commit</em> and <em>git commit-tree</em> issue
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
@@ -978,7 +978,7 @@ mind.</p></div> commitEncoding = ISO-8859-1</code></pre>
</div></div>
<div class="paragraph"><p>Commit objects created with the above setting record the value
-of <code>i18n.commitEncoding</code> in its <code>encoding</code> header. This is to
+of <code>i18n.commitEncoding</code> in their <code>encoding</code> header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.</p></div>
</li>
diff --git a/git-commit.html b/git-commit.html index 7e270544d..539622ffc 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1685,7 +1685,7 @@ mind.</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-<em>git commit</em> and <em>git commit-tree</em> issues
+<em>git commit</em> and <em>git commit-tree</em> issue
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
@@ -1697,7 +1697,7 @@ mind.</p></div> commitEncoding = ISO-8859-1</code></pre>
</div></div>
<div class="paragraph"><p>Commit objects created with the above setting record the value
-of <code>i18n.commitEncoding</code> in its <code>encoding</code> header. This is to
+of <code>i18n.commitEncoding</code> in their <code>encoding</code> header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.</p></div>
</li>
@@ -1743,7 +1743,7 @@ commit.cleanup 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
+ with the comment character <code>#</code> in your log message, in which case you
would do <code>git config commit.cleanup whitespace</code> (note that you will
have to remove the help lines that begin with <code>#</code> in the commit log
template yourself, if you do this).
@@ -1785,7 +1785,7 @@ commit.verbose </dt>
<dd>
<p>
- A boolean or int to specify the level of verbose with <code>git commit</code>.
+ A boolean or int to specify the level of verbosity with <code>git commit</code>.
See <a href="git-commit.html">git-commit(1)</a>.
</p>
</dd>
diff --git a/git-config.html b/git-config.html index 31d92b2ed..aaa4e804d 100644 --- a/git-config.html +++ b/git-config.html @@ -1578,7 +1578,7 @@ store a per-user configuration as fallback values for the <code>.git/config</cod file. The file <code>/etc/gitconfig</code> can be used to store a system-wide
default configuration.</p></div>
<div class="paragraph"><p>The configuration variables are used by both the Git plumbing
-and the porcelains. The variables are divided into sections, wherein
+and the porcelain commands. The variables are divided into sections, wherein
the fully qualified variable name of the variable itself is the last
dot-separated segment and the section name is everything before the last
dot. The variable names are case-insensitive, allow only alphanumeric
@@ -1654,7 +1654,7 @@ was found. See below for examples.</p></div> </div>
<div class="sect2">
<h3 id="_conditional_includes">Conditional includes</h3>
-<div class="paragraph"><p>You can include a config file from another conditionally by setting a
+<div class="paragraph"><p>You can conditionally include a config file from another by setting an
<code>includeIf.<condition>.path</code> variable to the name of the file to be
included.</p></div>
<div class="paragraph"><p>The condition starts with a keyword followed by a colon and some data
@@ -1671,7 +1671,7 @@ are:</p></div> pattern, the include condition is met.
</p>
<div class="paragraph"><p>The .git location may be auto-discovered, or come from <code>$GIT_DIR</code>
-environment variable. If the repository is auto discovered via a .git
+environment variable. If the repository is auto-discovered via a .git
file (e.g. from submodules, or a linked worktree), the .git location
would be the final location where the .git directory is, not where the
.git file is.</p></div>
@@ -1995,7 +1995,7 @@ ambiguousFetchRefspec </dt>
<dd>
<p>
- Advice shown when fetch refspec for multiple remotes map to
+ Advice shown when a fetch refspec for multiple remotes maps to
the same remote-tracking branch namespace and causes branch
tracking set-up to fail.
</p>
@@ -2125,7 +2125,7 @@ statusHints the template shown when writing commit messages in
<a href="git-commit.html">git-commit(1)</a>, and in the help message shown
by <a href="git-switch.html">git-switch(1)</a> or
- <a href="git-checkout.html">git-checkout(1)</a> when switching branch.
+ <a href="git-checkout.html">git-checkout(1)</a> when switching branches.
</p>
</dd>
<dt class="hdlist1">
@@ -2191,7 +2191,7 @@ detachedHead <p>
Advice shown when you used
<a href="git-switch.html">git-switch(1)</a> or <a href="git-checkout.html">git-checkout(1)</a>
- to move to the detach HEAD state, to instruct how to
+ to move to the detached HEAD state, to instruct how to
create a local branch after the fact.
</p>
</dd>
@@ -2217,7 +2217,7 @@ checkoutAmbiguousRemoteBranchName otherwise caused a remote-tracking branch to be
checked out. See the <code>checkout.defaultRemote</code>
configuration variable for how to set a given remote
- to used by default in some situations where this
+ to be used by default in some situations where this
advice would be printed.
</p>
</dd>
@@ -3487,7 +3487,7 @@ alias.* <code>git last</code> is equivalent to <code>git cat-file commit HEAD</code>. To avoid
confusion and troubles with script usage, aliases that
hide existing Git commands are ignored. Arguments are split by
- spaces, the usual shell quoting and escaping is supported.
+ spaces, the usual shell quoting and escaping are supported.
A quote pair or a backslash can be used to quote them.
</p>
<div class="paragraph"><p>Note that the first word of an alias does not necessarily have to be a
@@ -3542,7 +3542,7 @@ apply.ignoreWhitespace 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
+ When set to one of: no, none, never, false, it tells <em>git apply</em> to
respect all whitespace differences.
See <a href="git-apply.html">git-apply(1)</a>.
</p>
@@ -3552,7 +3552,7 @@ apply.whitespace </dt>
<dd>
<p>
- Tells <em>git apply</em> how to handle whitespaces, in the same way
+ Tells <em>git apply</em> how to handle whitespace, in the same way
as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.
</p>
</dd>
@@ -3690,7 +3690,7 @@ branch.<name>.remote <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
+ which remote to fetch from or push to. The remote to push to
may be overridden with <code>remote.pushDefault</code> (for all branches).
The remote to push to, for the current branch, may be further
overridden by <code>branch.<name>.pushRemote</code>. If no remote is
@@ -3728,7 +3728,7 @@ branch.<name>.merge 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
+ The merge information is used by <em>git pull</em> (which first calls
<em>git fetch</em>) to lookup the default branch for merging. Without
this option, <em>git pull</em> defaults to merge the first refspec fetched.
Specify multiple values to get an octopus merge.
@@ -3775,7 +3775,7 @@ branch.<name>.description <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
+ automatically added to the format-patch cover letter or
request-pull summary.
</p>
</dd>
@@ -3906,7 +3906,7 @@ checkout.workers 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
+<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
@@ -3919,7 +3919,7 @@ checkout.thresholdForParallelism <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
+ the parallelization gains. This setting allows you to define the minimum
number of files for which parallel checkout should be attempted. The
default is 100.
</p>
@@ -3930,7 +3930,7 @@ clean.requireForce <dd>
<p>
A boolean to make git-clean do nothing unless given -f,
- -i or -n. Defaults to true.
+ -i, or -n. Defaults to true.
</p>
</dd>
<dt class="hdlist1">
@@ -3948,8 +3948,8 @@ 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>
+ Reject cloning a repository if it is a shallow one; this can be overridden by
+ passing the <code>--reject-shallow</code> option on the command line. See <a href="git-clone.html">git-clone(1)</a>
</p>
</dd>
<dt class="hdlist1">
@@ -4168,7 +4168,7 @@ color.grep.<slot> <dd>
<p>
matching text in selected lines. Also, used to customize the following
- <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code> and <code>--committer</code>.
+ <a href="git-log.html">git-log(1)</a> subcommands: <code>--grep</code>, <code>--author</code>, and <code>--committer</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -4457,7 +4457,7 @@ column.clean </dt>
<dd>
<p>
- Specify the layout when list items in <code>git clean -i</code>, which always
+ Specify the layout when listing items in <code>git clean -i</code>, which always
shows files and directories in columns. See <code>column.ui</code> for details.
</p>
</dd>
@@ -4475,7 +4475,7 @@ column.tag </dt>
<dd>
<p>
- Specify whether to output tag listing in <code>git tag</code> in columns.
+ Specify whether to output tag listings in <code>git tag</code> in columns.
See <code>column.ui</code> for details.
</p>
</dd>
@@ -4487,7 +4487,7 @@ commit.cleanup 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
+ with the comment character <code>#</code> in your log message, in which case you
would do <code>git config commit.cleanup whitespace</code> (note that you will
have to remove the help lines that begin with <code>#</code> in the commit log
template yourself, if you do this).
@@ -4529,7 +4529,7 @@ commit.verbose </dt>
<dd>
<p>
- A boolean or int to specify the level of verbose with <code>git commit</code>.
+ A boolean or int to specify the level of verbosity with <code>git commit</code>.
See <a href="git-commit.html">git-commit(1)</a>.
</p>
</dd>
@@ -4604,7 +4604,7 @@ credential.<url>.* <dd>
<p>
Any of the credential.* options above can be applied selectively to
- some credentials. For example "credential.https://example.com.username"
+ some credentials. For example, "credential.https://example.com.username"
would set the default username only for https connections to
example.com. See <a href="gitcredentials.html">gitcredentials(7)</a> for details on how URLs are
matched.
@@ -4624,7 +4624,7 @@ credentialStore.lockTimeoutMS <dd>
<p>
The length of time, in milliseconds, for git-credential-store to retry
- when trying to lock the credentials file. Value 0 means not to retry at
+ when trying to lock the credentials file. A value of 0 means not to retry at
all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
1s).
</p>
@@ -4648,7 +4648,7 @@ diff.autoRefreshIndex <dd>
<p>
When using <em>git diff</em> to compare with work tree
- files, do not consider stat-only change as changed.
+ files, do not consider stat-only changes 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
@@ -5429,8 +5429,8 @@ fastimport.unpackLimit <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
+ 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.
@@ -5598,8 +5598,8 @@ fetch.output <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.
+ <code>full</code> and <code>compact</code>. Default value is <code>full</code>. See the
+ OUTPUT section in <a href="git-fetch.html">git-fetch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
@@ -5829,7 +5829,7 @@ format.pretty </dt>
<dd>
<p>
- The default pretty format for log/show/whatchanged command,
+ The default pretty format for log/show/whatchanged command.
See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>,
<a href="git-whatchanged.html">git-whatchanged(1)</a>.
</p>
@@ -5991,12 +5991,12 @@ to accept pushes of such data set <code>receive.fsck.<msg-id></code> inste to clone or fetch it set <code>fetch.fsck.<msg-id></code>.</p></div>
<div class="paragraph"><p>The rest of the documentation discusses <code>fsck.*</code> for brevity, but the
same applies for the corresponding <code>receive.fsck.*</code> and
-<code>fetch.<msg-id>.*</code>. variables.</p></div>
-<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the
+<code>fetch.fsck.*</code>. variables.</p></div>
+<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code>, the
<code>receive.fsck.<msg-id></code> and <code>fetch.fsck.<msg-id></code> variables will not
fall back on the <code>fsck.<msg-id></code> configuration if they aren’t set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.</p></div>
+uniformly configure the same fsck settings in different circumstances,
+all three of them must be set to the same values.</p></div>
<div class="paragraph"><p>When <code>fsck.<msg-id></code> is set, errors can be switched to warnings and
vice versa by configuring the <code>fsck.<msg-id></code> setting where the
<code><msg-id></code> is the fsck message ID and the value is one of <code>error</code>,
@@ -6011,7 +6011,7 @@ allow new instances of the same breakages go unnoticed.</p></div> <div class="paragraph"><p>Setting an unknown <code>fsck.<msg-id></code> value will cause fsck to die, but
doing the same for <code>receive.fsck.<msg-id></code> and <code>fetch.fsck.<msg-id></code>
will only cause git to warn.</p></div>
-<div class="paragraph"><p>See <code>Fsck Messages</code> section of <a href="git-fsck.html">git-fsck(1)</a> for supported
+<div class="paragraph"><p>See the <code>Fsck Messages</code> section of <a href="git-fsck.html">git-fsck(1)</a> for supported
values of <code><msg-id></code>.</p></div>
</dd>
<dt class="hdlist1">
@@ -6021,12 +6021,12 @@ fsck.skipList <p>
The path to a list of object names (i.e. one unabbreviated SHA-1 per
line) that are known to be broken in a non-fatal way and should
- be ignored. On versions of Git 2.20 and later comments (<em>#</em>), empty
- lines, and any leading and trailing whitespace is ignored. Everything
+ be ignored. On versions of Git 2.20 and later, comments (<em>#</em>), empty
+ lines, and any leading and trailing whitespace are ignored. Everything
but a SHA-1 per line will error out on older versions.
</p>
<div class="paragraph"><p>This feature is useful when an established project should be accepted
-despite early commits containing errors that can be safely ignored
+despite early commits containing errors that can be safely ignored,
such as invalid committer email addresses. Note: corrupt objects
cannot be skipped with this setting.</p></div>
<div class="paragraph"><p>Like <code>fsck.<msg-id></code> this variable has corresponding
@@ -6034,10 +6034,10 @@ cannot be skipped with this setting.</p></div> <div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the
<code>receive.fsck.skipList</code> and <code>fetch.fsck.skipList</code> variables will not
fall back on the <code>fsck.skipList</code> configuration if they aren’t set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.</p></div>
+uniformly configure the same fsck settings in different circumstances,
+all three of them must be set to the same values.</p></div>
<div class="paragraph"><p>Older versions of Git (before 2.20) documented that the object names
-list should be sorted. This was never a requirement, the object names
+list should be sorted. This was never a requirement; the object names
could appear in any order, but when reading the list we tracked whether
the list was sorted for the purposes of an internal binary search
implementation, which could save itself some work with an already sorted
@@ -6050,7 +6050,7 @@ fsmonitor.allowRemote </dt>
<dd>
<p>
- By default, the fsmonitor daemon refuses to work against network-mounted
+ By default, the fsmonitor daemon refuses to work with network-mounted
repositories. Setting <code>fsmonitor.allowRemote</code> to <code>true</code> overrides this
behavior. Only respected when <code>core.fsmonitor</code> is set to <code>true</code>.
</p>
@@ -6105,7 +6105,7 @@ gc.auto default value is 6700.
</p>
<div class="paragraph"><p>Setting this to 0 disables not only automatic packing based on the
-number of loose objects, but any other heuristic <code>git gc --auto</code> will
+number of loose objects, but also any other heuristic <code>git gc --auto</code> will
otherwise use to determine if there’s work to do, such as
<code>gc.autoPackLimit</code>.</p></div>
</dd>
@@ -6128,7 +6128,7 @@ gc.autoDetach </dt>
<dd>
<p>
- Make <code>git gc --auto</code> return immediately and run in background
+ Make <code>git gc --auto</code> return immediately and run in the background
if the system supports it. Default is true.
</p>
</dd>
@@ -6581,7 +6581,7 @@ gpg.program same command-line interface as GPG, namely, to verify a detached
signature, "<code>gpg --verify $signature - <$file</code>" is run, and the
program is expected to signal a good signature by exiting with
- code 0, and to generate an ASCII-armored detached signature, the
+ code 0. To generate an ASCII-armored detached signature, the
standard input of "<code>gpg -bsau $key</code>" is fed with the contents to be
signed, and the program is expected to send the result to its
standard output.
@@ -6616,7 +6616,7 @@ gpg.minTrustLevel <p>
Specifies a minimum trust level for signature verification. If
this option is unset, then signature verification for merge
- operations require a key with at least <code>marginal</code> trust. Other
+ operations requires a key with at least <code>marginal</code> trust. Other
operations that perform signature verification require a key
with at least <code>undefined</code> trust. Setting this option overrides
the required trust-level for all operations. Supported values,
@@ -6655,7 +6655,7 @@ gpg.ssh.defaultKeyCommand </dt>
<dd>
<p>
- This command that will be run when user.signingkey is not set and a ssh
+ This command will be run when user.signingkey is not set and a ssh
signature is requested. On successful exit a valid ssh public key
prefixed with <code>key::</code> is expected in the first line of its output.
This allows for a script doing a dynamic lookup of the correct public
@@ -6762,7 +6762,7 @@ gui.newBranchTemplate </dt>
<dd>
<p>
- Is used as suggested name when creating new branches using the
+ Is used as a suggested name when creating new branches using the
<a href="git-gui.html">git-gui(1)</a>.
</p>
</dd>
@@ -7481,7 +7481,7 @@ http.noEPSV <dd>
<p>
A boolean which disables using of EPSV ftp command by curl.
- This can helpful with some "poor" ftp servers which don’t
+ This can be helpful with some "poor" ftp servers which don’t
support EPSV mode. Can be overridden by the <code>GIT_CURL_FTP_NO_EPSV</code>
environment variable. Default is false (curl will use EPSV).
</p>
@@ -7492,7 +7492,7 @@ http.userAgent <dd>
<p>
The HTTP USER_AGENT string presented to an HTTP server. The default
- value represents the version of the client Git such as git/1.7.1.
+ value represents the version of the Git client such as git/1.7.1.
This option allows you to override this value to a more common value
such as Mozilla/4.0. This may be necessary, for instance, if
connecting through a firewall that restricts HTTP connections to a set
@@ -7592,7 +7592,7 @@ i18n.commitEncoding Character encoding the commit messages are stored in; Git itself
does not care per se, but this information is necessary e.g. when
importing commits from emails or in the gitk graphical history
- browser (and possibly at other places in the future or in other
+ browser (and possibly in other places in the future or in other
porcelains). See e.g. <a href="git-mailinfo.html">git-mailinfo(1)</a>. Defaults to <em>utf-8</em>.
</p>
</dd>
@@ -7620,7 +7620,7 @@ imap.tunnel </dt>
<dd>
<p>
- Command used to setup a tunnel to the IMAP server through which
+ Command used to set up a tunnel to the IMAP server through which
commands will be piped instead of using a direct network connection
to the server. Required when imap.host is not set.
</p>
@@ -7688,7 +7688,7 @@ imap.authMethod </dt>
<dd>
<p>
- Specify authenticate method for authentication with IMAP server.
+ Specify the authentication method for authenticating with the IMAP server.
If Git was built with the NO_CURL option, or if your curl version is older
than 7.34.0, or if you’re running git-imap-send with the <code>--no-curl</code>
option, the only supported method is <em>CRAM-MD5</em>. If this is not set
@@ -7753,7 +7753,7 @@ index.threads Specifies the number of threads to spawn when loading the index.
This is meant to reduce index load time on multiprocessor machines.
Specifying 0 or <em>true</em> will cause Git to auto-detect the number of
- CPU’s and set the number of threads accordingly. Specifying 1 or
+ CPUs and set the number of threads accordingly. Specifying 1 or
<em>false</em> will disable multithreading. Defaults to <em>true</em>.
</p>
</dd>
@@ -7894,7 +7894,7 @@ log.date <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
+"foo" will be used for the date format. Otherwise, "default" will
be used.</p></div>
</dd>
<dt class="hdlist1">
@@ -8015,7 +8015,7 @@ mailinfo.scissors <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
+ was provided on the command-line. When active, this feature
removes everything from the message body before a scissors
line (i.e. consisting mainly of ">8", "8<" and "-").
</p>
@@ -8072,7 +8072,7 @@ maintenance.strategy <div class="ulist"><ul>
<li>
<p>
-<code>none</code>: This default setting implies no task are run at any schedule.
+<code>none</code>: This default setting implies no tasks are run at any schedule.
</p>
</li>
<li>
@@ -8167,7 +8167,7 @@ man.<tool>.cmd <p>
Specify the command to invoke the specified man viewer. The
specified command is evaluated in shell with the man page
- passed as argument. (See <a href="git-help.html">git-help(1)</a>.)
+ passed as an argument. (See <a href="git-help.html">git-help(1)</a>.)
</p>
</dd>
<dt class="hdlist1">
@@ -8192,7 +8192,7 @@ merge.conflictStyle marker and the original text before the <code>=======</code> marker. The
"merge" style tends to produce smaller conflict regions than diff3,
both because of the exclusion of the original text, and because
- when a subset of lines match on the two sides they are just pulled
+ when a subset of lines match on the two sides, they are just pulled
out of the conflict region. Another alternate style, "zdiff3", is
similar to diff3 but removes matching lines on the two sides from
the conflict region when those matching lines appear near either
@@ -8727,8 +8727,8 @@ mergetool.<tool>.trustExitCode For a custom merge command, specify whether the exit code of
the merge command can be used to determine whether the merge was
successful. If this is not set to true then the merge target file
- timestamp is checked and the merge assumed to have been successful
- if the file has been updated, otherwise the user is prompted to
+ timestamp is checked, and the merge is assumed to have been successful
+ if the file has been updated; otherwise, the user is prompted to
indicate the success of the merge.
</p>
</dd>
@@ -8752,7 +8752,7 @@ mergetool.meld.useAutoMerge <dd>
<p>
When the <code>--auto-merge</code> is given, meld will merge all non-conflicting
- parts automatically, highlight the conflicting parts and wait for
+ parts automatically, highlight the conflicting parts, and wait for
user decision. Setting <code>mergetool.meld.useAutoMerge</code> to <code>true</code> tells
Git to unconditionally use the <code>--auto-merge</code> option with <code>meld</code>.
Setting this value to <code>auto</code> makes git detect whether <code>--auto-merge</code>
@@ -8767,7 +8767,7 @@ mergetool.vimdiff.layout <dd>
<p>
The vimdiff backend uses this variable to control how its split
- windows look like. Applies even if you are using Neovim (<code>nvim</code>) or
+ windows appear. Applies even if you are using Neovim (<code>nvim</code>) or
gVim (<code>gvim</code>) as the merge tool. See BACKEND SPECIFIC HINTS section
in <a href="git-mergetool.html">git-mergetool(1)</a>.
for details.
@@ -8778,7 +8778,7 @@ mergetool.hideResolved </dt>
<dd>
<p>
- During a merge Git will automatically resolve as many conflicts as
+ During a merge, Git will automatically resolve as many conflicts as
possible and write the <em>MERGED</em> file containing conflict markers around
any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally
represent the versions of the file from before Git’s conflict
@@ -8807,7 +8807,7 @@ mergetool.keepTemporaries When invoking a custom merge tool, Git uses a set of temporary
files to pass to the tool. If the tool returns an error and this
variable is set to <code>true</code>, then these temporary files will be
- preserved, otherwise they will be removed after the tool has
+ preserved; otherwise, they will be removed after the tool has
exited. Defaults to <code>false</code>.
</p>
</dd>
@@ -8849,7 +8849,7 @@ notes.mergeStrategy <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"
+ <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See the "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
@@ -9056,7 +9056,7 @@ pack.threads warning. This is meant to reduce packing time on multiprocessor
machines. The required amount of memory for the delta search window
is however multiplied by the number of threads.
- Specifying 0 will cause Git to auto-detect the number of CPU’s
+ Specifying 0 will cause Git to auto-detect the number of CPUs
and set the number of threads accordingly.
</p>
</dd>
@@ -9070,11 +9070,11 @@ pack.indexVersion the new pack index with capabilities for packs larger than 4 GB
as well as proper protection against the repacking of corrupted
packs. Version 2 is the default. Note that version 2 is enforced
- and this config option ignored whenever the corresponding pack is
+ and this config option is ignored whenever the corresponding pack is
larger than 2 GB.
</p>
<div class="paragraph"><p>If you have an old Git that does not understand the version 2 <code>*.idx</code> file,
-cloning or fetching over a non native protocol (e.g. "http")
+cloning or fetching over a non-native protocol (e.g. "http")
that will copy both <code>*.pack</code> file and corresponding <code>*.idx</code> file from the
other side may give you a repository that cannot be accessed with your
older version of Git. If the <code>*.pack</code> file is smaller than 2 GB, however,
@@ -9093,8 +9093,8 @@ pack.packSizeLimit in the creation of multiple packfiles.
</p>
<div class="paragraph"><p>Note that this option is rarely useful, and may result in a larger total
-on-disk size (because Git will not store deltas between packs), as well
-as worse runtime performance (object lookup within multiple packs is
+on-disk size (because Git will not store deltas between packs) and
+worse runtime performance (object lookup within multiple packs is
slower than a single pack, and optimizations like reachability bitmaps
cannot cope with multiple packs).</p></div>
<div class="paragraph"><p>If you need to actively run Git using smaller packfiles (e.g., because your
@@ -9487,7 +9487,7 @@ push.default </li>
<li>
<p>
-<code>simple</code> - pushes the current branch with the same name on the remote.
+<code>simple</code> - push 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
@@ -9524,7 +9524,7 @@ push.followTags </dt>
<dd>
<p>
- If set to true enable <code>--follow-tags</code> option by default. You
+ 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>
@@ -9797,7 +9797,7 @@ receive.certNonceSeed <dd>
<p>
By setting this variable to a string, <code>git receive-pack</code>
- will accept a <code>git push --signed</code> and verifies it by using
+ will accept a <code>git push --signed</code> and verify it by using
a "nonce" protected by HMAC using this string as a secret
key.
</p>
@@ -9807,7 +9807,7 @@ receive.certNonceSlop </dt>
<dd>
<p>
- When a <code>git push --signed</code> sent a push certificate with a
+ When a <code>git push --signed</code> sends a push certificate with a
"nonce" that was issued by a receive-pack serving the same
repository within this many seconds, export the "nonce"
found in the certificate to <code>GIT_PUSH_CERT_NONCE</code> to the
@@ -10273,7 +10273,7 @@ rerere.autoUpdate <p>
When set to true, <code>git-rerere</code> updates the index with the
resulting contents after it cleanly resolves conflicts using
- previously recorded resolution. Defaults to false.
+ previously recorded resolutions. Defaults to false.
</p>
</dd>
<dt class="hdlist1">
@@ -10324,7 +10324,7 @@ config. This will protect you from attacks that involve cloning a repository that contains a bare repository and running a Git command
within that directory.</p></div>
<div class="paragraph"><p>This config setting is only respected in protected configuration (see
-<a href="#SCOPES">[SCOPES]</a>). This prevents the untrusted repository from tampering with
+<a href="#SCOPES">[SCOPES]</a>). This prevents untrusted repositories from tampering with
this value.</p></div>
</li>
</ul></div>
@@ -10347,7 +10347,7 @@ via <code>git config --add</code>. To reset the list of safe directories (e.g. t override any such directories specified in the system config), add a
<code>safe.directory</code> entry with an empty value.</p></div>
<div class="paragraph"><p>This config setting is only respected in protected configuration (see
-<a href="#SCOPES">[SCOPES]</a>). This prevents the untrusted repository from tampering with this
+<a href="#SCOPES">[SCOPES]</a>). This prevents untrusted repositories from tampering with this
value.</p></div>
<div class="paragraph"><p>The value of this setting is interpolated, i.e. <code>~/<path></code> expands to a
path relative to the home directory and <code>%(prefix)/<path></code> expands to a
@@ -10449,7 +10449,7 @@ sendemail.aliasFileType <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>.
+ one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, <em>elm</em>, <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
@@ -10592,7 +10592,7 @@ sendemail.smtpReloginDelay </dt>
<dd>
<p>
- Seconds wait before reconnecting to smtp server.
+ Seconds to wait before reconnecting to the smtp server.
See also the <code>--relogin-delay</code> option of <a href="git-send-email.html">git-send-email(1)</a>.
</p>
</dd>
@@ -10614,7 +10614,7 @@ sequence.editor Text editor used by <code>git rebase -i</code> for editing the rebase instruction file.
The value is meant to be interpreted by the shell when it is used.
It can be overridden by the <code>GIT_SEQUENCE_EDITOR</code> environment variable.
- When not configured the default commit message editor is used instead.
+ When not configured, the default commit message editor is used instead.
</p>
</dd>
<dt class="hdlist1">
@@ -10665,10 +10665,10 @@ splitIndex.maxPercentChange percent of entries the split index can contain compared to the
total number of entries in both the split index and the shared
index before a new shared index is written.
- The value should be between 0 and 100. If the value is 0 then
- a new shared index is always written, if it is 100 a new
+ The value should be between 0 and 100. If the value is 0, then
+ a new shared index is always written; if it is 100, a new
shared index is never written.
- By default the value is 20, so a new shared index is written
+ By default, the value is 20, so a new shared index is written
if the number of entries in the split index would be greater
than 20 percent of the total number of entries.
See <a href="git-update-index.html">git-update-index(1)</a>.
@@ -10835,7 +10835,7 @@ status.showUntrackedFiles contain only untracked files, are shown with the directory name
only. Showing untracked files means that Git needs to lstat() all
the files in the whole repository, which might be slow on some
- systems. So, this variable controls how the commands displays
+ systems. So, this variable controls how the commands display
the untracked files. Possible values are:
</p>
<div class="openblock">
@@ -10868,7 +10868,7 @@ status.submoduleSummary <dd>
<p>
Defaults to false.
- If this is set to a non zero number or true (identical to -1 or an
+ If this is set to a non-zero number or true (identical to -1 or an
unlimited number), the submodule summary will be enabled and a
summary of commits for modified submodules will be shown (see
--summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>). Please note
@@ -10890,7 +10890,7 @@ stash.showIncludeUntracked <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>.
+ the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -10900,7 +10900,7 @@ stash.showPatch <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>.
+ See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -10909,8 +10909,8 @@ stash.showStat <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>.
+ option will show a diffstat of the stash entry. Defaults to true.
+ See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -10921,7 +10921,7 @@ submodule.<name>.url The URL for a submodule. This variable is copied from the .gitmodules
file to the git config via <em>git submodule init</em>. The user can change
the configured URL before obtaining the submodule via <em>git submodule
- update</em>. If neither submodule.<name>.active or submodule.active are
+ update</em>. If neither submodule.<name>.active nor submodule.active are
set, the presence of this variable is used as a fallback to indicate
whether the submodule is of interest to git commands.
See <a href="git-submodule.html">git-submodule(1)</a> and <a href="gitmodules.html">gitmodules(5)</a> for details.
@@ -10974,7 +10974,7 @@ submodule.<name>.ignore a submodule as modified. When set to "all", it will never be considered
modified (but it will nonetheless show up in the output of status and
commit when it has been staged), "dirty" will ignore all changes
- to the submodules work tree and
+ to the submodule’s work tree and
takes only differences between the HEAD of the submodule and the commit
recorded in the superproject into account. "untracked" will additionally
let submodules with modified tracked files in their work tree show up.
@@ -11294,7 +11294,7 @@ trace2.maxFiles <dd>
<p>
Integer. When writing trace files to a target directory, do not
- write additional traces if we would exceed this many files. Instead,
+ write additional traces if doing so would exceed this many files. Instead,
write a sentinel file that will block further tracing to this
directory. Defaults to 0, which disables this check.
</p>
@@ -11312,7 +11312,7 @@ transfer.credentialsInUrl and any other direct use of the configured URL.
</p>
<div class="paragraph"><p>Note that this is currently limited to detecting credentials in
-<code>remote.<name>.url</code> configuration, it won’t detect credentials in
+<code>remote.<name>.url</code> configuration; it won’t detect credentials in
<code>remote.<name>.pushurl</code> configuration.</p></div>
<div class="paragraph"><p>You might want to enable this to prevent inadvertent credentials
exposure, e.g. because:</p></div>
@@ -11340,7 +11340,7 @@ The git programs will pass the full URL to one another as arguments documented in procfs(5) allows for configuring this behavior.
</p>
<div class="paragraph"><p>If such concerns don’t apply to you then you probably don’t need to be
-concerned about credentials exposure due to storing that sensitive
+concerned about credentials exposure due to storing sensitive
data in git’s configuration files. If you do want to use this, set
<code>transfer.credentialsInUrl</code> to one of these values:</p></div>
</li>
@@ -11677,14 +11677,14 @@ committer.email <dd>
<p>
The <code>user.name</code> and <code>user.email</code> variables determine what ends
- up in the <code>author</code> and <code>committer</code> field of commit
+ up in the <code>author</code> and <code>committer</code> fields of commit
objects.
If you need the <code>author</code> or <code>committer</code> to be different, the
- <code>author.name</code>, <code>author.email</code>, <code>committer.name</code> or
+ <code>author.name</code>, <code>author.email</code>, <code>committer.name</code>, or
<code>committer.email</code> variables can be set.
- Also, all of these can be overridden by the <code>GIT_AUTHOR_NAME</code>,
+ All of these can be overridden by the <code>GIT_AUTHOR_NAME</code>,
<code>GIT_AUTHOR_EMAIL</code>, <code>GIT_COMMITTER_NAME</code>,
- <code>GIT_COMMITTER_EMAIL</code> and <code>EMAIL</code> environment variables.
+ <code>GIT_COMMITTER_EMAIL</code>, and <code>EMAIL</code> environment variables.
</p>
<div class="paragraph"><p>Note that the <code>name</code> forms of these variables conventionally refer to
some form of a personal name. See <a href="git-commit.html">git-commit(1)</a> and the
@@ -11721,7 +11721,7 @@ user.signingKey your private ssh key or the public key when ssh-agent is used.
Alternatively it can contain a public key prefixed with <code>key::</code>
directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
- needs to be available via ssh-agent. If not set git will call
+ needs to be available via ssh-agent. If not set Git will call
gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
first key available. For backward compatibility, a raw key which
begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
@@ -11759,13 +11759,13 @@ with those suffixes. E.g. if "-pre" appears before "-rc" in the configuration, then all "1.0-preX" tags will be listed before any
"1.0-rcX" tags. The placement of the main release tag relative to tags
with various suffixes can be determined by specifying the empty suffix
-among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and
+among those other suffixes. E.g. if the suffixes "-rc", "", "-ck", and
"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags
are listed first, followed by "v4.8", then "v4.8-ckX" and finally
"v4.8-bfsX".</p></div>
-<div class="paragraph"><p>If more than one suffixes match the same tagname, then that tagname will
+<div class="paragraph"><p>If more than one suffix matches the same tagname, then that tagname will
be sorted according to the suffix which starts at the earliest position in
-the tagname. If more than one different matching suffixes start at
+the tagname. If more than one different matching suffix starts at
that earliest position, then that tagname will be sorted according to the
longest of those suffixes.
The sorting order between different suffixes is undefined if they are
diff --git a/git-count-objects.html b/git-count-objects.html index e13c6b1a2..d54a5c898 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -757,7 +757,7 @@ git-count-objects(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This counts the number of unpacked object files and disk space consumed by
+<div class="paragraph"><p>Counts the number of unpacked object files and disk space consumed by
them, to help you decide when it is a good time to repack.</p></div>
</div>
</div>
@@ -773,7 +773,7 @@ them, to help you decide when it is a good time to repack.</p></div> </dt>
<dd>
<p>
- Report in more detail:
+ Provide more detailed reports:
</p>
<div class="paragraph"><p>count: the number of loose objects</p></div>
<div class="paragraph"><p>size: disk space consumed by loose objects, in KiB (unless -H is specified)</p></div>
@@ -781,7 +781,7 @@ them, to help you decide when it is a good time to repack.</p></div> <div class="paragraph"><p>size-pack: disk space consumed by the packs, in KiB (unless -H is specified)</p></div>
<div class="paragraph"><p>prune-packable: the number of loose objects that are also present in
the packs. These objects could be pruned using <code>git prune-packed</code>.</p></div>
-<div class="paragraph"><p>garbage: the number of files in object database that are neither valid loose
+<div class="paragraph"><p>garbage: the number of files in the object database that are neither valid loose
objects nor valid packs</p></div>
<div class="paragraph"><p>size-garbage: disk space consumed by garbage files, in KiB (unless -H is
specified)</p></div>
@@ -815,7 +815,7 @@ Print sizes in human readable format <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-count-objects.txt b/git-count-objects.txt index cb9b4d2e4..97f9f1261 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -This counts the number of unpacked object files and disk space consumed by +Counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack. @@ -20,7 +20,7 @@ OPTIONS ------- -v:: --verbose:: - Report in more detail: + Provide more detailed reports: + count: the number of loose objects + @@ -33,7 +33,7 @@ size-pack: disk space consumed by the packs, in KiB (unless -H is specified) prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`. + -garbage: the number of files in object database that are neither valid loose +garbage: the number of files in the object database that are neither valid loose objects nor valid packs + size-garbage: disk space consumed by garbage files, in KiB (unless -H is diff --git a/git-credential-cache.html b/git-credential-cache.html index 8ef664dc4..bfe10c977 100644 --- a/git-credential-cache.html +++ b/git-credential-cache.html @@ -759,7 +759,7 @@ git-credential-cache(1) Manual Page <div class="sectionbody">
<div class="paragraph"><p>This command caches credentials for use by future Git programs.
The stored credentials are kept in memory of the cache-daemon
-process (instead of written to a file) and are forgotten after a
+process (instead of being written to a file) and are forgotten after a
configurable timeout. Credentials are forgotten sooner if the
cache-daemon dies, for example if the system restarts. The cache
is accessible over a Unix domain socket, restricted to the current
@@ -845,7 +845,7 @@ variable (this example increases the cache time to 1 hour):</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-02-09 16:57:15 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-credential-cache.txt b/git-credential-cache.txt index f473994a8..487cc557a 100644 --- a/git-credential-cache.txt +++ b/git-credential-cache.txt @@ -16,7 +16,7 @@ DESCRIPTION This command caches credentials for use by future Git programs. The stored credentials are kept in memory of the cache-daemon -process (instead of written to a file) and are forgotten after a +process (instead of being written to a file) and are forgotten after a configurable timeout. Credentials are forgotten sooner if the cache-daemon dies, for example if the system restarts. The cache is accessible over a Unix domain socket, restricted to the current diff --git a/git-credential-store.html b/git-credential-store.html index 1bcd68344..c64a1ae50 100644 --- a/git-credential-store.html +++ b/git-credential-store.html @@ -786,7 +786,7 @@ be used as a credential helper by other parts of git. See <p>
Use <code><path></code> to lookup and store credentials. The file will have its
filesystem permissions set to prevent other users on the system
- from reading it, but will not be encrypted or otherwise
+ from reading it, but it will not be encrypted or otherwise
protected. If not specified, credentials will be searched for from
<code>~/.git-credentials</code> and <code>$XDG_CONFIG_HOME/git/credentials</code>, and
credentials will be written to <code>~/.git-credentials</code> if it exists, or
@@ -882,7 +882,7 @@ for more information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-05-11 19:34:31 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-credential-store.txt b/git-credential-store.txt index 76b079885..71864a872 100644 --- a/git-credential-store.txt +++ b/git-credential-store.txt @@ -33,7 +33,7 @@ OPTIONS Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system - from reading it, but will not be encrypted or otherwise + from reading it, but it will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or diff --git a/git-credential.html b/git-credential.html index 19960da87..ce596fc64 100644 --- a/git-credential.html +++ b/git-credential.html @@ -845,7 +845,7 @@ Report on the success or failure of the password. If the that <code>git credential</code> will ask for a new password in its next
invocation. In either case, <code>git credential</code> should be fed with
the credential description obtained from step (2) (which also
- contain the ones provided in step (1)).
+ contains the fields provided in step (1)).
</p>
</li>
</ol></div>
@@ -986,7 +986,7 @@ to pass additional information to credential helpers.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-credential.txt b/git-credential.txt index a220afed4..918a0aa42 100644 --- a/git-credential.txt +++ b/git-credential.txt @@ -94,7 +94,7 @@ unlocked) before it returned `password=secr3t`. that `git credential` will ask for a new password in its next invocation. In either case, `git credential` should be fed with the credential description obtained from step (2) (which also - contain the ones provided in step (1)). + contains the fields provided in step (1)). [[IOFMT]] INPUT/OUTPUT FORMAT diff --git a/git-daemon.html b/git-daemon.html index 11074ebda..5e2fa7ad5 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -972,7 +972,7 @@ otherwise <code>stderr</code>.</p></div> <dd>
<p>
Allow ~user notation to be used in requests. When
- specified with no parameter, requests to
+ specified with no parameter, a request to
git://host/~alice/foo is taken as a request to access
<em>foo</em> repository in the home directory of user <code>alice</code>.
If <code>--user-path=path</code> is specified, the same request is
@@ -1281,7 +1281,7 @@ services are performed.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-07-27 09:46:08 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-daemon.txt b/git-daemon.txt index 236df516c..e064f91c9 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -138,7 +138,7 @@ otherwise `stderr`. --user-path:: --user-path=<path>:: Allow {tilde}user notation to be used in requests. When - specified with no parameter, requests to + specified with no parameter, a request to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is diff --git a/git-diff-files.html b/git-diff-files.html index 827314312..2c512cf73 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1792,7 +1792,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -2067,7 +2067,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </dt>
<dd>
<p>
- Diff against the "base" version, "our branch" or "their
+ Diff against the "base" version, "our branch", or "their
branch" respectively. With these options, diffs for
merged entries are not shown.
</p>
@@ -2084,7 +2084,7 @@ omit diff output for unmerged entries and just show "Unmerged".</p></div> <dd>
<p>
This compares stage 2 (our branch), stage 3 (their
- branch) and the working tree file and outputs a combined
+ branch), and the working tree file and outputs a combined
diff, similar to the way <em>diff-tree</em> shows a merge
commit with these flags.
</p>
@@ -2094,7 +2094,7 @@ omit diff output for unmerged entries and just show "Unmerged".</p></div> </dt>
<dd>
<p>
- Remain silent even on nonexistent files
+ Remain silent even for nonexistent files
</p>
</dd>
</dl></div>
@@ -2368,7 +2368,7 @@ diff format:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
</p>
<div class="literalblock">
<div class="content">
@@ -2377,9 +2377,9 @@ It is preceded with a "git diff" header that looks like this: <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p></div>
+the file that the rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -2440,7 +2440,7 @@ rename to a</code></pre> <p>
Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
- <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
+ <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
specific languages.
</p>
</li>
@@ -2455,7 +2455,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
<code>--diff-merges</code> option to any of these commands to force generation of
-diffs in specific format.</p></div>
+diffs in a specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -2490,7 +2490,7 @@ index fabadb8,cc95eb0..4866510 <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header, that looks like
+It is preceded by a "git diff" header, that looks like
this (when the <code>-c</code> option is used):
</p>
<div class="literalblock">
@@ -2517,25 +2517,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
-information about detected contents movement (renames and
-copying detection) are designed to work with diff of two
+information about detected content movement (renames and
+copying detection) are designed to work with the diff of two
<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
-It is followed by two-line from-file/to-file header
+It is followed by a two-line from-file/to-file header:
</p>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
+++ b/file</code></pre>
</div></div>
-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit</p></div>
+two-line from-file/to-file, you get an N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
@@ -2578,7 +2578,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <code>-</code> removals from both file1 and
file2, plus <code>++</code> to mean one line that was added does not appear
-in either file1 or file2). Also eight other lines are the same
+in either file1 or file2). Also, eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -2716,7 +2716,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</ <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-diff-files.txt b/git-diff-files.txt index 591e3801b..bf78e3143 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -26,7 +26,7 @@ include::diff-options.txt[] -2 --ours:: -3 --theirs:: -0:: - Diff against the "base" version, "our branch" or "their + Diff against the "base" version, "our branch", or "their branch" respectively. With these options, diffs for merged entries are not shown. + @@ -37,12 +37,12 @@ omit diff output for unmerged entries and just show "Unmerged". -c:: --cc:: This compares stage 2 (our branch), stage 3 (their - branch) and the working tree file and outputs a combined + branch), and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge commit with these flags. -q:: - Remain silent even on nonexistent files + Remain silent even for nonexistent files include::diff-format.txt[] diff --git a/git-diff-index.html b/git-diff-index.html index 689d7fda4..238db47ca 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -757,10 +757,10 @@ git-diff-index(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Compares the content and mode of the blobs found in a tree object
+<div class="paragraph"><p>Compare the content and mode of the blobs found in a tree object
with the corresponding tracked files in the working tree, or with the
corresponding paths in the index. When <path> arguments are present,
-compares only paths matching those patterns. Otherwise all tracked
+compare only paths matching those patterns. Otherwise all tracked
files are compared.</p></div>
</div>
</div>
@@ -1793,7 +1793,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -2362,7 +2362,7 @@ diff format:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
</p>
<div class="literalblock">
<div class="content">
@@ -2371,9 +2371,9 @@ It is preceded with a "git diff" header that looks like this: <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p></div>
+the file that the rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -2434,7 +2434,7 @@ rename to a</code></pre> <p>
Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
- <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
+ <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
specific languages.
</p>
</li>
@@ -2449,7 +2449,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
<code>--diff-merges</code> option to any of these commands to force generation of
-diffs in specific format.</p></div>
+diffs in a specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -2484,7 +2484,7 @@ index fabadb8,cc95eb0..4866510 <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header, that looks like
+It is preceded by a "git diff" header, that looks like
this (when the <code>-c</code> option is used):
</p>
<div class="literalblock">
@@ -2511,25 +2511,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
-information about detected contents movement (renames and
-copying detection) are designed to work with diff of two
+information about detected content movement (renames and
+copying detection) are designed to work with the diff of two
<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
-It is followed by two-line from-file/to-file header
+It is followed by a two-line from-file/to-file header:
</p>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
+++ b/file</code></pre>
</div></div>
-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit</p></div>
+two-line from-file/to-file, you get an N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
@@ -2572,7 +2572,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <code>-</code> removals from both file1 and
file2, plus <code>++</code> to mean one line that was added does not appear
-in either file1 or file2). Also eight other lines are the same
+in either file1 or file2). Also, eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -2810,7 +2810,7 @@ always have the special all-zero sha1.</td> <div id="footer">
<div id="footer-text">
Last updated
- 2022-07-11 16:06:18 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-diff-index.txt b/git-diff-index.txt index c30d8f0da..4de1d4c8f 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -13,10 +13,10 @@ SYNOPSIS DESCRIPTION ----------- -Compares the content and mode of the blobs found in a tree object +Compare the content and mode of the blobs found in a tree object with the corresponding tracked files in the working tree, or with the corresponding paths in the index. When <path> arguments are present, -compares only paths matching those patterns. Otherwise all tracked +compare only paths matching those patterns. Otherwise all tracked files are compared. OPTIONS diff --git a/git-diff-tree.html b/git-diff-tree.html index d2f41be8a..54ca361f9 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -759,7 +759,7 @@ git-diff-tree(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
+<div class="paragraph"><p>Compare the content and mode of blobs found via two tree objects.</p></div>
<div class="paragraph"><p>If there is only one <tree-ish> given, the commit is compared with its parents
(see --stdin below).</p></div>
<div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
@@ -1794,7 +1794,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -2077,7 +2077,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </dt>
<dd>
<p>
- recurse into sub-trees
+ Recurse into sub-trees.
</p>
</dd>
<dt class="hdlist1">
@@ -2085,7 +2085,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< </dt>
<dd>
<p>
- show tree entry itself as well as subtrees. Implies -r.
+ Show tree entry itself as well as subtrees. Implies -r.
</p>
</dd>
<dt class="hdlist1">
@@ -2148,7 +2148,7 @@ commits (but not trees).</p></div> By default, <em>git diff-tree --stdin</em> shows differences,
either in machine-readable form (without <code>-p</code>) or in patch
form (with <code>-p</code>). This output can be suppressed. It is
- only useful with <code>-v</code> flag.
+ only useful with the <code>-v</code> flag.
</p>
</dd>
<dt class="hdlist1">
@@ -2241,7 +2241,7 @@ people using 80-column terminals.</p></div> <dd>
<p>
Perform a tab expansion (replace each tab with enough spaces
- to fill to the next display column that is multiple of <em><n></em>)
+ to fill to the next display column that is a multiple of <em><n></em>)
in the log message before showing it in the output.
<code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
<code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
@@ -2268,7 +2268,7 @@ environment overrides). See <a href="git-config.html">git-config(1)</a> for more <div class="paragraph"><p>With an optional <em><ref></em> argument, use the ref to find the notes
to display. The ref can specify the full refname when it begins
with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
-<code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div>
+<code>refs/notes/</code> is prefixed to form the full name of the ref.</p></div>
<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
being displayed. Examples: "--notes=foo" will show only notes from
"refs/notes/foo"; "--notes=foo --notes" will show both notes from
@@ -2348,10 +2348,10 @@ being displayed. Examples: "--notes=foo" will show only notes from This flag changes the way a merge commit patch is displayed,
in a similar way to the <code>-c</code> option. It implies the <code>-c</code>
and <code>-p</code> options and further compresses the patch output
- by omitting uninteresting hunks whose the contents in the parents
+ by omitting uninteresting hunks whose contents in the parents
have only two variants and the merge result picks one of them
without modification. When all hunks are uninteresting, the commit
- itself and the commit log message is not shown, just like in any other
+ itself and the commit log message are not shown, just like in any other
"empty diff" case.
</p>
</dd>
@@ -3696,7 +3696,7 @@ diff format:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
</p>
<div class="literalblock">
<div class="content">
@@ -3705,9 +3705,9 @@ It is preceded with a "git diff" header that looks like this: <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p></div>
+the file that the rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -3768,7 +3768,7 @@ rename to a</code></pre> <p>
Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
- <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
+ <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
specific languages.
</p>
</li>
@@ -3783,7 +3783,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
<code>--diff-merges</code> option to any of these commands to force generation of
-diffs in specific format.</p></div>
+diffs in a specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -3818,7 +3818,7 @@ index fabadb8,cc95eb0..4866510 <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header, that looks like
+It is preceded by a "git diff" header, that looks like
this (when the <code>-c</code> option is used):
</p>
<div class="literalblock">
@@ -3845,25 +3845,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
-information about detected contents movement (renames and
-copying detection) are designed to work with diff of two
+information about detected content movement (renames and
+copying detection) are designed to work with the diff of two
<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
-It is followed by two-line from-file/to-file header
+It is followed by a two-line from-file/to-file header:
</p>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
+++ b/file</code></pre>
</div></div>
-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit</p></div>
+two-line from-file/to-file, you get an N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
@@ -3906,7 +3906,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <code>-</code> removals from both file1 and
file2, plus <code>++</code> to mean one line that was added does not appear
-in either file1 or file2). Also eight other lines are the same
+in either file1 or file2). Also, eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -4044,7 +4044,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</ <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 274d5eaba..143318c41 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -15,7 +15,7 @@ SYNOPSIS DESCRIPTION ----------- -Compares the content and mode of the blobs found via two tree objects. +Compare the content and mode of blobs found via two tree objects. If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below). @@ -34,10 +34,10 @@ include::diff-options.txt[] matching one of the provided pathspecs. -r:: - recurse into sub-trees + Recurse into sub-trees. -t:: - show tree entry itself as well as subtrees. Implies -r. + Show tree entry itself as well as subtrees. Implies -r. --root:: When `--root` is specified the initial commit will be shown as a big @@ -78,7 +78,7 @@ commits (but not trees). By default, 'git diff-tree --stdin' shows differences, either in machine-readable form (without `-p`) or in patch form (with `-p`). This output can be suppressed. It is - only useful with `-v` flag. + only useful with the `-v` flag. -v:: This flag causes 'git diff-tree --stdin' to also show @@ -104,10 +104,10 @@ include::pretty-options.txt[] This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output - by omitting uninteresting hunks whose the contents in the parents + by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit - itself and the commit log message is not shown, just like in any other + itself and the commit log message are not shown, just like in any other "empty diff" case. --combined-all-paths:: diff --git a/git-diff.html b/git-diff.html index cd2783008..34f703e50 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1934,7 +1934,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -2504,7 +2504,7 @@ diff format:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
</p>
<div class="literalblock">
<div class="content">
@@ -2513,9 +2513,9 @@ It is preceded with a "git diff" header that looks like this: <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p></div>
+the file that the rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -2576,7 +2576,7 @@ rename to a</code></pre> <p>
Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
- <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
+ <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
specific languages.
</p>
</li>
@@ -2591,7 +2591,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
<code>--diff-merges</code> option to any of these commands to force generation of
-diffs in specific format.</p></div>
+diffs in a specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -2626,7 +2626,7 @@ index fabadb8,cc95eb0..4866510 <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header, that looks like
+It is preceded by a "git diff" header, that looks like
this (when the <code>-c</code> option is used):
</p>
<div class="literalblock">
@@ -2653,25 +2653,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
-information about detected contents movement (renames and
-copying detection) are designed to work with diff of two
+information about detected content movement (renames and
+copying detection) are designed to work with the diff of two
<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
-It is followed by two-line from-file/to-file header
+It is followed by a two-line from-file/to-file header:
</p>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
+++ b/file</code></pre>
</div></div>
-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit</p></div>
+two-line from-file/to-file, you get an N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
@@ -2714,7 +2714,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <code>-</code> removals from both file1 and
file2, plus <code>++</code> to mean one line that was added does not appear
-in either file1 or file2). Also eight other lines are the same
+in either file1 or file2). Also, eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -3011,7 +3011,7 @@ diff.autoRefreshIndex <dd>
<p>
When using <em>git diff</em> to compare with work tree
- files, do not consider stat-only change as changed.
+ files, do not consider stat-only changes 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
diff --git a/git-difftool.html b/git-difftool.html index 6f904f826..62858e6a9 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -807,7 +807,7 @@ to <em>git diff</em> and accepts the same options and arguments. See <dd>
<p>
Start showing the diff for the given path,
- the paths before it will move to end and output.
+ the paths before it will move to the end and output.
</p>
</dd>
<dt class="hdlist1">
@@ -867,7 +867,7 @@ with custom merge tool commands and has the same value as <code>$MERGED</code>.< </dt>
<dd>
<p>
- <em>git difftool</em>'s default behavior is create symlinks to the
+ <em>git difftool</em>'s default behavior is to create symlinks to the
working tree when run in <code>--dir-diff</code> mode and the right-hand
side of the comparison yields the same content as the file in
the working tree.
@@ -1055,7 +1055,7 @@ difftool.guiDefault <div id="footer">
<div id="footer-text">
Last updated
- 2023-04-17 21:53:20 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-difftool.txt b/git-difftool.txt index ac0ac6fa0..50cb08008 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -36,7 +36,7 @@ OPTIONS --rotate-to=<file>:: Start showing the diff for the given path, - the paths before it will move to end and output. + the paths before it will move to the end and output. --skip-to=<file>:: Start showing the diff for the given path, skipping all @@ -78,7 +78,7 @@ with custom merge tool commands and has the same value as `$MERGED`. Print a list of diff tools that may be used with `--tool`. --[no-]symlinks:: - 'git difftool''s default behavior is create symlinks to the + 'git difftool''s default behavior is to create symlinks to the working tree when run in `--dir-diff` mode and the right-hand side of the comparison yields the same content as the file in the working tree. diff --git a/git-fast-import.html b/git-fast-import.html index db44a65ee..a7047a374 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1570,7 +1570,7 @@ in octal. Git only supports the following modes:</p></div> <li>
<p>
<code>160000</code>: A gitlink, SHA-1 of the object refers to a commit in
- another repository. Git links can only be specified by SHA or through
+ another repository. Git links can only be specified either by SHA or through
a commit mark. They are used to implement submodules.
</p>
</li>
@@ -2398,7 +2398,7 @@ object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the
accuracy and completeness of the import by comparing each Git
commit to the corresponding source revision.</p></div>
-<div class="paragraph"><p>Coming from a system such as Perforce or Subversion this should be
+<div class="paragraph"><p>Coming from a system such as Perforce or Subversion, this should be
quite simple, as the fast-import mark can also be the Perforce changeset
number or the Subversion revision number.</p></div>
</div>
@@ -2613,8 +2613,8 @@ fastimport.unpackLimit <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
+ 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.
@@ -2640,7 +2640,7 @@ fastimport.unpackLimit <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-fast-import.txt b/git-fast-import.txt index 8b5dd6add..bd7b1e0a2 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -622,7 +622,7 @@ in octal. Git only supports the following modes: * `100755` or `755`: A normal, but executable, file. * `120000`: A symlink, the content of the file will be the link target. * `160000`: A gitlink, SHA-1 of the object refers to a commit in - another repository. Git links can only be specified by SHA or through + another repository. Git links can only be specified either by SHA or through a commit mark. They are used to implement submodules. * `040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`. @@ -1353,7 +1353,7 @@ the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision. -Coming from a system such as Perforce or Subversion this should be +Coming from a system such as Perforce or Subversion, this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number. diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 91927de49..95a4f984f 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -850,7 +850,7 @@ be in a separate packet, and the list must end with a flush packet.</p></div> <dd>
<p>
Use this to specify the path to <em>git-upload-pack</em> on the
- remote side, if is not found on your $PATH.
+ remote side, if it is not found on your $PATH.
Installations of sshd ignores the user’s environment
setup scripts for login shells (e.g. .bash_profile) and
your privately installed git may not be found on the system
@@ -983,7 +983,7 @@ they may alternatively be 40-hex sha1s present on the remote.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-04-04 11:19:32 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 46747d5f4..b3467664d 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt @@ -69,7 +69,7 @@ be in a separate packet, and the list must end with a flush packet. --upload-pack=<git-upload-pack>:: Use this to specify the path to 'git-upload-pack' on the - remote side, if is not found on your $PATH. + remote side, if it is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system diff --git a/git-fetch.html b/git-fetch.html index b8134f065..1fdd6118b 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -876,7 +876,7 @@ the current repository has the same history as the source repository.</p></div> <p>
By default when fetching from a shallow repository,
<code>git fetch</code> refuses refs that require updating
- .git/shallow. This option updates .git/shallow and accept such
+ .git/shallow. This option updates .git/shallow and accepts such
refs.
</p>
</dd>
@@ -954,7 +954,7 @@ precedence over the <code>fetch.output</code> config option.</p></div> </dt>
<dd>
<p>
- When <em>git fetch</em> is used with <code><src>:<dst></code> refspec it may
+ When <em>git fetch</em> is used with <code><src>:<dst></code> refspec, it may
refuse to update the local branch as discussed
in the <code><refspec></code> part below.
This option overrides that check.
@@ -1388,14 +1388,14 @@ refspec (or <code>--force</code>).</p></div> <div class="paragraph"><p>Unlike when pushing with <a href="git-push.html">git-push(1)</a>, any updates outside of
<code>refs/{tags,heads}/*</code> will be accepted without <code>+</code> in the refspec (or
<code>--force</code>), whether that’s swapping e.g. a tree object for a blob, or
-a commit for another commit that’s doesn’t have the previous commit as
+a commit for another commit that doesn’t have the previous commit as
an ancestor etc.</p></div>
<div class="paragraph"><p>Unlike when pushing with <a href="git-push.html">git-push(1)</a>, there is no
configuration which’ll amend these rules, and nothing like a
<code>pre-fetch</code> hook analogous to the <code>pre-receive</code> hook.</p></div>
<div class="paragraph"><p>As with pushing with <a href="git-push.html">git-push(1)</a>, all of the rules described
above about what’s not allowed as an update can be overridden by
-adding an the optional leading <code>+</code> to a refspec (or using <code>--force</code>
+adding an optional leading <code>+</code> to a refspec (or using the <code>--force</code>
command line option). The only exception to this is that no amount of
forcing will make the <code>refs/heads/*</code> namespace accept a non-commit
object.</p></div>
@@ -1406,7 +1406,7 @@ object.</p></div> </td>
<td class="content">When the remote branch you want to fetch is known to
be rewound and rebased regularly, it is expected that
-its new tip will not be descendant of its previous tip
+its new tip will not be a descendant of its previous tip
(as stored in your remote-tracking branch the last time
you fetched). You would want
to use the <code>+</code> sign to indicate non-fast-forward updates
@@ -1436,9 +1436,9 @@ must know this is the expected usage pattern for a branch.</td> address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.</p></div>
-<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
+<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp
and ftps can be used for fetching, but this is inefficient and
-deprecated; do not use it).</p></div>
+deprecated; do not use them).</p></div>
<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1606,7 +1606,7 @@ config file would appear like this:</p></div> fetch = <refspec></code></pre>
</div></div>
<div class="paragraph"><p>The <code><pushurl></code> is used for pushes only. It is optional and defaults
-to <code><URL></code>. Pushing to a remote affects all defined pushurls or to all
+to <code><URL></code>. Pushing to a remote affects all defined pushurls or all
defined urls if no pushurls are defined. Fetch, however, will only
fetch from the first defined url if multiple urls are defined.</p></div>
</div>
@@ -1620,7 +1620,7 @@ provide a refspec on the command line. This file should have the following format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code> URL: one of the above URL format
+<pre><code> URL: one of the above URL formats
Push: <refspec>
Pull: <refspec></code></pre>
</div></div>
@@ -2113,8 +2113,8 @@ fetch.output <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.
+ <code>full</code> and <code>compact</code>. Default value is <code>full</code>. See the
+ OUTPUT section in <a href="git-fetch.html">git-fetch(1)</a> for details.
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-format-patch.html b/git-format-patch.html index 151102612..d2e154ad0 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -807,7 +807,7 @@ The "patch", which is the "diff -p --stat" output (see </p>
</li>
</ul></div>
-<div class="paragraph"><p>The log message and the patch is separated by a line with a
+<div class="paragraph"><p>The log message and the patch are separated by a line with a
three-dash line.</p></div>
<div class="paragraph"><p>There are two ways to specify which commits to operate on.</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -1401,7 +1401,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -2618,7 +2618,7 @@ merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-09-07 15:10:34 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 711823a7f..aaafce24b 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -55,7 +55,7 @@ A "message" generated by the command consists of three parts: * The "patch", which is the "diff -p --stat" output (see linkgit:git-diff[1]) between the commit and its parent. -The log message and the patch is separated by a line with a +The log message and the patch are separated by a line with a three-dash line. There are two ways to specify which commits to operate on. diff --git a/git-fsck.html b/git-fsck.html index d118d5a31..148c3b9c8 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -775,7 +775,7 @@ git-fsck(1) Manual Page An object to treat as the head of an unreachability trace.
</p>
<div class="paragraph"><p>If no objects are given, <em>git fsck</em> defaults to using the
-index file, all SHA-1 references in <code>refs</code> namespace, and all reflogs
+index file, all SHA-1 references in the <code>refs</code> namespace, and all reflogs
(unless --no-reflogs is given) as heads.</p></div>
</dd>
<dt class="hdlist1">
@@ -854,7 +854,7 @@ index file, all SHA-1 references in <code>refs</code> namespace, and all reflogs <p>
Check only the connectivity of reachable objects, making sure
that any objects referenced by a reachable tag, commit, or tree
- is present. This speeds up the operation by avoiding reading
+ are present. This speeds up the operation by avoiding reading
blobs entirely (though it does still check that referenced blobs
exist). This will detect corruption in commits and trees, but
not do any semantic checks (e.g., for format errors). Corruption
@@ -873,7 +873,7 @@ care about this output and want to speed it up further.</p></div> recorded with g+w bit set, which was created by older
versions of Git. Existing repositories, including the
Linux kernel, Git itself, and sparse repository have old
- objects that triggers this check, but it is recommended
+ objects that trigger this check, but it is recommended
to check new projects with this flag.
</p>
</dd>
@@ -945,12 +945,12 @@ to accept pushes of such data set <code>receive.fsck.<msg-id></code> inste to clone or fetch it set <code>fetch.fsck.<msg-id></code>.</p></div>
<div class="paragraph"><p>The rest of the documentation discusses <code>fsck.*</code> for brevity, but the
same applies for the corresponding <code>receive.fsck.*</code> and
-<code>fetch.<msg-id>.*</code>. variables.</p></div>
-<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the
+<code>fetch.fsck.*</code>. variables.</p></div>
+<div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code>, the
<code>receive.fsck.<msg-id></code> and <code>fetch.fsck.<msg-id></code> variables will not
fall back on the <code>fsck.<msg-id></code> configuration if they aren’t set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.</p></div>
+uniformly configure the same fsck settings in different circumstances,
+all three of them must be set to the same values.</p></div>
<div class="paragraph"><p>When <code>fsck.<msg-id></code> is set, errors can be switched to warnings and
vice versa by configuring the <code>fsck.<msg-id></code> setting where the
<code><msg-id></code> is the fsck message ID and the value is one of <code>error</code>,
@@ -965,7 +965,7 @@ allow new instances of the same breakages go unnoticed.</p></div> <div class="paragraph"><p>Setting an unknown <code>fsck.<msg-id></code> value will cause fsck to die, but
doing the same for <code>receive.fsck.<msg-id></code> and <code>fetch.fsck.<msg-id></code>
will only cause git to warn.</p></div>
-<div class="paragraph"><p>See <code>Fsck Messages</code> section of <a href="git-fsck.html">git-fsck(1)</a> for supported
+<div class="paragraph"><p>See the <code>Fsck Messages</code> section of <a href="git-fsck.html">git-fsck(1)</a> for supported
values of <code><msg-id></code>.</p></div>
</dd>
<dt class="hdlist1">
@@ -975,12 +975,12 @@ fsck.skipList <p>
The path to a list of object names (i.e. one unabbreviated SHA-1 per
line) that are known to be broken in a non-fatal way and should
- be ignored. On versions of Git 2.20 and later comments (<em>#</em>), empty
- lines, and any leading and trailing whitespace is ignored. Everything
+ be ignored. On versions of Git 2.20 and later, comments (<em>#</em>), empty
+ lines, and any leading and trailing whitespace are ignored. Everything
but a SHA-1 per line will error out on older versions.
</p>
<div class="paragraph"><p>This feature is useful when an established project should be accepted
-despite early commits containing errors that can be safely ignored
+despite early commits containing errors that can be safely ignored,
such as invalid committer email addresses. Note: corrupt objects
cannot be skipped with this setting.</p></div>
<div class="paragraph"><p>Like <code>fsck.<msg-id></code> this variable has corresponding
@@ -988,10 +988,10 @@ cannot be skipped with this setting.</p></div> <div class="paragraph"><p>Unlike variables like <code>color.ui</code> and <code>core.editor</code> the
<code>receive.fsck.skipList</code> and <code>fetch.fsck.skipList</code> variables will not
fall back on the <code>fsck.skipList</code> configuration if they aren’t set. To
-uniformly configure the same fsck settings in different circumstances
-all three of them they must all set to the same values.</p></div>
+uniformly configure the same fsck settings in different circumstances,
+all three of them must be set to the same values.</p></div>
<div class="paragraph"><p>Older versions of Git (before 2.20) documented that the object names
-list should be sorted. This was never a requirement, the object names
+list should be sorted. This was never a requirement; the object names
could appear in any order, but when reading the list we tracked whether
the list was sorted for the purposes of an internal binary search
implementation, which could save itself some work with an already sorted
@@ -1423,7 +1423,7 @@ by setting the corresponding <code>fsck.<msg-id></code> configuration vari </dt>
<dd>
<p>
- (ERROR) Missing space before the email in author/committer line.
+ (ERROR) Missing space before the email in an author/committer line.
</p>
</dd>
<dt class="hdlist1">
@@ -1535,7 +1535,7 @@ by setting the corresponding <code>fsck.<msg-id></code> configuration vari </dt>
<dd>
<p>
- (ERROR) Found a zero padded date in an author/commiter line.
+ (ERROR) Found a zero padded date in an author/committer line.
</p>
</dd>
<dt class="hdlist1">
@@ -1591,7 +1591,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES <div id="footer">
<div id="footer-text">
Last updated
- 2022-11-04 21:49:36 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-fsck.txt b/git-fsck.txt index b6a0f8a08..5b82e4605 100644 --- a/git-fsck.txt +++ b/git-fsck.txt @@ -24,7 +24,7 @@ OPTIONS An object to treat as the head of an unreachability trace. + If no objects are given, 'git fsck' defaults to using the -index file, all SHA-1 references in `refs` namespace, and all reflogs +index file, all SHA-1 references in the `refs` namespace, and all reflogs (unless --no-reflogs is given) as heads. --unreachable:: @@ -64,7 +64,7 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs --connectivity-only:: Check only the connectivity of reachable objects, making sure that any objects referenced by a reachable tag, commit, or tree - is present. This speeds up the operation by avoiding reading + are present. This speeds up the operation by avoiding reading blobs entirely (though it does still check that referenced blobs exist). This will detect corruption in commits and trees, but not do any semantic checks (e.g., for format errors). Corruption @@ -79,7 +79,7 @@ care about this output and want to speed it up further. recorded with g+w bit set, which was created by older versions of Git. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old - objects that triggers this check, but it is recommended + objects that trigger this check, but it is recommended to check new projects with this flag. --verbose:: diff --git a/git-fsmonitor--daemon.html b/git-fsmonitor--daemon.html index 80dcb9852..d04cb8e67 100644 --- a/git-fsmonitor--daemon.html +++ b/git-fsmonitor--daemon.html @@ -835,10 +835,10 @@ modified within the working directory of a submodule, it will report the change (as happening against the super repo). However, the client
will properly ignore these extra events, so performance may be affected
but it will not cause an incorrect result.</p></div>
-<div class="paragraph"><p>By default, the fsmonitor daemon refuses to work against network-mounted
+<div class="paragraph"><p>By default, the fsmonitor daemon refuses to work with network-mounted
repositories; this may be overridden by setting <code>fsmonitor.allowRemote</code> to
<code>true</code>. Note, however, that the fsmonitor daemon is not guaranteed to work
-correctly with all network-mounted repositories and such use is considered
+correctly with all network-mounted repositories, so such use is considered
experimental.</p></div>
<div class="paragraph"><p>On Mac OS, the inter-process communication (IPC) between various Git
commands and the fsmonitor daemon is done via a Unix domain socket (UDS) — a
@@ -846,10 +846,10 @@ special type of file — which is supported by native Mac OS fil but not on network-mounted filesystems, NTFS, or FAT32. Other filesystems
may or may not have the needed support; the fsmonitor daemon is not guaranteed
to work with these filesystems and such use is considered experimental.</p></div>
-<div class="paragraph"><p>By default, the socket is created in the <code>.git</code> directory, however, if the
-<code>.git</code> directory is on a network-mounted filesystem, it will be instead be
+<div class="paragraph"><p>By default, the socket is created in the <code>.git</code> directory. However, if the
+<code>.git</code> directory is on a network-mounted filesystem, it will instead be
created at <code>$HOME/.git-fsmonitor-*</code> unless <code>$HOME</code> itself is on a
-network-mounted filesystem in which case you must set the configuration
+network-mounted filesystem, in which case you must set the configuration
variable <code>fsmonitor.socketDir</code> to the path of a directory on a Mac OS native
filesystem in which to create the socket file.</p></div>
<div class="paragraph"><p>If none of the above directories (<code>.git</code>, <code>$HOME</code>, or <code>fsmonitor.socketDir</code>)
@@ -869,7 +869,7 @@ fsmonitor.allowRemote </dt>
<dd>
<p>
- By default, the fsmonitor daemon refuses to work against network-mounted
+ By default, the fsmonitor daemon refuses to work with network-mounted
repositories. Setting <code>fsmonitor.allowRemote</code> to <code>true</code> overrides this
behavior. Only respected when <code>core.fsmonitor</code> is set to <code>true</code>.
</p>
@@ -900,7 +900,7 @@ fsmonitor.socketDir <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-17 15:23:34 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-fsmonitor--daemon.txt b/git-fsmonitor--daemon.txt index 8238eadb0..8585d19f4 100644 --- a/git-fsmonitor--daemon.txt +++ b/git-fsmonitor--daemon.txt @@ -70,10 +70,10 @@ the change (as happening against the super repo). However, the client will properly ignore these extra events, so performance may be affected but it will not cause an incorrect result. -By default, the fsmonitor daemon refuses to work against network-mounted +By default, the fsmonitor daemon refuses to work with network-mounted repositories; this may be overridden by setting `fsmonitor.allowRemote` to `true`. Note, however, that the fsmonitor daemon is not guaranteed to work -correctly with all network-mounted repositories and such use is considered +correctly with all network-mounted repositories, so such use is considered experimental. On Mac OS, the inter-process communication (IPC) between various Git @@ -83,10 +83,10 @@ but not on network-mounted filesystems, NTFS, or FAT32. Other filesystems may or may not have the needed support; the fsmonitor daemon is not guaranteed to work with these filesystems and such use is considered experimental. -By default, the socket is created in the `.git` directory, however, if the -`.git` directory is on a network-mounted filesystem, it will be instead be +By default, the socket is created in the `.git` directory. However, if the +`.git` directory is on a network-mounted filesystem, it will instead be created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a -network-mounted filesystem in which case you must set the configuration +network-mounted filesystem, in which case you must set the configuration variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native filesystem in which to create the socket file. diff --git a/git-gc.html b/git-gc.html index 796d5ce4f..cc259c1f9 100644 --- a/git-gc.html +++ b/git-gc.html @@ -948,7 +948,7 @@ gc.auto default value is 6700.
</p>
<div class="paragraph"><p>Setting this to 0 disables not only automatic packing based on the
-number of loose objects, but any other heuristic <code>git gc --auto</code> will
+number of loose objects, but also any other heuristic <code>git gc --auto</code> will
otherwise use to determine if there’s work to do, such as
<code>gc.autoPackLimit</code>.</p></div>
</dd>
@@ -971,7 +971,7 @@ gc.autoDetach </dt>
<dd>
<p>
- Make <code>git gc --auto</code> return immediately and run in background
+ Make <code>git gc --auto</code> return immediately and run in the background
if the system supports it. Default is true.
</p>
</dd>
diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index e63c21cf1..fe994802b 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -761,7 +761,7 @@ git-get-tar-commit-id(1) Manual Page and extract the commit ID stored in it. It reads only the first
1024 bytes of input, thus its runtime is not influenced by the size
of the tar archive very much.</p></div>
-<div class="paragraph"><p>If no commit ID is found, <em>git get-tar-commit-id</em> quietly exists with a
+<div class="paragraph"><p>If no commit ID is found, <em>git get-tar-commit-id</em> quietly exits with a
return code of 1. This can happen if the archive had not been created
using <em>git archive</em> or if the first parameter of <em>git archive</em> had been
a tree ID instead of a commit ID or tag.</p></div>
@@ -778,7 +778,7 @@ a tree ID instead of a commit ID or tag.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt index ac44d85b0..b537bb45b 100644 --- a/git-get-tar-commit-id.txt +++ b/git-get-tar-commit-id.txt @@ -20,7 +20,7 @@ and extract the commit ID stored in it. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of the tar archive very much. -If no commit ID is found, 'git get-tar-commit-id' quietly exists with a +If no commit ID is found, 'git get-tar-commit-id' quietly exits with a return code of 1. This can happen if the archive had not been created using 'git archive' or if the first parameter of 'git archive' had been a tree ID instead of a commit ID or tag. diff --git a/git-grep.html b/git-grep.html index cee178ff1..7ab380ca1 100644 --- a/git-grep.html +++ b/git-grep.html @@ -1400,7 +1400,7 @@ in <a href="gitglossary.html">gitglossary(7)</a>.</p></div> <code>--open-files-in-pager</code> is used, forcing a single-threaded execution.</p></div>
<div class="paragraph"><p>When grepping the object store (with <code>--cached</code> or giving tree objects), running
with multiple threads might perform slower than single threaded if <code>--textconv</code>
-is given and there’re too many text conversions. So if you experience low
+is given and there are too many text conversions. So if you experience low
performance in this case, it might be desirable to use <code>--threads=1</code>.</p></div>
</div>
</div>
@@ -1489,7 +1489,7 @@ grep.fallbackToNoIndex <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-grep.txt b/git-grep.txt index dabdbe847..0d0103c78 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -337,7 +337,7 @@ The `--threads` option (and the grep.threads configuration) will be ignored when When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` -is given and there're too many text conversions. So if you experience low +is given and there are too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`. CONFIGURATION diff --git a/git-hash-object.html b/git-hash-object.html index ec1b8dc28..b55804565 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -809,10 +809,10 @@ When <type> is not specified, it defaults to "blob".</p></div> </dt>
<dd>
<p>
- Hash object as it were located at the given path. The location of
- file does not directly influence on the hash value, but path is
- used to determine what Git filters should be applied to the object
- before it can be placed to the object database, and, as result of
+ Hash object as if it were located at the given path. The location of
+ the file does not directly influence the hash value, but the path is
+ used to determine which Git filters should be applied to the object
+ before it can be placed in the object database. As a result of
applying filters, the actual blob put into the object database may
differ from the given file. This option is mainly useful for hashing
temporary files located outside of the working directory or files
@@ -855,7 +855,7 @@ When <type> is not specified, it defaults to "blob".</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-07-06 12:47:39 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-hash-object.txt b/git-hash-object.txt index 8577f7a7d..ef4719ae4 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt @@ -39,10 +39,10 @@ OPTIONS of from the command-line. --path:: - Hash object as it were located at the given path. The location of - file does not directly influence on the hash value, but path is - used to determine what Git filters should be applied to the object - before it can be placed to the object database, and, as result of + Hash object as if it were located at the given path. The location of + the file does not directly influence the hash value, but the path is + used to determine which Git filters should be applied to the object + before it can be placed in the object database. As a result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files diff --git a/git-help.html b/git-help.html index 12a904cf6..1fd38ca06 100644 --- a/git-help.html +++ b/git-help.html @@ -779,7 +779,7 @@ standard output. To get the manual page for the aliased command, use <div class="paragraph"><p>Note that <code>git --help ...</code> is identical to <code>git help ...</code> because the
former is internally converted into the latter.</p></div>
<div class="paragraph"><p>To display the <a href="git.html">git(1)</a> man page, use <code>git help git</code>.</p></div>
-<div class="paragraph"><p>This page can be displayed with <em>git help help</em> or <code>git help --help</code></p></div>
+<div class="paragraph"><p>This page can be displayed with <em>git help help</em> or <code>git help --help</code>.</p></div>
</div>
</div>
<div class="sect1">
@@ -794,7 +794,7 @@ former is internally converted into the latter.</p></div> </dt>
<dd>
<p>
- Prints all the available commands on the standard output.
+ Print all the available commands on the standard output.
</p>
</dd>
<dt class="hdlist1">
@@ -820,7 +820,7 @@ former is internally converted into the latter.</p></div> </dt>
<dd>
<p>
- When used with <code>--all</code> print description for all recognized
+ When used with <code>--all</code>, print description for all recognized
commands. This is the default.
</p>
</dd>
@@ -844,7 +844,7 @@ former is internally converted into the latter.</p></div> </dt>
<dd>
<p>
- Prints a list of the Git concept guides on the standard output.
+ Print a list of the Git concept guides on the standard output.
</p>
</dd>
<dt class="hdlist1">
@@ -852,7 +852,7 @@ former is internally converted into the latter.</p></div> </dt>
<dd>
<p>
- Prints a list of the repository, command and file interfaces
+ Print a list of the repository, command and file interfaces
documentation on the standard output.
</p>
<div class="paragraph"><p>In-repository file interfaces such as <code>.git/info/exclude</code> are
@@ -868,7 +868,7 @@ described in <a href="githooks.html">githooks(5)</a>.</p></div> </dt>
<dd>
<p>
- Print list of file formats, protocols and other developer
+ Print a list of file formats, protocols and other developer
interfaces documentation on the standard output.
</p>
</dd>
@@ -912,7 +912,7 @@ other display programs (see below).</p></div> format. A web browser will be used for that purpose.
</p>
<div class="paragraph"><p>The web browser can be specified using the configuration variable
-<code>help.browser</code>, or <code>web.browser</code> if the former is not set. If none of
+<code>help.browser</code>, or <code>web.browser</code> if the former is not set. If neither of
these config variables is set, the <em>git web--browse</em> helper script
(called by <em>git help</em>) will pick a suitable default. See
<a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p></div>
@@ -948,7 +948,7 @@ line option:</p></div> </ul></div>
</div>
<div class="sect2">
-<h3 id="_help_browser_web_browser_and_browser_lt_tool_gt_path">help.browser, web.browser and browser.<tool>.path</h3>
+<h3 id="_help_browser_web_browser_and_browser_lt_tool_gt_path">help.browser, web.browser, and browser.<tool>.path</h3>
<div class="paragraph"><p>The <code>help.browser</code>, <code>web.browser</code> and <code>browser.<tool>.path</code> will also
be checked if the <em>web</em> format is chosen (either by command-line
option or configuration variable). See <em>-w|--web</em> in the OPTIONS
@@ -1056,7 +1056,7 @@ See <a href="git-config.html">git-config(1)</a> for more information about this. <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-help.txt b/git-help.txt index 2b0b5e390..f0bedc1f9 100644 --- a/git-help.txt +++ b/git-help.txt @@ -42,13 +42,13 @@ former is internally converted into the latter. To display the linkgit:git[1] man page, use `git help git`. -This page can be displayed with 'git help help' or `git help --help` +This page can be displayed with 'git help help' or `git help --help`. OPTIONS ------- -a:: --all:: - Prints all the available commands on the standard output. + Print all the available commands on the standard output. --no-external-commands:: When used with `--all`, exclude the listing of external "git-*" @@ -59,7 +59,7 @@ OPTIONS aliases. --verbose:: - When used with `--all` print description for all recognized + When used with `--all`, print description for all recognized commands. This is the default. -c:: @@ -69,10 +69,10 @@ OPTIONS -g:: --guides:: - Prints a list of the Git concept guides on the standard output. + Print a list of the Git concept guides on the standard output. --user-interfaces:: - Prints a list of the repository, command and file interfaces + Print a list of the repository, command and file interfaces documentation on the standard output. + In-repository file interfaces such as `.git/info/exclude` are @@ -85,7 +85,7 @@ pseudo-configuration such as the file-based `.git/hooks/*` interface described in linkgit:githooks[5]. --developer-interfaces:: - Print list of file formats, protocols and other developer + Print a list of file formats, protocols and other developer interfaces documentation on the standard output. -i:: @@ -109,7 +109,7 @@ other display programs (see below). format. A web browser will be used for that purpose. + The web browser can be specified using the configuration variable -`help.browser`, or `web.browser` if the former is not set. If none of +`help.browser`, or `web.browser` if the former is not set. If neither of these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for more information about this. @@ -129,8 +129,8 @@ line option: * "info" corresponds to '-i|--info', * "web" or "html" correspond to '-w|--web'. -help.browser, web.browser and browser.<tool>.path -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +help.browser, web.browser, and browser.<tool>.path +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The `help.browser`, `web.browser` and `browser.<tool>.path` will also be checked if the 'web' format is chosen (either by command-line diff --git a/git-hook.html b/git-hook.html index 45a6e23d4..5068e5a84 100644 --- a/git-hook.html +++ b/git-hook.html @@ -757,7 +757,7 @@ git-hook(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>A command interface to running git hooks (see <a href="githooks.html">githooks(5)</a>),
+<div class="paragraph"><p>A command interface for running git hooks (see <a href="githooks.html">githooks(5)</a>),
for use by other scripted git commands.</p></div>
</div>
</div>
@@ -789,7 +789,7 @@ mandatory <code>--</code> (or <code>--end-of-options</code>, see <a href="gitcli </dt>
<dd>
<p>
- For "run"; Specify a file which will be streamed into the
+ For "run"; specify a file which will be streamed into the
hook’s stdin. The hook will receive the entire file from
beginning to EOF.
</p>
@@ -824,7 +824,7 @@ mandatory <code>--</code> (or <code>--end-of-options</code>, see <a href="gitcli <div id="footer">
<div id="footer-text">
Last updated
- 2023-02-22 15:29:29 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-hook.txt b/git-hook.txt index 3407f3c2c..f6cc72d2c 100644 --- a/git-hook.txt +++ b/git-hook.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -A command interface to running git hooks (see linkgit:githooks[5]), +A command interface for running git hooks (see linkgit:githooks[5]), for use by other scripted git commands. SUBCOMMANDS @@ -32,7 +32,7 @@ OPTIONS ------- --to-stdin:: - For "run"; Specify a file which will be streamed into the + For "run"; specify a file which will be streamed into the hook's stdin. The hook will receive the entire file from beginning to EOF. diff --git a/git-http-backend.html b/git-http-backend.html index a9975459e..a0fb2b867 100644 --- a/git-http-backend.html +++ b/git-http-backend.html @@ -767,7 +767,7 @@ discussion of <code>GIT_PROTOCOL</code> in the ENVIRONMENT section below.</p></d <div class="paragraph"><p>It verifies that the directory has the magic file
"git-daemon-export-ok", and it will refuse to export any Git directory
that hasn’t explicitly been marked for export this way (unless the
-<code>GIT_HTTP_EXPORT_ALL</code> environmental variable is set).</p></div>
+<code>GIT_HTTP_EXPORT_ALL</code> environment variable is set).</p></div>
<div class="paragraph"><p>By default, only the <code>upload-pack</code> service is enabled, which serves
<em>git fetch-pack</em> and <em>git ls-remote</em> clients, which are invoked from
<em>git fetch</em>, <em>git pull</em>, and <em>git clone</em>. If the client is authenticated,
@@ -791,7 +791,7 @@ http.getanyfile any file within the repository, including objects that are
no longer reachable from a branch but are still present.
It is enabled by default, but a repository can disable it
- by setting this configuration item to <code>false</code>.
+ by setting this configuration value to <code>false</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -801,7 +801,7 @@ http.uploadpack <p>
This serves <em>git fetch-pack</em> and <em>git ls-remote</em> clients.
It is enabled by default, but a repository can disable it
- by setting this configuration item to <code>false</code>.
+ by setting this configuration value to <code>false</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1063,11 +1063,11 @@ REQUEST_METHOD </p>
</li>
</ul></div>
-<div class="paragraph"><p>The <code>GIT_HTTP_EXPORT_ALL</code> environmental variable may be passed to
+<div class="paragraph"><p>The <code>GIT_HTTP_EXPORT_ALL</code> environment variable may be passed to
<em>git-http-backend</em> to bypass the check for the "git-daemon-export-ok"
file in each repository before allowing export of that repository.</p></div>
<div class="paragraph"><p>The <code>GIT_HTTP_MAX_REQUEST_BUFFER</code> environment variable (or the
-<code>http.maxRequestBuffer</code> config variable) may be set to change the
+<code>http.maxRequestBuffer</code> config option) may be set to change the
largest ref negotiation request that git will handle during a fetch; any
fetch requiring a larger buffer will not succeed. This value should not
normally need to be changed, but may be helpful if you are fetching from
@@ -1102,7 +1102,7 @@ invoked by the <em>git-receive-pack</em>.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-09-23 14:33:59 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-http-backend.txt b/git-http-backend.txt index 0c5c0dde1..f37ddaded 100644 --- a/git-http-backend.txt +++ b/git-http-backend.txt @@ -23,7 +23,7 @@ discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below. It verifies that the directory has the magic file "git-daemon-export-ok", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the -`GIT_HTTP_EXPORT_ALL` environmental variable is set). +`GIT_HTTP_EXPORT_ALL` environment variable is set). By default, only the `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from @@ -42,12 +42,12 @@ http.getanyfile:: any file within the repository, including objects that are no longer reachable from a branch but are still present. It is enabled by default, but a repository can disable it - by setting this configuration item to `false`. + by setting this configuration value to `false`. http.uploadpack:: This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it - by setting this configuration item to `false`. + by setting this configuration value to `false`. http.receivepack:: This serves 'git send-pack' clients, allowing push. It is @@ -265,12 +265,12 @@ by the invoking web server, including: * QUERY_STRING * REQUEST_METHOD -The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to +The `GIT_HTTP_EXPORT_ALL` environment variable may be passed to 'git-http-backend' to bypass the check for the "git-daemon-export-ok" file in each repository before allowing export of that repository. The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the -`http.maxRequestBuffer` config variable) may be set to change the +`http.maxRequestBuffer` config option) may be set to change the largest ref negotiation request that git will handle during a fetch; any fetch requiring a larger buffer will not succeed. This value should not normally need to be changed, but may be helpful if you are fetching from diff --git a/git-http-fetch.html b/git-http-fetch.html index fc1a54411..0ab1d00fc 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -797,7 +797,7 @@ commit-id </dt>
<dd>
<p>
- Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on
+ Writes the commit-id into the specified filename under $GIT_DIR/refs/<filename> on
the local end after the transfer is complete.
</p>
</dd>
@@ -860,7 +860,7 @@ commit-id <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-http-fetch.txt b/git-http-fetch.txt index 319062c02..4ec7c68d3 100644 --- a/git-http-fetch.txt +++ b/git-http-fetch.txt @@ -31,7 +31,7 @@ commit-id:: Report what is downloaded. -w <filename>:: - Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on + Writes the commit-id into the specified filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete. --stdin:: diff --git a/git-http-push.html b/git-http-push.html index 0b45400c0..cf2c85562 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -757,11 +757,11 @@ git-http-push(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Sends missing objects to remote repository, and updates the
+<div class="paragraph"><p>Sends missing objects to the remote repository, and updates the
remote branch.</p></div>
<div class="paragraph"><p><strong>NOTE</strong>: This command is temporarily disabled if your libcurl
is older than 7.16, as the combination has been reported
-not to work and sometimes corrupts repository.</p></div>
+not to work and sometimes corrupts the repository.</p></div>
</div>
</div>
<div class="sect1">
@@ -816,7 +816,7 @@ not to work and sometimes corrupts repository.</p></div> <dd>
<p>
Remove <ref> from remote repository. The specified branch
- cannot be the remote HEAD. If -d is specified the following
+ cannot be the remote HEAD. If -d is specified, the following
other conditions must also be met:
</p>
<div class="ulist"><ul>
@@ -890,8 +890,8 @@ it has to start with "refs/"; <dst> is used as the <div class="paragraph"><p>Without ‘--force`, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
ancestor) of <src>. This check, known as "fast-forward check",
-is performed in order to avoid accidentally overwriting the
-remote ref and lose other peoples’ commits from there.</p></div>
+is performed to avoid accidentally overwriting the
+remote ref and losing other peoples’ commits from there.</p></div>
<div class="paragraph"><p>With <code>--force</code>, the fast-forward check is disabled for all refs.</p></div>
<div class="paragraph"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign
to disable the fast-forward check only on that ref.</p></div>
@@ -908,7 +908,7 @@ to disable the fast-forward check only on that ref.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-http-push.txt b/git-http-push.txt index 7c6a6dd7f..ce0d80821 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -13,12 +13,12 @@ SYNOPSIS DESCRIPTION ----------- -Sends missing objects to remote repository, and updates the +Sends missing objects to the remote repository, and updates the remote branch. *NOTE*: This command is temporarily disabled if your libcurl is older than 7.16, as the combination has been reported -not to work and sometimes corrupts repository. +not to work and sometimes corrupts the repository. OPTIONS ------- @@ -44,7 +44,7 @@ OPTIONS -d:: -D:: Remove <ref> from remote repository. The specified branch - cannot be the remote HEAD. If -d is specified the following + cannot be the remote HEAD. If -d is specified, the following other conditions must also be met: - Remote HEAD must resolve to an object that exists locally @@ -83,8 +83,8 @@ and where it is pushed is determined by using the destination side. Without `--force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as "fast-forward check", -is performed in order to avoid accidentally overwriting the -remote ref and lose other peoples' commits from there. +is performed to avoid accidentally overwriting the +remote ref and losing other peoples' commits from there. With `--force`, the fast-forward check is disabled for all refs. diff --git a/git-imap-send.html b/git-imap-send.html index f6c1f3b0e..959a11ecc 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -840,7 +840,7 @@ imap.tunnel </dt>
<dd>
<p>
- Command used to setup a tunnel to the IMAP server through which
+ Command used to set up a tunnel to the IMAP server through which
commands will be piped instead of using a direct network connection
to the server. Required when imap.host is not set.
</p>
@@ -908,7 +908,7 @@ imap.authMethod </dt>
<dd>
<p>
- Specify authenticate method for authentication with IMAP server.
+ Specify the authentication method for authenticating with the IMAP server.
If Git was built with the NO_CURL option, or if your curl version is older
than 7.34.0, or if you’re running git-imap-send with the <code>--no-curl</code>
option, the only supported method is <em>CRAM-MD5</em>. If this is not set
diff --git a/git-index-pack.html b/git-index-pack.html index ddc243bf9..5555f40fc 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -759,10 +759,10 @@ git-index-pack(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Reads a packed archive (.pack) from the specified file, and
-builds a pack index file (.idx) for it. Optionally writes a
+<div class="paragraph"><p>Reads a packed archive (.pack) from the specified file,
+builds a pack index file (.idx) for it, and optionally writes a
reverse-index (.rev) for the specified pack. The packed
-archive together with the pack index can then be placed in
+archive, together with the pack index, can then be placed in
the objects/pack/ directory of a Git repository.</p></div>
</div>
</div>
@@ -847,8 +847,8 @@ the objects/pack/ directory of a Git repository.</p></div> </dt>
<dd>
<p>
- Like --keep create a .keep file before moving the index into
- its final destination, but rather than creating an empty file
+ Like --keep, create a .keep file before moving the index into
+ its final destination. However, instead of creating an empty file
place <em><msg></em> followed by an LF into the .keep file. The <em><msg></em>
message can later be searched for within all .keep files to
locate any which have outlived their usefulness.
@@ -985,7 +985,7 @@ mentioned above.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-03-27 10:29:17 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-index-pack.txt b/git-index-pack.txt index 4e71c256e..6486620c3 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt @@ -16,10 +16,10 @@ SYNOPSIS DESCRIPTION ----------- -Reads a packed archive (.pack) from the specified file, and -builds a pack index file (.idx) for it. Optionally writes a +Reads a packed archive (.pack) from the specified file, +builds a pack index file (.idx) for it, and optionally writes a reverse-index (.rev) for the specified pack. The packed -archive together with the pack index can then be placed in +archive, together with the pack index, can then be placed in the objects/pack/ directory of a Git repository. @@ -68,8 +68,8 @@ OPTIONS updated to use objects contained in the pack. --keep=<msg>:: - Like --keep create a .keep file before moving the index into - its final destination, but rather than creating an empty file + Like --keep, create a .keep file before moving the index into + its final destination. However, instead of creating an empty file place '<msg>' followed by an LF into the .keep file. The '<msg>' message can later be searched for within all .keep files to locate any which have outlived their usefulness. diff --git a/git-init.html b/git-init.html index dd7e1f351..976b0805c 100644 --- a/git-init.html +++ b/git-init.html @@ -769,7 +769,7 @@ for its name).</p></div> to use instead of <code>./.git</code> for the base of the repository.</p></div>
<div class="paragraph"><p>If the object storage directory is specified via the
<code>$GIT_OBJECT_DIRECTORY</code> environment variable then the sha1 directories
-are created underneath - otherwise the default <code>$GIT_DIR/objects</code>
+are created underneath; otherwise, the default <code>$GIT_DIR/objects</code>
directory is used.</p></div>
<div class="paragraph"><p>Running <em>git init</em> in an existing repository is safe. It will not
overwrite things that are already there. The primary reason for
@@ -836,10 +836,10 @@ DIRECTORY" section below.) <p>
Instead of initializing the repository as a directory to either <code>$GIT_DIR</code> or
<code>./.git/</code>, create a text file there containing the path to the actual
-repository. This file acts as filesystem-agnostic Git symbolic link to the
+repository. This file acts as a filesystem-agnostic Git symbolic link to the
repository.
</p>
-<div class="paragraph"><p>If this is reinitialization, the repository will be moved to the specified path.</p></div>
+<div class="paragraph"><p>If this is a reinitialization, the repository will be moved to the specified path.</p></div>
</dd>
<dt class="hdlist1">
-b <branch-name>
@@ -886,7 +886,7 @@ specified. </dt>
<dd>
<p>
-Make the repository group-writable, (and g+sx, since the git group may be not
+Make the repository group-writable, (and g+sx, since the git group may not be
the primary group of all users). This is used to loosen the permissions of an
otherwise safe umask(2) value. Note that the umask still applies to the other
permission bits (e.g. if umask is <em>0022</em>, using <em>group</em> will not remove read
@@ -910,7 +910,7 @@ Same as <em>group</em>, but make the repository readable by all users. <em><perm></em> is a 3-digit octal number prefixed with ‘0` and each file
will have mode <em><perm></em>. <em><perm></em> will override users’ umask(2)
value (and not only loosen permissions as <em>group</em> and <em>all</em>
-does). <em>0640</em> will create a repository which is group-readable, but
+do). <em>0640</em> will create a repository which is group-readable, but
not group-writable or accessible to others. <em>0660</em> will create a repo
that is readable and writable to the current user and group, but
inaccessible to others (directories and executable files get their
@@ -1038,7 +1038,7 @@ init.defaultBranch <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-init.txt b/git-init.txt index 160dea137..6f0d2973b 100644 --- a/git-init.txt +++ b/git-init.txt @@ -29,7 +29,7 @@ to use instead of `./.git` for the base of the repository. If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories -are created underneath - otherwise the default `$GIT_DIR/objects` +are created underneath; otherwise, the default `$GIT_DIR/objects` directory is used. Running 'git init' in an existing repository is safe. It will not @@ -66,10 +66,10 @@ DIRECTORY" section below.) Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual -repository. This file acts as filesystem-agnostic Git symbolic link to the +repository. This file acts as a filesystem-agnostic Git symbolic link to the repository. + -If this is reinitialization, the repository will be moved to the specified path. +If this is a reinitialization, the repository will be moved to the specified path. -b <branch-name>:: --initial-branch=<branch-name>:: @@ -99,7 +99,7 @@ specified. 'group' (or 'true'):: -Make the repository group-writable, (and g+sx, since the git group may be not +Make the repository group-writable, (and g+sx, since the git group may not be the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read @@ -115,7 +115,7 @@ Same as 'group', but make the repository readable by all users. '<perm>' is a 3-digit octal number prefixed with `0` and each file will have mode '<perm>'. '<perm>' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' -does). '0640' will create a repository which is group-readable, but +do). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others (directories and executable files get their diff --git a/git-log.html b/git-log.html index 3b3c25430..179aaa387 100644 --- a/git-log.html +++ b/git-log.html @@ -1089,7 +1089,7 @@ ordering and formatting options, such as <code>--reverse</code>.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones with log message that
+ Limit the commits output to ones with a log message that
matches the specified pattern (regular expression). With
more than one <code>--grep=<pattern></code>, commits whose message
matches any of the given patterns are chosen (but see
@@ -1112,7 +1112,7 @@ matched as if it were part of the log message.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones with log message that do not
+ Limit the commits output to ones with a log message that do not
match the pattern specified with <code>--grep=<pattern></code>.
</p>
</dd>
@@ -2246,7 +2246,7 @@ people using 80-column terminals.</p></div> <dd>
<p>
Perform a tab expansion (replace each tab with enough spaces
- to fill to the next display column that is multiple of <em><n></em>)
+ to fill to the next display column that is a multiple of <em><n></em>)
in the log message before showing it in the output.
<code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
<code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
@@ -2273,7 +2273,7 @@ environment overrides). See <a href="git-config.html">git-config(1)</a> for more <div class="paragraph"><p>With an optional <em><ref></em> argument, use the ref to find the notes
to display. The ref can specify the full refname when it begins
with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
-<code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div>
+<code>refs/notes/</code> is prefixed to form the full name of the ref.</p></div>
<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
being displayed. Examples: "--notes=foo" will show only notes from
"refs/notes/foo"; "--notes=foo --notes" will show both notes from
@@ -3537,11 +3537,11 @@ $ git log -2 --pretty=%h 4da45bef</code></pre> <div class="paragraph"><p>By default, <code>git log</code> does not generate any diff output. The options
below can be used to show the changes made by each commit.</p></div>
<div class="paragraph"><p>Note that unless one of <code>--diff-merges</code> variants (including short
-<code>-m</code>, <code>-c</code>, and <code>--cc</code> options) is explicitly given, merge commits
+<code>-m</code>, <code>-c</code>, <code>--cc</code>, and <code>--dd</code> options) is explicitly given, merge commits
will not show a diff, even if a diff format like <code>--patch</code> is
selected, nor will they match search options like <code>-S</code>. The exception
is when <code>--first-parent</code> is in use, in which case <code>first-parent</code> is
-the default format.</p></div>
+the default format for merge commits.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-p
@@ -3572,128 +3572,149 @@ the default format.</p></div> </p>
</dd>
<dt class="hdlist1">
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)
-</dt>
-<dt class="hdlist1">
---no-diff-merges
+-m
</dt>
<dd>
<p>
- Specify diff format to be used for merge commits. Default is
- <code>off</code> unless <code>--first-parent</code> is in use, in which case
- <code>first-parent</code> is the default.
+ Show diffs for merge commits in the default format. This is
+ similar to <em>--diff-merges=on</em>, except <code>-m</code> will
+ produce no output unless <code>-p</code> is given as well.
</p>
-<div class="dlist"><dl>
-<dt class="hdlist1">
---diff-merges=(off|none)
-</dt>
+</dd>
<dt class="hdlist1">
---no-diff-merges
+-c
</dt>
<dd>
<p>
- Disable output of diffs for merge commits. Useful to override
- implied value.
+ Produce combined diff output for merge commits.
+ Shortcut for <em>--diff-merges=combined -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=on
-</dt>
-<dt class="hdlist1">
---diff-merges=m
-</dt>
-<dt class="hdlist1">
--m
+--cc
</dt>
<dd>
<p>
- This option makes diff output for merge commits to be shown in
- the default format. <code>-m</code> will produce the output only if <code>-p</code>
- is given as well. The default format could be changed using
- <code>log.diffMerges</code> configuration parameter, which default value
- is <code>separate</code>.
+ Produce dense combined diff output for merge commits.
+ Shortcut for <em>--diff-merges=dense-combined -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=first-parent
-</dt>
-<dt class="hdlist1">
---diff-merges=1
+--dd
</dt>
<dd>
<p>
- This option makes merge commits show the full diff with
- respect to the first parent only.
+ Produce diff with respect to first parent for both merge and
+ regular commits.
+ Shortcut for <em>--diff-merges=first-parent -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=separate
+--remerge-diff
</dt>
<dd>
<p>
- This makes merge commits show the full diff with respect to
- each of the parents. Separate log entry and diff is generated
- for each parent.
+ Produce remerge-diff output for merge commits.
+ Shortcut for <em>--diff-merges=remerge -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=remerge
+--no-diff-merges
</dt>
+<dd>
+<p>
+ Synonym for <em>--diff-merges=off</em>.
+</p>
+</dd>
<dt class="hdlist1">
---diff-merges=r
+--diff-merges=<format>
</dt>
+<dd>
+<p>
+ Specify diff format to be used for merge commits. Default is
+ <code>off</code> unless <code>--first-parent</code> is in use, in
+ which case <code>first-parent</code> is the default.
+</p>
+<div class="paragraph"><p>The following formats are supported:</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
<dt class="hdlist1">
---remerge-diff
+off, none
</dt>
<dd>
<p>
- With this option, two-parent merge commits are remerged to
- create a temporary tree object — potentially containing files
- with conflict markers and such. A diff is then shown between
- that temporary tree and the actual merge commit.
+ Disable output of diffs for merge commits. Useful to override
+ implied value.
</p>
-<div class="paragraph"><p>The output emitted when this option is used is subject to change, and
-so is its interaction with other options (unless explicitly
-documented).</p></div>
</dd>
<dt class="hdlist1">
---diff-merges=combined
+on, m
</dt>
+<dd>
+<p>
+ Make diff output for merge commits to be shown in the default
+ format. The default format could be changed using
+ <code>log.diffMerges</code> configuration variable, whose default value
+ is <code>separate</code>.
+</p>
+</dd>
<dt class="hdlist1">
---diff-merges=c
+first-parent, 1
</dt>
+<dd>
+<p>
+ Show full diff with respect to first parent. This is the same
+ format as <code>--patch</code> produces for non-merge commits.
+</p>
+</dd>
<dt class="hdlist1">
--c
+separate
</dt>
<dd>
<p>
- With this option, diff output for a merge commit shows the
- differences from each of the parents to the merge result
- simultaneously instead of showing pairwise diff between a
- parent and the result one at a time. Furthermore, it lists
- only files which were modified from all parents. <code>-c</code> implies
- <code>-p</code>.
+ Show full diff with respect to each of parents.
+ Separate log entry and diff is generated for each parent.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=dense-combined
+combined, c
</dt>
+<dd>
+<p>
+ Show differences from each of the parents to the merge
+ result simultaneously instead of showing pairwise diff between
+ a parent and the result one at a time. Furthermore, it lists
+ only files which were modified from all parents.
+</p>
+</dd>
<dt class="hdlist1">
---diff-merges=cc
+dense-combined, cc
</dt>
+<dd>
+<p>
+ Further compress output produced by <code>--diff-merges=combined</code>
+ by omitting uninteresting hunks whose contents in the parents
+ have only two variants and the merge result picks one of them
+ without modification.
+</p>
+</dd>
<dt class="hdlist1">
---cc
+remerge, r
</dt>
<dd>
<p>
- With this option the output produced by
- <code>--diff-merges=combined</code> is further compressed by omitting
- uninteresting hunks whose contents in the parents have only
- two variants and the merge result picks one of them without
- modification. <code>--cc</code> implies <code>-p</code>.
+ Remerge two-parent merge commits to create a temporary tree
+ object—potentially containing files with conflict markers
+ and such. A diff is then shown between that temporary tree
+ and the actual merge commit.
</p>
+<div class="paragraph"><p>The output emitted when this option is used is subject to change, and
+so is its interaction with other options (unless explicitly
+documented).</p></div>
</dd>
</dl></div>
+</div></div>
</dd>
<dt class="hdlist1">
--combined-all-paths
@@ -4718,7 +4739,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -4981,7 +5002,7 @@ diff format:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
</p>
<div class="literalblock">
<div class="content">
@@ -4990,9 +5011,9 @@ It is preceded with a "git diff" header that looks like this: <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p></div>
+the file that the rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -5053,7 +5074,7 @@ rename to a</code></pre> <p>
Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
- <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
+ <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
specific languages.
</p>
</li>
@@ -5068,7 +5089,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
<code>--diff-merges</code> option to any of these commands to force generation of
-diffs in specific format.</p></div>
+diffs in a specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -5103,7 +5124,7 @@ index fabadb8,cc95eb0..4866510 <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header, that looks like
+It is preceded by a "git diff" header, that looks like
this (when the <code>-c</code> option is used):
</p>
<div class="literalblock">
@@ -5130,25 +5151,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
-information about detected contents movement (renames and
-copying detection) are designed to work with diff of two
+information about detected content movement (renames and
+copying detection) are designed to work with the diff of two
<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
-It is followed by two-line from-file/to-file header
+It is followed by a two-line from-file/to-file header:
</p>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
+++ b/file</code></pre>
</div></div>
-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit</p></div>
+two-line from-file/to-file, you get an N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
@@ -5191,7 +5212,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <code>-</code> removals from both file1 and
file2, plus <code>++</code> to mean one line that was added does not appear
-in either file1 or file2). Also eight other lines are the same
+in either file1 or file2). Also, eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -5353,7 +5374,7 @@ mind.</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-<em>git commit</em> and <em>git commit-tree</em> issues
+<em>git commit</em> and <em>git commit-tree</em> issue
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
@@ -5365,7 +5386,7 @@ mind.</p></div> commitEncoding = ISO-8859-1</code></pre>
</div></div>
<div class="paragraph"><p>Commit objects created with the above setting record the value
-of <code>i18n.commitEncoding</code> in its <code>encoding</code> header. This is to
+of <code>i18n.commitEncoding</code> in their <code>encoding</code> header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.</p></div>
</li>
@@ -5442,7 +5463,7 @@ log.date <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
+"foo" will be used for the date format. Otherwise, "default" will
be used.</p></div>
</dd>
<dt class="hdlist1">
@@ -5548,7 +5569,7 @@ notes.mergeStrategy <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"
+ <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See the "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
@@ -5645,7 +5666,7 @@ See <code>notes.rewrite.<command></code> above for a further description o <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-log.txt b/git-log.txt index 2a66cf888..579682172 100644 --- a/git-log.txt +++ b/git-log.txt @@ -120,11 +120,11 @@ By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit. Note that unless one of `--diff-merges` variants (including short -`-m`, `-c`, and `--cc` options) is explicitly given, merge commits +`-m`, `-c`, `--cc`, and `--dd` options) is explicitly given, merge commits will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is -the default format. +the default format for merge commits. :git-log: 1 :diff-merges-default: `off` diff --git a/git-ls-files.html b/git-ls-files.html index 8462ae45e..8c908bc5c 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -769,11 +769,11 @@ git-ls-files(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This merges the file listing in the index with the actual working
+<div class="paragraph"><p>This command merges the file listing in the index with the actual working
directory list, and shows different combinations of the two.</p></div>
-<div class="paragraph"><p>One or more of the options below may be used to determine the files
+<div class="paragraph"><p>Several flags can be used to determine which files are
shown, and each file may be printed multiple times if there are
-multiple entries in the index or multiple statuses are applicable for
+multiple entries in the index or if multiple statuses are applicable for
the relevant file selection options.</p></div>
</div>
</div>
@@ -842,7 +842,7 @@ the relevant file selection options.</p></div> matching an exclude pattern. When showing "other" files
(i.e. when used with <em>-o</em>), show only those matched by an
exclude pattern. Standard ignore rules are not automatically
- activated, therefore at least one of the <code>--exclude*</code> options
+ activated; therefore, at least one of the <code>--exclude*</code> options
is required.
</p>
</dd>
@@ -1006,7 +1006,7 @@ the relevant file selection options.</p></div> Show status tags together with filenames. Note that for
scripting purposes, <a href="git-status.html">git-status(1)</a> <code>--porcelain</code> and
<a href="git-diff-files.html">git-diff-files(1)</a> <code>--name-status</code> are almost always
- superior alternatives, and users should look at
+ superior alternatives; users should look at
<a href="git-status.html">git-status(1)</a> <code>--short</code> or <a href="git-diff.html">git-diff(1)</a>
<code>--name-status</code> for more user-friendly alternatives.
</p>
@@ -1382,7 +1382,7 @@ pattern file appears in.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-13 13:57:42 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-ls-files.txt b/git-ls-files.txt index 1bc0328bb..f65a8cd91 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -25,12 +25,12 @@ SYNOPSIS DESCRIPTION ----------- -This merges the file listing in the index with the actual working +This command merges the file listing in the index with the actual working directory list, and shows different combinations of the two. -One or more of the options below may be used to determine the files +Several flags can be used to determine which files are shown, and each file may be printed multiple times if there are -multiple entries in the index or multiple statuses are applicable for +multiple entries in the index or if multiple statuses are applicable for the relevant file selection options. OPTIONS @@ -62,7 +62,7 @@ OPTIONS matching an exclude pattern. When showing "other" files (i.e. when used with '-o'), show only those matched by an exclude pattern. Standard ignore rules are not automatically - activated, therefore at least one of the `--exclude*` options + activated; therefore, at least one of the `--exclude*` options is required. -s:: @@ -141,7 +141,7 @@ OPTIONS Show status tags together with filenames. Note that for scripting purposes, linkgit:git-status[1] `--porcelain` and linkgit:git-diff-files[1] `--name-status` are almost always - superior alternatives, and users should look at + superior alternatives; users should look at linkgit:git-status[1] `--short` or linkgit:git-diff[1] `--name-status` for more user-friendly alternatives. + diff --git a/git-mailinfo.html b/git-mailinfo.html index 1daf955f3..749f046ff 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -953,7 +953,7 @@ mailinfo.scissors <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
+ was provided on the command-line. When active, this feature
removes everything from the message body before a scissors
line (i.e. consisting mainly of ">8", "8<" and "-").
</p>
diff --git a/git-mailsplit.html b/git-mailsplit.html index cd57d9c38..5f1c2dba5 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -807,7 +807,7 @@ patches in the correct order.</td> <dd>
<p>
If any file doesn’t begin with a From line, assume it is a
- single mail message instead of signaling error.
+ single mail message instead of signaling an error.
</p>
</dd>
<dt class="hdlist1">
@@ -860,7 +860,7 @@ patches in the correct order.</td> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-mailsplit.txt b/git-mailsplit.txt index e3b2a88c4..3f0a6662c 100644 --- a/git-mailsplit.txt +++ b/git-mailsplit.txt @@ -34,7 +34,7 @@ OPTIONS -b:: If any file doesn't begin with a From line, assume it is a - single mail message instead of signaling error. + single mail message instead of signaling an error. -d<prec>:: Instead of the default 4 digits with leading zeros, diff --git a/git-maintenance.html b/git-maintenance.html index e4fc32214..5f0816780 100644 --- a/git-maintenance.html +++ b/git-maintenance.html @@ -902,9 +902,9 @@ prefetch requested refs within <code>refs/prefetch/</code>. Also, tags are not updated.
</p>
<div class="paragraph"><p>This is done to avoid disrupting the remote-tracking branches. The end users
-expect these refs to stay unmoved unless they initiate a fetch. With prefetch
-task, however, the objects necessary to complete a later real fetch would
-already be obtained, so the real fetch would go faster. In the ideal case,
+expect these refs to stay unmoved unless they initiate a fetch. However,
+with the prefetch task, the objects necessary to complete a later real fetch
+would already be obtained, making the real fetch faster. In the ideal case,
it will just become an update to a bunch of remote-tracking branches without
any object transfer.</p></div>
</dd>
@@ -1266,7 +1266,7 @@ maintenance.strategy <div class="ulist"><ul>
<li>
<p>
-<code>none</code>: This default setting implies no task are run at any schedule.
+<code>none</code>: This default setting implies no tasks are run at any schedule.
</p>
</li>
<li>
@@ -1359,7 +1359,7 @@ maintenance.incremental-repack.auto <div id="footer">
<div id="footer-text">
Last updated
- 2022-11-22 19:59:10 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-maintenance.txt b/git-maintenance.txt index 805e5a2e3..51d0f7e94 100644 --- a/git-maintenance.txt +++ b/git-maintenance.txt @@ -102,9 +102,9 @@ prefetch:: requested refs within `refs/prefetch/`. Also, tags are not updated. + This is done to avoid disrupting the remote-tracking branches. The end users -expect these refs to stay unmoved unless they initiate a fetch. With prefetch -task, however, the objects necessary to complete a later real fetch would -already be obtained, so the real fetch would go faster. In the ideal case, +expect these refs to stay unmoved unless they initiate a fetch. However, +with the prefetch task, the objects necessary to complete a later real fetch +would already be obtained, making the real fetch faster. In the ideal case, it will just become an update to a bunch of remote-tracking branches without any object transfer. diff --git a/git-merge-base.html b/git-merge-base.html index 2dd37db5a..e86337efa 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -761,7 +761,7 @@ git-merge-base(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>git merge-base</em> finds best common ancestor(s) between two commits to use
+<div class="paragraph"><p><em>git merge-base</em> finds the best common ancestor(s) between two commits to use
in a three-way merge. One common ancestor is <em>better</em> than another common
ancestor if the latter is an ancestor of the former. A common ancestor
that does not have any better common ancestor is a <em>best common
@@ -772,7 +772,7 @@ merge base for a pair of commits.</p></div> <div class="sect1">
<h2 id="_operation_modes">OPERATION MODES</h2>
<div class="sectionbody">
-<div class="paragraph"><p>As the most common special case, specifying only two commits on the
+<div class="paragraph"><p>In the most common special case, specifying only two commits on the
command line means computing the merge base between the given two commits.</p></div>
<div class="paragraph"><p>More generally, among the two commits to compute the merge base from,
one is specified by the first commit argument on the command line;
@@ -825,7 +825,7 @@ from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <c the two commits, but also takes into account the reflog of
<ref> to see if the history leading to <commit> forked from
an earlier incarnation of the branch <ref> (see discussion
- on this mode below).
+ of this mode below).
</p>
</dd>
</dl></div>
@@ -862,7 +862,7 @@ which is reachable from both <em>A</em> and <em>B</em> through the parent relati ---o---1---o---o---o---A</code></pre>
</div></div>
<div class="paragraph"><p>the merge base between <em>A</em> and <em>B</em> is <em>1</em>.</p></div>
-<div class="paragraph"><p>Given three commits <em>A</em>, <em>B</em> and <em>C</em>, <code>git merge-base A B C</code> will compute the
+<div class="paragraph"><p>Given three commits <em>A</em>, <em>B</em>, and <em>C</em>, <code>git merge-base A B C</code> will compute the
merge base between <em>A</em> and a hypothetical commit <em>M</em>, which is a merge
between <em>B</em> and <em>C</em>. For example, with this topology:</p></div>
<div class="literalblock">
@@ -898,7 +898,7 @@ the best common ancestor of all commits.</p></div> / \
---2---o---o---B</code></pre>
</div></div>
-<div class="paragraph"><p>both <em>1</em> and <em>2</em> are merge-bases of A and B. Neither one is better than
+<div class="paragraph"><p>both <em>1</em> and <em>2</em> are merge bases of A and B. Neither one is better than
the other (both are <em>best</em> merge bases). When the <code>--all</code> option is not given,
it is unspecified which best one is output.</p></div>
<div class="paragraph"><p>A common idiom to check "fast-forward-ness" between two commits A
@@ -968,7 +968,7 @@ discarded.</p></div> <div class="content">
<pre><code>$ git rebase --onto origin/master $fork_point topic</code></pre>
</div></div>
-<div class="paragraph"><p>will replay D0, D1 and D on top of B to create a new history of this
+<div class="paragraph"><p>will replay D0, D1, and D on top of B to create a new history of this
shape:</p></div>
<div class="literalblock">
<div class="content">
@@ -1017,7 +1017,7 @@ commits that used to be at the tip of origin/master).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-merge-base.txt b/git-merge-base.txt index b01ba3d35..5ab957cfb 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION ----------- -'git merge-base' finds best common ancestor(s) between two commits to use +'git merge-base' finds the best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is 'better' than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a 'best common @@ -28,7 +28,7 @@ merge base for a pair of commits. OPERATION MODES --------------- -As the most common special case, specifying only two commits on the +In the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits. More generally, among the two commits to compute the merge base from, @@ -64,7 +64,7 @@ from linkgit:git-show-branch[1] when used with the `--merge-base` option. the two commits, but also takes into account the reflog of <ref> to see if the history leading to <commit> forked from an earlier incarnation of the branch <ref> (see discussion - on this mode below). + of this mode below). OPTIONS ------- @@ -88,7 +88,7 @@ For example, with this topology: the merge base between 'A' and 'B' is '1'. -Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the +Given three commits 'A', 'B', and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology: @@ -130,7 +130,7 @@ When the history involves criss-cross merges, there can be more than one ---2---o---o---B .... -both '1' and '2' are merge-bases of A and B. Neither one is better than +both '1' and '2' are merge bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output. @@ -204,7 +204,7 @@ will find B0, and $ git rebase --onto origin/master $fork_point topic -will replay D0, D1 and D on top of B to create a new history of this +will replay D0, D1, and D on top of B to create a new history of this shape: .... diff --git a/git-merge-tree.html b/git-merge-tree.html index 9d4a158bd..a429f6aea 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -761,10 +761,10 @@ git-merge-tree(1) Manual Page <div class="paragraph"><p>This command has a modern <code>--write-tree</code> mode and a deprecated
<code>--trivial-merge</code> mode. With the exception of the
<a href="#DEPMERGE">DEPRECATED DESCRIPTION</a> section at the end, the rest of
-this documentation describes modern <code>--write-tree</code> mode.</p></div>
+this documentation describes the modern <code>--write-tree</code> mode.</p></div>
<div class="paragraph"><p>Performs a merge, but does not make any new commits and does not read
from or write to either the working tree or index.</p></div>
-<div class="paragraph"><p>The performed merge will use the same feature as the "real"
+<div class="paragraph"><p>The performed merge will use the same features as the "real"
<a href="git-merge.html">git-merge(1)</a>, including:</p></div>
<div class="ulist"><ul>
<li>
@@ -1088,7 +1088,7 @@ in the future).</p></div> the <a href="#CFI">Conflicted file info</a> list. The information there is
insufficient to do so. For example: Rename/rename(1to2) conflicts (both
sides renamed the same file differently) will result in three different
-file having higher order stages (but each only has one higher order
+files having higher order stages (but each only has one higher order
stage), with no way (short of the <a href="#IM">Informational messages</a> section)
to determine which three files are related. File/directory conflicts
also result in a file with exactly one higher order stage.
@@ -1097,7 +1097,7 @@ Possibly-involved-in-directory-rename conflicts (when a file with exactly one higher order stage. In all cases, the
<a href="#IM">Informational messages</a> section has the necessary info, though it
is not designed to be machine parseable.</p></div>
-<div class="paragraph"><p>Do NOT assume that each paths from <a href="#CFI">Conflicted file info</a>, and
+<div class="paragraph"><p>Do NOT assume that each path from <a href="#CFI">Conflicted file info</a>, and
the logical conflicts in the <a href="#IM">Informational messages</a> have a
one-to-one mapping, nor that there is a one-to-many mapping, nor a
many-to-one mapping. Many-to-many mappings exist, meaning that each
@@ -1152,7 +1152,7 @@ large repositories).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-03-19 15:16:41 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index ffc4fbf7e..b50acace3 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -19,12 +19,12 @@ DESCRIPTION This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode. With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of -this documentation describes modern `--write-tree` mode. +this documentation describes the modern `--write-tree` mode. Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index. -The performed merge will use the same feature as the "real" +The performed merge will use the same features as the "real" linkgit:git-merge[1], including: * three way content merges of individual files @@ -253,7 +253,7 @@ Do NOT attempt to guess or make the user guess the conflict types from the <<CFI,Conflicted file info>> list. The information there is insufficient to do so. For example: Rename/rename(1to2) conflicts (both sides renamed the same file differently) will result in three different -file having higher order stages (but each only has one higher order +files having higher order stages (but each only has one higher order stage), with no way (short of the <<IM,Informational messages>> section) to determine which three files are related. File/directory conflicts also result in a file with exactly one higher order stage. @@ -263,7 +263,7 @@ a file with exactly one higher order stage. In all cases, the <<IM,Informational messages>> section has the necessary info, though it is not designed to be machine parseable. -Do NOT assume that each paths from <<CFI,Conflicted file info>>, and +Do NOT assume that each path from <<CFI,Conflicted file info>>, and the logical conflicts in the <<IM,Informational messages>> have a one-to-one mapping, nor that there is a one-to-many mapping, nor a many-to-one mapping. Many-to-many mappings exist, meaning that each diff --git a/git-merge.html b/git-merge.html index ade5c345e..d5dda7ff8 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1455,7 +1455,7 @@ Resolve the conflicts. Git will mark the conflicts in <li>
<p>
Use a mergetool. <code>git mergetool</code> to launch a graphical
- mergetool which will work you through the merge.
+ mergetool which will work through the merge with you.
</p>
</li>
<li>
@@ -1819,7 +1819,7 @@ merge.conflictStyle marker and the original text before the <code>=======</code> marker. The
"merge" style tends to produce smaller conflict regions than diff3,
both because of the exclusion of the original text, and because
- when a subset of lines match on the two sides they are just pulled
+ when a subset of lines match on the two sides, they are just pulled
out of the conflict region. Another alternate style, "zdiff3", is
similar to diff3 but removes matching lines on the two sides from
the conflict region when those matching lines appear near either
@@ -2336,7 +2336,7 @@ merge.<driver>.recursive <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-merge.txt b/git-merge.txt index 8625c5cb0..e8ab34031 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -336,7 +336,7 @@ After seeing a conflict, you can do two things: You can work through the conflict with a number of tools: * Use a mergetool. `git mergetool` to launch a graphical - mergetool which will work you through the merge. + mergetool which will work through the merge with you. * Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index f69456238..6f4780f83 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -777,7 +777,7 @@ get_merge_tool </dt>
<dd>
<p>
- returns a merge tool. the return code is 1 if we returned a guessed
+ Returns a merge tool. The return code is 1 if we returned a guessed
merge tool, else 0. <em>$GIT_MERGETOOL_GUI</em> may be set to <em>true</em> to
search for the appropriate guitool.
</p>
@@ -787,7 +787,7 @@ get_merge_tool_cmd </dt>
<dd>
<p>
- returns the custom command for a merge tool.
+ Returns the custom command for a merge tool.
</p>
</dd>
<dt class="hdlist1">
@@ -795,7 +795,7 @@ get_merge_tool_path </dt>
<dd>
<p>
- returns the custom path for a merge tool.
+ Returns the custom path for a merge tool.
</p>
</dd>
<dt class="hdlist1">
@@ -803,7 +803,7 @@ initialize_merge_tool </dt>
<dd>
<p>
- bring merge tool specific functions into scope so they can be used or
+ Brings merge tool specific functions into scope so they can be used or
overridden.
</p>
</dd>
@@ -812,7 +812,7 @@ run_merge_tool </dt>
<dd>
<p>
- launches a merge tool given the tool name and a true/false
+ Launches a merge tool given the tool name and a true/false
flag to indicate whether a merge base is present.
<em>$MERGED</em>, <em>$LOCAL</em>, <em>$REMOTE</em>, and <em>$BASE</em> must be defined
for use by the merge tool.
@@ -832,7 +832,7 @@ run_merge_tool <div id="footer">
<div id="footer-text">
Last updated
- 2021-02-26 23:35:19 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-mergetool--lib.txt b/git-mergetool--lib.txt index 3e8f59ac0..0726b560d 100644 --- a/git-mergetool--lib.txt +++ b/git-mergetool--lib.txt @@ -28,22 +28,22 @@ to define the operation mode for the functions listed below. FUNCTIONS --------- get_merge_tool:: - returns a merge tool. the return code is 1 if we returned a guessed + Returns a merge tool. The return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool. get_merge_tool_cmd:: - returns the custom command for a merge tool. + Returns the custom command for a merge tool. get_merge_tool_path:: - returns the custom path for a merge tool. + Returns the custom path for a merge tool. initialize_merge_tool:: - bring merge tool specific functions into scope so they can be used or + Brings merge tool specific functions into scope so they can be used or overridden. run_merge_tool:: - launches a merge tool given the tool name and a true/false + Launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool. diff --git a/git-mergetool.html b/git-mergetool.html index 9967ccc19..8c8886e54 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -760,7 +760,7 @@ git-mergetool(1) Manual Page <div class="paragraph"><p>Use <code>git mergetool</code> to run one of several merge utilities to resolve
merge conflicts. It is typically run after <em>git merge</em>.</p></div>
<div class="paragraph"><p>If one or more <file> parameters are given, the merge tool program will
-be run to resolve differences on each file (skipping those without
+be run to resolve differences in each file (skipping those without
conflicts). Specifying a directory will include all unresolved files in
that path. If no <file> names are specified, <em>git mergetool</em> will run
the merge tool program on every file with merge conflicts.</p></div>
@@ -798,7 +798,7 @@ by specifying the command line to invoke in a configuration variable <code>mergetool.<tool>.cmd</code>.</p></div>
<div class="paragraph"><p>When <em>git mergetool</em> is invoked with this tool (either through the
<code>-t</code> or <code>--tool</code> option or the <code>merge.tool</code> configuration
-variable) the configured command line will be invoked with <code>$BASE</code>
+variable), the configured command line will be invoked with <code>$BASE</code>
set to the name of a temporary file containing the common base for
the merge, if available; <code>$LOCAL</code> set to the name of a temporary
file containing the contents of the file on the current branch;
@@ -852,7 +852,7 @@ success of the resolution after the custom tool has exited.</p></div> </dt>
<dd>
<p>
- When <em>git-mergetool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
+ When <em>git-mergetool</em> is invoked with the <code>-g</code> or <code>--gui</code> option,
the default merge tool will be read from the configured
<code>merge.guitool</code> variable instead of <code>merge.tool</code>. If
<code>merge.guitool</code> is not set, we will fallback to the tool
@@ -935,8 +935,8 @@ mergetool.<tool>.trustExitCode For a custom merge command, specify whether the exit code of
the merge command can be used to determine whether the merge was
successful. If this is not set to true then the merge target file
- timestamp is checked and the merge assumed to have been successful
- if the file has been updated, otherwise the user is prompted to
+ timestamp is checked, and the merge is assumed to have been successful
+ if the file has been updated; otherwise, the user is prompted to
indicate the success of the merge.
</p>
</dd>
@@ -960,7 +960,7 @@ mergetool.meld.useAutoMerge <dd>
<p>
When the <code>--auto-merge</code> is given, meld will merge all non-conflicting
- parts automatically, highlight the conflicting parts and wait for
+ parts automatically, highlight the conflicting parts, and wait for
user decision. Setting <code>mergetool.meld.useAutoMerge</code> to <code>true</code> tells
Git to unconditionally use the <code>--auto-merge</code> option with <code>meld</code>.
Setting this value to <code>auto</code> makes git detect whether <code>--auto-merge</code>
@@ -975,7 +975,7 @@ mergetool.vimdiff.layout <dd>
<p>
The vimdiff backend uses this variable to control how its split
- windows look like. Applies even if you are using Neovim (<code>nvim</code>) or
+ windows appear. Applies even if you are using Neovim (<code>nvim</code>) or
gVim (<code>gvim</code>) as the merge tool. See BACKEND SPECIFIC HINTS section
for details.
</p>
@@ -985,7 +985,7 @@ mergetool.hideResolved </dt>
<dd>
<p>
- During a merge Git will automatically resolve as many conflicts as
+ During a merge, Git will automatically resolve as many conflicts as
possible and write the <em>MERGED</em> file containing conflict markers around
any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally
represent the versions of the file from before Git’s conflict
@@ -1014,7 +1014,7 @@ mergetool.keepTemporaries When invoking a custom merge tool, Git uses a set of temporary
files to pass to the tool. If the tool returns an error and this
variable is set to <code>true</code>, then these temporary files will be
- preserved, otherwise they will be removed after the tool has
+ preserved; otherwise, they will be removed after the tool has
exited. Defaults to <code>false</code>.
</p>
</dd>
@@ -1059,7 +1059,7 @@ mergetool.guiDefault These are safe to remove once a file has been merged and its
<code>git mergetool</code> session has completed.</p></div>
<div class="paragraph"><p>Setting the <code>mergetool.keepBackup</code> configuration variable to <code>false</code>
-causes <code>git mergetool</code> to automatically remove the backup as files
+causes <code>git mergetool</code> to automatically remove the backup files as files
are successfully merged.</p></div>
</div>
</div>
@@ -1114,12 +1114,12 @@ have special meaning:</p></div> </li>
<li>
<p>
-<code>@</code> is used to indicate which is the file containing the final version after
+<code>@</code> is used to indicate the file containing the final version after
solving the conflicts. If not present, <code>MERGED</code> will be used by default.
</p>
</li>
</ul></div>
-<div class="paragraph"><p>The precedence of the operators is this one (you can use parentheses to change
+<div class="paragraph"><p>The precedence of the operators is as follows (you can use parentheses to change
it):</p></div>
<div class="literalblock">
<div class="content">
@@ -1278,7 +1278,7 @@ information as the first tab, with a different layout.</p></div> | REMOTE | |
---------------------------------------------</code></pre>
</div></div>
-<div class="paragraph"><p>Note how in the third tab definition we need to use parenthesis to make <code>,</code>
+<div class="paragraph"><p>Note how in the third tab definition we need to use parentheses to make <code>,</code>
have precedence over <code>/</code>.</p></div>
</div></div>
</li>
@@ -1342,7 +1342,7 @@ MERGED and REMOTE).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-04-17 21:53:20 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-mergetool.txt b/git-mergetool.txt index 07535f657..b9e20c5dc 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -17,7 +17,7 @@ Use `git mergetool` to run one of several merge utilities to resolve merge conflicts. It is typically run after 'git merge'. If one or more <file> parameters are given, the merge tool program will -be run to resolve differences on each file (skipping those without +be run to resolve differences in each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts. @@ -49,7 +49,7 @@ variable `mergetool.<tool>.cmd`. + When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration -variable) the configured command line will be invoked with `$BASE` +variable), the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for the merge, if available; `$LOCAL` set to the name of a temporary file containing the contents of the file on the current branch; @@ -81,7 +81,7 @@ success of the resolution after the custom tool has exited. -g:: --gui:: - When 'git-mergetool' is invoked with the `-g` or `--gui` option + When 'git-mergetool' is invoked with the `-g` or `--gui` option, the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool @@ -115,7 +115,7 @@ These are safe to remove once a file has been merged and its `git mergetool` session has completed. Setting the `mergetool.keepBackup` configuration variable to `false` -causes `git mergetool` to automatically remove the backup as files +causes `git mergetool` to automatically remove the backup files as files are successfully merged. BACKEND SPECIFIC HINTS diff --git a/git-mktag.html b/git-mktag.html index 835253a7b..037c05c81 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -757,7 +757,7 @@ git-mktag(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Reads a tag contents on standard input and creates a tag object. The
+<div class="paragraph"><p>Reads a tag’s contents on standard input and creates a tag object. The
output is the new tag’s <object> identifier.</p></div>
<div class="paragraph"><p>This command is mostly equivalent to <a href="git-hash-object.html">git-hash-object(1)</a>
invoked with <code>-t tag -w --stdin</code>. I.e. both of these will create and
@@ -769,7 +769,7 @@ git hash-object -t tag -w --stdin <my-tag</code></pre> </div></div>
<div class="paragraph"><p>The difference is that mktag will die before writing the tag if the
tag doesn’t pass a <a href="git-fsck.html">git-fsck(1)</a> check.</p></div>
-<div class="paragraph"><p>The "fsck" check done mktag is stricter than what <a href="git-fsck.html">git-fsck(1)</a>
+<div class="paragraph"><p>The "fsck" check done by mktag is stricter than what <a href="git-fsck.html">git-fsck(1)</a>
would run by default in that all <code>fsck.<msg-id></code> messages are promoted
from warnings to errors (so e.g. a missing "tagger" line is an error).</p></div>
<div class="paragraph"><p>Extra headers in the object are also an error under mktag, but ignored
@@ -811,7 +811,7 @@ tag <tagname> tagger <tagger></code></pre>
</div></div>
<div class="paragraph"><p>followed by some <em>optional</em> free-form message (some tags created
-by older Git may not have <code>tagger</code> line). The message, when it
+by older Git may not have a <code>tagger</code> line). The message, when it
exists, is separated by a blank line from the header. The
message part may contain a signature that Git itself doesn’t
care about, but that can be verified with gpg.</p></div>
@@ -828,7 +828,7 @@ care about, but that can be verified with gpg.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-mktag.txt b/git-mktag.txt index b2a2e80d4..006d75996 100644 --- a/git-mktag.txt +++ b/git-mktag.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads a tag contents on standard input and creates a tag object. The +Reads a tag's contents on standard input and creates a tag object. The output is the new tag's <object> identifier. This command is mostly equivalent to linkgit:git-hash-object[1] @@ -27,7 +27,7 @@ write a tag found in `my-tag`: The difference is that mktag will die before writing the tag if the tag doesn't pass a linkgit:git-fsck[1] check. -The "fsck" check done mktag is stricter than what linkgit:git-fsck[1] +The "fsck" check done by mktag is stricter than what linkgit:git-fsck[1] would run by default in that all `fsck.<msg-id>` messages are promoted from warnings to errors (so e.g. a missing "tagger" line is an error). @@ -56,7 +56,7 @@ has a very simple fixed format: four lines of tagger <tagger> followed by some 'optional' free-form message (some tags created -by older Git may not have `tagger` line). The message, when it +by older Git may not have a `tagger` line). The message, when it exists, is separated by a blank line from the header. The message part may contain a signature that Git itself doesn't care about, but that can be verified with gpg. diff --git a/git-mktree.html b/git-mktree.html index ec61aa492..1bb98f72d 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -781,7 +781,7 @@ built is written to the standard output.</p></div> <dd>
<p>
Allow missing objects. The default behaviour (without this option)
- is to verify that each tree entry’s sha1 identifies an existing
+ is to verify that each tree entry’s hash identifies an existing
object. This option has no effect on the treatment of gitlink entries
(aka "submodules") which are always allowed to be missing.
</p>
@@ -792,7 +792,7 @@ built is written to the standard output.</p></div> <dd>
<p>
Allow building of more than one tree object before exiting. Each
- tree is separated by a single blank line. The final new-line is
+ tree is separated by a single blank line. The final newline is
optional. Note - if the <code>-z</code> option is used, lines are terminated
with NUL.
</p>
@@ -811,7 +811,7 @@ built is written to the standard output.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-02-16 17:29:08 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-mktree.txt b/git-mktree.txt index 76b44f4da..383f09dd3 100644 --- a/git-mktree.txt +++ b/git-mktree.txt @@ -25,13 +25,13 @@ OPTIONS --missing:: Allow missing objects. The default behaviour (without this option) - is to verify that each tree entry's sha1 identifies an existing + is to verify that each tree entry's hash identifies an existing object. This option has no effect on the treatment of gitlink entries (aka "submodules") which are always allowed to be missing. --batch:: Allow building of more than one tree object before exiting. Each - tree is separated by a single blank line. The final new-line is + tree is separated by a single blank line. The final newline is optional. Note - if the `-z` option is used, lines are terminated with NUL. diff --git a/git-mv.html b/git-mv.html index 71c0b6755..e928ca73e 100644 --- a/git-mv.html +++ b/git-mv.html @@ -757,7 +757,7 @@ git-mv(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Move or rename a file, directory or symlink.</p></div>
+<div class="paragraph"><p>Move or rename a file, directory, or symlink.</p></div>
<div class="literalblock">
<div class="content">
<pre><code>git mv [-v] [-f] [-n] [-k] <source> <destination>
@@ -857,7 +857,7 @@ been implemented.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-mv.txt b/git-mv.txt index fb0220fd1..7f991a338 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Move or rename a file, directory or symlink. +Move or rename a file, directory, or symlink. git mv [-v] [-f] [-n] [-k] <source> <destination> git mv [-v] [-f] [-n] [-k] <source> ... <destination directory> diff --git a/git-name-rev.html b/git-name-rev.html index 3d8145860..74e35afab 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -780,7 +780,7 @@ format parsable by <em>git rev-parse</em>.</p></div> <dd>
<p>
Only use refs whose names match a given shell pattern. The pattern
- can be one of branch name, tag name or fully qualified ref name. If
+ can be a branch name, a tag name, or a fully qualified ref name. If
given multiple times, use refs whose names match any of the given shell
patterns. Use <code>--no-refs</code> to clear any previous ref patterns given.
</p>
@@ -903,7 +903,7 @@ not the context.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-05-15 16:02:03 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-name-rev.txt b/git-name-rev.txt index 5c56c8702..d4f1c4d59 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt @@ -26,7 +26,7 @@ OPTIONS --refs=<pattern>:: Only use refs whose names match a given shell pattern. The pattern - can be one of branch name, tag name or fully qualified ref name. If + can be a branch name, a tag name, or a fully qualified ref name. If given multiple times, use refs whose names match any of the given shell patterns. Use `--no-refs` to clear any previous ref patterns given. diff --git a/git-notes.html b/git-notes.html index be22522ba..849ec4c76 100644 --- a/git-notes.html +++ b/git-notes.html @@ -1246,7 +1246,7 @@ notes.mergeStrategy <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"
+ <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See the "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
diff --git a/git-prune-packed.html b/git-prune-packed.html index cdbe250da..3726c82db 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -758,7 +758,7 @@ git-prune-packed(1) Manual Page <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>This program searches the <code>$GIT_OBJECT_DIRECTORY</code> for all objects that currently
-exist in a pack file as well as the independent object directories.</p></div>
+exist in a pack file as well as in the independent object directories.</p></div>
<div class="paragraph"><p>All such extra objects are removed.</p></div>
<div class="paragraph"><p>A pack is a collection of objects, individually compressed, with delta
compression applied, stored in a single file, with an associated index file.</p></div>
@@ -814,7 +814,7 @@ disk storage, etc.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-prune-packed.txt b/git-prune-packed.txt index 844d6f808..db742dcfe 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -15,7 +15,7 @@ SYNOPSIS DESCRIPTION ----------- This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently -exist in a pack file as well as the independent object directories. +exist in a pack file as well as in the independent object directories. All such extra objects are removed. diff --git a/git-prune.html b/git-prune.html index 1ccb61fbc..cdc99c623 100644 --- a/git-prune.html +++ b/git-prune.html @@ -767,7 +767,7 @@ git-prune(1) Manual Page </tr></table>
</div>
<div class="paragraph"><p>This runs <em>git fsck --unreachable</em> using all the refs
-available in <code>refs/</code>, optionally with additional set of
+available in <code>refs/</code>, optionally with an additional set of
objects specified on the command line, and prunes all unpacked
objects unreachable from any of these head objects from the object database.
In addition, it
@@ -884,7 +884,7 @@ many other housekeeping tasks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-prune.txt b/git-prune.txt index 03552dd86..9a45571b9 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -18,7 +18,7 @@ NOTE: In most cases, users should run 'git gc', which calls 'git prune'. See the section "NOTES", below. This runs 'git fsck --unreachable' using all the refs -available in `refs/`, optionally with additional set of +available in `refs/`, optionally with an additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database. In addition, it diff --git a/git-pull.html b/git-pull.html index 044fe1f89..c32ec00f8 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1268,7 +1268,7 @@ the current repository has the same history as the source repository.</p></div> <p>
By default when fetching from a shallow repository,
<code>git fetch</code> refuses refs that require updating
- .git/shallow. This option updates .git/shallow and accept such
+ .git/shallow. This option updates .git/shallow and accepts such
refs.
</p>
</dd>
@@ -1334,7 +1334,7 @@ precedence over the <code>fetch.output</code> config option.</p></div> </dt>
<dd>
<p>
- When <em>git fetch</em> is used with <code><src>:<dst></code> refspec it may
+ When <em>git fetch</em> is used with <code><src>:<dst></code> refspec, it may
refuse to update the local branch as discussed
in the <code><refspec></code> part of the <a href="git-fetch.html">git-fetch(1)</a>
documentation.
@@ -1600,14 +1600,14 @@ refspec (or <code>--force</code>).</p></div> <div class="paragraph"><p>Unlike when pushing with <a href="git-push.html">git-push(1)</a>, any updates outside of
<code>refs/{tags,heads}/*</code> will be accepted without <code>+</code> in the refspec (or
<code>--force</code>), whether that’s swapping e.g. a tree object for a blob, or
-a commit for another commit that’s doesn’t have the previous commit as
+a commit for another commit that doesn’t have the previous commit as
an ancestor etc.</p></div>
<div class="paragraph"><p>Unlike when pushing with <a href="git-push.html">git-push(1)</a>, there is no
configuration which’ll amend these rules, and nothing like a
<code>pre-fetch</code> hook analogous to the <code>pre-receive</code> hook.</p></div>
<div class="paragraph"><p>As with pushing with <a href="git-push.html">git-push(1)</a>, all of the rules described
above about what’s not allowed as an update can be overridden by
-adding an the optional leading <code>+</code> to a refspec (or using <code>--force</code>
+adding an optional leading <code>+</code> to a refspec (or using the <code>--force</code>
command line option). The only exception to this is that no amount of
forcing will make the <code>refs/heads/*</code> namespace accept a non-commit
object.</p></div>
@@ -1618,7 +1618,7 @@ object.</p></div> </td>
<td class="content">When the remote branch you want to fetch is known to
be rewound and rebased regularly, it is expected that
-its new tip will not be descendant of its previous tip
+its new tip will not be a descendant of its previous tip
(as stored in your remote-tracking branch the last time
you fetched). You would want
to use the <code>+</code> sign to indicate non-fast-forward updates
@@ -1664,9 +1664,9 @@ is often useful.</td> address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.</p></div>
-<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
+<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp
and ftps can be used for fetching, but this is inefficient and
-deprecated; do not use it).</p></div>
+deprecated; do not use them).</p></div>
<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1834,7 +1834,7 @@ config file would appear like this:</p></div> fetch = <refspec></code></pre>
</div></div>
<div class="paragraph"><p>The <code><pushurl></code> is used for pushes only. It is optional and defaults
-to <code><URL></code>. Pushing to a remote affects all defined pushurls or to all
+to <code><URL></code>. Pushing to a remote affects all defined pushurls or all
defined urls if no pushurls are defined. Fetch, however, will only
fetch from the first defined url if multiple urls are defined.</p></div>
</div>
@@ -1848,7 +1848,7 @@ provide a refspec on the command line. This file should have the following format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code> URL: one of the above URL format
+<pre><code> URL: one of the above URL formats
Push: <refspec>
Pull: <refspec></code></pre>
</div></div>
diff --git a/git-push.html b/git-push.html index cf8c7ac36..69061302c 100644 --- a/git-push.html +++ b/git-push.html @@ -793,7 +793,7 @@ local one.</p></div> </dt>
<dd>
<p>
- The "remote" repository that is destination of a push
+ The "remote" repository that is the destination of a push
operation. This parameter can be either a URL
(see the section <a href="#URLS">GIT URLS</a> below) or the name
of a remote (see the section <a href="#REMOTES">REMOTES</a> below).
@@ -1331,9 +1331,9 @@ further recursion will occur. In this case, "only" is treated as "on-demand".</p address of the remote server, and the path to the repository.
Depending on the transport protocol, some of this information may be
absent.</p></div>
-<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp,
+<div class="paragraph"><p>Git supports ssh, git, http, and https protocols (in addition, ftp
and ftps can be used for fetching, but this is inefficient and
-deprecated; do not use it).</p></div>
+deprecated; do not use them).</p></div>
<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
@@ -1501,7 +1501,7 @@ config file would appear like this:</p></div> fetch = <refspec></code></pre>
</div></div>
<div class="paragraph"><p>The <code><pushurl></code> is used for pushes only. It is optional and defaults
-to <code><URL></code>. Pushing to a remote affects all defined pushurls or to all
+to <code><URL></code>. Pushing to a remote affects all defined pushurls or all
defined urls if no pushurls are defined. Fetch, however, will only
fetch from the first defined url if multiple urls are defined.</p></div>
</div>
@@ -1515,7 +1515,7 @@ provide a refspec on the command line. This file should have the following format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><code> URL: one of the above URL format
+<pre><code> URL: one of the above URL formats
Push: <refspec>
Pull: <refspec></code></pre>
</div></div>
@@ -2036,7 +2036,7 @@ push.default </li>
<li>
<p>
-<code>simple</code> - pushes the current branch with the same name on the remote.
+<code>simple</code> - push 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
@@ -2073,7 +2073,7 @@ push.followTags </dt>
<dd>
<p>
- If set to true enable <code>--follow-tags</code> option by default. You
+ 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>
@@ -2181,7 +2181,7 @@ push.useBitmaps <div id="footer">
<div id="footer-text">
Last updated
- 2023-08-24 09:59:29 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-push.txt b/git-push.txt index 5b4edaf4a..c12caedbb 100644 --- a/git-push.txt +++ b/git-push.txt @@ -48,7 +48,7 @@ local one. OPTIONS[[OPTIONS]] ------------------ <repository>:: - The "remote" repository that is destination of a push + The "remote" repository that is the destination of a push operation. This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below). diff --git a/git-quiltimport.html b/git-quiltimport.html index d17775bb8..ea022dc54 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -789,7 +789,7 @@ preserved as the 1 line subject in the Git description.</p></div> </p>
</dd>
<dt class="hdlist1">
---author Author Name <Author Email>
+--author <em>Author Name <Author Email></em>
</dt>
<dd>
<p>
@@ -804,7 +804,7 @@ preserved as the 1 line subject in the Git description.</p></div> <p>
The directory to find the quilt patches.
</p>
-<div class="paragraph"><p>The default for the patch directory is patches
+<div class="paragraph"><p>The default for the patch directory is <em>patches</em>
or the value of the <code>$QUILT_PATCHES</code> environment
variable.</p></div>
</dd>
@@ -841,7 +841,7 @@ variable.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-quiltimport.txt b/git-quiltimport.txt index 70562dc4c..40e02d92e 100644 --- a/git-quiltimport.txt +++ b/git-quiltimport.txt @@ -38,14 +38,14 @@ OPTIONS a patch. At the time of this writing only missing author information is warned about. ---author Author Name <Author Email>:: +--author 'Author Name <Author Email>':: The author name and email address to use when no author information can be found in the patch description. --patches <dir>:: The directory to find the quilt patches. + -The default for the patch directory is patches +The default for the patch directory is 'patches' or the value of the `$QUILT_PATCHES` environment variable. diff --git a/git-range-diff.html b/git-range-diff.html index 3a720e4d6..fd1fa99d3 100644 --- a/git-range-diff.html +++ b/git-range-diff.html @@ -831,7 +831,7 @@ to revert to color all lines according to the outer diff markers Defaults to 60. Try a larger value if <code>git range-diff</code> erroneously
considers a large change a total rewrite (deletion of one commit
and addition of another), and a smaller one in the reverse case.
- See the ``Algorithm`` section below for an explanation why this is
+ See the ``Algorithm`` section below for an explanation of why this is
needed.
</p>
</dd>
@@ -1085,7 +1085,7 @@ found in this case will look like this:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-09 15:06:28 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-range-diff.txt b/git-range-diff.txt index 0b393715d..605a92e22 100644 --- a/git-range-diff.txt +++ b/git-range-diff.txt @@ -70,7 +70,7 @@ to revert to color all lines according to the outer diff markers Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. - See the ``Algorithm`` section below for an explanation why this is + See the ``Algorithm`` section below for an explanation of why this is needed. --left-only:: diff --git a/git-read-tree.html b/git-read-tree.html index 716b1d4e4..1968d7e86 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -766,8 +766,8 @@ but does not actually <strong>update</strong> any of the files it "caches". (see fast-forward (i.e. 2-way) merge, or a 3-way merge, with the <code>-m</code>
flag. When used with <code>-m</code>, the <code>-u</code> flag causes it to also update
the files in the work tree with the result of the merge.</p></div>
-<div class="paragraph"><p>Trivial merges are done by <em>git read-tree</em> itself. Only conflicting paths
-will be in unmerged state when <em>git read-tree</em> returns.</p></div>
+<div class="paragraph"><p>Only trivial merges are done by <em>git read-tree</em> itself. Only conflicting paths
+will be in an unmerged state when <em>git read-tree</em> returns.</p></div>
</div>
</div>
<div class="sect1">
@@ -781,7 +781,7 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div> <p>
Perform a merge, not just a read. The command will
refuse to run if your index file has unmerged entries,
- indicating that you have not finished previous merge you
+ indicating that you have not finished a previous merge you
started.
</p>
</dd>
@@ -1294,7 +1294,7 @@ support.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-30 14:44:53 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-read-tree.txt b/git-read-tree.txt index b09707474..1c48c2899 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -25,15 +25,15 @@ fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, the `-u` flag causes it to also update the files in the work tree with the result of the merge. -Trivial merges are done by 'git read-tree' itself. Only conflicting paths -will be in unmerged state when 'git read-tree' returns. +Only trivial merges are done by 'git read-tree' itself. Only conflicting paths +will be in an unmerged state when 'git read-tree' returns. OPTIONS ------- -m:: Perform a merge, not just a read. The command will refuse to run if your index file has unmerged entries, - indicating that you have not finished previous merge you + indicating that you have not finished a previous merge you started. --reset:: diff --git a/git-rebase.html b/git-rebase.html index c31d4251e..a2673f109 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -2786,7 +2786,7 @@ sequence.editor Text editor used by <code>git rebase -i</code> for editing the rebase instruction file.
The value is meant to be interpreted by the shell when it is used.
It can be overridden by the <code>GIT_SEQUENCE_EDITOR</code> environment variable.
- When not configured the default commit message editor is used instead.
+ When not configured, the default commit message editor is used instead.
</p>
</dd>
</dl></div>
diff --git a/git-receive-pack.html b/git-receive-pack.html index dbdb992c9..25bc415f1 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -761,9 +761,9 @@ git-receive-pack(1) Manual Page information fed from the remote end.</p></div>
<div class="paragraph"><p>This command is usually not invoked directly by the end user.
The UI for the protocol is on the <em>git send-pack</em> side, and the
-program pair is meant to be used to push updates to remote
+program pair is meant to be used to push updates to a remote
repository. For pull operations, see <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.</p></div>
-<div class="paragraph"><p>The command allows for creation and fast-forwarding of sha1 refs
+<div class="paragraph"><p>The command allows for the creation and fast-forwarding of sha1 refs
(heads/tags) on the remote end (strictly speaking, it is the
local end <em>git-receive-pack</em> runs, but to the user who is sitting at
the send-pack end, it is updating the remote. Confused?)</p></div>
@@ -1094,7 +1094,7 @@ The <code>pre-receive</code> hook MUST NOT update any refs to point to <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-receive-pack.txt b/git-receive-pack.txt index 65ff518cc..20aca9207 100644 --- a/git-receive-pack.txt +++ b/git-receive-pack.txt @@ -18,10 +18,10 @@ information fed from the remote end. This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git send-pack' side, and the -program pair is meant to be used to push updates to remote +program pair is meant to be used to push updates to a remote repository. For pull operations, see linkgit:git-fetch-pack[1]. -The command allows for creation and fast-forwarding of sha1 refs +The command allows for the creation and fast-forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end 'git-receive-pack' runs, but to the user who is sitting at the send-pack end, it is updating the remote. Confused?) diff --git a/git-remote-ext.html b/git-remote-ext.html index e81564705..7c6850d48 100644 --- a/git-remote-ext.html +++ b/git-remote-ext.html @@ -810,10 +810,10 @@ the same service.</p></div> This argument will not be passed to <em><command></em>. Instead, it
will cause the helper to start by sending git:// service requests to
the remote side with the service field set to an appropriate value and
- the repository field set to rest of the argument. Default is not to send
+ the repository field set to the rest of the argument. Default is not to send
such a request.
</p>
-<div class="paragraph"><p>This is useful if remote side is git:// server accessed over
+<div class="paragraph"><p>This is useful if the remote side is git:// server accessed over
some tunnel.</p></div>
</dd>
<dt class="hdlist1">
@@ -822,7 +822,7 @@ some tunnel.</p></div> <dd>
<p>
This argument will not be passed to <em><command></em>. Instead it sets
- the vhost field in the git:// service request (to rest of the argument).
+ the vhost field in the git:// service request (to the rest of the argument).
Default is not to send vhost in such request (if sent).
</p>
</dd>
@@ -883,7 +883,7 @@ begins with <code>ext::</code>. Examples:</p></div> <dd>
<p>
Like host.example:foo/repo, but use /home/foo/.ssh/somekey as
- keypair and user as user on remote side. This avoids needing to
+ keypair and user as the user on the remote side. This avoids the need to
edit .ssh/config.
</p>
</dd>
@@ -893,7 +893,7 @@ begins with <code>ext::</code>. Examples:</p></div> <dd>
<p>
Represents repository with path /somerepo accessible over
- git protocol at abstract namespace address /git-server.
+ git protocol at the abstract namespace address /git-server.
</p>
</dd>
<dt class="hdlist1">
@@ -963,7 +963,7 @@ begins with <code>ext::</code>. Examples:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-remote-ext.txt b/git-remote-ext.txt index 88ea7e1cc..b33ee3c9e 100644 --- a/git-remote-ext.txt +++ b/git-remote-ext.txt @@ -44,15 +44,15 @@ The following sequences have a special meaning: This argument will not be passed to '<command>'. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and - the repository field set to rest of the argument. Default is not to send + the repository field set to the rest of the argument. Default is not to send such a request. + -This is useful if remote side is git:// server accessed over +This is useful if the remote side is git:// server accessed over some tunnel. '%V' (must be first characters in argument):: This argument will not be passed to '<command>'. Instead it sets - the vhost field in the git:// service request (to rest of the argument). + the vhost field in the git:// service request (to the rest of the argument). Default is not to send vhost in such request (if sent). ENVIRONMENT VARIABLES @@ -82,12 +82,12 @@ begins with `ext::`. Examples: "ext::ssh -i /home/foo/.ssh/somekey user@host.example %S 'foo/repo'":: Like host.example:foo/repo, but use /home/foo/.ssh/somekey as - keypair and user as user on remote side. This avoids needing to + keypair and user as the user on the remote side. This avoids the need to edit .ssh/config. "ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo":: Represents repository with path /somerepo accessible over - git protocol at abstract namespace address /git-server. + git protocol at the abstract namespace address /git-server. "ext::git-server-alias foo %G/repo":: Represents a repository with path /repo accessed using the diff --git a/git-remote-fd.html b/git-remote-fd.html index 70a21290c..3bfe8eca3 100644 --- a/git-remote-fd.html +++ b/git-remote-fd.html @@ -756,16 +756,16 @@ git-remote-fd(1) Manual Page <div class="sectionbody">
<div class="paragraph"><p>This helper uses specified file descriptors to connect to a remote Git server.
This is not meant for end users but for programs and scripts calling git
-fetch, push or archive.</p></div>
+fetch, push, or archive.</p></div>
<div class="paragraph"><p>If only <infd> is given, it is assumed to be a bidirectional socket connected
-to remote Git server (git-upload-pack, git-receive-pack or
+to a remote Git server (git-upload-pack, git-receive-pack, or
git-upload-archive). If both <infd> and <outfd> are given, they are assumed
to be pipes connected to a remote Git server (<infd> being the inbound pipe
-and <outfd> being the outbound pipe.</p></div>
+and <outfd> being the outbound pipe).</p></div>
<div class="paragraph"><p>It is assumed that any handshaking procedures have already been completed
(such as sending service request for git://) before this helper is started.</p></div>
<div class="paragraph"><p><anything> can be any string. It is ignored. It is meant for providing
-information to user in the URL in case that URL is displayed in some
+information to the user in the URL in case that URL is displayed in some
context.</p></div>
</div>
</div>
@@ -812,7 +812,7 @@ GIT_TRANSLOOP_DEBUG <p>
Push master, using file descriptor #7 to read data from
git-receive-pack and file descriptor #8 to write data to
- same service.
+ the same service.
</p>
</dd>
<dt class="hdlist1">
@@ -843,7 +843,7 @@ GIT_TRANSLOOP_DEBUG <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-remote-fd.txt b/git-remote-fd.txt index 0451ceb8a..1dd2648a7 100644 --- a/git-remote-fd.txt +++ b/git-remote-fd.txt @@ -13,19 +13,19 @@ DESCRIPTION ----------- This helper uses specified file descriptors to connect to a remote Git server. This is not meant for end users but for programs and scripts calling git -fetch, push or archive. +fetch, push, or archive. If only <infd> is given, it is assumed to be a bidirectional socket connected -to remote Git server (git-upload-pack, git-receive-pack or +to a remote Git server (git-upload-pack, git-receive-pack, or git-upload-archive). If both <infd> and <outfd> are given, they are assumed to be pipes connected to a remote Git server (<infd> being the inbound pipe -and <outfd> being the outbound pipe. +and <outfd> being the outbound pipe). It is assumed that any handshaking procedures have already been completed (such as sending service request for git://) before this helper is started. <anything> can be any string. It is ignored. It is meant for providing -information to user in the URL in case that URL is displayed in some +information to the user in the URL in case that URL is displayed in some context. ENVIRONMENT VARIABLES @@ -45,7 +45,7 @@ EXAMPLES `git push fd::7,8 master (as URL)`:: Push master, using file descriptor #7 to read data from git-receive-pack and file descriptor #8 to write data to - same service. + the same service. `git push fd::7,8/bar master`:: Same as above. diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 5787646d7..5ab796bfc 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>git-remote-helpers</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/git-repack.html b/git-repack.html index ff3a374e3..129e1e975 100644 --- a/git-repack.html +++ b/git-repack.html @@ -1049,7 +1049,7 @@ depth is 4095.</p></div> Exclude the given pack from repacking. This is the equivalent
of having <code>.keep</code> file on the pack. <code><pack-name></code> is the
pack file name without leading directory (e.g. <code>pack-123.pack</code>).
- The option could be specified multiple times to keep multiple
+ The option can be specified multiple times to keep multiple
packs.
</p>
</dd>
@@ -1115,7 +1115,7 @@ progression.</p></div> this "roll-up", without respect to their reachability. This is subject
to change in the future. This option (implying a drastically different
repack mode) is not guaranteed to work with all other combinations of
-option to <code>git repack</code>.</p></div>
+options to <code>git repack</code>.</p></div>
<div class="paragraph"><p>When writing a multi-pack bitmap, <code>git repack</code> selects the largest resulting
pack as the preferred pack for object selection by the MIDX (see
<a href="git-multi-pack-index.html">git-multi-pack-index(1)</a>).</p></div>
@@ -1172,7 +1172,7 @@ attribute <code>delta</code> set to false.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-18 13:44:22 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-repack.txt b/git-repack.txt index 893b8a2fe..c33832908 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -199,7 +199,7 @@ depth is 4095. Exclude the given pack from repacking. This is the equivalent of having `.keep` file on the pack. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). - The option could be specified multiple times to keep multiple + The option can be specified multiple times to keep multiple packs. --unpack-unreachable=<when>:: @@ -241,7 +241,7 @@ When `--unpacked` is specified, loose objects are implicitly included in this "roll-up", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of -option to `git repack`. +options to `git repack`. + When writing a multi-pack bitmap, `git repack` selects the largest resulting pack as the preferred pack for object selection by the MIDX (see diff --git a/git-replace.html b/git-replace.html index edee34707..a61a62620 100644 --- a/git-replace.html +++ b/git-replace.html @@ -774,7 +774,7 @@ Merge commits can be replaced by non-merge commits and vice versa.</p></div> <div class="paragraph"><p>Replacement references will be used by default by all Git commands
except those doing reachability traversal (prune, pack transfer and
fsck).</p></div>
-<div class="paragraph"><p>It is possible to disable use of replacement references for any
+<div class="paragraph"><p>It is possible to disable the use of replacement references for any
command using the <code>--no-replace-objects</code> option just after <em>git</em>.</p></div>
<div class="paragraph"><p>For example if commit <em>foo</em> has been replaced by commit <em>bar</em>:</p></div>
<div class="listingblock">
@@ -898,7 +898,7 @@ achieve the same effect as the <code>--no-replace-objects</code> option.</p></di <div class="sect1">
<h2 id="_formats">FORMATS</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The following format are available:</p></div>
+<div class="paragraph"><p>The following formats are available:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -971,7 +971,7 @@ pending objects.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-replace.txt b/git-replace.txt index f271d758c..4f257126e 100644 --- a/git-replace.txt +++ b/git-replace.txt @@ -35,7 +35,7 @@ Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck). -It is possible to disable use of replacement references for any +It is possible to disable the use of replacement references for any command using the `--no-replace-objects` option just after 'git'. For example if commit 'foo' has been replaced by commit 'bar': @@ -111,7 +111,7 @@ OPTIONS FORMATS ------- -The following format are available: +The following formats are available: * 'short': <replaced sha1> diff --git a/git-request-pull.html b/git-request-pull.html index 5a8efb8d4..058ee0c84 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -760,7 +760,7 @@ git-request-pull(1) Manual Page <div class="paragraph"><p>Generate a request asking your upstream project to pull changes into
their tree. The request, printed to the standard output,
begins with the branch description, summarizes
-the changes and indicates from where they can be pulled.</p></div>
+the changes, and indicates from where they can be pulled.</p></div>
<div class="paragraph"><p>The upstream project is expected to have the commit named by
<code><start></code> and the output asks it to integrate the changes you made
since that commit, up to the commit named by <code><end></code>, by visiting
@@ -816,7 +816,7 @@ its remote name.</p></div> <h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="paragraph"><p>Imagine that you built your work on your <code>master</code> branch on top of
-the <code>v1.0</code> release, and want it to be integrated to the project.
+the <code>v1.0</code> release, and want it to be integrated into the project.
First you push that change to your public repository for others to
see:</p></div>
<div class="literalblock">
@@ -855,7 +855,7 @@ the one you have locally, e.g.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-request-pull.txt b/git-request-pull.txt index fa5a42670..15dcbb6d9 100644 --- a/git-request-pull.txt +++ b/git-request-pull.txt @@ -16,7 +16,7 @@ DESCRIPTION Generate a request asking your upstream project to pull changes into their tree. The request, printed to the standard output, begins with the branch description, summarizes -the changes and indicates from where they can be pulled. +the changes, and indicates from where they can be pulled. The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made @@ -50,7 +50,7 @@ EXAMPLES -------- Imagine that you built your work on your `master` branch on top of -the `v1.0` release, and want it to be integrated to the project. +the `v1.0` release, and want it to be integrated into the project. First you push that change to your public repository for others to see: diff --git a/git-restore.html b/git-restore.html index 3ac507ae8..04efbff66 100644 --- a/git-restore.html +++ b/git-restore.html @@ -912,7 +912,7 @@ in <a href="git-checkout.html">git-checkout(1)</a> for details.</p></div> </dt>
<dd>
<p>
- In sparse checkout mode, by default is to only update entries
+ In sparse checkout mode, the default is to only update entries
matched by <code><pathspec></code> and sparse patterns in
$GIT_DIR/info/sparse-checkout. This option ignores the sparse
patterns and unconditionally restores any files in
@@ -1046,7 +1046,7 @@ the same as using <a href="git-reset.html">git-reset(1)</a>)</p></div> <div class="content">
<pre><code>$ git restore --staged hello.c</code></pre>
</div></div>
-<div class="paragraph"><p>or you can restore both the index and the working tree (this the same
+<div class="paragraph"><p>or you can restore both the index and the working tree (this is the same
as using <a href="git-checkout.html">git-checkout(1)</a>)</p></div>
<div class="listingblock">
<div class="content">
@@ -1077,7 +1077,7 @@ as using <a href="git-checkout.html">git-checkout(1)</a>)</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-02 12:46:05 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-restore.txt b/git-restore.txt index c70444705..975825b44 100644 --- a/git-restore.txt +++ b/git-restore.txt @@ -105,7 +105,7 @@ in linkgit:git-checkout[1] for details. specified. Unmerged paths on the working tree are left alone. --ignore-skip-worktree-bits:: - In sparse checkout mode, by default is to only update entries + In sparse checkout mode, the default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in @@ -199,7 +199,7 @@ the same as using linkgit:git-reset[1]) $ git restore --staged hello.c ------------ -or you can restore both the index and the working tree (this the same +or you can restore both the index and the working tree (this is the same as using linkgit:git-checkout[1]) ------------ diff --git a/git-rev-list.html b/git-rev-list.html index 410079a0b..6d5a95367 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -790,9 +790,9 @@ between the two operands. The following two commands are equivalent:</p></div> <pre><code>$ git rev-list A B --not $(git merge-base --all A B)
$ git rev-list A...B</code></pre>
</div></div>
-<div class="paragraph"><p><em>rev-list</em> is a very essential Git command, since it
+<div class="paragraph"><p><em>rev-list</em> is an essential Git command, since it
provides the ability to build and traverse commit ancestry graphs. For
-this reason, it has a lot of different options that enables it to be
+this reason, it has a lot of different options that enable it to be
used by commands as different as <em>git bisect</em> and
<em>git repack</em>.</p></div>
</div>
@@ -909,7 +909,7 @@ ordering and formatting options, such as <code>--reverse</code>.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones with log message that
+ Limit the commits output to ones with a log message that
matches the specified pattern (regular expression). With
more than one <code>--grep=<pattern></code>, commits whose message
matches any of the given patterns are chosen (but see
@@ -930,7 +930,7 @@ ordering and formatting options, such as <code>--reverse</code>.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones with log message that do not
+ Limit the commits output to ones with a log message that do not
match the pattern specified with <code>--grep=<pattern></code>.
</p>
</dd>
@@ -2362,7 +2362,7 @@ people using 80-column terminals.</p></div> <dd>
<p>
Perform a tab expansion (replace each tab with enough spaces
- to fill to the next display column that is multiple of <em><n></em>)
+ to fill to the next display column that is a multiple of <em><n></em>)
in the log message before showing it in the output.
<code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
<code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
@@ -3770,7 +3770,7 @@ Compare the on-disk size of branches in one group of refs, excluding <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-rev-list.txt b/git-rev-list.txt index 51029a227..2e05c4b51 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -17,9 +17,9 @@ DESCRIPTION :git-rev-list: 1 include::rev-list-description.txt[] -'rev-list' is a very essential Git command, since it +'rev-list' is an essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For -this reason, it has a lot of different options that enables it to be +this reason, it has a lot of different options that enable it to be used by commands as different as 'git bisect' and 'git repack'. diff --git a/git-rev-parse.html b/git-rev-parse.html index 169df7177..01238dcc4 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -757,7 +757,7 @@ git-rev-parse(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Many Git porcelainish commands take mixture of flags
+<div class="paragraph"><p>Many Git porcelainish commands take a mixture of flags
(i.e. parameters that begin with a dash <em>-</em>) and parameters
meant for the underlying <em>git rev-list</em> command they use internally
and flags and parameters for the other commands they use
@@ -787,7 +787,7 @@ distinguish between them.</p></div> <p>
Use <em>git rev-parse</em> in shell quoting mode (see SQ-QUOTE
section below). In contrast to the <code>--sq</code> option below, this
- mode does only quoting. Nothing else is done to command input.
+ mode only does quoting. Nothing else is done to command input.
</p>
</dd>
</dl></div>
@@ -997,7 +997,7 @@ for another option.</p></div> are not refs (i.e. branch or tag names; or more
explicitly disambiguating "heads/master" form, when you
want to name the "master" branch when there is an
- unfortunately named tag "master"), and show them as full
+ unfortunately named tag "master"), and shows them as full
refnames (e.g. "refs/heads/master").
</p>
</dd>
@@ -2028,7 +2028,7 @@ Use <code>!</code> to not make the corresponding negated long option available. </dd>
</dl></div>
<div class="paragraph"><p>The remainder of the line, after stripping the spaces, is used
-as the help associated to the option.</p></div>
+as the help associated with the option.</p></div>
<div class="paragraph"><p>Blank lines are ignored, and lines that don’t match this specification are used
as option group headers (start the line with a space to create such
lines on purpose).</p></div>
@@ -2151,7 +2151,7 @@ Similar to above: <div id="footer">
<div id="footer-text">
Last updated
- 2023-08-25 11:06:36 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 6a4968f68..912fab9f5 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Many Git porcelainish commands take mixture of flags +Many Git porcelainish commands take a mixture of flags (i.e. parameters that begin with a dash '-') and parameters meant for the underlying 'git rev-list' command they use internally and flags and parameters for the other commands they use @@ -36,7 +36,7 @@ Each of these options must appear first on the command line. --sq-quote:: Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE section below). In contrast to the `--sq` option below, this - mode does only quoting. Nothing else is done to command input. + mode only does quoting. Nothing else is done to command input. Options for --parseopt ~~~~~~~~~~~~~~~~~~~~~~ @@ -156,7 +156,7 @@ for another option. are not refs (i.e. branch or tag names; or more explicitly disambiguating "heads/master" form, when you want to name the "master" branch when there is an - unfortunately named tag "master"), and show them as full + unfortunately named tag "master"), and shows them as full refnames (e.g. "refs/heads/master"). Options for Objects @@ -383,7 +383,7 @@ Each line of options has this format: dash to separate words in a multi-word argument hint. The remainder of the line, after stripping the spaces, is used -as the help associated to the option. +as the help associated with the option. Blank lines are ignored, and lines that don't match this specification are used as option group headers (start the line with a space to create such diff --git a/git-rm.html b/git-rm.html index ee7d70018..ac15f874b 100644 --- a/git-rm.html +++ b/git-rm.html @@ -968,7 +968,7 @@ in the <a href="gitmodules.html">gitmodules(5)</a> file will also be removed and will be staged (unless --cached or -n are used).</p></div>
<div class="paragraph"><p>A submodule is considered up to date when the HEAD is the same as
recorded in the index, no tracked files are modified and no untracked
-files that aren’t ignored are present in the submodules work tree.
+files that aren’t ignored are present in the submodule’s work tree.
Ignored files are deemed expendable and won’t stop a submodule’s work
tree from being removed.</p></div>
<div class="paragraph"><p>If you only want to remove the local checkout of a submodule from your
@@ -1033,7 +1033,7 @@ obsolete when recursive submodule update has been implemented.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-10-14 10:10:01 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-rm.txt b/git-rm.txt index 81bc23f3c..363a26934 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -163,7 +163,7 @@ will be staged (unless --cached or -n are used). A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked -files that aren't ignored are present in the submodules work tree. +files that aren't ignored are present in the submodule's work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed. diff --git a/git-send-email.html b/git-send-email.html index eab7c37ac..5abdf0c8d 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -1525,8 +1525,8 @@ default to <code>--validate</code>.</p></div> <dd>
<p>
Instead of the normal operation, dump the shorthand alias names from
- the configured alias file(s), one per line in alphabetical order. Note,
- this only includes the alias name and not its expanded email addresses.
+ the configured alias file(s), one per line in alphabetical order. Note
+ that this only includes the alias name and not its expanded email addresses.
See <em>sendemail.aliasesfile</em> for more information about aliases.
</p>
</dd>
@@ -1618,7 +1618,7 @@ sendemail.aliasFileType <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>.
+ one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, <em>elm</em>, <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
@@ -1761,7 +1761,7 @@ sendemail.smtpReloginDelay </dt>
<dd>
<p>
- Seconds wait before reconnecting to smtp server.
+ Seconds to wait before reconnecting to the smtp server.
See also the <code>--relogin-delay</code> option of <a href="git-send-email.html">git-send-email(1)</a>.
</p>
</dd>
@@ -1833,7 +1833,7 @@ Authen::SASL and Mail::Address.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-05-15 16:02:03 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-send-email.txt b/git-send-email.txt index 492a82323..e90d04181 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -468,8 +468,8 @@ Information --dump-aliases:: Instead of the normal operation, dump the shorthand alias names from - the configured alias file(s), one per line in alphabetical order. Note, - this only includes the alias name and not its expanded email addresses. + the configured alias file(s), one per line in alphabetical order. Note + that this only includes the alias name and not its expanded email addresses. See 'sendemail.aliasesfile' for more information about aliases. diff --git a/git-send-pack.html b/git-send-pack.html index c4354c91c..7fe9e63d2 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -828,7 +828,7 @@ be in a separate packet, and the list must end with a flush packet.</p></div> <p>
Usually, the command refuses to update a remote ref that
is not an ancestor of the local ref used to overwrite it.
- This flag disables the check. What this means is that
+ This flag disables the check. This means that
the remote repository can lose commits; use it with
care.
</p>
@@ -923,16 +923,16 @@ be in a separate packet, and the list must end with a flush packet.</p></div> <div class="sectionbody">
<div class="paragraph"><p>There are three ways to specify which refs to update on the
remote end.</p></div>
-<div class="paragraph"><p>With <code>--all</code> flag, all refs that exist locally are transferred to
+<div class="paragraph"><p>With the <code>--all</code> flag, all refs that exist locally are transferred to
the remote side. You cannot specify any <em><ref></em> if you use
this flag.</p></div>
<div class="paragraph"><p>Without <code>--all</code> and without any <em><ref></em>, the heads that exist
both on the local side and on the remote side are updated.</p></div>
<div class="paragraph"><p>When one or more <em><ref></em> are specified explicitly (whether on the
command line or via <code>--stdin</code>), it can be either a
-single pattern, or a pair of such pattern separated by a colon
+single pattern, or a pair of such patterns separated by a colon
":" (this means that a ref name cannot have a colon in it). A
-single pattern <em><name></em> is just a shorthand for <em><name>:<name></em>.</p></div>
+single pattern <em><name></em> is just shorthand for <em><name>:<name></em>.</p></div>
<div class="paragraph"><p>Each pattern pair consists of the source side (before the colon)
and the destination side (after the colon). The ref to be
pushed is determined by finding a match that matches the source
@@ -949,7 +949,7 @@ It is an error if <src> does not match exactly one of the </li>
<li>
<p>
-It is an error if <dst> matches more than one remote refs.
+It is an error if <dst> matches more than one remote ref.
</p>
</li>
<li>
@@ -973,11 +973,11 @@ it has to start with "refs/"; <dst> is used as the </ul></div>
</li>
</ul></div>
-<div class="paragraph"><p>Without ‘--force`, the <src> ref is stored at the remote only if
+<div class="paragraph"><p>Without <code>--force</code>, the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
-ancestor) of <src>. This check, known as "fast-forward check",
-is performed in order to avoid accidentally overwriting the
-remote ref and lose other peoples’ commits from there.</p></div>
+ancestor) of <src>. This check, known as the "fast-forward check",
+is performed to avoid accidentally overwriting the
+remote ref and losing other people’s commits from there.</p></div>
<div class="paragraph"><p>With <code>--force</code>, the fast-forward check is disabled for all refs.</p></div>
<div class="paragraph"><p>Optionally, a <ref> parameter can be prefixed with a plus <em>+</em> sign
to disable the fast-forward check only on that ref.</p></div>
@@ -994,7 +994,7 @@ to disable the fast-forward check only on that ref.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-send-pack.txt b/git-send-pack.txt index 595b00215..b9e73f2e7 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -55,7 +55,7 @@ be in a separate packet, and the list must end with a flush packet. --force:: Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. - This flag disables the check. What this means is that + This flag disables the check. This means that the remote repository can lose commits; use it with care. @@ -106,7 +106,7 @@ SPECIFYING THE REFS There are three ways to specify which refs to update on the remote end. -With `--all` flag, all refs that exist locally are transferred to +With the `--all` flag, all refs that exist locally are transferred to the remote side. You cannot specify any '<ref>' if you use this flag. @@ -115,9 +115,9 @@ both on the local side and on the remote side are updated. When one or more '<ref>' are specified explicitly (whether on the command line or via `--stdin`), it can be either a -single pattern, or a pair of such pattern separated by a colon +single pattern, or a pair of such patterns separated by a colon ":" (this means that a ref name cannot have a colon in it). A -single pattern '<name>' is just a shorthand for '<name>:<name>'. +single pattern '<name>' is just shorthand for '<name>:<name>'. Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be @@ -130,7 +130,7 @@ name. See linkgit:git-rev-parse[1]. - It is an error if <src> does not match exactly one of the local refs. - - It is an error if <dst> matches more than one remote refs. + - It is an error if <dst> matches more than one remote ref. - If <dst> does not match any remote ref, either @@ -143,9 +143,9 @@ name. See linkgit:git-rev-parse[1]. Without `--force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an -ancestor) of <src>. This check, known as "fast-forward check", -is performed in order to avoid accidentally overwriting the -remote ref and lose other peoples' commits from there. +ancestor) of <src>. This check, known as the "fast-forward check", +is performed to avoid accidentally overwriting the +remote ref and losing other people's commits from there. With `--force`, the fast-forward check is disabled for all refs. diff --git a/git-sh-setup.html b/git-sh-setup.html index 15f6c34f7..5ebb9ea7a 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -764,7 +764,7 @@ Porcelain-ish scripts and/or are writing new ones.</p></div> <code>.</code>) by other shell scripts to set up some variables pointing at
the normal Git directories and a few helper shell functions.</p></div>
<div class="paragraph"><p>Before sourcing it, your script should set up a few variables;
-<code>USAGE</code> (and <code>LONG_USAGE</code>, if any) is used to define message
+<code>USAGE</code> (and <code>LONG_USAGE</code>, if any) is used to define the message
given by <code>usage()</code> shell function. <code>SUBDIRECTORY_OK</code> can be set
if the script can run from a subdirectory of the working tree
(some commands do not).</p></div>
@@ -902,7 +902,7 @@ create_virtual_base <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-sh-setup.txt b/git-sh-setup.txt index 8632612c3..bdaf6e5fc 100644 --- a/git-sh-setup.txt +++ b/git-sh-setup.txt @@ -22,7 +22,7 @@ The 'git sh-setup' scriptlet is designed to be sourced (using the normal Git directories and a few helper shell functions. Before sourcing it, your script should set up a few variables; -`USAGE` (and `LONG_USAGE`, if any) is used to define message +`USAGE` (and `LONG_USAGE`, if any) is used to define the message given by `usage()` shell function. `SUBDIRECTORY_OK` can be set if the script can run from a subdirectory of the working tree (some commands do not). diff --git a/git-shortlog.html b/git-shortlog.html index 6947f136e..d3d2b1421 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -1030,7 +1030,7 @@ ordering and formatting options, such as <code>--reverse</code>.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones with log message that
+ Limit the commits output to ones with a log message that
matches the specified pattern (regular expression). With
more than one <code>--grep=<pattern></code>, commits whose message
matches any of the given patterns are chosen (but see
@@ -1053,7 +1053,7 @@ matched as if it were part of the log message.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones with log message that do not
+ Limit the commits output to ones with a log message that do not
match the pattern specified with <code>--grep=<pattern></code>.
</p>
</dd>
diff --git a/git-show-branch.html b/git-show-branch.html index 5aaa5dc6f..d25943de9 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -822,7 +822,7 @@ no <rev> or <glob> is given on the command line.</p></div> <dd>
<p>
With this option, the command includes the current
- branch to the list of revs to be shown when it is not
+ branch in the list of revs to be shown when it is not
given on the command line.
</p>
</dd>
@@ -966,7 +966,7 @@ no <rev> or <glob> is given on the command line.</p></div> </p>
</dd>
</dl></div>
-<div class="paragraph"><p>Note that --more, --list, --independent and --merge-base options
+<div class="paragraph"><p>Note that --more, --list, --independent, and --merge-base options
are mutually exclusive.</p></div>
</div>
</div>
@@ -977,13 +977,13 @@ are mutually exclusive.</p></div> their commit message. The branch head that is pointed at by
$GIT_DIR/HEAD is prefixed with an asterisk <code>*</code> character while other
heads are prefixed with a <code>!</code> character.</p></div>
-<div class="paragraph"><p>Following these N lines, one-line log for each commit is
+<div class="paragraph"><p>Following these N lines, a one-line log for each commit is
displayed, indented N places. If a commit is on the I-th
branch, the I-th indentation character shows a <code>+</code> sign;
otherwise it shows a space. Merge commits are denoted by
a <code>-</code> sign. Each commit shows a short name that
can be used as an extended SHA-1 to name that commit.</p></div>
-<div class="paragraph"><p>The following example shows three branches, "master", "fixes"
+<div class="paragraph"><p>The following example shows three branches, "master", "fixes",
and "mhf":</p></div>
<div class="listingblock">
<div class="content">
@@ -993,7 +993,7 @@ and "mhf":</p></div> ! [mhf] Allow "+remote:local" refspec to cause --force when fetching.
---
+ [mhf] Allow "+remote:local" refspec to cause --force when fetching.
- + [mhf~1] Use git-octopus when pulling more than one heads.
+ + [mhf~1] Use git-octopus when pulling more than one head.
+ [fixes] Introduce "reset type" flag to "git reset"
+ [mhf~2] "git fetch --force".
+ [mhf~3] Use .git/remote/origin, not .git/branches/origin.
@@ -1032,7 +1032,7 @@ your topic branch, it is shown as well.</p></div> </div></div>
<div class="paragraph"><p>shows 10 reflog entries going back from the tip as of 1 hour ago.
Without <code>--list</code>, the output also shows how these tips are
-topologically related with each other.</p></div>
+topologically related to each other.</p></div>
</div>
</div>
<div class="sect1">
@@ -1065,7 +1065,7 @@ showBranch.default <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-13 13:57:42 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index 58cf6210c..c771c8977 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -50,7 +50,7 @@ OPTIONS --current:: With this option, the command includes the current - branch to the list of revs to be shown when it is not + branch in the list of revs to be shown when it is not given on the command line. --topo-order:: @@ -125,7 +125,7 @@ OPTIONS default to color output. Same as `--color=never`. -Note that --more, --list, --independent and --merge-base options +Note that --more, --list, --independent, and --merge-base options are mutually exclusive. @@ -137,14 +137,14 @@ their commit message. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*` character while other heads are prefixed with a `!` character. -Following these N lines, one-line log for each commit is +Following these N lines, a one-line log for each commit is displayed, indented N places. If a commit is on the I-th branch, the I-th indentation character shows a `+` sign; otherwise it shows a space. Merge commits are denoted by a `-` sign. Each commit shows a short name that can be used as an extended SHA-1 to name that commit. -The following example shows three branches, "master", "fixes" +The following example shows three branches, "master", "fixes", and "mhf": ------------------------------------------------ @@ -154,7 +154,7 @@ $ git show-branch master fixes mhf ! [mhf] Allow "+remote:local" refspec to cause --force when fetching. --- + [mhf] Allow "+remote:local" refspec to cause --force when fetching. - + [mhf~1] Use git-octopus when pulling more than one heads. + + [mhf~1] Use git-octopus when pulling more than one head. + [fixes] Introduce "reset type" flag to "git reset" + [mhf~2] "git fetch --force". + [mhf~3] Use .git/remote/origin, not .git/branches/origin. @@ -197,7 +197,7 @@ $ git show-branch --reflog="10,1 hour ago" --list master 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. +topologically related to each other. CONFIGURATION ------------- diff --git a/git-show-ref.html b/git-show-ref.html index 68ba73e39..52b6a6631 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -930,7 +930,7 @@ use:</p></div> <pre><code> git show-ref master</code></pre>
</div></div>
<div class="paragraph"><p>This will show "refs/heads/master" but also "refs/remote/other-repo/master",
-if such references exists.</p></div>
+if such references exist.</p></div>
<div class="paragraph"><p>When using the <code>--verify</code> flag, the command requires an exact path:</p></div>
<div class="listingblock">
<div class="content">
@@ -987,7 +987,7 @@ flag, so you can do</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-08-17 17:18:11 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-show-ref.txt b/git-show-ref.txt index 2fe274b8f..36e81b9de 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt @@ -144,7 +144,7 @@ use: ----------------------------------------------------------------------------- This will show "refs/heads/master" but also "refs/remote/other-repo/master", -if such references exists. +if such references exist. When using the `--verify` flag, the command requires an exact path: diff --git a/git-show.html b/git-show.html index bf6fb1a78..16cf6407e 100644 --- a/git-show.html +++ b/git-show.html @@ -865,7 +865,7 @@ people using 80-column terminals.</p></div> <dd>
<p>
Perform a tab expansion (replace each tab with enough spaces
- to fill to the next display column that is multiple of <em><n></em>)
+ to fill to the next display column that is a multiple of <em><n></em>)
in the log message before showing it in the output.
<code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
<code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
@@ -892,7 +892,7 @@ environment overrides). See <a href="git-config.html">git-config(1)</a> for more <div class="paragraph"><p>With an optional <em><ref></em> argument, use the ref to find the notes
to display. The ref can specify the full refname when it begins
with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
-<code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div>
+<code>refs/notes/</code> is prefixed to form the full name of the ref.</p></div>
<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
being displayed. Examples: "--notes=foo" will show only notes from
"refs/notes/foo"; "--notes=foo --notes" will show both notes from
@@ -2027,128 +2027,149 @@ diff output.</p></div> </p>
</dd>
<dt class="hdlist1">
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)
-</dt>
-<dt class="hdlist1">
---no-diff-merges
+-m
</dt>
<dd>
<p>
- Specify diff format to be used for merge commits. Default is
- <code>dense-combined</code> unless <code>--first-parent</code> is in use, in which case
- <code>first-parent</code> is the default.
+ Show diffs for merge commits in the default format. This is
+ similar to <em>--diff-merges=on</em>, except <code>-m</code> will
+ produce no output unless <code>-p</code> is given as well.
</p>
-<div class="dlist"><dl>
-<dt class="hdlist1">
---diff-merges=(off|none)
-</dt>
+</dd>
<dt class="hdlist1">
---no-diff-merges
+-c
</dt>
<dd>
<p>
- Disable output of diffs for merge commits. Useful to override
- implied value.
+ Produce combined diff output for merge commits.
+ Shortcut for <em>--diff-merges=combined -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=on
-</dt>
-<dt class="hdlist1">
---diff-merges=m
-</dt>
-<dt class="hdlist1">
--m
+--cc
</dt>
<dd>
<p>
- This option makes diff output for merge commits to be shown in
- the default format. <code>-m</code> will produce the output only if <code>-p</code>
- is given as well. The default format could be changed using
- <code>log.diffMerges</code> configuration parameter, which default value
- is <code>separate</code>.
+ Produce dense combined diff output for merge commits.
+ Shortcut for <em>--diff-merges=dense-combined -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=first-parent
-</dt>
-<dt class="hdlist1">
---diff-merges=1
+--dd
</dt>
<dd>
<p>
- This option makes merge commits show the full diff with
- respect to the first parent only.
+ Produce diff with respect to first parent for both merge and
+ regular commits.
+ Shortcut for <em>--diff-merges=first-parent -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=separate
+--remerge-diff
</dt>
<dd>
<p>
- This makes merge commits show the full diff with respect to
- each of the parents. Separate log entry and diff is generated
- for each parent.
+ Produce remerge-diff output for merge commits.
+ Shortcut for <em>--diff-merges=remerge -p</em>.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=remerge
+--no-diff-merges
</dt>
+<dd>
+<p>
+ Synonym for <em>--diff-merges=off</em>.
+</p>
+</dd>
<dt class="hdlist1">
---diff-merges=r
+--diff-merges=<format>
</dt>
+<dd>
+<p>
+ Specify diff format to be used for merge commits. Default is
+ <code>dense-combined</code> unless <code>--first-parent</code> is in use, in
+ which case <code>first-parent</code> is the default.
+</p>
+<div class="paragraph"><p>The following formats are supported:</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
<dt class="hdlist1">
---remerge-diff
+off, none
</dt>
<dd>
<p>
- With this option, two-parent merge commits are remerged to
- create a temporary tree object — potentially containing files
- with conflict markers and such. A diff is then shown between
- that temporary tree and the actual merge commit.
+ Disable output of diffs for merge commits. Useful to override
+ implied value.
</p>
-<div class="paragraph"><p>The output emitted when this option is used is subject to change, and
-so is its interaction with other options (unless explicitly
-documented).</p></div>
</dd>
<dt class="hdlist1">
---diff-merges=combined
+on, m
</dt>
+<dd>
+<p>
+ Make diff output for merge commits to be shown in the default
+ format. The default format could be changed using
+ <code>log.diffMerges</code> configuration variable, whose default value
+ is <code>separate</code>.
+</p>
+</dd>
<dt class="hdlist1">
---diff-merges=c
+first-parent, 1
</dt>
+<dd>
+<p>
+ Show full diff with respect to first parent. This is the same
+ format as <code>--patch</code> produces for non-merge commits.
+</p>
+</dd>
<dt class="hdlist1">
--c
+separate
</dt>
<dd>
<p>
- With this option, diff output for a merge commit shows the
- differences from each of the parents to the merge result
- simultaneously instead of showing pairwise diff between a
- parent and the result one at a time. Furthermore, it lists
- only files which were modified from all parents. <code>-c</code> implies
- <code>-p</code>.
+ Show full diff with respect to each of parents.
+ Separate log entry and diff is generated for each parent.
</p>
</dd>
<dt class="hdlist1">
---diff-merges=dense-combined
+combined, c
</dt>
+<dd>
+<p>
+ Show differences from each of the parents to the merge
+ result simultaneously instead of showing pairwise diff between
+ a parent and the result one at a time. Furthermore, it lists
+ only files which were modified from all parents.
+</p>
+</dd>
<dt class="hdlist1">
---diff-merges=cc
+dense-combined, cc
</dt>
+<dd>
+<p>
+ Further compress output produced by <code>--diff-merges=combined</code>
+ by omitting uninteresting hunks whose contents in the parents
+ have only two variants and the merge result picks one of them
+ without modification.
+</p>
+</dd>
<dt class="hdlist1">
---cc
+remerge, r
</dt>
<dd>
<p>
- With this option the output produced by
- <code>--diff-merges=combined</code> is further compressed by omitting
- uninteresting hunks whose contents in the parents have only
- two variants and the merge result picks one of them without
- modification. <code>--cc</code> implies <code>-p</code>.
+ Remerge two-parent merge commits to create a temporary tree
+ object—potentially containing files with conflict markers
+ and such. A diff is then shown between that temporary tree
+ and the actual merge commit.
</p>
+<div class="paragraph"><p>The output emitted when this option is used is subject to change, and
+so is its interaction with other options (unless explicitly
+documented).</p></div>
</dd>
</dl></div>
+</div></div>
</dd>
<dt class="hdlist1">
--combined-all-paths
@@ -3173,7 +3194,7 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "< <p>
Discard the files before the named <file> from the output
(i.e. <em>skip to</em>), or move them to the end of the output
- (i.e. <em>rotate to</em>). These were invented primarily for use
+ (i.e. <em>rotate to</em>). These options were invented primarily for the use
of the <code>git difftool</code> command, and may not be very useful
otherwise.
</p>
@@ -3436,7 +3457,7 @@ diff format:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header that looks like this:
+It is preceded by a "git diff" header that looks like this:
</p>
<div class="literalblock">
<div class="content">
@@ -3445,9 +3466,9 @@ It is preceded with a "git diff" header that looks like this: <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
+<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p></div>
+the file that the rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -3508,7 +3529,7 @@ rename to a</code></pre> <p>
Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
- <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
+ <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
specific languages.
</p>
</li>
@@ -3523,7 +3544,7 @@ produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
<code>--diff-merges</code> option to any of these commands to force generation of
-diffs in specific format.</p></div>
+diffs in a specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -3558,7 +3579,7 @@ index fabadb8,cc95eb0..4866510 <div class="olist arabic"><ol class="arabic">
<li>
<p>
-It is preceded with a "git diff" header, that looks like
+It is preceded by a "git diff" header, that looks like
this (when the <code>-c</code> option is used):
</p>
<div class="literalblock">
@@ -3585,25 +3606,25 @@ deleted file mode <mode>,<mode></code></pre> </div></div>
<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
-information about detected contents movement (renames and
-copying detection) are designed to work with diff of two
+information about detected content movement (renames and
+copying detection) are designed to work with the diff of two
<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
-It is followed by two-line from-file/to-file header
+It is followed by a two-line from-file/to-file header:
</p>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
+++ b/file</code></pre>
</div></div>
-<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
-two-line from-file/to-file you get a N+1 line from-file/to-file header,
-where N is the number of parents in the merge commit</p></div>
+two-line from-file/to-file, you get an N+1 line from-file/to-file header,
+where N is the number of parents in the merge commit:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>--- a/file
@@ -3646,7 +3667,7 @@ added, from the point of view of that parent).</p></div> <div class="paragraph"><p>In the above example output, the function signature was changed
from both files (hence two <code>-</code> removals from both file1 and
file2, plus <code>++</code> to mean one line that was added does not appear
-in either file1 or file2). Also eight other lines are the same
+in either file1 or file2). Also, eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
@@ -3665,7 +3686,7 @@ two unresolved merge parents with the working tree file </dt>
<dd>
<p>
- Shows the tag <code>v1.0.0</code>, along with the object the tags
+ Shows the tag <code>v1.0.0</code>, along with the object the tag
points at.
</p>
</dd>
@@ -3758,7 +3779,7 @@ mind.</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-<em>git commit</em> and <em>git commit-tree</em> issues
+<em>git commit</em> and <em>git commit-tree</em> issue
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
@@ -3770,7 +3791,7 @@ mind.</p></div> commitEncoding = ISO-8859-1</code></pre>
</div></div>
<div class="paragraph"><p>Commit objects created with the above setting record the value
-of <code>i18n.commitEncoding</code> in its <code>encoding</code> header. This is to
+of <code>i18n.commitEncoding</code> in their <code>encoding</code> header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.</p></div>
</li>
@@ -3808,7 +3829,7 @@ reversible operation.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-09-29 09:41:32 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-show.txt b/git-show.txt index 03c063451..5eb67439a 100644 --- a/git-show.txt +++ b/git-show.txt @@ -61,7 +61,7 @@ EXAMPLES -------- `git show v1.0.0`:: - Shows the tag `v1.0.0`, along with the object the tags + Shows the tag `v1.0.0`, along with the object the tag points at. `git show v1.0.0^{tree}`:: diff --git a/git-stash.html b/git-stash.html index 3b9cfbe9c..226e7ac6e 100644 --- a/git-stash.html +++ b/git-stash.html @@ -1280,7 +1280,7 @@ stash.showIncludeUntracked <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>.
+ the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1290,7 +1290,7 @@ stash.showPatch <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>.
+ See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1299,8 +1299,8 @@ stash.showStat <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>.
+ option will show a diffstat of the stash entry. Defaults to true.
+ See the description of the <em>show</em> command in <a href="git-stash.html">git-stash(1)</a>.
</p>
</dd>
</dl></div>
diff --git a/git-status.html b/git-status.html index 049477947..829aa59e3 100644 --- a/git-status.html +++ b/git-status.html @@ -1160,7 +1160,7 @@ U U unmerged, both modified </p>
</li>
</ul></div>
-<div class="paragraph"><p>since modified content or untracked files in a submodule cannot be added
+<div class="paragraph"><p>This is since modified content or untracked files in a submodule cannot be added
via <code>git add</code> in the superproject to prepare a commit.</p></div>
<div class="paragraph"><p><em>m</em> and <em>?</em> are applied recursively. For example if a nested submodule
in a submodule contains an untracked file, this is reported as <em>?</em> as well.</p></div>
@@ -1464,7 +1464,7 @@ normal.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-12 13:23:23 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-status.txt b/git-status.txt index 48f46eb20..10fecc51a 100644 --- a/git-status.txt +++ b/git-status.txt @@ -250,7 +250,7 @@ Submodules have more state and instead report * 'm' = the submodule has modified content * '?' = the submodule has untracked files -since modified content or untracked files in a submodule cannot be added +This is since modified content or untracked files in a submodule cannot be added via `git add` in the superproject to prepare a commit. 'm' and '?' are applied recursively. For example if a nested submodule diff --git a/git-stripspace.html b/git-stripspace.html index 36c2cfe0d..5a54c830b 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -786,7 +786,7 @@ add a missing <em>\n</em> to the last line if necessary. </ul></div>
<div class="paragraph"><p>In the case where the input consists entirely of whitespace characters, no
output will be produced.</p></div>
-<div class="paragraph"><p><strong>NOTE</strong>: This is intended for cleaning metadata, prefer the <code>--whitespace=fix</code>
+<div class="paragraph"><p><strong>NOTE</strong>: This is intended for cleaning metadata. Prefer the <code>--whitespace=fix</code>
mode of <a href="git-apply.html">git-apply(1)</a> for correcting whitespace of patches or files in
the repository.</p></div>
</div>
@@ -803,7 +803,7 @@ the repository.</p></div> </dt>
<dd>
<p>
- Skip and remove all lines starting with comment character (default <em>#</em>).
+ Skip and remove all lines starting with a comment character (default <em>#</em>).
</p>
</dd>
<dt class="hdlist1">
@@ -814,7 +814,7 @@ the repository.</p></div> </dt>
<dd>
<p>
- Prepend comment character and blank to each line. Lines will automatically
+ Prepend the comment character and a blank space to each line. Lines will automatically
be terminated with a newline. On empty lines, only the comment character
will be prepended.
</p>
@@ -876,7 +876,7 @@ the repository.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-stripspace.txt b/git-stripspace.txt index 2438f76da..a29332758 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt @@ -29,7 +29,7 @@ With no arguments, this will: In the case where the input consists entirely of whitespace characters, no output will be produced. -*NOTE*: This is intended for cleaning metadata, prefer the `--whitespace=fix` +*NOTE*: This is intended for cleaning metadata. Prefer the `--whitespace=fix` mode of linkgit:git-apply[1] for correcting whitespace of patches or files in the repository. @@ -37,11 +37,11 @@ OPTIONS ------- -s:: --strip-comments:: - Skip and remove all lines starting with comment character (default '#'). + Skip and remove all lines starting with a comment character (default '#'). -c:: --comment-lines:: - Prepend comment character and blank to each line. Lines will automatically + Prepend the comment character and a blank space to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended. diff --git a/git-switch.html b/git-switch.html index 6106d7415..1f9277ff2 100644 --- a/git-switch.html +++ b/git-switch.html @@ -1160,7 +1160,7 @@ checkout.workers 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
+<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
@@ -1173,7 +1173,7 @@ checkout.thresholdForParallelism <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
+ the parallelization gains. This setting allows you to define the minimum
number of files for which parallel checkout should be attempted. The
default is 100.
</p>
diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 052bc45f4..0e2558780 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -769,7 +769,7 @@ point at the given branch <ref>.</p></div> symbolic ref.</p></div>
<div class="paragraph"><p>A symbolic ref is a regular file that stores a string that
begins with <code>ref: refs/</code>. For example, your <code>.git/HEAD</code> is
-a regular file whose contents is <code>ref: refs/heads/master</code>.</p></div>
+a regular file whose content is <code>ref: refs/heads/master</code>.</p></div>
</div>
</div>
<div class="sect1">
@@ -863,7 +863,7 @@ name is not a symbolic ref, or 128 if another error occurs.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-21 13:46:13 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index 102c83eb1..761b154bc 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -27,7 +27,7 @@ symbolic ref. A symbolic ref is a regular file that stores a string that begins with `ref: refs/`. For example, your `.git/HEAD` is -a regular file whose contents is `ref: refs/heads/master`. +a regular file whose content is `ref: refs/heads/master`. OPTIONS ------- diff --git a/git-update-index.html b/git-update-index.html index 1876ed129..07d2ca98c 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -803,7 +803,7 @@ using the various options:</p></div> <p>
If a specified file is in the index but is missing then it’s
removed.
- Default behavior is to ignore removed file.
+ Default behavior is to ignore removed files.
</p>
</dd>
<dt class="hdlist1">
@@ -896,7 +896,7 @@ using the various options:</p></div> the index. If you want to change the working tree file,
you need to unset the bit to tell Git. This is
sometimes helpful when working with a big project on a
- filesystem that has very slow lstat(2) system call
+ filesystem that has a very slow lstat(2) system call
(e.g. cifs).
</p>
<div class="paragraph"><p>Git will fail (gracefully) in case it needs to modify this file
@@ -918,7 +918,7 @@ you will need to handle the situation manually.</p></div> </dt>
<dd>
<p>
- When one of these flags is specified, the object name recorded
+ When one of these flags is specified, the object names recorded
for the paths are not updated. Instead, these options
set and unset the "skip-worktree" bit for the paths. See
section "Skip-worktree bit" below for more information.
@@ -938,7 +938,7 @@ you will need to handle the situation manually.</p></div> </dt>
<dd>
<p>
- When one of these flags is specified, the object name recorded
+ When one of these flags is specified, the object names recorded
for the paths are not updated. Instead, these options
set and unset the "fsmonitor valid" bit for the paths. See
section "File System Monitor" below for more information.
@@ -953,7 +953,7 @@ you will need to handle the situation manually.</p></div> <dd>
<p>
Runs <em>git update-index</em> itself on the paths whose index
- entries are different from those from the <code>HEAD</code> commit.
+ entries are different from those of the <code>HEAD</code> commit.
</p>
</dd>
<dt class="hdlist1">
@@ -1002,8 +1002,8 @@ you will need to handle the situation manually.</p></div> </dt>
<dd>
<p>
- Instead of taking list of paths from the command line,
- read list of paths from the standard input. Paths are
+ Instead of taking a list of paths from the command line,
+ read a list of paths from the standard input. Paths are
separated by LF (i.e. one path per line) by default.
</p>
</dd>
@@ -1012,7 +1012,7 @@ you will need to handle the situation manually.</p></div> </dt>
<dd>
<p>
- Report what is being added and removed from index.
+ Report what is being added and removed from the index.
</p>
</dd>
<dt class="hdlist1">
@@ -1021,7 +1021,7 @@ you will need to handle the situation manually.</p></div> <dd>
<p>
Write the resulting index out in the named on-disk format version.
- Supported versions are 2, 3 and 4. The current default version is 2
+ Supported versions are 2, 3, and 4. The current default version is 2
or 3, depending on whether extra features are used, such as
<code>git add -N</code>. With <code>--verbose</code>, also report the version the index
file uses before and after this command.
@@ -1557,7 +1557,7 @@ automatically.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-09-20 12:03:35 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-update-index.txt b/git-update-index.txt index 1271486ae..8c47890a6 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -49,7 +49,7 @@ OPTIONS --remove:: If a specified file is in the index but is missing then it's removed. - Default behavior is to ignore removed file. + Default behavior is to ignore removed files. --refresh:: Looks at the current index and checks to see if merges or @@ -95,7 +95,7 @@ OPTIONS the index. If you want to change the working tree file, you need to unset the bit to tell Git. This is sometimes helpful when working with a big project on a - filesystem that has very slow lstat(2) system call + filesystem that has a very slow lstat(2) system call (e.g. cifs). + Git will fail (gracefully) in case it needs to modify this file @@ -108,7 +108,7 @@ you will need to handle the situation manually. without regard to the "assume unchanged" setting. --[no-]skip-worktree:: - When one of these flags is specified, the object name recorded + When one of these flags is specified, the object names recorded for the paths are not updated. Instead, these options set and unset the "skip-worktree" bit for the paths. See section "Skip-worktree bit" below for more information. @@ -119,7 +119,7 @@ you will need to handle the situation manually. the `--remove` option was specified. --[no-]fsmonitor-valid:: - When one of these flags is specified, the object name recorded + When one of these flags is specified, the object names recorded for the paths are not updated. Instead, these options set and unset the "fsmonitor valid" bit for the paths. See section "File System Monitor" below for more information. @@ -127,7 +127,7 @@ you will need to handle the situation manually. -g:: --again:: Runs 'git update-index' itself on the paths whose index - entries are different from those from the `HEAD` commit. + entries are different from those of the `HEAD` commit. --unresolve:: Restores the 'unmerged' or 'needs updating' state of a @@ -151,16 +151,16 @@ you will need to handle the situation manually. automatically removed with warning messages. --stdin:: - Instead of taking list of paths from the command line, - read list of paths from the standard input. Paths are + Instead of taking a list of paths from the command line, + read a list of paths from the standard input. Paths are separated by LF (i.e. one path per line) by default. --verbose:: - Report what is being added and removed from index. + Report what is being added and removed from the index. --index-version <n>:: Write the resulting index out in the named on-disk format version. - Supported versions are 2, 3 and 4. The current default version is 2 + Supported versions are 2, 3, and 4. The current default version is 2 or 3, depending on whether extra features are used, such as `git add -N`. With `--verbose`, also report the version the index file uses before and after this command. diff --git a/git-update-ref.html b/git-update-ref.html index 4fd37bc7b..6a2c094ee 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -881,7 +881,7 @@ option </dt>
<dd>
<p>
- Modify behavior of the next command naming a <ref>.
+ Modify the behavior of the next command naming a <ref>.
The only valid option is <code>no-deref</code> to avoid dereferencing
a symbolic ref.
</p>
@@ -974,7 +974,7 @@ or does not have committer information available.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-12-14 13:07:53 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-update-ref.txt b/git-update-ref.txt index 48b668307..0561808cc 100644 --- a/git-update-ref.txt +++ b/git-update-ref.txt @@ -118,7 +118,7 @@ verify:: <oldvalue> is zero or missing, the ref must not exist. option:: - Modify behavior of the next command naming a <ref>. + Modify the behavior of the next command naming a <ref>. The only valid option is `no-deref` to avoid dereferencing a symbolic ref. diff --git a/git-update-server-info.html b/git-update-server-info.html index 681a5082f..b3675ccf4 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -776,7 +776,7 @@ generates such auxiliary files.</p></div> </dt>
<dd>
<p>
- update the info files from scratch.
+ Update the info files from scratch.
</p>
</dd>
</dl></div>
@@ -786,7 +786,7 @@ generates such auxiliary files.</p></div> <h2 id="_output">OUTPUT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Currently the command updates the following files. Please see
-<a href="gitrepository-layout.html">gitrepository-layout(5)</a> for description of
+<a href="gitrepository-layout.html">gitrepository-layout(5)</a> for a description of
what they are for:</p></div>
<div class="ulist"><ul>
<li>
@@ -813,7 +813,7 @@ info/refs <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-update-server-info.txt b/git-update-server-info.txt index 17e429dbd..6bc9b50d8 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt @@ -23,13 +23,13 @@ OPTIONS ------- -f:: --force:: - update the info files from scratch. + Update the info files from scratch. OUTPUT ------ Currently the command updates the following files. Please see -linkgit:gitrepository-layout[5] for description of +linkgit:gitrepository-layout[5] for a description of what they are for: * objects/info/packs diff --git a/git-upload-pack.html b/git-upload-pack.html index c12d89dc4..9a9a70402 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -775,7 +775,7 @@ repository. For push operations, see <em>git send-pack</em>.</p></div> </dt>
<dd>
<p>
- Do not try <directory>/.git/ if <directory> is no Git directory.
+ Do not try <directory>/.git/ if <directory> is not a Git directory.
</p>
</dd>
<dt class="hdlist1">
@@ -854,7 +854,7 @@ repository. For push operations, see <em>git send-pack</em>.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-15 16:31:06 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-upload-pack.txt b/git-upload-pack.txt index b656b4756..7ad60bc34 100644 --- a/git-upload-pack.txt +++ b/git-upload-pack.txt @@ -26,7 +26,7 @@ OPTIONS ------- --[no-]strict:: - Do not try <directory>/.git/ if <directory> is no Git directory. + Do not try <directory>/.git/ if <directory> is not a Git directory. --timeout=<n>:: Interrupt transfer after <n> seconds of inactivity. diff --git a/git-var.html b/git-var.html index db85549c6..4d49b2ac5 100644 --- a/git-var.html +++ b/git-var.html @@ -770,7 +770,7 @@ no value.</p></div> </dt>
<dd>
<p>
- Cause the logical variables to be listed. In addition, all the
+ Display the logical variables. In addition, all the
variables of the Git configuration file .git/config are listed
as well. (However, the configuration variables listing functionality
is deprecated in favor of <code>git config -l</code>.)
@@ -924,7 +924,7 @@ disabled by other environment variables.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-07-04 22:20:50 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-var.txt b/git-var.txt index c38fb3968..0680568df 100644 --- a/git-var.txt +++ b/git-var.txt @@ -19,7 +19,7 @@ no value. OPTIONS ------- -l:: - Cause the logical variables to be listed. In addition, all the + Display the logical variables. In addition, all the variables of the Git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of `git config -l`.) diff --git a/git-verify-pack.html b/git-verify-pack.html index 3b18d241e..3230d9f73 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -758,7 +758,7 @@ git-verify-pack(1) Manual Page <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Reads given idx file for packed Git archive created with the
-<em>git pack-objects</em> command and verifies idx file and the
+<em>git pack-objects</em> command and verifies the idx file and the
corresponding pack file.</p></div>
</div>
</div>
@@ -782,7 +782,7 @@ corresponding pack file.</p></div> </dt>
<dd>
<p>
- After verifying the pack, show list of objects contained
+ After verifying the pack, show the list of objects contained
in the pack and a histogram of delta chain length.
</p>
</dd>
@@ -795,7 +795,7 @@ corresponding pack file.</p></div> <dd>
<p>
Do not verify the pack contents; only show the histogram of delta
- chain length. With <code>--verbose</code>, list of objects is also shown.
+ chain length. With <code>--verbose</code>, the list of objects is also shown.
</p>
</dd>
<dt class="hdlist1">
@@ -836,7 +836,7 @@ corresponding pack file.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-28 11:53:56 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-verify-pack.txt b/git-verify-pack.txt index b8720dce8..d7e886918 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt @@ -15,7 +15,7 @@ SYNOPSIS DESCRIPTION ----------- Reads given idx file for packed Git archive created with the -'git pack-objects' command and verifies idx file and the +'git pack-objects' command and verifies the idx file and the corresponding pack file. OPTIONS @@ -25,13 +25,13 @@ OPTIONS -v:: --verbose:: - After verifying the pack, show list of objects contained + After verifying the pack, show the list of objects contained in the pack and a histogram of delta chain length. -s:: --stat-only:: Do not verify the pack contents; only show the histogram of delta - chain length. With `--verbose`, list of objects is also shown. + chain length. With `--verbose`, the list of objects is also shown. \--:: Do not interpret any more arguments as options. diff --git a/git-whatchanged.html b/git-whatchanged.html index 5f46b7839..e1280a31f 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -740,7 +740,7 @@ git-whatchanged(1) Manual Page <h2>NAME</h2>
<div class="sectionbody">
<p>git-whatchanged -
- Show logs with difference each commit introduces
+ Show logs with differences each commit introduces
</p>
</div>
</div>
@@ -760,10 +760,10 @@ git-whatchanged(1) Manual Page <div class="paragraph"><p>Shows commit logs and diff output each commit introduces.</p></div>
<div class="paragraph"><p>New users are encouraged to use <a href="git-log.html">git-log(1)</a> instead. The
<code>whatchanged</code> command is essentially the same as <a href="git-log.html">git-log(1)</a>
-but defaults to show the raw format diff output and to skip merges.</p></div>
-<div class="paragraph"><p>The command is kept primarily for historical reasons; fingers of
+but defaults to showing the raw format diff output and skipping merges.</p></div>
+<div class="paragraph"><p>The command is primarily kept for historical reasons; fingers of
many people who learned Git long before <code>git log</code> was invented by
-reading Linux kernel mailing list are trained to type it.</p></div>
+reading the Linux kernel mailing list are trained to type it.</p></div>
</div>
</div>
<div class="sect1">
@@ -803,7 +803,7 @@ reading Linux kernel mailing list are trained to type it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/git-whatchanged.txt b/git-whatchanged.txt index 8b63ceb00..8e55e0bb1 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt @@ -3,7 +3,7 @@ git-whatchanged(1) NAME ---- -git-whatchanged - Show logs with difference each commit introduces +git-whatchanged - Show logs with differences each commit introduces SYNOPSIS @@ -18,11 +18,11 @@ Shows commit logs and diff output each commit introduces. New users are encouraged to use linkgit:git-log[1] instead. The `whatchanged` command is essentially the same as linkgit:git-log[1] -but defaults to show the raw format diff output and to skip merges. +but defaults to showing the raw format diff output and skipping merges. -The command is kept primarily for historical reasons; fingers of +The command is primarily kept for historical reasons; fingers of many people who learned Git long before `git log` was invented by -reading Linux kernel mailing list are trained to type it. +reading the Linux kernel mailing list are trained to type it. Examples @@ -1669,7 +1669,7 @@ ancillary user utilities.</p></div> </dt>
<dd>
<p>
- Show logs with difference each commit introduces.
+ Show logs with differences each commit introduces.
</p>
</dd>
<dt class="hdlist1">
diff --git a/gitcli.html b/gitcli.html index 63e928d3e..4ed8ec24f 100644 --- a/gitcli.html +++ b/gitcli.html @@ -765,10 +765,10 @@ Options come first and then args. A subcommand may take dashed options (which may take their own
arguments, e.g. "--max-parents 2") and arguments. You SHOULD
give dashed options first and then arguments. Some commands may
- accept dashed options after you have already gave non-option
+ accept dashed options after you have already given non-option
arguments (which may make the command ambiguous), but you should
not rely on it (because eventually we may find a way to fix
- these ambiguity by enforcing the "options then args" rule).
+ these ambiguities by enforcing the "options then args" rule).
</p>
</li>
<li>
@@ -785,7 +785,7 @@ When an argument can be misunderstood as either a revision or a path, they can be disambiguated by placing <code>--</code> between them.
E.g. <code>git diff -- HEAD</code> is, "I have a file called HEAD in my work
tree. Please show changes between the version I staged in the index
- and what I have in the work tree for that file", not "show difference
+ and what I have in the work tree for that file", not "show the difference
between the HEAD commit and the work tree as a whole". You can say
<code>git diff HEAD --</code> to ask for the latter.
</p>
@@ -793,7 +793,7 @@ When an argument can be misunderstood as either a revision or a path, <li>
<p>
Without disambiguating <code>--</code>, Git makes a reasonable guess, but errors
- out and asking you to disambiguate when ambiguous. E.g. if you have a
+ out and asks you to disambiguate when ambiguous. E.g. if you have a
file called HEAD in your work tree, <code>git diff HEAD</code> is ambiguous, and
you have to say either <code>git diff HEAD --</code> or <code>git diff -- HEAD</code> to
disambiguate.
@@ -1052,7 +1052,7 @@ The two options can be specified together to ask a command to work <div id="footer">
<div id="footer-text">
Last updated
- 2022-02-16 17:29:08 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitcli.txt b/gitcli.txt index 1819a5a18..e5fac9432 100644 --- a/gitcli.txt +++ b/gitcli.txt @@ -23,10 +23,10 @@ arguments. Here are the rules: A subcommand may take dashed options (which may take their own arguments, e.g. "--max-parents 2") and arguments. You SHOULD give dashed options first and then arguments. Some commands may - accept dashed options after you have already gave non-option + accept dashed options after you have already given non-option arguments (which may make the command ambiguous), but you should not rely on it (because eventually we may find a way to fix - these ambiguity by enforcing the "options then args" rule). + these ambiguities by enforcing the "options then args" rule). * Revisions come first and then paths. E.g. in `git diff v1.0 v2.0 arch/x86 include/asm-x86`, @@ -37,12 +37,12 @@ arguments. Here are the rules: they can be disambiguated by placing `--` between them. E.g. `git diff -- HEAD` is, "I have a file called HEAD in my work tree. Please show changes between the version I staged in the index - and what I have in the work tree for that file", not "show difference + and what I have in the work tree for that file", not "show the difference between the HEAD commit and the work tree as a whole". You can say `git diff HEAD --` to ask for the latter. * Without disambiguating `--`, Git makes a reasonable guess, but errors - out and asking you to disambiguate when ambiguous. E.g. if you have a + out and asks you to disambiguate when ambiguous. E.g. if you have a file called HEAD in your work tree, `git diff HEAD` is ambiguous, and you have to say either `git diff HEAD --` or `git diff -- HEAD` to disambiguate. diff --git a/gitdiffcore.html b/gitdiffcore.html index 48120c50f..b29f33347 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html @@ -940,7 +940,7 @@ number after the "-M" or "-C" option (e.g. "-M8" to tell it to use detection are off, rename detection adds a preliminary step that first
checks if files are moved across directories while keeping their
filename the same. If there is a file added to a directory whose
-contents is sufficiently similar to a file with the same name that got
+contents are sufficiently similar to a file with the same name that got
deleted from a different directory, it will mark them as renames and
exclude them from the later quadratic step (the one that pairwise
compares all unmatched files to find the "best" matches, determined by
@@ -978,7 +978,7 @@ from the original, and does not count insertion. If you removed only 10 lines from a 100-line document, even if you added 910
new lines to make a new 1000-line document, you did not do a
complete rewrite. diffcore-break breaks such a case in order to
-help diffcore-rename to consider such filepairs as candidate of
+help diffcore-rename to consider such filepairs as a candidate of
rename/copy detection, but if filepairs broken that way were not
matched with other filepairs to create rename/copy, then this
transformation merges them back into the original
@@ -1001,13 +1001,13 @@ like these:</p></div> </p>
</li>
</ul></div>
-<div class="paragraph"><p>Note that earlier implementation left a broken pair as a separate
-creation and deletion patches. This was an unnecessary hack and
+<div class="paragraph"><p>Note that earlier implementation left a broken pair as separate
+creation and deletion patches. This was an unnecessary hack, and
the latest implementation always merges all the broken pairs
back into modifications, but the resulting patch output is
formatted differently for easier review in case of such
-a complete rewrite by showing the entire contents of old version
-prefixed with <em>-</em>, followed by the entire contents of new
+a complete rewrite by showing the entire contents of the old version
+prefixed with <em>-</em>, followed by the entire contents of the new
version prefixed with <em>+</em>.</p></div>
</div>
</div>
@@ -1032,7 +1032,7 @@ textual diff has an added or a deleted line that matches the given regular expression. This means that it will detect in-file (or what
rename-detection considers the same file) moves, which is noise. The
implementation runs diff twice and greps, and this can be quite
-expensive. To speed things up binary files without textconv filters
+expensive. To speed things up, binary files without textconv filters
will be ignored.</p></div>
<div class="paragraph"><p>When <code>-S</code> or <code>-G</code> are used without <code>--pickaxe-all</code>, only filepairs
that match their respective criterion are kept in the output. When
@@ -1108,7 +1108,7 @@ not sorted when diffcore-order is in effect.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-03-22 14:53:18 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitdiffcore.txt b/gitdiffcore.txt index 0d57f86ab..3cda2e07c 100644 --- a/gitdiffcore.txt +++ b/gitdiffcore.txt @@ -173,7 +173,7 @@ Note that when rename detection is on but both copy and break detection are off, rename detection adds a preliminary step that first checks if files are moved across directories while keeping their filename the same. If there is a file added to a directory whose -contents is sufficiently similar to a file with the same name that got +contents are sufficiently similar to a file with the same name that got deleted from a different directory, it will mark them as renames and exclude them from the later quadratic step (the one that pairwise compares all unmatched files to find the "best" matches, determined by @@ -213,7 +213,7 @@ from the original, and does not count insertion. If you removed only 10 lines from a 100-line document, even if you added 910 new lines to make a new 1000-line document, you did not do a complete rewrite. diffcore-break breaks such a case in order to -help diffcore-rename to consider such filepairs as candidate of +help diffcore-rename to consider such filepairs as a candidate of rename/copy detection, but if filepairs broken that way were not matched with other filepairs to create rename/copy, then this transformation merges them back into the original @@ -230,13 +230,13 @@ like these: * -B/60 (the same as above, since diffcore-break defaults to 50%). -Note that earlier implementation left a broken pair as a separate -creation and deletion patches. This was an unnecessary hack and +Note that earlier implementation left a broken pair as separate +creation and deletion patches. This was an unnecessary hack, and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is formatted differently for easier review in case of such -a complete rewrite by showing the entire contents of old version -prefixed with '-', followed by the entire contents of new +a complete rewrite by showing the entire contents of the old version +prefixed with '-', followed by the entire contents of the new version prefixed with '+'. @@ -263,7 +263,7 @@ textual diff has an added or a deleted line that matches the given regular expression. This means that it will detect in-file (or what rename-detection considers the same file) moves, which is noise. The implementation runs diff twice and greps, and this can be quite -expensive. To speed things up binary files without textconv filters +expensive. To speed things up, binary files without textconv filters will be ignored. When `-S` or `-G` are used without `--pickaxe-all`, only filepairs diff --git a/giteveryday.html b/giteveryday.html index 6863bd515..dc3e76aa6 100644 --- a/giteveryday.html +++ b/giteveryday.html @@ -755,7 +755,7 @@ giteveryday(7) Manual Page <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Git users can broadly be grouped into four categories for the purposes of
-describing here a small set of useful command for everyday Git.</p></div>
+describing here a small set of useful commands for everyday Git.</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -1546,7 +1546,7 @@ create and push version tags. <div id="footer">
<div id="footer-text">
Last updated
- 2020-07-09 15:39:10 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/giteveryday.txt b/giteveryday.txt index faba2ef08..12b62b912 100644 --- a/giteveryday.txt +++ b/giteveryday.txt @@ -14,7 +14,7 @@ DESCRIPTION ----------- Git users can broadly be grouped into four categories for the purposes of -describing here a small set of useful command for everyday Git. +describing here a small set of useful commands for everyday Git. * <<STANDALONE,Individual Developer (Standalone)>> commands are essential for anybody who makes a commit, even for somebody who works alone. diff --git a/gitformat-bundle.html b/gitformat-bundle.html index 59269de6f..10befb28f 100644 --- a/gitformat-bundle.html +++ b/gitformat-bundle.html @@ -812,7 +812,7 @@ pack = ... ; packfile</code></pre> </li>
<li>
<p>
-"Prerequisites" lists the objects that are NOT included in the bundle and the
+"Prerequisites" list the objects that are NOT included in the bundle and the
reader of the bundle MUST already have, in order to use the data in the
bundle. The objects stored in the bundle may refer to prerequisite objects and
anything reachable from them (e.g. a tree object in the bundle can reference
@@ -839,8 +839,8 @@ pack = ... ; packfile</code></pre> This is a comment and it has no specific meaning. The writer of the bundle MAY
put any string here. The reader of the bundle MUST ignore the comment.</p></div>
<div class="sect2">
-<h3 id="_note_on_the_shallow_clone_and_a_git_bundle">Note on the shallow clone and a Git bundle</h3>
-<div class="paragraph"><p>Note that the prerequisites does not represent a shallow-clone boundary. The
+<h3 id="_note_on_shallow_clones_and_git_bundles">Note on shallow clones and Git bundles</h3>
+<div class="paragraph"><p>Note that the prerequisites do not represent a shallow-clone boundary. The
semantics of the prerequisites and the shallow-clone boundaries are different,
and the Git bundle v2 format cannot represent a shallow clone repository.</p></div>
</div>
@@ -879,7 +879,7 @@ bundle</em> to abort.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitformat-bundle.txt b/gitformat-bundle.txt index 00e0a20e6..1b75cf71c 100644 --- a/gitformat-bundle.txt +++ b/gitformat-bundle.txt @@ -67,7 +67,7 @@ A Git bundle consists of several parts. * "Capabilities", which are only in the v3 format, indicate functionality that the bundle requires to be read properly. -* "Prerequisites" lists the objects that are NOT included in the bundle and the +* "Prerequisites" list the objects that are NOT included in the bundle and the reader of the bundle MUST already have, in order to use the data in the bundle. The objects stored in the bundle may refer to prerequisite objects and anything reachable from them (e.g. a tree object in the bundle can reference @@ -86,10 +86,10 @@ In the bundle format, there can be a comment following a prerequisite obj-id. This is a comment and it has no specific meaning. The writer of the bundle MAY put any string here. The reader of the bundle MUST ignore the comment. -Note on the shallow clone and a Git bundle -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Note on shallow clones and Git bundles +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Note that the prerequisites does not represent a shallow-clone boundary. The +Note that the prerequisites do not represent a shallow-clone boundary. The semantics of the prerequisites and the shallow-clone boundaries are different, and the Git bundle v2 format cannot represent a shallow clone repository. diff --git a/gitformat-chunk.html b/gitformat-chunk.html index a38231614..99740ceac 100644 --- a/gitformat-chunk.html +++ b/gitformat-chunk.html @@ -781,7 +781,7 @@ where C is the number of chunks. Consider the following table:</p></div> <div class="paragraph"><p>Each row consists of a 4-byte chunk identifier (ID) and an 8-byte offset.
Each integer is stored in network-byte order.</p></div>
<div class="paragraph"><p>The chunk identifier <code>ID[i]</code> is a label for the data stored within this
-fill from <code>OFFSET[i]</code> (inclusive) to <code>OFFSET[i+1]</code> (exclusive). Thus, the
+file from <code>OFFSET[i]</code> (inclusive) to <code>OFFSET[i+1]</code> (exclusive). Thus, the
size of the <code>i`th chunk is equal to the difference between `OFFSET[i+1]</code>
and <code>OFFSET[i]</code>. This requires that the chunk data appears contiguously
in the same order as the table of contents.</p></div>
@@ -803,7 +803,7 @@ calling <code>init_chunkfile()</code> and pass a <code>struct hashfile</code> po caller is responsible for opening the <code>hashfile</code> and writing header
information so the file format is identifiable before the chunk-based
format begins.</p></div>
-<div class="paragraph"><p>Then, call <code>add_chunk()</code> for each chunk that is intended for write. This
+<div class="paragraph"><p>Then, call <code>add_chunk()</code> for each chunk that is intended for writing. This
populates the <code>chunkfile</code> with information about the order and size of
each chunk to write. Provide a <code>chunk_write_fn</code> function pointer to
perform the write of the chunk data upon request.</p></div>
@@ -888,7 +888,7 @@ for future formats:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitformat-chunk.txt b/gitformat-chunk.txt index 57202ede2..3315df620 100644 --- a/gitformat-chunk.txt +++ b/gitformat-chunk.txt @@ -42,7 +42,7 @@ Each row consists of a 4-byte chunk identifier (ID) and an 8-byte offset. Each integer is stored in network-byte order. The chunk identifier `ID[i]` is a label for the data stored within this -fill from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the +file from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the size of the `i`th chunk is equal to the difference between `OFFSET[i+1]` and `OFFSET[i]`. This requires that the chunk data appears contiguously in the same order as the table of contents. @@ -67,7 +67,7 @@ caller is responsible for opening the `hashfile` and writing header information so the file format is identifiable before the chunk-based format begins. -Then, call `add_chunk()` for each chunk that is intended for write. This +Then, call `add_chunk()` for each chunk that is intended for writing. This populates the `chunkfile` with information about the order and size of each chunk to write. Provide a `chunk_write_fn` function pointer to perform the write of the chunk data upon request. diff --git a/gitformat-pack.html b/gitformat-pack.html index 7ec3ee1a2..6632dcb10 100644 --- a/gitformat-pack.html +++ b/gitformat-pack.html @@ -760,8 +760,8 @@ $GIT_DIR/objects/pack/multi-pack-index</pre> <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The Git pack format is now Git stores most of its primary repository
-data. Over the lietime af a repository loose objects (if any) and
+<div class="paragraph"><p>The Git pack format is how Git stores most of its primary repository
+data. Over the lifetime of a repository, loose objects (if any) and
smaller packs are consolidated into larger pack(s). See
<a href="git-gc.html">git-gc(1)</a> and <a href="git-pack-objects.html">git-pack-objects(1)</a>.</p></div>
<div class="paragraph"><p>The pack format is also used over-the-wire, see
@@ -808,7 +808,7 @@ more than 4G objects in a pack.</code></pre> </li>
<li>
<p>
-The header is followed by number of object entries, each of
+The header is followed by a number of object entries, each of
which looks like this:
</p>
<div class="literalblock">
@@ -828,7 +828,7 @@ compressed delta data</code></pre> </div></div>
<div class="literalblock">
<div class="content">
-<pre><code>Observation: length of each object is encoded in a variable
+<pre><code>Observation: the length of each object is encoded in a variable
length format and is not constrained to 32-bit or anything.</code></pre>
</div></div>
</li>
@@ -908,7 +908,7 @@ the delta data is a sequence of instructions to reconstruct the object from the base object. If the base object is deltified, it must be
converted to canonical form first. Each instruction appends more and
more data to the target object until it’s complete. There are two
-supported instructions so far: one for copy a byte range from the
+supported instructions so far: one for copying a byte range from the
source object and one for inserting new data embedded in the
instruction itself.</p></div>
<div class="paragraph"><p>Each instruction has variable length. Instruction type is determined
@@ -927,7 +927,7 @@ object. It encodes the offset to copy from and the number of bytes to copy. Offset and size are in little-endian order.</p></div>
<div class="paragraph"><p>All offset and size bytes are optional. This is to reduce the
instruction size when encoding small offsets or sizes. The first seven
-bits in the first octet determines which of the next seven octets is
+bits in the first octet determine which of the next seven octets is
present. If bit zero is set, offset1 is present. If bit one is set
offset2 is present and so on.</p></div>
<div class="paragraph"><p>Note that a more compact instruction does not change offset and size
@@ -953,9 +953,9 @@ converted to 0x10000.</p></div> | 0xxxxxxx | data |
+----------+============+</code></pre>
</div></div>
-<div class="paragraph"><p>This is the instruction to construct target object without the base
+<div class="paragraph"><p>This is the instruction to construct the target object without the base
object. The following data is appended to the target object. The first
-seven bits of the first octet determines the size of data in
+seven bits of the first octet determine the size of data in
bytes. The size must be non-zero.</p></div>
</div>
<div class="sect3">
@@ -1146,7 +1146,7 @@ The same trailer as a v1 pack file: </p>
<div class="literalblock">
<div class="content">
-<pre><code>A copy of the pack checksum at the end of
+<pre><code>A copy of the pack checksum at the end of the
corresponding packfile.</code></pre>
</div></div>
<div class="literalblock">
@@ -1552,7 +1552,7 @@ support for optional chunks of data, it may make sense to consolidate the <div id="footer">
<div id="footer-text">
Last updated
- 2023-09-07 15:10:34 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitformat-pack.txt b/gitformat-pack.txt index 870e00f29..4a4d87e7d 100644 --- a/gitformat-pack.txt +++ b/gitformat-pack.txt @@ -17,8 +17,8 @@ $GIT_DIR/objects/pack/multi-pack-index DESCRIPTION ----------- -The Git pack format is now Git stores most of its primary repository -data. Over the lietime af a repository loose objects (if any) and +The Git pack format is how Git stores most of its primary repository +data. Over the lifetime of a repository, loose objects (if any) and smaller packs are consolidated into larger pack(s). See linkgit:git-gc[1] and linkgit:git-pack-objects[1]. @@ -48,7 +48,7 @@ Similarly, in SHA-256 repositories, these values are computed using SHA-256. Observation: we cannot have more than 4G versions ;-) and more than 4G objects in a pack. - - The header is followed by number of object entries, each of + - The header is followed by a number of object entries, each of which looks like this: (undeltified representation) @@ -62,7 +62,7 @@ Similarly, in SHA-256 repositories, these values are computed using SHA-256. is an OBJ_OFS_DELTA object compressed delta data - Observation: length of each object is encoded in a variable + Observation: the length of each object is encoded in a variable length format and is not constrained to 32-bit or anything. - The trailer records a pack checksum of all of the above. @@ -117,7 +117,7 @@ the delta data is a sequence of instructions to reconstruct the object from the base object. If the base object is deltified, it must be converted to canonical form first. Each instruction appends more and more data to the target object until it's complete. There are two -supported instructions so far: one for copy a byte range from the +supported instructions so far: one for copying a byte range from the source object and one for inserting new data embedded in the instruction itself. @@ -137,7 +137,7 @@ copy. Offset and size are in little-endian order. All offset and size bytes are optional. This is to reduce the instruction size when encoding small offsets or sizes. The first seven -bits in the first octet determines which of the next seven octets is +bits in the first octet determine which of the next seven octets is present. If bit zero is set, offset1 is present. If bit one is set offset2 is present and so on. @@ -161,9 +161,9 @@ converted to 0x10000. | 0xxxxxxx | data | +----------+============+ -This is the instruction to construct target object without the base +This is the instruction to construct the target object without the base object. The following data is appended to the target object. The first -seven bits of the first octet determines the size of data in +seven bits of the first octet determine the size of data in bytes. The size must be non-zero. ==== Reserved instruction @@ -294,7 +294,7 @@ Pack file entry: <+ - The same trailer as a v1 pack file: - A copy of the pack checksum at the end of + A copy of the pack checksum at the end of the corresponding packfile. Index checksum of all of the above. diff --git a/gitglossary.html b/gitglossary.html index 6d0632f87..c0a12c66e 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1080,7 +1080,7 @@ current branch integrates with) obviously do not work, as there is no </dt>
<dd>
<p>
- Grafts enables two otherwise different lines of development to be joined
+ Grafts enable two otherwise different lines of development to be joined
together by recording fake ancestry information for commits. This way
you can make Git pretend the set of <a href="#def_parent">parents</a> a <a href="#def_commit">commit</a> has
is different from what was recorded when the commit was
diff --git a/githooks.html b/githooks.html index 841c9b84e..6d1777df2 100644 --- a/githooks.html +++ b/githooks.html @@ -810,7 +810,7 @@ invoked after the patch is applied, but before a commit is made.</p></div> <div class="paragraph"><p>If it exits with non-zero status, then the working tree will not be
committed after applying the patch.</p></div>
<div class="paragraph"><p>It can be used to inspect the current working tree and refuse to
-make a commit if it does not pass certain test.</p></div>
+make a commit if it does not pass certain tests.</p></div>
<div class="paragraph"><p>The default <em>pre-applypatch</em> hook, when enabled, runs the
<em>pre-commit</em> hook, if the latter is enabled.</p></div>
</div>
@@ -872,7 +872,7 @@ a commit object name (if a <code>-c</code>, <code>-C</code> or <code>--amend</co <div class="paragraph"><p>The purpose of the hook is to edit the message file in place, and
it is not suppressed by the <code>--no-verify</code> option. A non-zero exit
means a failure of the hook and aborts the commit. It should not
-be used as replacement for pre-commit hook.</p></div>
+be used as a replacement for the pre-commit hook.</p></div>
<div class="paragraph"><p>The sample <code>prepare-commit-msg</code> hook that comes with Git removes the
help message found in the commented portion of the commit template.</p></div>
</div>
@@ -1045,7 +1045,7 @@ shell to restrict the user’s access to only git commands.</p></div> for the user.</p></div>
<div class="paragraph"><p>The default <em>update</em> hook, when enabled—and with
<code>hooks.allowunannotated</code> config option unset or set to false—prevents
-unannotated tags to be pushed.</p></div>
+unannotated tags from being pushed.</p></div>
</div>
<div class="sect2">
<h3 id="proc-receive">proc-receive</h3>
@@ -1081,12 +1081,12 @@ S: flush-pkt</code></pre> </div></div>
<div class="literalblock">
<div class="content">
-<pre><code># Receive result from the hook.
+<pre><code># Receive results from the hook.
# OK, run this command successfully.
H: PKT-LINE(ok <ref>)
# NO, I reject it.
H: PKT-LINE(ng <ref> <reason>)
-# Fall through, let 'receive-pack' to execute it.
+# Fall through, let 'receive-pack' execute it.
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option fall-through)
# OK, but has an alternate reference. The alternate reference name
@@ -1442,7 +1442,7 @@ running passing "1", "1" should not be possible.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-05-10 11:57:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/githooks.txt b/githooks.txt index 86f804720..883982e7a 100644 --- a/githooks.txt +++ b/githooks.txt @@ -80,7 +80,7 @@ If it exits with non-zero status, then the working tree will not be committed after applying the patch. It can be used to inspect the current working tree and refuse to -make a commit if it does not pass certain test. +make a commit if it does not pass certain tests. The default 'pre-applypatch' hook, when enabled, runs the 'pre-commit' hook, if the latter is enabled. @@ -157,7 +157,7 @@ If the exit status is non-zero, `git commit` will abort. The purpose of the hook is to edit the message file in place, and it is not suppressed by the `--no-verify` option. A non-zero exit means a failure of the hook and aborts the commit. It should not -be used as replacement for pre-commit hook. +be used as a replacement for the pre-commit hook. The sample `prepare-commit-msg` hook that comes with Git removes the help message found in the commented portion of the commit template. @@ -345,7 +345,7 @@ for the user. The default 'update' hook, when enabled--and with `hooks.allowunannotated` config option unset or set to false--prevents -unannotated tags to be pushed. +unannotated tags from being pushed. [[proc-receive]] proc-receive @@ -379,12 +379,12 @@ following example for the protocol, the letter 'S' stands for S: ... ... S: flush-pkt - # Receive result from the hook. + # Receive results from the hook. # OK, run this command successfully. H: PKT-LINE(ok <ref>) # NO, I reject it. H: PKT-LINE(ng <ref> <reason>) - # Fall through, let 'receive-pack' to execute it. + # Fall through, let 'receive-pack' execute it. H: PKT-LINE(ok <ref>) H: PKT-LINE(option fall-through) # OK, but has an alternate reference. The alternate reference name diff --git a/gitprotocol-capabilities.html b/gitprotocol-capabilities.html index e653f9321..3b4d5dec2 100644 --- a/gitprotocol-capabilities.html +++ b/gitprotocol-capabilities.html @@ -777,7 +777,7 @@ to the client.</p></div> to be in effect. The client MUST NOT ask for capabilities the server
did not say it supports.</p></div>
<div class="paragraph"><p>Server MUST diagnose and abort if capabilities it does not understand
-was sent. Server MUST NOT ignore capabilities that client requested
+were sent. Server MUST NOT ignore capabilities that client requested
and server advertised. As a consequence of these rules, server MUST
NOT advertise capabilities it does not understand.</p></div>
<div class="paragraph"><p>The <em>atomic</em>, <em>report-status</em>, <em>report-status-v2</em>, <em>delete-refs</em>, <em>quiet</em>,
@@ -804,8 +804,8 @@ complete cut across the DAG, or the client has said "done".</p></div> <div class="paragraph"><p>Without multi_ack, a client sends have lines in --date-order until
the server has found a common base. That means the client will send
have lines that are already known by the server to be common, because
-they overlap in time with another branch that the server hasn’t found
-a common base on yet.</p></div>
+they overlap in time with another branch on which the server hasn’t found
+a common base yet.</p></div>
<div class="paragraph"><p>For example suppose the client has commits in caps that the server
doesn’t and the server has commits in lower case that the client
doesn’t, as in the following diagram:</p></div>
@@ -832,7 +832,7 @@ interleaved with S-R-Q.</p></div> <div class="sect1">
<h2 id="_multi_ack_detailed">multi_ack_detailed</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This is an extension of multi_ack that permits client to better
+<div class="paragraph"><p>This is an extension of multi_ack that permits the client to better
understand the server’s in-memory state. See <a href="gitprotocol-pack.html">gitprotocol-pack(5)</a>,
section "Packfile Negotiation" for more information.</p></div>
</div>
@@ -878,7 +878,7 @@ to disable the feature in a backwards-compatible manner.</p></div> <div class="sect1">
<h2 id="_side_band_side_band_64k">side-band, side-band-64k</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This capability means that server can send, and client understand multiplexed
+<div class="paragraph"><p>This capability means that the server can send, and the client can understand, multiplexed
progress reports and error info interleaved with the packfile itself.</p></div>
<div class="paragraph"><p>These two options are mutually exclusive. A modern client always
favors <em>side-band-64k</em>.</p></div>
@@ -902,15 +902,15 @@ for the older clients.</p></div> 999 bytes of payload and 1 byte for the stream code. With side-band-64k,
same deal, you have up to 65519 bytes of data and 1 byte for the stream
code.</p></div>
-<div class="paragraph"><p>The client MUST send only maximum of one of "side-band" and "side-
-band-64k". Server MUST diagnose it as an error if client requests
+<div class="paragraph"><p>The client MUST send only one of "side-band" and "side-
+band-64k". The server MUST diagnose it as an error if client requests
both.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_ofs_delta">ofs-delta</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Server can send, and client understand PACKv2 with delta referring to
+<div class="paragraph"><p>The server can send, and the client can understand, PACKv2 with delta referring to
its base by position in pack rather than by an obj-id. That is, they can
send/read OBJ_OFS_DELTA (aka type 6) in a packfile.</p></div>
</div>
@@ -996,7 +996,7 @@ the current shallow boundary, instead of the depth from remote refs.</p></div> <div class="sect1">
<h2 id="_no_progress">no-progress</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The client was started with "git clone -q" or something, and doesn’t
+<div class="paragraph"><p>The client was started with "git clone -q" or something similar, and doesn’t
want that side band 2. Basically the client just says "I do not
wish to receive stream 2 on sideband, so do not send it to me, and if
you did, I will drop it on the floor anyway". However, the sideband
@@ -1016,7 +1016,7 @@ the server advertises this capability. The decision for a client to request include-tag only has to do with the client’s desires for tag
data, whether or not a server had advertised objects in the
refs/tags/* namespace.</p></div>
-<div class="paragraph"><p>Servers MUST pack the tags if their referrant is packed and the client
+<div class="paragraph"><p>Servers MUST pack the tags if their referent is packed and the client
has requested include-tags.</p></div>
<div class="paragraph"><p>Clients MUST be prepared for the case where a server has ignored
include-tag and has not actually sent tags in the pack. In such
@@ -1154,7 +1154,7 @@ and users of the session ID should not rely on this fact.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-21 15:44:34 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitprotocol-capabilities.txt b/gitprotocol-capabilities.txt index 0fb5ea0c1..d6c6effc2 100644 --- a/gitprotocol-capabilities.txt +++ b/gitprotocol-capabilities.txt @@ -30,7 +30,7 @@ to be in effect. The client MUST NOT ask for capabilities the server did not say it supports. Server MUST diagnose and abort if capabilities it does not understand -was sent. Server MUST NOT ignore capabilities that client requested +were sent. Server MUST NOT ignore capabilities that client requested and server advertised. As a consequence of these rules, server MUST NOT advertise capabilities it does not understand. @@ -61,8 +61,8 @@ complete cut across the DAG, or the client has said "done". Without multi_ack, a client sends have lines in --date-order until the server has found a common base. That means the client will send have lines that are already known by the server to be common, because -they overlap in time with another branch that the server hasn't found -a common base on yet. +they overlap in time with another branch on which the server hasn't found +a common base yet. For example suppose the client has commits in caps that the server doesn't and the server has commits in lower case that the client @@ -88,7 +88,7 @@ interleaved with S-R-Q. multi_ack_detailed ------------------ -This is an extension of multi_ack that permits client to better +This is an extension of multi_ack that permits the client to better understand the server's in-memory state. See linkgit:gitprotocol-pack[5], section "Packfile Negotiation" for more information. @@ -135,7 +135,7 @@ to disable the feature in a backwards-compatible manner. side-band, side-band-64k ------------------------ -This capability means that server can send, and client understand multiplexed +This capability means that the server can send, and the client can understand, multiplexed progress reports and error info interleaved with the packfile itself. These two options are mutually exclusive. A modern client always @@ -163,14 +163,14 @@ Further, with side-band and its up to 1000-byte messages, it's actually same deal, you have up to 65519 bytes of data and 1 byte for the stream code. -The client MUST send only maximum of one of "side-band" and "side- -band-64k". Server MUST diagnose it as an error if client requests +The client MUST send only one of "side-band" and "side- +band-64k". The server MUST diagnose it as an error if client requests both. ofs-delta --------- -Server can send, and client understand PACKv2 with delta referring to +The server can send, and the client can understand, PACKv2 with delta referring to its base by position in pack rather than by an obj-id. That is, they can send/read OBJ_OFS_DELTA (aka type 6) in a packfile. @@ -252,7 +252,7 @@ the current shallow boundary, instead of the depth from remote refs. no-progress ----------- -The client was started with "git clone -q" or something, and doesn't +The client was started with "git clone -q" or something similar, and doesn't want that side band 2. Basically the client just says "I do not wish to receive stream 2 on sideband, so do not send it to me, and if you did, I will drop it on the floor anyway". However, the sideband @@ -273,7 +273,7 @@ request include-tag only has to do with the client's desires for tag data, whether or not a server had advertised objects in the refs/tags/* namespace. -Servers MUST pack the tags if their referrant is packed and the client +Servers MUST pack the tags if their referent is packed and the client has requested include-tags. Clients MUST be prepared for the case where a server has ignored diff --git a/gitprotocol-common.html b/gitprotocol-common.html index 3bfaab6a9..90d5db18a 100644 --- a/gitprotocol-common.html +++ b/gitprotocol-common.html @@ -757,7 +757,7 @@ gitprotocol-common(5) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>This document sets defines things common to various over-the-wire
+<div class="paragraph"><p>This document defines things common to various over-the-wire
protocols and file formats used in Git.</p></div>
</div>
</div>
@@ -889,7 +889,7 @@ pkt-line ("0004").</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitprotocol-common.txt b/gitprotocol-common.txt index 1486651bd..cdc9d6e70 100644 --- a/gitprotocol-common.txt +++ b/gitprotocol-common.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -This document sets defines things common to various over-the-wire +This document defines things common to various over-the-wire protocols and file formats used in Git. ABNF Notation diff --git a/gitprotocol-http.html b/gitprotocol-http.html index 62f55c8f2..0285551f6 100644 --- a/gitprotocol-http.html +++ b/gitprotocol-http.html @@ -782,7 +782,7 @@ the http:// repository URL entered by the end-user.</p></div> both the "smart" and "dumb" HTTP protocols used by Git operate
by appending additional path components onto the end of the user
supplied <code>$GIT_URL</code> string.</p></div>
-<div class="paragraph"><p>An example of a dumb client requesting for a loose object:</p></div>
+<div class="paragraph"><p>An example of a dumb client requesting a loose object:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>$GIT_URL: http://example.com:8080/git/repo.git
@@ -1109,7 +1109,7 @@ cap_list = capability *(SP capability)</code></pre> <div class="paragraph"><p>C: Place any object seen into set <code>advertised</code>.</p></div>
<div class="paragraph"><p>C: Build an empty set, <code>common</code>, to hold the objects that are later
determined to be on both ends.</p></div>
-<div class="paragraph"><p>C: Build a set, <code>want</code>, of the objects from <code>advertised</code> the client
+<div class="paragraph"><p>C: Build a set, <code>want</code>, of the objects from <code>advertised</code> that the client
wants to fetch, based on what it saw during ref discovery.</p></div>
<div class="paragraph"><p>C: Start a queue, <code>c_pending</code>, ordered by commit time (popping newest
first). Add all client refs. When a commit is popped from
@@ -1156,7 +1156,7 @@ object name as its value. Multiple object names MUST be sent by sending multiple commands. Object names MUST be given using the object format
negotiated through the <code>object-format</code> capability (default SHA-1).</p></div>
<div class="paragraph"><p>The <code>have</code> list is created by popping the first 32 commits
-from <code>c_pending</code>. Less can be supplied if <code>c_pending</code> empties.</p></div>
+from <code>c_pending</code>. Fewer can be supplied if <code>c_pending</code> empties.</p></div>
<div class="paragraph"><p>If the client has sent 256 "have" commits and has not yet
received one of those back from <code>s_common</code>, or the client has
emptied <code>c_pending</code> it SHOULD include a "done" command to let
@@ -1279,7 +1279,7 @@ update = old_id SP new_id SP name</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitprotocol-http.txt b/gitprotocol-http.txt index ccc13f0a4..21b73b7a1 100644 --- a/gitprotocol-http.txt +++ b/gitprotocol-http.txt @@ -42,7 +42,7 @@ both the "smart" and "dumb" HTTP protocols used by Git operate by appending additional path components onto the end of the user supplied `$GIT_URL` string. -An example of a dumb client requesting for a loose object: +An example of a dumb client requesting a loose object: $GIT_URL: http://example.com:8080/git/repo.git URL request: http://example.com:8080/git/repo.git/objects/d0/49f6c27a2244e12041955e262a404c7faba355 @@ -379,7 +379,7 @@ C: Place any object seen into set `advertised`. C: Build an empty set, `common`, to hold the objects that are later determined to be on both ends. -C: Build a set, `want`, of the objects from `advertised` the client +C: Build a set, `want`, of the objects from `advertised` that the client wants to fetch, based on what it saw during ref discovery. C: Start a queue, `c_pending`, ordered by commit time (popping newest @@ -423,7 +423,7 @@ multiple commands. Object names MUST be given using the object format negotiated through the `object-format` capability (default SHA-1). The `have` list is created by popping the first 32 commits -from `c_pending`. Less can be supplied if `c_pending` empties. +from `c_pending`. Fewer can be supplied if `c_pending` empties. If the client has sent 256 "have" commits and has not yet received one of those back from `s_common`, or the client has diff --git a/gitprotocol-pack.html b/gitprotocol-pack.html index 0dfa78382..dc70204f4 100644 --- a/gitprotocol-pack.html +++ b/gitprotocol-pack.html @@ -774,7 +774,7 @@ of data to send in order to fully update one or the other.</p></div> <h2 id="_pkt_line_format">pkt-line Format</h2>
<div class="sectionbody">
<div class="paragraph"><p>The descriptions below build on the pkt-line format described in
-<a href="gitprotocol-common.html">gitprotocol-common(5)</a>. When the grammar indicate <code>PKT-LINE(...)</code>, unless
+<a href="gitprotocol-common.html">gitprotocol-common(5)</a>. When the grammar indicates <code>PKT-LINE(...)</code>, unless
otherwise noted the usual pkt-line LF rules apply: the sender SHOULD
include a LF, but the receiver MUST NOT complain if it is not present.</p></div>
<div class="paragraph"><p>An error packet is a special pkt-line that contains an error string.</p></div>
@@ -886,7 +886,7 @@ an absolute path in the remote filesystem.</p></div> v
ssh user@example.com "git-upload-pack '/project.git'"</code></pre>
</div></div>
-<div class="paragraph"><p>In a "user@host:path" format URI, its relative to the user’s home
+<div class="paragraph"><p>In a "user@host:path" format URI, it’s relative to the user’s home
directory, because the Git client will run:</p></div>
<div class="literalblock">
<div class="content">
@@ -1075,7 +1075,7 @@ a positive depth, this step is skipped.</p></div> </div></div>
<div class="paragraph"><p>If the client has requested a positive depth, the server will compute
the set of commits which are no deeper than the desired depth. The set
-of commits start at the client’s wants.</p></div>
+of commits starts at the client’s wants.</p></div>
<div class="paragraph"><p>The server writes <em>shallow</em> lines for each
commit whose parents will not be sent as a result. The server writes
an <em>unshallow</em> line for each commit which the client has indicated is
@@ -1494,7 +1494,7 @@ can be rejected.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitprotocol-pack.txt b/gitprotocol-pack.txt index dd4108b7a..837b691c8 100644 --- a/gitprotocol-pack.txt +++ b/gitprotocol-pack.txt @@ -30,7 +30,7 @@ pkt-line Format --------------- The descriptions below build on the pkt-line format described in -linkgit:gitprotocol-common[5]. When the grammar indicate `PKT-LINE(...)`, unless +linkgit:gitprotocol-common[5]. When the grammar indicates `PKT-LINE(...)`, unless otherwise noted the usual pkt-line LF rules apply: the sender SHOULD include a LF, but the receiver MUST NOT complain if it is not present. @@ -137,7 +137,7 @@ an absolute path in the remote filesystem. v ssh user@example.com "git-upload-pack '/project.git'" -In a "user@host:path" format URI, its relative to the user's home +In a "user@host:path" format URI, it's relative to the user's home directory, because the Git client will run: git clone user@example.com:project.git @@ -325,7 +325,7 @@ a positive depth, this step is skipped. If the client has requested a positive depth, the server will compute the set of commits which are no deeper than the desired depth. The set -of commits start at the client's wants. +of commits starts at the client's wants. The server writes 'shallow' lines for each commit whose parents will not be sent as a result. The server writes diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html index fcc493150..7080f39a2 100644 --- a/gitprotocol-v2.html +++ b/gitprotocol-v2.html @@ -797,7 +797,7 @@ Designed with http and stateless-rpc in mind. With clear flush </li>
</ul></div>
<div class="paragraph"><p>In protocol v2 communication is command oriented. When first contacting a
-server a list of capabilities will advertised. Some of these capabilities
+server a list of capabilities will be advertised. Some of these capabilities
will be commands which a client can request be executed. Once a command
has completed, a client can reuse the connection and request that other
commands be executed.</p></div>
@@ -1719,7 +1719,7 @@ headers of that bundle or bundles.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-16 13:16:56 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitprotocol-v2.txt b/gitprotocol-v2.txt index acb97ad0c..8c1e7c61e 100644 --- a/gitprotocol-v2.txt +++ b/gitprotocol-v2.txt @@ -29,7 +29,7 @@ protocol. Protocol v2 will improve upon v1 in the following ways: semantics the http remote helper can simply act as a proxy In protocol v2 communication is command oriented. When first contacting a -server a list of capabilities will advertised. Some of these capabilities +server a list of capabilities will be advertised. Some of these capabilities will be commands which a client can request be executed. Once a command has completed, a client can reuse the connection and request that other commands be executed. diff --git a/gitrepository-layout.html b/gitrepository-layout.html index bd1714a54..1fe37233d 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html @@ -1340,7 +1340,7 @@ in the future.</p></div> <div class="sect3">
<h4 id="_code_worktreeconfig_code"><code>worktreeConfig</code></h4>
<div class="paragraph"><p>If set, by default "git config" reads from both "config" and
-"config.worktree" file from GIT_DIR in that order. In
+"config.worktree" files from GIT_DIR in that order. In
multiple working directory mode, "config" file is shared while
"config.worktree" is per-working directory (i.e., it’s in
GIT_COMMON_DIR/worktrees/<id>/config.worktree)</p></div>
diff --git a/gitsubmodules.html b/gitsubmodules.html index c98b3c2e1..f125266d3 100644 --- a/gitsubmodules.html +++ b/gitsubmodules.html @@ -843,7 +843,7 @@ Access control: <p>
The command line for those commands that support taking submodules
as part of their pathspecs. Most commands have a boolean flag
- <code>--recurse-submodules</code> which specify whether to recurse into submodules.
+ <code>--recurse-submodules</code> which specifies whether to recurse into submodules.
Examples are <code>grep</code> and <code>checkout</code>.
Some commands take enums, such as <code>fetch</code> and <code>push</code>, where you can
specify how submodules are affected.
@@ -983,7 +983,7 @@ if <code>submodule.<name>.url</code> is set. [submodule "baz"]
url = https://example.org/baz</code></pre>
</div></div>
-<div class="paragraph"><p>In the above config only the submodule <em>bar</em> and <em>baz</em> are active,
+<div class="paragraph"><p>In the above config only the submodules <em>bar</em> and <em>baz</em> are active,
<em>bar</em> due to (1) and <em>baz</em> due to (3). <em>foo</em> is inactive because
(1) takes precedence over (3)</p></div>
<div class="paragraph"><p>Note that (3) is a historical artefact and will be ignored if the
@@ -1092,7 +1092,7 @@ will not be checked out by default; you can instruct <code>clone</code> to recur into submodules. The <code>init</code> and <code>update</code> subcommands of <code>git submodule</code>
will maintain submodules checked out and at an appropriate revision in
your working tree. Alternatively you can set <code>submodule.recurse</code> to have
-<code>checkout</code> recursing into submodules (note that <code>submodule.recurse</code> also
+<code>checkout</code> recurse into submodules (note that <code>submodule.recurse</code> also
affects other Git commands, see <a href="git-config.html">git-config(1)</a> for a complete list).</p></div>
</div>
</div>
@@ -1113,7 +1113,7 @@ affects other Git commands, see <a href="git-config.html">git-config(1)</a> for <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitsubmodules.txt b/gitsubmodules.txt index 941858a6e..8400d591d 100644 --- a/gitsubmodules.txt +++ b/gitsubmodules.txt @@ -78,7 +78,7 @@ Submodule operations can be configured using the following mechanisms * The command line for those commands that support taking submodules as part of their pathspecs. Most commands have a boolean flag - `--recurse-submodules` which specify whether to recurse into submodules. + `--recurse-submodules` which specifies whether to recurse into submodules. Examples are `grep` and `checkout`. Some commands take enums, such as `fetch` and `push`, where you can specify how submodules are affected. @@ -192,7 +192,7 @@ For example: [submodule "baz"] url = https://example.org/baz -In the above config only the submodule 'bar' and 'baz' are active, +In the above config only the submodules 'bar' and 'baz' are active, 'bar' due to (1) and 'baz' due to (3). 'foo' is inactive because (1) takes precedence over (3) @@ -274,7 +274,7 @@ will not be checked out by default; you can instruct `clone` to recurse into submodules. The `init` and `update` subcommands of `git submodule` will maintain submodules checked out and at an appropriate revision in your working tree. Alternatively you can set `submodule.recurse` to have -`checkout` recursing into submodules (note that `submodule.recurse` also +`checkout` recurse into submodules (note that `submodule.recurse` also affects other Git commands, see linkgit:git-config[1] for a complete list). diff --git a/gitweb.conf.html b/gitweb.conf.html index 34a32cce9..9369a341b 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html @@ -799,7 +799,7 @@ common system-wide configuration file (defaults to <li>
<p>
either per-instance configuration file (defaults to <em>gitweb_config.perl</em>
- in the same directory as the installed gitweb), or if it does not exists
+ in the same directory as the installed gitweb), or if it does not exist
then fallback system-wide configuration file (defaults to <code>/etc/gitweb.conf</code>).
</p>
</li>
@@ -2015,7 +2015,7 @@ gitweb_config.perl <div id="footer">
<div id="footer-text">
Last updated
- 2021-04-13 18:13:34 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitweb.conf.txt b/gitweb.conf.txt index 34b1d6e22..b078fef6f 100644 --- a/gitweb.conf.txt +++ b/gitweb.conf.txt @@ -53,7 +53,7 @@ following order: `/etc/gitweb-common.conf`), * either per-instance configuration file (defaults to 'gitweb_config.perl' - in the same directory as the installed gitweb), or if it does not exists + in the same directory as the installed gitweb), or if it does not exist then fallback system-wide configuration file (defaults to `/etc/gitweb.conf`). Values obtained in later configuration files override values obtained earlier diff --git a/gitweb.html b/gitweb.html index d4614f0a0..d9c01c75c 100644 --- a/gitweb.html +++ b/gitweb.html @@ -749,7 +749,7 @@ gitweb(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="paragraph"><p>To get started with gitweb, run <a href="git-instaweb.html">git-instaweb(1)</a> from a Git repository.
-This would configure and start your web server, and run web browser pointing to
+This will configure and start your web server, and run a web browser pointing to
gitweb.</p></div>
</div>
</div>
@@ -776,7 +776,7 @@ Viewing the contents of files in the repository at any revision. <li>
<p>
Viewing the revision log of branches, history of files and directories,
- see what was changed when, by who.
+ seeing what was changed, when, and by whom.
</p>
</li>
<li>
@@ -792,13 +792,13 @@ Generating RSS and Atom feeds of commits, for any branch. </li>
<li>
<p>
-Viewing everything that was changed in a revision, and step through
+Viewing everything that was changed in a revision, and stepping through
revisions one at a time, viewing the history of the repository.
</p>
</li>
<li>
<p>
-Finding commits which commit messages matches given search term.
+Finding commits whose commit messages match a given search term.
</p>
</li>
</ul></div>
@@ -815,16 +815,16 @@ for details.</p></div> <div class="sect2">
<h3 id="_repositories">Repositories</h3>
<div class="paragraph"><p>Gitweb can show information from one or more Git repositories. These
-repositories have to be all on local filesystem, and have to share common
+repositories have to be all on local filesystem, and have to share a common
repository root, i.e. be all under a single parent repository (but see also
-"Advanced web server setup" section, "Webserver configuration with multiple
+the "Advanced web server setup" section, "Webserver configuration with multiple
projects' root" subsection).</p></div>
<div class="listingblock">
<div class="content">
<pre><code>our $projectroot = '/path/to/parent/directory';</code></pre>
</div></div>
<div class="paragraph"><p>The default value for <code>$projectroot</code> is <code>/pub/git</code>. You can change it during
-building gitweb via <code>GITWEB_PROJECTROOT</code> build configuration variable.</p></div>
+building gitweb via the <code>GITWEB_PROJECTROOT</code> build configuration variable.</p></div>
<div class="paragraph"><p>By default all Git repositories under <code>$projectroot</code> are visible and available
to gitweb. The list of projects is generated by default by scanning the
<code>$projectroot</code> directory for Git repositories (for object databases to be
@@ -836,7 +836,7 @@ found at "$projectroot/$repo".</p></div> </div>
<div class="sect2">
<h3 id="_projects_list_file_format">Projects list file format</h3>
-<div class="paragraph"><p>Instead of having gitweb find repositories by scanning filesystem
+<div class="paragraph"><p>Instead of having gitweb find repositories by scanning the filesystem
starting from $projectroot, you can provide a pre-generated list of
visible projects by setting <code>$projects_list</code> to point to a plain text
file with a list of projects (with some additional info).</p></div>
@@ -1642,7 +1642,7 @@ putting "gitweb" in the subject of email.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/gitweb.txt b/gitweb.txt index af6bf3c45..1030e9667 100644 --- a/gitweb.txt +++ b/gitweb.txt @@ -8,7 +8,7 @@ gitweb - Git web interface (web frontend to Git repositories) SYNOPSIS -------- To get started with gitweb, run linkgit:git-instaweb[1] from a Git repository. -This would configure and start your web server, and run web browser pointing to +This will configure and start your web server, and run a web browser pointing to gitweb. @@ -20,13 +20,13 @@ Gitweb provides a web interface to Git repositories. Its features include: * Browsing every revision of the repository. * Viewing the contents of files in the repository at any revision. * Viewing the revision log of branches, history of files and directories, - see what was changed when, by who. + seeing what was changed, when, and by whom. * Viewing the blame/annotation details of any file (if enabled). * Generating RSS and Atom feeds of commits, for any branch. The feeds are auto-discoverable in modern web browsers. -* Viewing everything that was changed in a revision, and step through +* Viewing everything that was changed in a revision, and stepping through revisions one at a time, viewing the history of the repository. -* Finding commits which commit messages matches given search term. +* Finding commits whose commit messages match a given search term. See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code, browsed using gitweb itself. @@ -41,9 +41,9 @@ for details. Repositories ~~~~~~~~~~~~ Gitweb can show information from one or more Git repositories. These -repositories have to be all on local filesystem, and have to share common +repositories have to be all on local filesystem, and have to share a common repository root, i.e. be all under a single parent repository (but see also -"Advanced web server setup" section, "Webserver configuration with multiple +the "Advanced web server setup" section, "Webserver configuration with multiple projects' root" subsection). ----------------------------------------------------------------------- @@ -51,7 +51,7 @@ our $projectroot = '/path/to/parent/directory'; ----------------------------------------------------------------------- The default value for `$projectroot` is `/pub/git`. You can change it during -building gitweb via `GITWEB_PROJECTROOT` build configuration variable. +building gitweb via the `GITWEB_PROJECTROOT` build configuration variable. By default all Git repositories under `$projectroot` are visible and available to gitweb. The list of projects is generated by default by scanning the @@ -66,7 +66,7 @@ found at "$projectroot/$repo". Projects list file format ~~~~~~~~~~~~~~~~~~~~~~~~~ -Instead of having gitweb find repositories by scanning filesystem +Instead of having gitweb find repositories by scanning the filesystem starting from $projectroot, you can provide a pre-generated list of visible projects by setting `$projects_list` to point to a plain text file with a list of projects (with some additional info). diff --git a/glossary-content.txt b/glossary-content.txt index 5a537268e..65c89e7b3 100644 --- a/glossary-content.txt +++ b/glossary-content.txt @@ -186,7 +186,7 @@ current branch integrates with) obviously do not work, as there is no points at the directory that is the real repository. [[def_grafts]]grafts:: - Grafts enables two otherwise different lines of development to be joined + Grafts enable two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was diff --git a/howto-index.html b/howto-index.html index b85f11cf4..09683eb0a 100644 --- a/howto-index.html +++ b/howto-index.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Git Howto Index</h1>
-<span id="revdate">2023-08-21</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -896,7 +896,7 @@ later validate it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-08-21 10:25:05 PDT
+ 2023-10-23 14:43:47 PDT
</div>
</div>
</body>
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 8e567fbc6..c9602354a 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -935,7 +935,7 @@ embargoes reasonably short in the interest of keeping Git’s users safe.</p <h3 id="_opening_a_security_advisory_draft">Opening a Security Advisory draft</h3>
<div class="paragraph"><p>The first step is to <a href="https://github.com/git/git/security/advisories/new">open
an advisory</a>. Technically, this is not necessary. However, it is the most
-convenient way to obtain the CVE number and it give us a private repository
+convenient way to obtain the CVE number and it gives us a private repository
associated with it that can be used to collaborate on a fix.</p></div>
</div>
<div class="sect2">
@@ -1038,7 +1038,7 @@ Thanks, <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
</div>
</div>
</body>
diff --git a/howto/coordinate-embargoed-releases.txt b/howto/coordinate-embargoed-releases.txt index e653775ba..b9cb95e82 100644 --- a/howto/coordinate-embargoed-releases.txt +++ b/howto/coordinate-embargoed-releases.txt @@ -145,7 +145,7 @@ Opening a Security Advisory draft The first step is to https://github.com/git/git/security/advisories/new[open an advisory]. Technically, this is not necessary. However, it is the most -convenient way to obtain the CVE number and it give us a private repository +convenient way to obtain the CVE number and it gives us a private repository associated with it that can be used to collaborate on a fix. Notifying the Linux distributions diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index bf53ccefb..f1d68c7b9 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Keep authoritative canonical history correct with git pull</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -939,7 +939,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 2130c1458..010ef9e71 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to maintain Git</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
@@ -889,7 +889,7 @@ Scan mailing list. Respond with review comments, suggestions <li>
<p>
Write his own patches to address issues raised on the list but
- nobody has stepped up solving. Send it out just like other
+ nobody has stepped up to solve. Send it out just like other
contributors do, and pick them up just like patches from other
contributors (see above).
</p>
@@ -1400,12 +1400,12 @@ Due to the nature of "SQUASH???" fix-ups, if the original author <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
<div class="paragraph"><p>A merge of two topics may not textually conflict but still have
conflict at the semantic level. A classic example is for one topic
-to rename an variable and all its uses, while another topic adds a
+to rename a variable and all its uses, while another topic adds a
new use of the variable under its old name. When these two topics
are merged together, the reference to the variable newly added by
the latter topic will still use the old name in the result.</p></div>
<div class="paragraph"><p>The Meta/Reintegrate script that is used by redo-jch and redo-seen
-scripts implements a crude but usable way to work this issue around.
+scripts implements a crude but usable way to work around this issue.
When the script merges branch $X, it checks if "refs/merge-fix/$X"
exists, and if so, the effect of it is squashed into the result of
the mechanical merge. In other words,</p></div>
@@ -1479,7 +1479,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.txt b/howto/maintain-git.txt index d07c6d44e..013014bbe 100644 --- a/howto/maintain-git.txt +++ b/howto/maintain-git.txt @@ -104,7 +104,7 @@ by doing the following: files in mbox format). - Write his own patches to address issues raised on the list but - nobody has stepped up solving. Send it out just like other + nobody has stepped up to solve. Send it out just like other contributors do, and pick them up just like patches from other contributors (see above). @@ -411,13 +411,13 @@ Preparing a "merge-fix" A merge of two topics may not textually conflict but still have conflict at the semantic level. A classic example is for one topic -to rename an variable and all its uses, while another topic adds a +to rename a variable and all its uses, while another topic adds a new use of the variable under its old name. When these two topics are merged together, the reference to the variable newly added by the latter topic will still use the old name in the result. The Meta/Reintegrate script that is used by redo-jch and redo-seen -scripts implements a crude but usable way to work this issue around. +scripts implements a crude but usable way to work around this issue. When the script merges branch $X, it checks if "refs/merge-fix/$X" exists, and if so, the effect of it is squashed into the result of the mechanical merge. In other words, diff --git a/howto/new-command.html b/howto/new-command.html index 590769881..c02fecbfa 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to integrate new subcommands</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -864,7 +864,7 @@ letter [PATCH 0/n]. <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:22 PDT
+ 2023-10-23 14:44:16 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index b9f8f4a30..87ce5764c 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to rebase from an internal branch</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -896,7 +896,7 @@ the #1' commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 438fbf5ff..2d9debf36 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to rebuild from update hook</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -848,7 +848,7 @@ This is still crude and does not protect against simultaneous <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 35ef2f192..d21b974fe 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to recover a corrupted blob object</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -881,7 +881,7 @@ thing.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:17 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 2b0e6bb35..085dd5b47 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to recover an object from scratch</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -1190,7 +1190,7 @@ int main(int argc, char **argv) <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:17 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 6fb687054..ef142dda1 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to revert a faulty merge</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -1026,7 +1026,7 @@ P---o---o---M---x---x---W---x---M2 <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:17 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index a924200de..5261fcf9d 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to revert an existing commit</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -908,7 +908,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:22 PDT
+ 2023-10-23 14:44:16 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 093a4ab37..b19f1efa3 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to separate topic branches</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -842,7 +842,7 @@ o---o"master"</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:17 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 4ec4f8339..76a250503 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to setup Git server over http</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -1072,7 +1072,7 @@ help diagnosing the problem, but removes security checks.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:17 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index c195955a5..bc9515dc1 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to use the update hook</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -931,7 +931,7 @@ that JC can make non-fast-forward pushes on it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:17 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 63a57cc1d..b14bc7a06 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -735,13 +735,13 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to use git-daemon</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>Git can be run in inetd mode and in stand alone mode. But all you want is
-let a coworker pull from you, and therefore need to set up a Git server
+to let a coworker pull from you, and therefore need to set up a Git server
real quick, right?</p></div>
<div class="paragraph"><p>Note that git-daemon is not really chatty at the moment, especially when
things do not go according to plan (e.g. a socket could not be bound).</p></div>
@@ -792,7 +792,7 @@ a good practice to put the paths after a "--" separator.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:16 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.txt b/howto/use-git-daemon.txt index 7af2e52cf..2cad9b3ca 100644 --- a/howto/use-git-daemon.txt +++ b/howto/use-git-daemon.txt @@ -4,7 +4,7 @@ How to use git-daemon ===================== Git can be run in inetd mode and in stand alone mode. But all you want is -let a coworker pull from you, and therefore need to set up a Git server +to let a coworker pull from you, and therefore need to set up a Git server real quick, right? Note that git-daemon is not really chatty at the moment, especially when diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index da3548d22..1fb1147dd 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -735,12 +735,12 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to use the subtree merge strategy</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
-<div class="paragraph"><p>There are situations where you want to include contents in your project
+<div class="paragraph"><p>There are situations where you want to include content in your project
from an independently developed project. You can just pull from the
other project as long as there are no conflicting paths.</p></div>
<div class="paragraph"><p>The problematic case is when there are conflicting files. Potential
@@ -849,7 +849,7 @@ Please note that if the other project merges from you, then it will <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:16 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.txt b/howto/using-merge-subtree.txt index a499a94ac..3bd581ac3 100644 --- a/howto/using-merge-subtree.txt +++ b/howto/using-merge-subtree.txt @@ -11,7 +11,7 @@ Message-ID: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE> How to use the subtree merge strategy ===================================== -There are situations where you want to include contents in your project +There are situations where you want to include content in your project from an independently developed project. You can just pull from the other project as long as there are no conflicting paths. diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index c6f80ddc2..87195c2c1 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>How to use a signed tag in pull requests</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -953,7 +953,7 @@ as part of the merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:16 PDT
</div>
</div>
</body>
@@ -34,7 +34,7 @@ project find it more convenient to use legacy encodings, Git does not forbid it. However, there are a few things to keep in mind. -. 'git commit' and 'git commit-tree' issues +. 'git commit' and 'git commit-tree' issue a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to @@ -46,7 +46,7 @@ mind. ------------ + Commit objects created with the above setting record the value -of `i18n.commitEncoding` in its `encoding` header. This is to +of `i18n.commitEncoding` in their `encoding` header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF-8. diff --git a/pretty-options.txt b/pretty-options.txt index 335395b72..23888cd61 100644 --- a/pretty-options.txt +++ b/pretty-options.txt @@ -48,7 +48,7 @@ people using 80-column terminals. --expand-tabs:: --no-expand-tabs:: Perform a tab expansion (replace each tab with enough spaces - to fill to the next display column that is multiple of '<n>') + to fill to the next display column that is a multiple of '<n>') in the log message before showing it in the output. `--expand-tabs` is a short-hand for `--expand-tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, @@ -73,7 +73,7 @@ environment overrides). See linkgit:git-config[1] for more details. With an optional '<ref>' argument, use the ref to find the notes to display. The ref can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise -`refs/notes/` is prefixed to form a full name of the ref. +`refs/notes/` is prefixed to form the full name of the ref. + Multiple --notes options can be combined to control which notes are being displayed. Examples: "--notes=foo" will show only notes from diff --git a/pull-fetch-param.txt b/pull-fetch-param.txt index 95a7390b2..c718f7946 100644 --- a/pull-fetch-param.txt +++ b/pull-fetch-param.txt @@ -71,7 +71,7 @@ refspec (or `--force`). Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), whether that's swapping e.g. a tree object for a blob, or -a commit for another commit that's doesn't have the previous commit as +a commit for another commit that doesn't have the previous commit as an ancestor etc. + Unlike when pushing with linkgit:git-push[1], there is no @@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a + As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by -adding an the optional leading `+` to a refspec (or using `--force` +adding an optional leading `+` to a refspec (or using the `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object. @@ -88,7 +88,7 @@ object. [NOTE] When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that -its new tip will not be descendant of its previous tip +its new tip will not be a descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates diff --git a/rev-list-options.txt b/rev-list-options.txt index 66d71d1b9..2bf239ff0 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -56,7 +56,7 @@ endif::git-rev-list[] error to use this option unless `--walk-reflogs` is in use. --grep=<pattern>:: - Limit the commits output to ones with log message that + Limit the commits output to ones with a log message that matches the specified pattern (regular expression). With more than one `--grep=<pattern>`, commits whose message matches any of the given patterns are chosen (but see @@ -72,7 +72,7 @@ endif::git-rev-list[] instead of ones that match at least one. --invert-grep:: - Limit the commits output to ones with log message that do not + Limit the commits output to ones with a log message that do not match the pattern specified with `--grep=<pattern>`. -i:: diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 35b06fb42..fb9133085 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Error reporting in git</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/api-index-skel.txt b/technical/api-index-skel.txt index eda8c195c..7780a76b0 100644 --- a/technical/api-index-skel.txt +++ b/technical/api-index-skel.txt @@ -1,7 +1,7 @@ Git API Documents ================= -Git has grown a set of internal API over time. This collection +Git has grown a set of internal APIs over time. This collection documents them. //////////////////////////////////////////////////////////////// diff --git a/technical/api-index.html b/technical/api-index.html index 11581bb7b..25ba484fe 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -735,12 +735,12 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Git API Documents</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
-<div class="paragraph"><p>Git has grown a set of internal API over time. This collection
+<div class="paragraph"><p>Git has grown a set of internal APIs over time. This collection
documents them.</p></div>
<div class="ulist"><ul>
<li>
@@ -776,7 +776,7 @@ documents them.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-08-21 10:25:12 PDT
+ 2023-10-23 14:43:49 PDT
</div>
</div>
</body>
diff --git a/technical/api-index.txt b/technical/api-index.txt index b73de5539..311479f9f 100644 --- a/technical/api-index.txt +++ b/technical/api-index.txt @@ -1,7 +1,7 @@ Git API Documents ================= -Git has grown a set of internal API over time. This collection +Git has grown a set of internal APIs over time. This collection documents them. //////////////////////////////////////////////////////////////// diff --git a/technical/api-merge.html b/technical/api-merge.html index 47fde9187..bec282e67 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>merge API</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 421279f4c..38531ea69 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>parse-options API</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index 04e0c9dec..5d2e56db2 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -735,13 +735,13 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Simple-IPC API</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>The Simple-IPC API is a collection of <code>ipc_</code> prefixed library routines
-and a basic communication protocol that allow an IPC-client process to
+and a basic communication protocol that allows an IPC-client process to
send an application-specific IPC-request message to an IPC-server
process and receive an application-specific IPC-response message.</p></div>
<div class="paragraph"><p>Communication occurs over a named pipe on Windows and a Unix domain
@@ -756,11 +756,11 @@ IPC-server routines then incrementally relay responses back to the IPC-client.</p></div>
<div class="paragraph"><p>The IPC-client routines within a client application process connect
to the IPC-server and send a request message and wait for a response.
-When received, the response is returned back the caller.</p></div>
+When received, the response is returned back to the caller.</p></div>
<div class="paragraph"><p>For example, the <code>fsmonitor--daemon</code> feature will be built as a server
application on top of the IPC-server library routines. It will have
threads watching for file system events and a thread pool waiting for
-client connections. Clients, such as <code>git status</code> will request a list
+client connections. Clients, such as <code>git status</code>, will request a list
of file system events since a point in time and the server will
respond with a list of changed files and directories. The formats of
the request and response are application-specific; the IPC-client and
@@ -772,7 +772,7 @@ IPC-server routines treat them as opaque byte streams.</p></div> <div class="sectionbody">
<div class="paragraph"><p>The Simple-IPC mechanism differs from the existing <code>sub-process.c</code>
model (Documentation/technical/long-running-process-protocol.txt) and
-used by applications like Git-LFS. In the LFS-style sub-process model
+used by applications like Git-LFS. In the LFS-style sub-process model,
the helper is started by the foreground process, communication happens
via a pair of file descriptors bound to the stdin/stdout of the
sub-process, the sub-process only serves the current foreground
@@ -833,7 +833,7 @@ stateless request, receive an application-specific response, and disconnect. It is a one round trip facility for
querying the server. The Simple-IPC routines hide the socket,
named pipe, and thread pool details and allow the application
-layer to focus on the application at hand.</p></div>
+layer to focus on the task at hand.</p></div>
</div>
</div>
</div>
@@ -841,7 +841,7 @@ layer to focus on the application at hand.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/technical/api-simple-ipc.txt b/technical/api-simple-ipc.txt index d44ada98e..c4fb152b2 100644 --- a/technical/api-simple-ipc.txt +++ b/technical/api-simple-ipc.txt @@ -2,7 +2,7 @@ Simple-IPC API ============== The Simple-IPC API is a collection of `ipc_` prefixed library routines -and a basic communication protocol that allow an IPC-client process to +and a basic communication protocol that allows an IPC-client process to send an application-specific IPC-request message to an IPC-server process and receive an application-specific IPC-response message. @@ -20,12 +20,12 @@ IPC-client. The IPC-client routines within a client application process connect to the IPC-server and send a request message and wait for a response. -When received, the response is returned back the caller. +When received, the response is returned back to the caller. For example, the `fsmonitor--daemon` feature will be built as a server application on top of the IPC-server library routines. It will have threads watching for file system events and a thread pool waiting for -client connections. Clients, such as `git status` will request a list +client connections. Clients, such as `git status`, will request a list of file system events since a point in time and the server will respond with a list of changed files and directories. The formats of the request and response are application-specific; the IPC-client and @@ -37,7 +37,7 @@ Comparison with sub-process model The Simple-IPC mechanism differs from the existing `sub-process.c` model (Documentation/technical/long-running-process-protocol.txt) and -used by applications like Git-LFS. In the LFS-style sub-process model +used by applications like Git-LFS. In the LFS-style sub-process model, the helper is started by the foreground process, communication happens via a pair of file descriptors bound to the stdin/stdout of the sub-process, the sub-process only serves the current foreground @@ -102,4 +102,4 @@ stateless request, receive an application-specific response, and disconnect. It is a one round trip facility for querying the server. The Simple-IPC routines hide the socket, named pipe, and thread pool details and allow the application -layer to focus on the application at hand. +layer to focus on the task at hand. diff --git a/technical/api-trace2.html b/technical/api-trace2.html index c0b5128e5..8dc54b3bc 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Trace2 API</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index b56808f2e..e8fa24b42 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>GIT bitmap v1 format</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
@@ -944,7 +944,7 @@ result in an empty bitmap (no bits set).</p></div> <p>
N entries with compressed bitmaps, one for each indexed commit
</p>
-<div class="paragraph"><p>Where <code>N</code> is the total amount of entries in this bitmap index.
+<div class="paragraph"><p>Where <code>N</code> is the total number of entries in this bitmap index.
Each entry contains the following:</p></div>
<div class="ulist"><ul>
<li>
@@ -973,7 +973,7 @@ Each entry contains the following:</p></div> <dd>
<p>
The xor offset used to compress this bitmap. For an entry
- in position <code>x</code>, a XOR offset of <code>y</code> means that the actual
+ in position <code>x</code>, an XOR offset of <code>y</code> means that the actual
bitmap representing this commit is composed by XORing the
bitmap for this entry with the bitmap in entry <code>x-y</code> (i.e.
the bitmap <code>y</code> entries before this one).
@@ -1154,7 +1154,7 @@ the desired bitmap from the entries without parsing previous unnecessary bitmaps.</p></div>
<div class="paragraph"><p>For a <code>.bitmap</code> containing <code>nr_entries</code> reachability bitmaps, the table
contains a list of <code>nr_entries</code> <commit_pos, offset, xor_row> triplets
-(sorted in the ascending order of <code>commit_pos</code>). The content of i’th
+(sorted in the ascending order of <code>commit_pos</code>). The content of the i’th
triplet is -</p></div>
<div class="ulist"><ul>
<li>
@@ -1209,7 +1209,7 @@ xor_row (4 byte integer, network byte order): <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-05 18:35:54 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/technical/bitmap-format.txt b/technical/bitmap-format.txt index c2e652b71..f5d200939 100644 --- a/technical/bitmap-format.txt +++ b/technical/bitmap-format.txt @@ -114,7 +114,7 @@ result in an empty bitmap (no bits set). * N entries with compressed bitmaps, one for each indexed commit + -Where `N` is the total amount of entries in this bitmap index. +Where `N` is the total number of entries in this bitmap index. Each entry contains the following: ** {empty} @@ -126,7 +126,7 @@ Each entry contains the following: ** {empty} 1-byte XOR-offset: :: The xor offset used to compress this bitmap. For an entry - in position `x`, a XOR offset of `y` means that the actual + in position `x`, an XOR offset of `y` means that the actual bitmap representing this commit is composed by XORing the bitmap for this entry with the bitmap in entry `x-y` (i.e. the bitmap `y` entries before this one). @@ -239,7 +239,7 @@ bitmaps. For a `.bitmap` containing `nr_entries` reachability bitmaps, the table contains a list of `nr_entries` <commit_pos, offset, xor_row> triplets -(sorted in the ascending order of `commit_pos`). The content of i'th +(sorted in the ascending order of `commit_pos`). The content of the i'th triplet is - * {empty} diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index b3cfae0eb..f5b25cd78 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Bundle URIs</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/commit-graph.txt b/technical/commit-graph.txt index 86fed0de0..2c26e95e5 100644 --- a/technical/commit-graph.txt +++ b/technical/commit-graph.txt @@ -136,7 +136,7 @@ Design Details - Commit grafts and replace objects can change the shape of the commit history. The latter can also be enabled/disabled on the fly using - `--no-replace-objects`. This leads to difficultly storing both possible + `--no-replace-objects`. This leads to difficulty storing both possible interpretations of a commit id, especially when computing generation numbers. The commit-graph will not be read or written when replace-objects or grafts are present. diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 3e61d6670..4af821f8f 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Git hash function transition</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 679d121ad..67cb5c10d 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Long-running process protocol</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 0fb666126..0f786b110 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Multi-Pack-Index (MIDX) Design Notes</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 0bfae5555..b7e390854 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Concerning Git’s Packing Heuristics</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 549672296..f830cf28e 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Parallel Checkout Design Notes</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
@@ -826,7 +826,7 @@ improvements over the sequential code, but there was still too much lock contention. A <code>perf</code> profiling indicated that around 20% of the runtime
during a local Linux clone (on an SSD) was spent in locking functions.
For this reason this approach was rejected in favor of using multiple
-child processes, which led to a better performance.</p></div>
+child processes, which led to better performance.</p></div>
</div>
</div>
<div class="sect1">
@@ -916,7 +916,7 @@ W5: Writes the result to the file descriptor opened at W2. </li>
<li>
<p>
-W6: Calls <code>fstat()</code> or lstat()` on the just-written path, and sends
+W6: Calls <code>fstat()</code> or <code>lstat()</code> on the just-written path, and sends
the result back to the main process, together with the end status of
the operation and the item’s identification number.
</p>
@@ -939,7 +939,7 @@ information, the main process handles the results in two steps:</p></div> <p>
First, it updates the in-memory index with the <code>lstat()</code> information
sent by the workers. (This must be done first as this information
- might me required in the following step.)
+ might be required in the following step.)
</p>
</li>
<li>
@@ -981,7 +981,7 @@ quite straightforward: for each parallel-eligible entry, the main process must remove all files that prevent this entry from being written
(before enqueueing it). This includes any non-directory file in the
leading path of the entry. Later, when a worker gets assigned the entry,
-it looks again for the non-directories files and for an already existing
+it looks again for the non-directory files and for an already existing
file at the entry’s path. If any of these checks finds something, the
worker knows that there was a path collision.</p></div>
<div class="paragraph"><p>Because parallel checkout can distinguish path collisions from the case
@@ -1032,7 +1032,7 @@ conversion and re-encoding, are eligible for parallel checkout.</p></div> </ul></div>
<div class="paragraph"><p>Ineligible entries are checked out by the classic sequential codepath
<strong>before</strong> spawning workers.</p></div>
-<div class="paragraph"><p>Note: submodules’s files are also eligible for parallel checkout (as
+<div class="paragraph"><p>Note: submodules' files are also eligible for parallel checkout (as
long as they don’t fall into any of the excluding categories mentioned
above). But since each submodule is checked out in its own child
process, we don’t mix the superproject’s and the submodules' files in
@@ -1076,7 +1076,7 @@ err |= run_parallel_checkout(&state, pc_workers, pc_threshold, NULL, NULL);< <div id="footer">
<div id="footer-text">
Last updated
- 2022-11-11 23:55:30 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/technical/parallel-checkout.txt b/technical/parallel-checkout.txt index 47c9b6183..b4a144e5f 100644 --- a/technical/parallel-checkout.txt +++ b/technical/parallel-checkout.txt @@ -63,7 +63,7 @@ improvements over the sequential code, but there was still too much lock contention. A `perf` profiling indicated that around 20% of the runtime during a local Linux clone (on an SSD) was spent in locking functions. For this reason this approach was rejected in favor of using multiple -child processes, which led to a better performance. +child processes, which led to better performance. Multi-Process Solution ---------------------- @@ -126,7 +126,7 @@ Then, for each assigned item, each worker: * W5: Writes the result to the file descriptor opened at W2. -* W6: Calls `fstat()` or lstat()` on the just-written path, and sends +* W6: Calls `fstat()` or `lstat()` on the just-written path, and sends the result back to the main process, together with the end status of the operation and the item's identification number. @@ -148,7 +148,7 @@ information, the main process handles the results in two steps: - First, it updates the in-memory index with the `lstat()` information sent by the workers. (This must be done first as this information - might me required in the following step.) + might be required in the following step.) - Then it writes the items which collided on disk (i.e. items marked with `PC_ITEM_COLLIDED`). More on this below. @@ -185,7 +185,7 @@ quite straightforward: for each parallel-eligible entry, the main process must remove all files that prevent this entry from being written (before enqueueing it). This includes any non-directory file in the leading path of the entry. Later, when a worker gets assigned the entry, -it looks again for the non-directories files and for an already existing +it looks again for the non-directory files and for an already existing file at the entry's path. If any of these checks finds something, the worker knows that there was a path collision. @@ -232,7 +232,7 @@ conversion and re-encoding, are eligible for parallel checkout. Ineligible entries are checked out by the classic sequential codepath *before* spawning workers. -Note: submodules's files are also eligible for parallel checkout (as +Note: submodules' files are also eligible for parallel checkout (as long as they don't fall into any of the excluding categories mentioned above). But since each submodule is checked out in its own child process, we don't mix the superproject's and the submodules' files in diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 728b1998d..2d454599a 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -735,14 +735,14 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Partial Clone Design Notes</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
<div class="paragraph"><p>The "Partial Clone" feature is a performance optimization for Git that
allows Git to function without having a complete copy of the repository.
-The goal of this work is to allow Git better handle extremely large
+The goal of this work is to allow Git to better handle extremely large
repositories.</p></div>
<div class="paragraph"><p>During clone and fetch operations, Git downloads the complete contents
and history of the repository. This includes all commits, trees, and
@@ -1083,7 +1083,7 @@ Dynamic object fetching invokes fetch-pack once <strong>for each item</strong> Dynamic object fetching currently uses the existing pack protocol V0
which means that each object is requested via fetch-pack. The server
will send a full set of info/refs when the connection is established.
- If there are large number of refs, this may incur significant overhead.
+ If there are a large number of refs, this may incur significant overhead.
</p>
</li>
</ul></div>
@@ -1098,7 +1098,7 @@ Dynamic object fetching currently uses the existing pack protocol V0 Improve the way to specify the order in which promisor remotes are
tried.
</p>
-<div class="paragraph"><p>For example this could allow to specify explicitly something like:
+<div class="paragraph"><p>For example this could allow specifying explicitly something like:
"When fetching from this remote, I want to use these promisor remotes
in this order, though, when pushing or fetching to that remote, I want
to use those promisor remotes in that order."</p></div>
@@ -1172,7 +1172,7 @@ for a dynamic object fetch), but we are not building on that.</p></div> <div class="sectionbody">
<div class="paragraph"><p>[a] expensive-to-modify list of missing objects: Earlier in the design of
partial clone we discussed the need for a single list of missing objects.
- This would essentially be a sorted linear list of OIDs that the were
+ This would essentially be a sorted linear list of OIDs that were
omitted by the server during a clone or subsequent fetches.</p></div>
<div class="paragraph"><p>This file would need to be loaded into memory on every object lookup.
It would need to be read, updated, and re-written (like the .git/index)
@@ -1214,7 +1214,7 @@ type of packfile that references it.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/technical/partial-clone.txt b/technical/partial-clone.txt index 92fcee2bf..cd948b007 100644 --- a/technical/partial-clone.txt +++ b/technical/partial-clone.txt @@ -3,7 +3,7 @@ Partial Clone Design Notes The "Partial Clone" feature is a performance optimization for Git that allows Git to function without having a complete copy of the repository. -The goal of this work is to allow Git better handle extremely large +The goal of this work is to allow Git to better handle extremely large repositories. During clone and fetch operations, Git downloads the complete contents @@ -256,7 +256,7 @@ remote in a specific order. - Dynamic object fetching currently uses the existing pack protocol V0 which means that each object is requested via fetch-pack. The server will send a full set of info/refs when the connection is established. - If there are large number of refs, this may incur significant overhead. + If there are a large number of refs, this may incur significant overhead. Future Work @@ -265,7 +265,7 @@ Future Work - Improve the way to specify the order in which promisor remotes are tried. + -For example this could allow to specify explicitly something like: +For example this could allow specifying explicitly something like: "When fetching from this remote, I want to use these promisor remotes in this order, though, when pushing or fetching to that remote, I want to use those promisor remotes in that order." @@ -322,7 +322,7 @@ Footnotes [a] expensive-to-modify list of missing objects: Earlier in the design of partial clone we discussed the need for a single list of missing objects. - This would essentially be a sorted linear list of OIDs that the were + This would essentially be a sorted linear list of OIDs that were omitted by the server during a clone or subsequent fetches. This file would need to be loaded into memory on every object lookup. diff --git a/technical/racy-git.html b/technical/racy-git.html index d2a7193b9..50b13cfaa 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Use of index and Racy Git problem</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
@@ -747,7 +747,7 @@ paths and their object names and serves as a staging area to write out the next tree object to be committed. The state is
"virtual" in the sense that it does not necessarily have to, and
often does not, match the files in the working tree.</p></div>
-<div class="paragraph"><p>There are cases Git needs to examine the differences between the
+<div class="paragraph"><p>There are cases where Git needs to examine the differences between the
virtual working tree state in the index and the files in the
working tree. The most obvious case is when the user asks <code>git
diff</code> (or its low level implementation, <code>git diff-files</code>) or
@@ -908,9 +908,9 @@ of the cached stat information.</p></div> <div class="sectionbody">
<div class="paragraph"><p>In order to avoid the above runtime penalty, post 1.4.2 Git used
to have a code that made sure the index file
-got timestamp newer than the youngest files in the index when
-there are many young files with the same timestamp as the
-resulting index file would otherwise would have by waiting
+got a timestamp newer than the youngest files in the index when
+there were many young files with the same timestamp as the
+resulting index file otherwise would have by waiting
before finishing writing the index file out.</p></div>
<div class="paragraph"><p>I suspected that in practice the situation where many paths in the
index are all racily clean was quite rare. The only code paths
@@ -938,7 +938,7 @@ out can become racily clean.</p></div> however, the initial computation of all object names in the
index takes more than one second, and the index file is written
out after all that happens. Therefore the timestamp of the
-index file will be more than one seconds later than the
+index file will be more than one second later than the
youngest file in the working tree. This means that in these
cases there actually will not be any racily clean entry in
the resulting index.</p></div>
@@ -953,7 +953,7 @@ practice anymore. This was done with commit 0fc82cff on Aug 15, <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/technical/racy-git.txt b/technical/racy-git.txt index ceda4bbfd..59bea66c0 100644 --- a/technical/racy-git.txt +++ b/technical/racy-git.txt @@ -11,7 +11,7 @@ write out the next tree object to be committed. The state is "virtual" in the sense that it does not necessarily have to, and often does not, match the files in the working tree. -There are cases Git needs to examine the differences between the +There are cases where Git needs to examine the differences between the virtual working tree state in the index and the files in the working tree. The most obvious case is when the user asks `git diff` (or its low level implementation, `git diff-files`) or @@ -165,9 +165,9 @@ Avoiding runtime penalty In order to avoid the above runtime penalty, post 1.4.2 Git used to have a code that made sure the index file -got timestamp newer than the youngest files in the index when -there are many young files with the same timestamp as the -resulting index file would otherwise would have by waiting +got a timestamp newer than the youngest files in the index when +there were many young files with the same timestamp as the +resulting index file otherwise would have by waiting before finishing writing the index file out. I suspected that in practice the situation where many paths in the @@ -190,7 +190,7 @@ In a large project where raciness avoidance cost really matters, however, the initial computation of all object names in the index takes more than one second, and the index file is written out after all that happens. Therefore the timestamp of the -index file will be more than one seconds later than the +index file will be more than one second later than the youngest file in the working tree. This means that in these cases there actually will not be any racily clean entry in the resulting index. diff --git a/technical/reftable.html b/technical/reftable.html index 16c612f24..d226a686c 100644 --- a/technical/reftable.html +++ b/technical/reftable.html @@ -802,7 +802,7 @@ reference storage. References are sorted, enabling linear scans, binary search lookup, and range scans.</p></div>
<div class="paragraph"><p>Storage in the file is organized into variable sized blocks. Prefix
compression is used within a single block to reduce disk space. Block
-size and alignment is tunable by the writer.</p></div>
+size and alignment are tunable by the writer.</p></div>
</div>
<div class="sect3">
<h4 id="_performance">Performance</h4>
@@ -974,7 +974,7 @@ to. This is analogous to storage in the packed-refs format.</p></div> <h4 id="_varint_encoding">Varint encoding</h4>
<div class="paragraph"><p>Varint encoding is identical to the ofs-delta encoding method used
within pack files.</p></div>
-<div class="paragraph"><p>Decoder works such as:</p></div>
+<div class="paragraph"><p>Decoder works as follows:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>val = buf[ptr] & 0x7f
@@ -1028,7 +1028,7 @@ log_block* log_index*
footer</code></pre>
</div></div>
-<div class="paragraph"><p>in a log-only file the first log block immediately follows the file
+<div class="paragraph"><p>In a log-only file, the first log block immediately follows the file
header, without padding to block alignment.</p></div>
</div>
<div class="sect3">
@@ -1089,7 +1089,7 @@ uint64( max_update_index ) uint32( hash_id )</code></pre>
</div></div>
<div class="paragraph"><p>The header is identical to <code>version_number=1</code>, with the 4-byte hash ID
-("sha1" for SHA1 and "s256" for SHA-256) append to the header.</p></div>
+("sha1" for SHA1 and "s256" for SHA-256) appended to the header.</p></div>
<div class="paragraph"><p>For maximum backward compatibility, it is recommended to use version 1 when
writing SHA1 reftables.</p></div>
</div>
@@ -1123,7 +1123,7 @@ the file header.</p></div> <code>restart_offset</code> list, which must not be empty. Readers can use
<code>restart_count</code> to binary search between restarts before starting a
linear scan.</p></div>
-<div class="paragraph"><p>Exactly <code>restart_count</code> 3-byte <code>restart_offset</code> values precedes the
+<div class="paragraph"><p>Exactly <code>restart_count</code> 3-byte <code>restart_offset</code> values precede the
<code>restart_count</code>. Offsets are relative to the start of the block and
refer to the first byte of any <code>ref_record</code> whose name has not been
prefix compressed. Entries in the <code>restart_offset</code> list must be sorted,
@@ -2056,7 +2056,7 @@ impossible.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-03-09 14:17:38 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
diff --git a/technical/reftable.txt b/technical/reftable.txt index 6a67cc417..dd0b37c4e 100644 --- a/technical/reftable.txt +++ b/technical/reftable.txt @@ -46,7 +46,7 @@ search lookup, and range scans. Storage in the file is organized into variable sized blocks. Prefix compression is used within a single block to reduce disk space. Block -size and alignment is tunable by the writer. +size and alignment are tunable by the writer. Performance ^^^^^^^^^^^ @@ -115,7 +115,7 @@ Varint encoding Varint encoding is identical to the ofs-delta encoding method used within pack files. -Decoder works such as: +Decoder works as follows: .... val = buf[ptr] & 0x7f @@ -175,7 +175,7 @@ log_index* footer .... -in a log-only file the first log block immediately follows the file +In a log-only file, the first log block immediately follows the file header, without padding to block alignment. Block size @@ -247,7 +247,7 @@ uint32( hash_id ) .... The header is identical to `version_number=1`, with the 4-byte hash ID -("sha1" for SHA1 and "s256" for SHA-256) append to the header. +("sha1" for SHA1 and "s256" for SHA-256) appended to the header. For maximum backward compatibility, it is recommended to use version 1 when writing SHA1 reftables. @@ -288,7 +288,7 @@ The 2-byte `restart_count` stores the number of entries in the `restart_count` to binary search between restarts before starting a linear scan. -Exactly `restart_count` 3-byte `restart_offset` values precedes the +Exactly `restart_count` 3-byte `restart_offset` values precede the `restart_count`. Offsets are relative to the start of the block and refer to the first byte of any `ref_record` whose name has not been prefix compressed. Entries in the `restart_offset` list must be sorted, diff --git a/technical/repository-version.txt b/technical/repository-version.txt index 8ef664b0b..045a76756 100644 --- a/technical/repository-version.txt +++ b/technical/repository-version.txt @@ -96,7 +96,7 @@ The value of this key is the name of the promisor remote. ==== `worktreeConfig` If set, by default "git config" reads from both "config" and -"config.worktree" file from GIT_DIR in that order. In +"config.worktree" files from GIT_DIR in that order. In multiple working directory mode, "config" file is shared while "config.worktree" is per-working directory (i.e., it's in GIT_COMMON_DIR/worktrees/<id>/config.worktree) diff --git a/technical/rerere.txt b/technical/rerere.txt index be58f1bee..580f23360 100644 --- a/technical/rerere.txt +++ b/technical/rerere.txt @@ -60,7 +60,7 @@ By resolving this conflict, to leave line D, the user declares: what AB and AC wanted to do. As branch AC2 refers to the same commit as AC, the above implies that -this is also compatible what AB and AC2 wanted to do. +this is also compatible with what AB and AC2 wanted to do. By extension, this means that rerere should recognize that the above conflicts are the same. To do this, the labels on the conflict @@ -76,7 +76,7 @@ examples would both result in the following normalized conflict: Sorting hunks ~~~~~~~~~~~~~ -As before, lets imagine that a common ancestor had a file with line A +As before, let's imagine that a common ancestor had a file with line A its early part, and line X in its late part. And then four branches are forked that do these things: @@ -145,7 +145,7 @@ Nested conflicts Nested conflicts are handled very similarly to "simple" conflicts. Similar to simple conflicts, the conflict is first normalized by stripping the labels from conflict markers, stripping the common ancestor -version, and the sorting the conflict hunks, both for the outer and the +version, and sorting the conflict hunks, both for the outer and the inner conflict. This is done recursively, so any number of nested conflicts can be handled. diff --git a/technical/scalar.html b/technical/scalar.html index 11fab097e..b5ec55e9c 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Scalar</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index 2ab7ba8ca..51bd9c198 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Git-send-pack internals</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div class="sect1">
diff --git a/technical/shallow.html b/technical/shallow.html index 35b1c67be..2e975c966 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Shallow commits</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 2adb6b979..10cfc7b89 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Trivial merge rules</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
</div>
<div id="content">
<div id="preamble">
diff --git a/urls-remotes.txt b/urls-remotes.txt index ae8c2db42..bf1701224 100644 --- a/urls-remotes.txt +++ b/urls-remotes.txt @@ -33,7 +33,7 @@ config file would appear like this: ------------ The `<pushurl>` is used for pushes only. It is optional and defaults -to `<URL>`. Pushing to a remote affects all defined pushurls or to all +to `<URL>`. Pushing to a remote affects all defined pushurls or all defined urls if no pushurls are defined. Fetch, however, will only fetch from the first defined url if multiple urls are defined. @@ -48,7 +48,7 @@ provide a refspec on the command line. This file should have the following format: ------------ - URL: one of the above URL format + URL: one of the above URL formats Push: <refspec> Pull: <refspec> @@ -6,9 +6,9 @@ address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent. -Git supports ssh, git, http, and https protocols (in addition, ftp, +Git supports ssh, git, http, and https protocols (in addition, ftp and ftps can be used for fetching, but this is inefficient and -deprecated; do not use it). +deprecated; do not use them). The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks. diff --git a/user-manual.html b/user-manual.html index 67eb67521..04eb99099 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="id-1"></a>Git User Manual</h1></div><div><div class="revhistory"><table style="border-style:solid; width:100%;" summary="Revision History"><tr><th align="left" valign="top" colspan="2"><b>Revision History</b></th></tr><tr><td align="left"></td><td align="left">2023-10-20</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="#_introduction">Introduction</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How Git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#pitfalls-with-submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dd><dl><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></dd><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt><dd><dl><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="_introduction"></a>Introduction</h1></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="id-1"></a>Git User Manual</h1></div><div><div class="revhistory"><table style="border-style:solid; width:100%;" summary="Revision History"><tr><th align="left" valign="top" colspan="2"><b>Revision History</b></th></tr><tr><td align="left"></td><td align="left">2023-10-23</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="#_introduction">Introduction</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How Git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#pitfalls-with-submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dd><dl><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></dd><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt><dd><dl><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="_introduction"></a>Introduction</h1></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring Git history">Chapter 2, <i>Exploring Git history</i></a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -2177,7 +2177,7 @@ current branch integrates with) obviously do not work, as there is no </dd><dt><span class="term"> <a name="def_grafts"></a>grafts </span></dt><dd><p class="simpara"> - Grafts enables two otherwise different lines of development to be joined + Grafts enable two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <a class="link" href="#def_parent">parents</a> a <a class="link" href="#def_commit">commit</a> has is different from what was recorded when the commit was |