diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 63c845e30..ab7dffa41 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 2402363fa..20523d68e 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@
diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt index 8615306ee..148d18d09 100644 --- a/RelNotes/2.44.0.txt +++ b/RelNotes/2.44.0.txt @@ -84,6 +84,13 @@ UI, Workflows & Features * The write codepath for the reftable data learned to honor core.fsync configuration. + * The "--fsck-objects" option of "git index-pack" now can take the + optional parameter to tweak severity of different fsck errors. + + * The wincred credential backend has been taught to support oauth + refresh token the same way as credential-cache and + credential-libsecret backends. + Performance, Internal Implementation, Development Support etc. @@ -141,6 +148,9 @@ Performance, Internal Implementation, Development Support etc. the path to the same library directory for link time and runtime. A Makefile template is used to reduce such repetition. + * The priority queue test has been migrated to the unit testing + framework. + Fixes since v2.43 ----------------- @@ -284,6 +294,10 @@ Fixes since v2.43 FreeBSD that is no longer available, which has been corrected. (merge 81fffb66d3 cb/use-freebsd-13-2-at-cirrus-ci later to maint). + * A caller called index_file_exists() that takes a string expressed + as with a wrong length, which has been corrected. + (merge 156e28b36d jh/sparse-index-expand-to-path-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 50f1abcff6 js/packfile-h-typofix later to maint). (merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 8e759c887..82b2f76a1 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -735,7 +735,7 @@
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index d491a035e..88f6732c4 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@
diff --git a/ToolsForGit.html b/ToolsForGit.html index abb927813..168a58141 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -735,7 +735,7 @@
diff --git a/diff-options.txt b/diff-options.txt index 53ec3c9a3..aaaff0d46 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -299,7 +299,7 @@ and accumulating child directory counts in the parent directories: Synonym for --dirstat=cumulative --dirstat-by-file[=...]:: - Synonym for --dirstat=files,param1,param2... + Synonym for --dirstat=files,,... --summary:: Output a condensed summary of extended header information diff --git a/everyday.html b/everyday.html index 2a66e5233..2f3cc8d3a 100644 --- a/everyday.html +++ b/everyday.html @@ -735,7 +735,7 @@
diff --git a/git-blame.html b/git-blame.html index 9c0a73b7a..49b3f86dd 100644 --- a/git-blame.html +++ b/git-blame.html @@ -1347,7 +1347,7 @@

INCREMENTAL OUTPUT

-
<40-byte hex sha1> <sourceline> <resultline> <num_lines>
+
<40-byte-hex-sha1> <sourceline> <resultline> <num-lines>

Line numbers count from 1.

@@ -1498,7 +1498,7 @@

GIT

diff --git a/git-blame.txt b/git-blame.txt index 5720d04ff..b1d7fb539 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -210,7 +210,7 @@ annotated. . Each blame entry always starts with a line of: - <40-byte hex sha1> + <40-byte-hex-sha1> + Line numbers count from 1. diff --git a/git-bugreport.html b/git-bugreport.html index 280115b7c..0660aa964 100644 --- a/git-bugreport.html +++ b/git-bugreport.html @@ -843,7 +843,7 @@

OPTIONS

Specify an alternate suffix for the bugreport name, to create a file - named git-bugreport-<formatted suffix>. This should take the form of a + named git-bugreport-<formatted-suffix>. This should take the form of a strftime(3) format string; the current local time will be used.

@@ -858,7 +858,7 @@

OPTIONS

Create a zip archive of supplemental information about the user’s machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named - git-diagnostics-<formatted suffix>. + git-diagnostics-<formatted-suffix>.

Without mode specified, the diagnostic archive will contain the default set of statistics reported by git diagnose. An optional mode value may be specified @@ -880,7 +880,7 @@

GIT

diff --git a/git-bugreport.txt b/git-bugreport.txt index 392d9eb6a..ca626f7fc 100644 --- a/git-bugreport.txt +++ b/git-bugreport.txt @@ -52,7 +52,7 @@ OPTIONS -s :: --suffix :: Specify an alternate suffix for the bugreport name, to create a file - named 'git-bugreport-'. This should take the form of a + named 'git-bugreport-'. This should take the form of a strftime(3) format string; the current local time will be used. --no-diagnose:: @@ -60,7 +60,7 @@ OPTIONS Create a zip archive of supplemental information about the user's machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named - 'git-diagnostics-'. + 'git-diagnostics-'. + Without `mode` specified, the diagnostic archive will contain the default set of statistics reported by `git diagnose`. An optional `mode` value may be specified diff --git a/git-clone.html b/git-clone.html index aa445fd7e..0aba355d1 100644 --- a/git-clone.html +++ b/git-clone.html @@ -1380,8 +1380,8 @@

GIT URLS

configuration section of the form:

-
        [url "<actual url base>"]
-                insteadOf = <other url base>
+
        [url "<actual-url-base>"]
+                insteadOf = <other-url-base>

For example, with this:

@@ -1396,8 +1396,8 @@

GIT URLS

configuration section of the form:

-
        [url "<actual url base>"]
-                pushInsteadOf = <other url base>
+
        [url "<actual-url-base>"]
+                pushInsteadOf = <other-url-base>

For example, with this:

diff --git a/git-commit-graph.html b/git-commit-graph.html index c7e3188b9..b887bea71 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html @@ -753,7 +753,7 @@

SYNOPSIS

git commit-graph write [--object-dir <dir>] [--append] [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits] [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] - <split options> + <split-options>
@@ -989,7 +989,7 @@

GIT

diff --git a/git-commit-graph.txt b/git-commit-graph.txt index c8dbceba0..903b16830 100644 --- a/git-commit-graph.txt +++ b/git-commit-graph.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git commit-graph write' [--object-dir ] [--append] [--split[=]] [--reachable | --stdin-packs | --stdin-commits] [--changed-paths] [--[no-]max-new-filters ] [--[no-]progress] - + DESCRIPTION diff --git a/git-config.html b/git-config.html index 3f23dc58d..ea905009a 100644 --- a/git-config.html +++ b/git-config.html @@ -899,11 +899,11 @@

OPTIONS

- When given a two-part name section.key, the value for - section.<URL>.key whose <URL> part matches the best to the + When given a two-part <name> as <section>.<key>, the value for + <section>.<URL>.<key> whose <URL> part matches the best to the given URL is returned (if no such key exists, the value for - section.key is used as a fallback). When given just the - section as name, do so for all the keys in the section and + <section>.<key> is used as a fallback). When given just the + <section> as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found.

@@ -11262,7 +11262,7 @@

Variables

  • -af_unix:[<socket_type>:]<absolute-pathname> - Write to a +af_unix:[<socket-type>:]<absolute-pathname> - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either stream or dgram; if omitted Git will try both. @@ -11895,7 +11895,7 @@

    GIT

    diff --git a/git-config.txt b/git-config.txt index b1caac887..dff39093b 100644 --- a/git-config.txt +++ b/git-config.txt @@ -103,11 +103,11 @@ OPTIONS names are not. --get-urlmatch :: - When given a two-part name section.key, the value for - section..key whose part matches the best to the + When given a two-part as
    ., the value for +
    .. whose part matches the best to the given URL is returned (if no such key exists, the value for - section.key is used as a fallback). When given just the - section as name, do so for all the keys in the section and +
    . is used as a fallback). When given just the +
    as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found. --global:: diff --git a/git-cvsserver.html b/git-cvsserver.html index a9f96a95b..3e253076d 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -988,7 +988,7 @@

    INSTALLATION

    Clients should now be able to check out the project. Use the CVS module name to indicate what Git head you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with - -d <dir_name>. For example, this checks out master branch to the + -d <dir-name>. For example, this checks out master branch to the project-master directory:

    @@ -1015,7 +1015,7 @@

    DATABASE BACKEND

    the database to work reliably (otherwise you need to make sure that the database is up to date any time git-cvsserver is executed).

    By default it uses SQLite databases in the Git directory, named -gitcvs.<module_name>.sqlite. Note that the SQLite backend creates +gitcvs.<module-name>.sqlite. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using git-cvsserver write access to the database file without granting @@ -1327,7 +1327,7 @@

    GIT

    diff --git a/git-cvsserver.txt b/git-cvsserver.txt index cf4a5a283..4c475efea 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -197,7 +197,7 @@ allowing access over SSH. 5. Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with - `-d `. For example, this checks out 'master' branch to the + `-d `. For example, this checks out 'master' branch to the `project-master` directory: + ------ @@ -224,7 +224,7 @@ the database to work reliably (otherwise you need to make sure that the database is up to date any time 'git-cvsserver' is executed). By default it uses SQLite databases in the Git directory, named -`gitcvs..sqlite`. Note that the SQLite backend creates +`gitcvs..sqlite`. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using 'git-cvsserver' write access to the database file without granting diff --git a/git-daemon.html b/git-daemon.html index 5e2fa7ad5..6c1f583e9 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -759,7 +759,7 @@

    SYNOPSIS

    [--allow-override=<service>] [--forbid-override=<service>] [--access-hook=<path>] [--[no-]informative-errors] [--inetd | - [--listen=<host_or_ipaddr>] [--port=<n>] + [--listen=<host-or-ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]] [--log-destination=(stderr|syslog|none)] [<directory>…] @@ -861,13 +861,13 @@

    OPTIONS

    ---listen=<host_or_ipaddr> +--listen=<host-or-ipaddr>

    Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 - is not supported, then --listen=hostname is also not supported and + is not supported, then --listen=<hostname> is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with --inetd option. @@ -975,8 +975,8 @@

    OPTIONS

    specified with no parameter, a request to git://host/~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 - taken as a request to access path/foo repository in + If --user-path=<path> is specified, the same request is + taken as a request to access <path>/foo repository in the home directory of user alice.

    @@ -1281,7 +1281,7 @@

    GIT

    diff --git a/git-daemon.txt b/git-daemon.txt index e064f91c9..ede7b935d 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -18,7 +18,7 @@ SYNOPSIS [--allow-override=] [--forbid-override=] [--access-hook=] [--[no-]informative-errors] [--inetd | - [--listen=] [--port=] + [--listen=] [--port=] [--user= [--group=]]] [--log-destination=(stderr|syslog|none)] [...] @@ -86,10 +86,10 @@ OPTIONS Incompatible with --detach, --port, --listen, --user and --group options. ---listen=:: +--listen=:: Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 - is not supported, then --listen=hostname is also not supported and + is not supported, then --listen= is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option. @@ -141,8 +141,8 @@ otherwise `stderr`. 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 - taken as a request to access `path/foo` repository in + If `--user-path=` is specified, the same request is + taken as a request to access `/foo` repository in the home directory of user `alice`. --verbose:: diff --git a/git-diagnose.html b/git-diagnose.html index 4fc838819..c1e39115e 100644 --- a/git-diagnose.html +++ b/git-diagnose.html @@ -824,7 +824,7 @@

    OPTIONS

    Specify an alternate suffix for the diagnostics archive name, to create - a file named git-diagnostics-<formatted suffix>. This should take the + a file named git-diagnostics-<formatted-suffix>. This should take the form of a strftime(3) format string; the current local time will be used.

    @@ -858,7 +858,7 @@

    GIT

    diff --git a/git-diagnose.txt b/git-diagnose.txt index 3ec8cc7ad..0711959e6 100644 --- a/git-diagnose.txt +++ b/git-diagnose.txt @@ -45,7 +45,7 @@ OPTIONS -s :: --suffix :: Specify an alternate suffix for the diagnostics archive name, to create - a file named 'git-diagnostics-'. This should take the + a file named 'git-diagnostics-'. This should take the form of a strftime(3) format string; the current local time will be used. diff --git a/git-diff-files.html b/git-diff-files.html index 2c512cf73..357e16e15 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1108,7 +1108,7 @@

    OPTIONS

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    diff --git a/git-diff-index.html b/git-diff-index.html index 238db47ca..7f9d6901e 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1109,7 +1109,7 @@

    OPTIONS

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    diff --git a/git-diff-tree.html b/git-diff-tree.html index 54ca361f9..bdaf0a8b0 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1110,7 +1110,7 @@

    OPTIONS

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    diff --git a/git-diff.html b/git-diff.html index e585ddaf9..88a3616fa 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1245,7 +1245,7 @@

    OPTIONS

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    diff --git a/git-difftool.html b/git-difftool.html index 62858e6a9..b2e108736 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -885,7 +885,7 @@

    OPTIONS

    Specify a custom command for viewing diffs. git-difftool ignores the configured defaults and runs - $command $LOCAL $REMOTE when this option is specified. + <command> $LOCAL $REMOTE when this option is specified. Additionally, $BASE is set in the environment.

    @@ -1055,7 +1055,7 @@

    GIT

    diff --git a/git-difftool.txt b/git-difftool.txt index 50cb08008..c05f97aca 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -90,7 +90,7 @@ instead. `--no-symlinks` is the default on Windows. --extcmd=:: Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs - `$command $LOCAL $REMOTE` when this option is specified. + ` $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment. -g:: diff --git a/git-fast-import.html b/git-fast-import.html index a7047a374..4d7aaaf05 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1703,11 +1703,11 @@

    filedeleteall

    notemodify

    -

    Included in a commit <notes_ref> command to add a new note +

    Included in a commit <notes-ref> command to add a new note annotating a <commit-ish> or change this annotation contents. Internally it is similar to filemodify 100644 on <commit-ish> path (maybe split into subdirectories). It’s not advised to -use any other commands to write to the <notes_ref> tree except +use any other commands to write to the <notes-ref> tree except filedeleteall to delete all existing notes in this tree. This command has two different means of specifying the content of the note.

    @@ -2640,7 +2640,7 @@

    GIT

    diff --git a/git-fast-import.txt b/git-fast-import.txt index bd7b1e0a2..b2607366b 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -745,11 +745,11 @@ paths for a commit are encouraged to do so. `notemodify` ^^^^^^^^^^^^ -Included in a `commit` `` command to add a new note +Included in a `commit` `` command to add a new note annotating a `` or change this annotation contents. Internally it is similar to filemodify 100644 on `` path (maybe split into subdirectories). It's not advised to -use any other commands to write to the `` tree except +use any other commands to write to the `` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note. diff --git a/git-fetch.html b/git-fetch.html index 75a95d199..c026f417a 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -1535,8 +1535,8 @@

    GIT URLS

    configuration section of the form:

    -
            [url "<actual url base>"]
-                insteadOf = <other url base>
    +
            [url "<actual-url-base>"]
+                insteadOf = <other-url-base>

    For example, with this:

    @@ -1551,8 +1551,8 @@

    GIT URLS

    configuration section of the form:

    -
            [url "<actual url base>"]
-                pushInsteadOf = <other url base>
    +
            [url "<actual-url-base>"]
+                pushInsteadOf = <other-url-base>

    For example, with this:

    @@ -1783,8 +1783,8 @@

    PRUNING

    $ git fetch origin --prune --prune-tags
 $ git fetch origin --prune 'refs/tags/*:refs/tags/*'
-$ git fetch <url of origin> --prune --prune-tags
-$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*'
    +$ git fetch <url-of-origin> --prune --prune-tags +$ git fetch <url-of-origin> --prune 'refs/tags/*:refs/tags/*'
    • @@ -2249,7 +2249,7 @@

    GIT

    diff --git a/git-fetch.txt b/git-fetch.txt index f123139c5..50900a50d 100644 --- a/git-fetch.txt +++ b/git-fetch.txt @@ -186,8 +186,8 @@ origin: ------------------------------------------------ $ git fetch origin --prune --prune-tags $ git fetch origin --prune 'refs/tags/*:refs/tags/*' -$ git fetch --prune --prune-tags -$ git fetch --prune 'refs/tags/*:refs/tags/*' +$ git fetch --prune --prune-tags +$ git fetch --prune 'refs/tags/*:refs/tags/*' ------------------------------------------------ OUTPUT diff --git a/git-filter-branch.html b/git-filter-branch.html index 73d68b573..e18168076 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -755,7 +755,7 @@

    SYNOPSIS

    [--msg-filter <command>] [--commit-filter <command>] [--tag-name-filter <command>] [--prune-empty] [--original <namespace>] [-d <directory>] [-f | --force] - [--state-branch <branch>] [--] [<rev-list options>…] + [--state-branch <branch>] [--] [<rev-list-options>…]
    @@ -779,7 +779,7 @@

    WARNING

    DESCRIPTION

    Lets you rewrite Git revision history by rewriting the branches mentioned -in the <rev-list options>, applying custom filters on each revision. +in the <rev-list-options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge @@ -1504,7 +1504,7 @@

    SAFETY

  • Running git-filter-branch with either --tags or --all in your - <rev-list options>. In order to retain annotated tags as + <rev-list-options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite).

    @@ -1626,7 +1626,7 @@

    GIT

    diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 62e482a95..5a4f85378 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -14,7 +14,7 @@ SYNOPSIS [--msg-filter ] [--commit-filter ] [--tag-name-filter ] [--prune-empty] [--original ] [-d ] [-f | --force] - [--state-branch ] [--] [...] + [--state-branch ] [--] [...] WARNING ------- @@ -32,7 +32,7 @@ listed there as reasonably possible. DESCRIPTION ----------- Lets you rewrite Git revision history by rewriting the branches mentioned -in the , applying custom filters on each revision. +in the , applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge @@ -624,7 +624,7 @@ with: real backup; it dereferences tags first.) ** Running git-filter-branch with either --tags or --all in your - . In order to retain annotated tags as + . In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite). diff --git a/git-format-patch.html b/git-format-patch.html index f092febbc..b069e3a1e 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -757,10 +757,10 @@

    SYNOPSIS

    [--signature-file=<file>] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] - [--in-reply-to=<message id>] [--suffix=.<sfx>] + [--in-reply-to=<message-id>] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--always] [--cover-from-description=<mode>] - [--rfc] [--subject-prefix=<subject prefix>] + [--rfc] [--subject-prefix=<subject-prefix>] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] @@ -770,8 +770,8 @@

    SYNOPSIS

    [--range-diff=<previous> [--creation-factor=<percent>]] [--filename-max-length=<n>] [--progress] - [<common diff options>] - [ <since> | <revision range> ] + [<common-diff-options>] + [ <since> | <revision-range> ]
    • @@ -820,7 +820,7 @@

    DESCRIPTION

  • -Generic <revision range> expression (see "SPECIFYING +Generic <revision-range> expression (see "SPECIFYING REVISIONS" section in gitrevisions(7)) means the commits in the specified range.

    @@ -1166,7 +1166,7 @@

    OPTIONS

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    @@ -1782,12 +1782,12 @@

    OPTIONS

    will want to ensure that threading is disabled for git send-email.

    • ---in-reply-to=<message id> +--in-reply-to=<message-id>

    Make the first mail (or all the mails with --no-thread) appear as a - reply to the given <message id>, which avoids breaking threads to + reply to the given <message-id>, which avoids breaking threads to provide a new patch series.

    @@ -1843,12 +1843,12 @@

    OPTIONS

    ---subject-prefix=<subject prefix> +--subject-prefix=<subject-prefix>

    Instead of the standard [PATCH] prefix in the subject - line, instead use [<subject prefix>]. This can be used + line, instead use [<subject-prefix>]. This can be used to name a patch series, and can be combined with the --numbered option.

    @@ -2144,7 +2144,7 @@

    OPTIONS

    - Treat the revision argument as a <revision range>, even if it + Treat the revision argument as a <revision-range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently @@ -2618,7 +2618,7 @@

    GIT

    diff --git a/git-format-patch.txt b/git-format-patch.txt index 414da6b73..728bb3821 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -17,10 +17,10 @@ SYNOPSIS [--signature-file=] [-n | --numbered | -N | --no-numbered] [--start-number ] [--numbered-files] - [--in-reply-to=] [--suffix=.] + [--in-reply-to=] [--suffix=.] [--ignore-if-in-upstream] [--always] [--cover-from-description=] - [--rfc] [--subject-prefix=] + [--rfc] [--subject-prefix=] [(--reroll-count|-v) ] [--to=] [--cc=] [--[no-]cover-letter] [--quiet] @@ -30,8 +30,8 @@ SYNOPSIS [--range-diff= [--creation-factor=]] [--filename-max-length=] [--progress] - [] - [ | ] + [] + [ | ] DESCRIPTION ----------- @@ -64,7 +64,7 @@ There are two ways to specify which commits to operate on. to the tip of the current branch that are not in the history that leads to the to be output. -2. Generic expression (see "SPECIFYING +2. Generic expression (see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]) means the commits in the specified range. @@ -179,9 +179,9 @@ Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`. ---in-reply-to=:: +--in-reply-to=:: Make the first mail (or all the mails with `--no-thread`) appear as a - reply to the given , which avoids breaking threads to + reply to the given , which avoids breaking threads to provide a new patch series. --ignore-if-in-upstream:: @@ -219,9 +219,9 @@ populated with placeholder text. Use the contents of instead of the branch's description for generating the cover letter. ---subject-prefix=:: +--subject-prefix=:: Instead of the standard '[PATCH]' prefix in the subject - line, instead use '[]'. This can be used + line, instead use '[]'. This can be used to name a patch series, and can be combined with the `--numbered` option. + @@ -403,7 +403,7 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`. `format.useAutoBase` configuration. --root:: - Treat the revision argument as a , even if it + Treat the revision argument as a , even if it is just a single commit (that would normally be treated as a ). Note that root commits included in the specified range are always formatted as creation patches, independently diff --git a/git-index-pack.html b/git-index-pack.html index 5555f40fc..f50f3b64b 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -865,11 +865,16 @@

    OPTIONS

    ---strict +--strict[=<msg-id>=<severity>…]

    - Die, if the pack contains broken objects or links. + Die, if the pack contains broken objects or links. An optional + comma-separated list of <msg-id>=<severity> can be passed to change + the severity of some possible issues, e.g., + --strict="missingEmail=ignore,badTagName=error". See the entry for the + fsck.<msg-id> configuration options in git-fsck(1) for more + information on the possible values of <msg-id> and <severity>.

    @@ -891,16 +896,21 @@

    OPTIONS

    ---fsck-objects +--fsck-objects[=<msg-id>=<severity>…]

    - For internal use only. + Die if the pack contains broken objects, but unlike --strict, don’t + choke on broken links. If the pack contains a tree pointing to a + .gitmodules blob that does not exist, prints the hash of that blob + (for the caller to check) after the hash that goes into the name of the + pack/idx file (see "Notes").

    -

    Die if the pack contains broken objects. If the pack contains a tree -pointing to a .gitmodules blob that does not exist, prints the hash of -that blob (for the caller to check) after the hash that goes into the -name of the pack/idx file (see "Notes").

    +

    An optional comma-separated list of <msg-id>=<severity> can be passed to +change the severity of some possible issues, e.g., +--fsck-objects="missingEmail=ignore,badTagName=ignore". See the entry for the +fsck.<msg-id> configuration options in git-fsck(1) for more +information on the possible values of <msg-id> and <severity>.

    --threads=<n> @@ -985,7 +995,7 @@

    GIT

    diff --git a/git-index-pack.txt b/git-index-pack.txt index 6486620c3..5a20deefd 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt @@ -79,8 +79,13 @@ OPTIONS to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset. ---strict:: - Die, if the pack contains broken objects or links. +--strict[==...]:: + Die, if the pack contains broken objects or links. An optional + comma-separated list of `=` can be passed to change + the severity of some possible issues, e.g., + `--strict="missingEmail=ignore,badTagName=error"`. See the entry for the + `fsck.` configuration options in linkgit:git-fsck[1] for more + information on the possible values of `` and ``. --progress-title:: For internal use only. @@ -91,13 +96,18 @@ default and "Indexing objects" when `--stdin` is specified. --check-self-contained-and-connected:: Die if the pack contains broken links. For internal use only. ---fsck-objects:: - For internal use only. +--fsck-objects[==...]:: + Die if the pack contains broken objects, but unlike `--strict`, don't + choke on broken links. If the pack contains a tree pointing to a + .gitmodules blob that does not exist, prints the hash of that blob + (for the caller to check) after the hash that goes into the name of the + pack/idx file (see "Notes"). + -Die if the pack contains broken objects. If the pack contains a tree -pointing to a .gitmodules blob that does not exist, prints the hash of -that blob (for the caller to check) after the hash that goes into the -name of the pack/idx file (see "Notes"). +An optional comma-separated list of `=` can be passed to +change the severity of some possible issues, e.g., +`--fsck-objects="missingEmail=ignore,badTagName=ignore"`. See the entry for the +`fsck.` configuration options in linkgit:git-fsck[1] for more +information on the possible values of `` and ``. --threads=:: Specifies the number of threads to spawn when resolving diff --git a/git-log.html b/git-log.html index bdf1a1aa2..c2b14a450 100644 --- a/git-log.html +++ b/git-log.html @@ -4052,7 +4052,7 @@

    DIFF FORMATTING

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    diff --git a/git-mv.html b/git-mv.html index e928ca73e..e172edcfd 100644 --- a/git-mv.html +++ b/git-mv.html @@ -761,7 +761,7 @@

    DESCRIPTION

    git mv [-v] [-f] [-n] [-k] <source> <destination>
-git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>
    +git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory>

    In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>. @@ -857,7 +857,7 @@

    GIT

    diff --git a/git-mv.txt b/git-mv.txt index 7f991a338..dc1bf6153 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -16,7 +16,7 @@ DESCRIPTION Move or rename a file, directory, or symlink. git mv [-v] [-f] [-n] [-k] - git mv [-v] [-f] [-n] [-k] ... + git mv [-v] [-f] [-n] [-k] ... In the first form, it renames , which must exist and be either a file, symlink or directory, to . diff --git a/git-notes.html b/git-notes.html index 849ec4c76..686769eea 100644 --- a/git-notes.html +++ b/git-notes.html @@ -800,7 +800,7 @@

    SUBCOMMANDS

    List the notes object for a given object. If no object is given, show a list of all note objects and the objects they - annotate (in the format "<note object> <annotated object>"). + annotate (in the format "<note-object> <annotated-object>"). This is the default subcommand if no subcommand is given.

    @@ -1396,7 +1396,7 @@

    GIT

    diff --git a/git-notes.txt b/git-notes.txt index f8310e56a..c9221a68c 100644 --- a/git-notes.txt +++ b/git-notes.txt @@ -56,7 +56,7 @@ SUBCOMMANDS list:: List the notes object for a given object. If no object is given, show a list of all note objects and the objects they - annotate (in the format " "). + annotate (in the format " "). This is the default subcommand if no subcommand is given. add:: diff --git a/git-pull.html b/git-pull.html index 9619fa577..a3cf05308 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1763,8 +1763,8 @@

    GIT URLS

    configuration section of the form:

    -
            [url "<actual url base>"]
-                insteadOf = <other url base>
    +
            [url "<actual-url-base>"]
+                insteadOf = <other-url-base>

    For example, with this:

    @@ -1779,8 +1779,8 @@

    GIT URLS

    configuration section of the form:

    -
            [url "<actual url base>"]
-                pushInsteadOf = <other url base>
    +
            [url "<actual-url-base>"]
+                pushInsteadOf = <other-url-base>

    For example, with this:

    diff --git a/git-push.html b/git-push.html index 1aeffea37..6cd8c752f 100644 --- a/git-push.html +++ b/git-push.html @@ -1429,8 +1429,8 @@

    GIT URLS

    configuration section of the form:

    -
            [url "<actual url base>"]
-                insteadOf = <other url base>
    +
            [url "<actual-url-base>"]
+                insteadOf = <other-url-base>

    For example, with this:

    @@ -1445,8 +1445,8 @@

    GIT URLS

    configuration section of the form:

    -
            [url "<actual url base>"]
-                pushInsteadOf = <other url base>
    +
            [url "<actual-url-base>"]
+                pushInsteadOf = <other-url-base>

    For example, with this:

    diff --git a/git-remote-helpers.html b/git-remote-helpers.html index f15510916..2a9ce39b0 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -735,7 +735,7 @@
    diff --git a/git-replace.html b/git-replace.html index a61a62620..1202d2704 100644 --- a/git-replace.html +++ b/git-replace.html @@ -903,19 +903,19 @@

    FORMATS

  • short: - <replaced sha1> + <replaced-sha1>

  • medium: - <replaced sha1> → <replacement sha1> + <replaced-sha1> → <replacement-sha1>

  • long: - <replaced sha1> (<replaced type>) → <replacement sha1> (<replacement type>) + <replaced-sha1> (<replaced-type>) → <replacement-sha1> (<replacement-type>)

    • @@ -971,7 +971,7 @@

    GIT

    diff --git a/git-replace.txt b/git-replace.txt index 4f257126e..0a65460ad 100644 --- a/git-replace.txt +++ b/git-replace.txt @@ -114,11 +114,11 @@ FORMATS The following formats are available: * 'short': - + * 'medium': - -> + -> * 'long': - () -> () + () -> () CREATING REPLACEMENT OBJECTS ---------------------------- diff --git a/git-revert.html b/git-revert.html index ad8b3d8de..3b2e27443 100644 --- a/git-revert.html +++ b/git-revert.html @@ -941,7 +941,7 @@

    OPTIONS

    Instead of starting the body of the log message with "This - reverts <full object name of the commit being reverted>.", + reverts <full-object-name-of-the-commit-being-reverted>.", refer to the commit using "--pretty=reference" format (cf. git-log(1)). The revert.reference configuration variable can be used to enable this option by @@ -1030,7 +1030,7 @@

    DISCUSSION

    strongly recommended to explain why the original commit is being reverted. In addition, repeatedly reverting reverts will result in increasingly -unwieldy subject lines, for example Reapply "Reapply "<original subject>"". +unwieldy subject lines, for example Reapply "Reapply "<original-subject>"". Please consider rewording these to be shorter and more unique.

    @@ -1070,7 +1070,7 @@

    GIT

    diff --git a/git-revert.txt b/git-revert.txt index cbe020883..568925db5 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -116,7 +116,7 @@ include::rerere-options.txt[] --reference:: Instead of starting the body of the log message with "This - reverts .", + reverts .", refer to the commit using "--pretty=reference" format (cf. linkgit:git-log[1]). The `revert.reference` configuration variable can be used to enable this option by @@ -149,7 +149,7 @@ While git creates a basic commit message automatically, it is _strongly_ recommended to explain why the original commit is being reverted. In addition, repeatedly reverting reverts will result in increasingly -unwieldy subject lines, for example 'Reapply "Reapply """'. +unwieldy subject lines, for example 'Reapply "Reapply """'. Please consider rewording these to be shorter and more unique. CONFIGURATION diff --git a/git-send-email.html b/git-send-email.html index bbcda4e8d..53c5d23bd 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -750,7 +750,7 @@

    SYNOPSIS

    git send-email [<options>] <file|directory>…
-git send-email [<options>] <format-patch options>
+git send-email [<options>] <format-patch-options>
 git send-email --dump-aliases
    @@ -1834,7 +1834,7 @@

    GIT

    diff --git a/git-send-email.txt b/git-send-email.txt index 30deb7fe2..d1ef6a204 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git send-email' [] ... -'git send-email' [] +'git send-email' [] 'git send-email' --dump-aliases diff --git a/git-show.html b/git-show.html index 3c83e4a7a..c92ade2d2 100644 --- a/git-show.html +++ b/git-show.html @@ -2507,7 +2507,7 @@

    DIFF FORMATTING

    - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>…

    diff --git a/git-status.html b/git-status.html index 829aa59e3..92fb4888b 100644 --- a/git-status.html +++ b/git-status.html @@ -1220,7 +1220,7 @@

    Branch Headers

    ------------------------------------------------------------ # branch.oid <commit> | (initial) Current commit. # branch.head <branch> | (detached) Current branch. -# branch.upstream <upstream_branch> If upstream is set. +# branch.upstream <upstream-branch> If upstream is set. # branch.ab +<ahead> -<behind> If upstream is set and the commit is present. ------------------------------------------------------------ @@ -1428,7 +1428,7 @@

    UNTRACKED FILES AND PERFORMANCE

  • core.untrackedCache=true and core.fsmonitor=true or - core.fsmonitor=<hook_command_pathname> (see + core.fsmonitor=<hook-command-pathname> (see git-update-index(1)): enable both the untracked cache and FSMonitor features and only search directories that have been modified since the previous git status command. This @@ -1464,7 +1464,7 @@

    GIT

    diff --git a/git-status.txt b/git-status.txt index 10fecc51a..4dbb88373 100644 --- a/git-status.txt +++ b/git-status.txt @@ -309,7 +309,7 @@ Line Notes ------------------------------------------------------------ # branch.oid | (initial) Current commit. # branch.head | (detached) Current branch. -# branch.upstream If upstream is set. +# branch.upstream If upstream is set. # branch.ab + - If upstream is set and the commit is present. ------------------------------------------------------------ @@ -502,7 +502,7 @@ results, so it could be faster on subsequent runs. usually worth the additional size. * `core.untrackedCache=true` and `core.fsmonitor=true` or - `core.fsmonitor=` (see + `core.fsmonitor=` (see linkgit:git-update-index[1]): enable both the untracked cache and FSMonitor features and only search directories that have been modified since the previous `git status` command. This diff --git a/git-submodule.html b/git-submodule.html index 5ca592e05..91267e8c7 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -887,7 +887,7 @@

    COMMANDS

    options.

    • -update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter spec>] [--] [<path>…] +update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter-spec>] [--] [<path>…]
    @@ -967,7 +967,7 @@

    COMMANDS

    submodule with the --init option.

    If --recursive is specified, this command will recurse into the registered submodules, and update any nested submodules within.

    -

    If --filter <filter spec> is specified, the given partial clone filter will be +

    If --filter <filter-spec> is specified, the given partial clone filter will be applied to the submodule. See git-rev-list(1) for details on filter specifications.

    @@ -1416,7 +1416,7 @@

    GIT

    diff --git a/git-submodule.txt b/git-submodule.txt index 695730609..ca0347a37 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -136,7 +136,7 @@ If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options. -update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference ] [--depth ] [--recursive] [--jobs ] [--[no-]single-branch] [--filter ] [--] [...]:: +update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference ] [--depth ] [--recursive] [--jobs ] [--[no-]single-branch] [--filter ] [--] [...]:: + -- Update the registered submodules to match what the superproject @@ -185,7 +185,7 @@ submodule with the `--init` option. If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within. -If `--filter ` is specified, the given partial clone filter will be +If `--filter ` is specified, the given partial clone filter will be applied to the submodule. See linkgit:git-rev-list[1] for details on filter specifications. -- diff --git a/git-svn.html b/git-svn.html index 26baae2bd..af5049dba 100644 --- a/git-svn.html +++ b/git-svn.html @@ -788,22 +788,22 @@

    COMMANDS

    --T<trunk_subdir> +-T<trunk-subdir>
    ---trunk=<trunk_subdir> +--trunk=<trunk-subdir>
    --t<tags_subdir> +-t<tags-subdir>
    ---tags=<tags_subdir> +--tags=<tags-subdir>
    --b<branches_subdir> +-b<branches-subdir>
    ---branches=<branches_subdir> +--branches=<branches-subdir>
    -s @@ -1994,14 +1994,14 @@

    ADVANCED OPTIONS

    --R<remote name> +-R<remote-name>
    ---svn-remote <remote name> +--svn-remote <remote-name>

    - Specify the [svn-remote "<remote name>"] section to use, + Specify the [svn-remote "<remote-name>"] section to use, this allows SVN multiple repositories to be tracked. Default: "svn"

    @@ -2514,7 +2514,7 @@

    GIT

    diff --git a/git-svn.txt b/git-svn.txt index 4e92308e8..43c68c2ec 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -37,12 +37,12 @@ COMMANDS argument. Normally this command initializes the current directory. --T;; ---trunk=;; --t;; ---tags=;; --b;; ---branches=;; +-T;; +--trunk=;; +-t;; +--tags=;; +-b;; +--branches=;; -s;; --stdlayout;; These are optional command-line options for init. Each of @@ -726,9 +726,9 @@ ADVANCED OPTIONS when tracking a single URL. The 'log' and 'dcommit' commands no longer require this switch as an argument. --R:: ---svn-remote :: - Specify the [svn-remote ""] section to use, +-R:: +--svn-remote :: + Specify the [svn-remote ""] section to use, this allows SVN multiple repositories to be tracked. Default: "svn" diff --git a/git-tag.html b/git-tag.html index 59571e6cf..00f5cc7a0 100644 --- a/git-tag.html +++ b/git-tag.html @@ -1123,7 +1123,7 @@

    CONFIGURATION

    [user]
-    signingKey = <gpg-key_id>
    + signingKey = <gpg-key-id>

    pager.tag is only respected when listing tags, i.e., when -l is used or implied. The default is to use a pager. @@ -1367,7 +1367,7 @@

    GIT

    diff --git a/git-tag.txt b/git-tag.txt index d42efb311..5fe519c31 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -224,7 +224,7 @@ it in the repository configuration as follows: ------------------------------------- [user] - signingKey = + signingKey = ------------------------------------- `pager.tag` is only respected when listing tags, i.e., when `-l` is diff --git a/git.html b/git.html index 1ef855040..5028c04ee 100644 --- a/git.html +++ b/git.html @@ -1053,7 +1053,7 @@

    OPTIONS

    ---list-cmds=group[,group…] +--list-cmds=<group>[,<group>…]

    @@ -3502,7 +3502,7 @@

    other

    of the SID and an optional counter (to avoid filename collisions).

    In addition, if the variable is set to -af_unix:[<socket_type>:]<absolute-pathname>, Git will try +af_unix:[<socket-type>:]<absolute-pathname>, Git will try to open the path as a Unix Domain Socket. The socket type can be either stream or dgram.

    Unsetting the variable, or setting it to empty, "0" or @@ -3846,7 +3846,7 @@

    GIT

    diff --git a/git.txt b/git.txt index da4e8d130..0d25224c9 100644 --- a/git.txt +++ b/git.txt @@ -202,7 +202,7 @@ If you just want to run git as if it was started in `` then use Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`. ---list-cmds=group[,group...]:: +--list-cmds=[,...]:: List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use @@ -842,7 +842,7 @@ of the SID and an optional counter (to avoid filename collisions). + In addition, if the variable is set to -`af_unix:[:]`, Git will try +`af_unix:[:]`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`. + diff --git a/gitdiffcore.html b/gitdiffcore.html index b29f33347..1d303137d 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html @@ -1016,18 +1016,18 @@

    d

    This transformation limits the set of filepairs to those that change specified strings between the preimage and the postimage in a certain -way. -S<block of text> and -G<regular expression> options are used to +way. -S<block-of-text> and -G<regular-expression> options are used to specify different ways these strings are sought.

    -

    "-S<block of text>" detects filepairs whose preimage and postimage +

    "-S<block-of-text>" detects filepairs whose preimage and postimage have different number of occurrences of the specified block of text. By definition, it will not detect in-file moves. Also, when a changeset moves a file wholesale without affecting the interesting string, diffcore-rename kicks in as usual, and -S omits the filepair (since the number of occurrences of that string didn’t change in that rename-detected filepair). When used with --pickaxe-regex, treat -the <block of text> as an extended POSIX regular expression to match, +the <block-of-text> as an extended POSIX regular expression to match, instead of a literal string.

    -

    "-G<regular expression>" (mnemonic: grep) detects filepairs whose +

    "-G<regular-expression>" (mnemonic: grep) detects filepairs whose 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 @@ -1108,7 +1108,7 @@

    GIT

    diff --git a/gitdiffcore.txt b/gitdiffcore.txt index 3cda2e07c..642c51227 100644 --- a/gitdiffcore.txt +++ b/gitdiffcore.txt @@ -245,20 +245,20 @@ diffcore-pickaxe: For Detecting Addition/Deletion of Specified String This transformation limits the set of filepairs to those that change specified strings between the preimage and the postimage in a certain -way. -S and -G options are used to +way. -S and -G options are used to specify different ways these strings are sought. -"-S" detects filepairs whose preimage and postimage +"-S" detects filepairs whose preimage and postimage have different number of occurrences of the specified block of text. By definition, it will not detect in-file moves. Also, when a changeset moves a file wholesale without affecting the interesting string, diffcore-rename kicks in as usual, and `-S` omits the filepair (since the number of occurrences of that string didn't change in that rename-detected filepair). When used with `--pickaxe-regex`, treat -the as an extended POSIX regular expression to match, +the as an extended POSIX regular expression to match, instead of a literal string. -"-G" (mnemonic: grep) detects filepairs whose +"-G" (mnemonic: grep) detects filepairs whose 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 diff --git a/gitformat-index.html b/gitformat-index.html index 940ea0cfe..558cf0e01 100644 --- a/gitformat-index.html +++ b/gitformat-index.html @@ -1419,8 +1419,8 @@

    End of Index Entry

    -
    Hash("TREE" + <binary representation of N> +
-        "REUC" + <binary representation of M>)
    +
    Hash("TREE" + <binary-representation-of-N> +
+        "REUC" + <binary-representation-of-M>)
    @@ -1493,7 +1493,7 @@

    GIT

    diff --git a/gitformat-index.txt b/gitformat-index.txt index 0773e5c38..145cace1f 100644 --- a/gitformat-index.txt +++ b/gitformat-index.txt @@ -386,8 +386,8 @@ The remaining data of each directory block is grouped by type: long, "REUC" extension that is M-bytes long, followed by "EOIE", then the hash would be: - Hash("TREE" + + - "REUC" + ) + Hash("TREE" + + + "REUC" + ) == Index Entry Offset Table diff --git a/githooks.html b/githooks.html index 6d1777df2..b322d8d57 100644 --- a/githooks.html +++ b/githooks.html @@ -945,7 +945,7 @@

    pre-push

    input with lines of the form:

    -
    <local ref> SP <local object name> SP <remote ref> SP <remote object name> LF
    +
    <local-ref> SP <local-object-name> SP <remote-ref> SP <remote-object-name> LF

    For instance, if the command git push origin master:foreign were run the hook would receive a line like the following:

    @@ -954,9 +954,9 @@

    pre-push

    refs/heads/master 67890 refs/heads/foreign 12345

    although the full object name would be supplied. If the foreign ref does not -yet exist the <remote object name> will be the all-zeroes object name. If a -ref is to be deleted, the <local ref> will be supplied as (delete) and the -<local object name> will be the all-zeroes object name. If the local commit +yet exist the <remote-object-name> will be the all-zeroes object name. If a +ref is to be deleted, the <local-ref> will be supplied as (delete) and the +<local-object-name> will be the all-zeroes object name. If the local commit was specified by something other than a name which could be expanded (such as HEAD~, or an object name) it will be supplied as it was originally given.

    If this hook exits with a non-zero status, git push will abort without @@ -1442,7 +1442,7 @@

    GIT

    diff --git a/githooks.txt b/githooks.txt index 883982e7a..37f91d5b5 100644 --- a/githooks.txt +++ b/githooks.txt @@ -243,7 +243,7 @@ named remote is not being used both values will be the same. Information about what is to be pushed is provided on the hook's standard input with lines of the form: - SP SP SP LF + SP SP SP LF For instance, if the command +git push origin master:foreign+ were run the hook would receive a line like the following: @@ -251,9 +251,9 @@ hook would receive a line like the following: refs/heads/master 67890 refs/heads/foreign 12345 although the full object name would be supplied. If the foreign ref does not -yet exist the `` will be the all-zeroes object name. If a -ref is to be deleted, the `` will be supplied as `(delete)` and the -`` will be the all-zeroes object name. If the local commit +yet exist the `` will be the all-zeroes object name. If a +ref is to be deleted, the `` will be supplied as `(delete)` and the +`` will be the all-zeroes object name. If the local commit was specified by something other than a name which could be expanded (such as `HEAD~`, or an object name) it will be supplied as it was originally given. diff --git a/gitk.html b/gitk.html index a60354d83..b80870539 100644 --- a/gitk.html +++ b/gitk.html @@ -749,7 +749,7 @@

    NAME

    SYNOPSIS

    -
    gitk [<options>] [<revision range>] [--] [<path>…]
    +
    gitk [<options>] [<revision-range>] [--] [<path>…]
    @@ -978,7 +978,7 @@

    gitk-specific options

    range to show. The command is expected to print on its standard output a list of additional revisions to be shown, one per line. Use this instead of explicitly specifying a - <revision range> if the set of commits to show may vary + <revision-range> if the set of commits to show may vary between refreshes.

    @@ -1101,7 +1101,7 @@

    GIT

    diff --git a/gitk.txt b/gitk.txt index c2213bb77..35b399602 100644 --- a/gitk.txt +++ b/gitk.txt @@ -8,7 +8,7 @@ gitk - The Git repository browser SYNOPSIS -------- [verse] -'gitk' [] [] [--] [...] +'gitk' [] [] [--] [...] DESCRIPTION ----------- @@ -124,7 +124,7 @@ gitk-specific options range to show. The command is expected to print on its standard output a list of additional revisions to be shown, one per line. Use this instead of explicitly specifying a - '' if the set of commits to show may vary + '' if the set of commits to show may vary between refreshes. --select-commit=:: diff --git a/gitprotocol-capabilities.html b/gitprotocol-capabilities.html index 3b4d5dec2..f1c1c2177 100644 --- a/gitprotocol-capabilities.html +++ b/gitprotocol-capabilities.html @@ -1131,7 +1131,7 @@

    filter

    -

    session-id=<session id>

    +

    session-id=<session-id>

    The server may advertise a session ID that can be used to identify this process across multiple requests. The client may advertise its own session ID back to @@ -1154,7 +1154,7 @@

    GIT

    diff --git a/gitprotocol-capabilities.txt b/gitprotocol-capabilities.txt index d6c6effc2..2cf7735be 100644 --- a/gitprotocol-capabilities.txt +++ b/gitprotocol-capabilities.txt @@ -378,7 +378,7 @@ fetch-pack may send "filter" commands to request a partial clone or partial fetch and request that the server omit various objects from the packfile. -session-id= +session-id= ----------------------- The server may advertise a session ID that can be used to identify this process diff --git a/gitprotocol-http.html b/gitprotocol-http.html index 90e7dac1d..f02bc7792 100644 --- a/gitprotocol-http.html +++ b/gitprotocol-http.html @@ -1119,14 +1119,14 @@

    The Negotiation Algorithm

    C: Send one $GIT_URL/git-upload-pack request:

    -
    C: 0032want <want #1>...............................
-C: 0032want <want #2>...............................
+
    C: 0032want <want-#1>...............................
+C: 0032want <want-#2>...............................
 ....
-C: 0032have <common #1>.............................
-C: 0032have <common #2>.............................
+C: 0032have <common-#1>.............................
+C: 0032have <common-#2>.............................
 ....
-C: 0032have <have #1>...............................
-C: 0032have <have #2>...............................
+C: 0032have <have-#1>...............................
+C: 0032have <have-#2>...............................
 ....
 C: 0000
    @@ -1235,7 +1235,7 @@

    Smart Service git-receive-pack

    update_request  =  command_list
-                   "PACK" <binary data>
    + "PACK" <binary-data>
    @@ -1279,7 +1279,7 @@

    GIT

    diff --git a/gitprotocol-http.txt b/gitprotocol-http.txt index 836b3490c..ec40a550c 100644 --- a/gitprotocol-http.txt +++ b/gitprotocol-http.txt @@ -391,14 +391,14 @@ C: Start a queue, `c_pending`, ordered by commit time (popping newest C: Send one `$GIT_URL/git-upload-pack` request: - C: 0032want ............................... - C: 0032want ............................... + C: 0032want ............................... + C: 0032want ............................... .... - C: 0032have ............................. - C: 0032have ............................. + C: 0032have ............................. + C: 0032have ............................. .... - C: 0032have ............................... - C: 0032have ............................... + C: 0032have ............................... + C: 0032have ............................... .... C: 0000 @@ -512,7 +512,7 @@ Within the command portion of the request body clients SHOULD send the id obtained through ref discovery as old_id. update_request = command_list - "PACK" + "PACK" command_list = PKT-LINE(command NUL cap_list LF) *(command_pkt) diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html index 7080f39a2..2513d3a50 100644 --- a/gitprotocol-v2.html +++ b/gitprotocol-v2.html @@ -986,7 +986,7 @@

    ls-refs

    which can be used to limit the refs sent from the server.

    Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "<command>=<feature 1> <feature 2>"

    +of a space separated list of features: "<command>=<feature-1> <feature-2>"

    ls-refs takes in the following arguments:

    @@ -1033,7 +1033,7 @@

    fetch

    addition of future extensions.

    Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "<command>=<feature 1> <feature 2>"

    +of a space separated list of features: "<command>=<feature-1> <feature-2>"

    A fetch request can take the following arguments:

    @@ -1176,7 +1176,7 @@

    fetch

    explained below.

    -
    packfile-uris <comma-separated list of protocols>
+
    packfile-uris <comma-separated-list-of-protocols>
     Indicates to the server that the client is willing to receive
     URIs of any of the given protocols in place of objects in the
     sent packfile. Before performing the connectivity check, the
@@ -1432,7 +1432,7 @@ 
     object-format
    
 SHA-1, it should specify its object-format string.
    -

    session-id=<session id>

    +

    session-id=<session-id>

    The server may advertise a session ID that can be used to identify this process across multiple requests. The client may advertise its own session ID back to the server as well.

    @@ -1719,7 +1719,7 @@

    GIT

    diff --git a/gitprotocol-v2.txt b/gitprotocol-v2.txt index 8c1e7c61e..0b800abd5 100644 --- a/gitprotocol-v2.txt +++ b/gitprotocol-v2.txt @@ -199,7 +199,7 @@ which can be used to limit the refs sent from the server. Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "= " +of a space separated list of features: "= " ls-refs takes in the following arguments: @@ -245,7 +245,7 @@ addition of future extensions. Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "= " +of a space separated list of features: "= " A `fetch` request can take the following arguments: @@ -363,7 +363,7 @@ can be included in the client's request as well as the potential addition of the 'packfile-uris' section in the server's response as explained below. - packfile-uris + packfile-uris Indicates to the server that the client is willing to receive URIs of any of the given protocols in place of objects in the sent packfile. Before performing the connectivity check, the @@ -534,7 +534,7 @@ with objects using hash algorithm X. If not specified, the server is assumed to only handle SHA-1. If the client would like to use a hash algorithm other than SHA-1, it should specify its object-format string. -session-id= +session-id= ~~~~~~~~~~~~~~~~~~~~~~~ The server may advertise a session ID that can be used to identify this process diff --git a/gitsubmodules.html b/gitsubmodules.html index f125266d3..af6727efe 100644 --- a/gitsubmodules.html +++ b/gitsubmodules.html @@ -932,7 +932,7 @@

    FORMS

  • Deleted submodule: A submodule can be deleted by running -git rm <submodule path> && git commit. This can be undone +git rm <submodule-path> && git commit. This can be undone using git revert.

    The deletion removes the superproject’s tracking data, which are @@ -1025,7 +1025,7 @@

    Workflow for a third party library< 
    # Occasionally update the submodule to a new version:
-git -C <path> checkout <new version>
+git -C <path> checkout <new-version>
 git add <path>
 git commit -m "update submodule to new version"
    @@ -1113,7 +1113,7 @@

    GIT

    diff --git a/gitsubmodules.txt b/gitsubmodules.txt index 8400d591d..f7b5a25a0 100644 --- a/gitsubmodules.txt +++ b/gitsubmodules.txt @@ -151,7 +151,7 @@ the superproject's `$GIT_DIR/config` file, so the superproject's history is not affected. This can be undone using `git submodule init`. * Deleted submodule: A submodule can be deleted by running -`git rm && git commit`. This can be undone +`git rm && git commit`. This can be undone using `git revert`. + The deletion removes the superproject's tracking data, which are @@ -229,7 +229,7 @@ Workflow for a third party library git submodule add # Occasionally update the submodule to a new version: - git -C checkout + git -C checkout git add git commit -m "update submodule to new version" diff --git a/gitweb.conf.html b/gitweb.conf.html index fb81c891a..19040afcb 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html @@ -1140,7 +1140,7 @@

    Links and their targets

    Label for the "home link" at the top of all pages, leading to $home_link (usually the main gitweb page, which contains the projects list). It is used as the first component of gitweb’s "breadcrumb trail": - <home link> / <project> / <action>. Can be set at build time using + <home-link> / <project> / <action>. Can be set at build time using the GITWEB_HOME_LINK_STR variable. By default it is set to "projects", as this link leads to the list of projects. Another popular choice is to set it to the name of site. Note that it is treated as raw HTML so it @@ -1522,9 +1522,9 @@

    CONFIGURING GITWEB FEATURES

    structure:

    -
    "<feature_name>" => {
-        "sub" => <feature-sub (subroutine)>,
-        "override" => <allow-override (boolean)>,
+
    "<feature-name>" => {
+        "sub" => <feature-sub-(subroutine)>,
+        "override" => <allow-override-(boolean)>,
         "default" => [ <options>... ]
 },
    @@ -1533,7 +1533,7 @@

    CONFIGURING GITWEB FEATURES

    form:

    • -
    "<feature_name>" => {
+
    "<feature-name>" => {
         "override" => 0,
         "default" => [ <options>... ]
 },
    
@@ -2015,7 +2015,7 @@ 
    GIT
    
 
 
diff --git a/gitweb.conf.txt b/gitweb.conf.txt
index 59fc1d274..85983587f 100644
--- a/gitweb.conf.txt
+++ b/gitweb.conf.txt
@@ -343,7 +343,7 @@ $home_link_str::
 	Label for the "home link" at the top of all pages, leading to `$home_link`
 	(usually the main gitweb page, which contains the projects list).  It is
 	used as the first component of gitweb's "breadcrumb trail":
-	` /  / `.  Can be set at build time using
+	` /  / `.  Can be set at build time using
 	the `GITWEB_HOME_LINK_STR` variable.  By default it is set to "projects",
 	as this link leads to the list of projects.  Another popular choice is to
 	set it to the name of site.  Note that it is treated as raw HTML so it
@@ -604,9 +604,9 @@ Many gitweb features can be enabled (or disabled) and configured using the
 Each `%feature` hash element is a hash reference and has the following
 structure:
 ----------------------------------------------------------------------
-"" => {
-	"sub" => ,
-	"override" => ,
+"" => {
+	"sub" => ,
+	"override" => ,
 	"default" => [ ... ]
 },
 ----------------------------------------------------------------------
@@ -614,7 +614,7 @@ Some features cannot be overridden per project.  For those
 features the structure of appropriate `%feature` hash element has a simpler
 form:
 ----------------------------------------------------------------------
-"" => {
+"" => {
 	"override" => 0,
 	"default" => [ ... ]
 },
diff --git a/gitweb.html b/gitweb.html
index ad20864ae..38ef6ff75 100644
--- a/gitweb.html
+++ b/gitweb.html
@@ -1158,7 +1158,7 @@ 
    ACTIONS, AND URLS
    
 looks like this:
    -
    .../gitweb.cgi/<repo>/<action>/<revision_from>:/<path_from>..<revision_to>:/<path_to>?<arguments>
    +
    .../gitweb.cgi/<repo>/<action>/<revision-from>:/<path-from>..<revision-to>:/<path-to>?<arguments>

    Each action is implemented as a subroutine, and must be present in %actions hash. Some actions are disabled by default, and must be turned on via feature @@ -1642,7 +1642,7 @@

    GIT

    diff --git a/gitweb.txt b/gitweb.txt index ddd4a0fc7..56d24a30a 100644 --- a/gitweb.txt +++ b/gitweb.txt @@ -305,7 +305,7 @@ pathnames. In most general form such path_info (component) based gitweb URL looks like this: ----------------------------------------------------------------------- -.../gitweb.cgi///:/..:/? +.../gitweb.cgi///:/..:/? ----------------------------------------------------------------------- diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 4afe0020a..8c3cda3bf 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@

    Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:37 PST

    diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 820380d65..2475a9238 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -735,7 +735,7 @@
    @@ -939,7 +939,7 @@

    Keep authoritative canonical history correct with git pull

    diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 524cca8f6..eeae362c9 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -735,7 +735,7 @@
    @@ -1479,7 +1479,7 @@

    Preparing a "merge-fix"

    diff --git a/howto/new-command.html b/howto/new-command.html index f47fe0d8b..ebd029433 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -735,7 +735,7 @@
    @@ -864,7 +864,7 @@

    Integrating a command

    diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 21f1aab3e..6cec36365 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -735,7 +735,7 @@
    @@ -896,7 +896,7 @@

    How to rebase from an internal branch

    diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 308562bf7..a2cc27575 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -735,7 +735,7 @@
    @@ -848,7 +848,7 @@

    How to rebuild from update hook

    diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 2f292d149..e36c1e1eb 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -735,7 +735,7 @@
    @@ -881,7 +881,7 @@

    How to recover a corrupted blob object

    diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 4ad512d77..ab5fba07f 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -735,7 +735,7 @@
    @@ -1190,7 +1190,7 @@

    The adventure continues…

    diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 359bd7d6a..eb4303cfa 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -735,7 +735,7 @@
    @@ -1026,7 +1026,7 @@

    How to revert a faulty merge

    diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 0dea8742e..7b7ec8424 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -735,7 +735,7 @@
    @@ -908,7 +908,7 @@

    How to revert an existing commit

    diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index e143f8292..d5b5de603 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -735,7 +735,7 @@
    @@ -842,7 +842,7 @@

    How to separate topic branches

    diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 24ad21202..8df118545 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -735,7 +735,7 @@
    @@ -1072,7 +1072,7 @@

    Troubleshooting:

    diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index f3e59ef78..a2938c81c 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -735,7 +735,7 @@
    @@ -931,7 +931,7 @@

    How to use the update hook

    diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 4a5e62a56..69815ea9d 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -735,7 +735,7 @@
    @@ -792,7 +792,7 @@

    How to use git-daemon

    diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 30a439918..4c78d8a28 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -735,7 +735,7 @@
    @@ -849,7 +849,7 @@

    Additional tips

    diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 21ebc3985..74d15efb8 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -735,7 +735,7 @@
    @@ -953,7 +953,7 @@

    Auditors

    diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index a6ed401df..a4f079324 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -735,7 +735,7 @@
    diff --git a/technical/api-index.html b/technical/api-index.html index 322931562..fae733cf8 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -735,7 +735,7 @@
    diff --git a/technical/api-merge.html b/technical/api-merge.html index 7373bc36a..b448eb0a7 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -735,7 +735,7 @@
    diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 5ffcc3e0a..051f2f0cb 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -735,7 +735,7 @@
    diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index 40fb11186..1db3da603 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -735,7 +735,7 @@
    diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 582af69a6..610bdc449 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -735,7 +735,7 @@
    @@ -893,7 +893,7 @@

    Enabling a Target

  • -af_unix:[<socket_type>:]<absolute-pathname> - Write to a +af_unix:[<socket-type>:]<absolute-pathname> - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either stream or dgram; if omitted Git will try both. diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index e3dc1dc31..382b8cf4a 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -735,7 +735,7 @@

    diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 471c98775..17699cc3b 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -735,7 +735,7 @@
    diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index b8463bc57..a5a07e272 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -735,7 +735,7 @@
    diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 5de827c2f..f1296fbe6 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -735,7 +735,7 @@
    diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 98acb1590..6aa8c1743 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -735,7 +735,7 @@
    diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 557b1cd2e..43b5be32e 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -735,7 +735,7 @@
    diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 230eb40d7..dfdbb4cd4 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -735,7 +735,7 @@
    diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 286761088..03c88f774 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -735,7 +735,7 @@
    diff --git a/technical/racy-git.html b/technical/racy-git.html index f68410b67..51b0b566e 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -735,7 +735,7 @@
    diff --git a/technical/scalar.html b/technical/scalar.html index 62a30e733..4a3aff1a2 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -735,7 +735,7 @@
    diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index c985b0421..d1684be75 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -735,7 +735,7 @@
    diff --git a/technical/shallow.html b/technical/shallow.html index c37f95781..45a93d94e 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -735,7 +735,7 @@
    diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 1108b0bd8..fcc61b32f 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@
    diff --git a/technical/unit-tests.html b/technical/unit-tests.html index 0e3e78c1e..9c297b5d1 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -735,7 +735,7 @@
    diff --git a/trace2-target-values.txt b/trace2-target-values.txt index 3985b6d3c..06f195331 100644 --- a/trace2-target-values.txt +++ b/trace2-target-values.txt @@ -5,7 +5,7 @@ * `` - Writes to the file in append mode. If the target already exists and is a directory, the traces will be written to files (one per process) underneath the given directory. -* `af_unix:[:]` - Write to a +* `af_unix:[:]` - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either `stream` or `dgram`; if omitted Git will try both. diff --git a/urls.txt b/urls.txt index 4e79c1589..ce671f812 100644 --- a/urls.txt +++ b/urls.txt @@ -73,8 +73,8 @@ use will be rewritten into URLs that work), you can create a configuration section of the form: ------------ - [url ""] - insteadOf = + [url ""] + insteadOf = ------------ For example, with this: @@ -92,8 +92,8 @@ If you want to rewrite URLs for push only, you can create a configuration section of the form: ------------ - [url ""] - pushInsteadOf = + [url ""] + pushInsteadOf = ------------ For example, with this: diff --git a/user-manual.html b/user-manual.html index 2ca99ca27..0425119ba 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

    Git User Manual

    Revision History
    2024-02-06

    Table of Contents

    Introduction
    1. Repositories and Branches
    How to get a Git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git fetch
    Fetching branches from other repositories
    2. Exploring Git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with Git
    Telling Git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git pull
    Submitting patches to a project
    Importing patches to a project
    Public Git repositories
    Setting up a public repository
    Exporting a Git repository via the Git protocol
    Exporting a git repository via HTTP
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    How to get a Git repository with minimal history
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Using interactive rebases
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git fetch to do non-fast-forward updates
    Configuring remote-tracking branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How Git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level Git operations
    Object access and manipulation
    The Workflow
    working directory → index
    index → object database
    object database → index
    index → working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking Git
    Object storage format
    A birds-eye view of Git’s source code
    11. Git Glossary
    Git explained
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual
    Todo list

    Introduction

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX +Git User Manual

    Git User Manual

    Revision History
    2024-02-08

    Table of Contents

    Introduction
    1. Repositories and Branches
    How to get a Git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git fetch
    Fetching branches from other repositories
    2. Exploring Git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with Git
    Telling Git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git pull
    Submitting patches to a project
    Importing patches to a project
    Public Git repositories
    Setting up a public repository
    Exporting a Git repository via the Git protocol
    Exporting a git repository via HTTP
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    How to get a Git repository with minimal history
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Using interactive rebases
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git fetch to do non-fast-forward updates
    Configuring remote-tracking branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How Git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level Git operations
    Object access and manipulation
    The Workflow
    working directory → index
    index → object database
    object database → index
    index → working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking Git
    Object storage format
    A birds-eye view of Git’s source code
    11. Git Glossary
    Git explained
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual
    Todo list

    Introduction

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.

    Chapter 1, Repositories and Branches and Chapter 2, Exploring Git history 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 @@ -1863,8 +1863,8 @@ be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that forms a sequence of -<ascii type without space> + <space> + <ascii decimal size> + -<byte\0> + <binary object data>.

    The structured objects can further have their structure and +<ascii-type-without-space> + <space> + <ascii-decimal-size> + +<byte\0> + <binary-object-data>.

    The structured objects can further have their structure and connectivity to other objects verified. This is generally done with the git fsck program, which generates a full dependency graph of all objects, and verifies their internal consistency (in addition diff --git a/user-manual.txt b/user-manual.txt index 5d32ff238..643390349 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -4100,8 +4100,8 @@ independently of the contents or the type of the object: all objects can be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that forms a sequence of -` + + + - + `. +` + + + + + `. The structured objects can further have their structure and connectivity to other objects verified. This is generally done with