From ff921867bef0a1b24753e19e4be0cf824eca22bf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 1 Mar 2024 17:33:01 -0800 Subject: Autogenerated HTML docs for v2.44.0-84-gb3876 --- MyFirstContribution.html | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/2.45.0.txt | 15 +++++++++++++ ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- everyday.html | 2 +- git-add.html | 22 +++++++++---------- git-add.txt | 20 ++++++++--------- git-clone.html | 4 ++-- git-clone.txt | 2 +- git-config.html | 28 +++++++++++------------- git-diff.html | 4 ++-- git-difftool.html | 3 +-- git-difftool.txt | 1 - git-fast-export.html | 4 ++-- git-fast-export.txt | 2 +- git-reflog.html | 4 +++- git-reflog.txt | 3 +++ git-remote-helpers.html | 2 +- git-remote.html | 4 ++-- git-remote.txt | 2 +- git-rev-parse.html | 26 +++++++++++----------- git-rev-parse.txt | 24 ++++++++++----------- git-send-email.html | 32 ++++++++++++++-------------- git-send-email.txt | 18 ++++++++-------- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 4 ++-- howto/maintain-git.html | 4 ++-- howto/new-command.html | 4 ++-- howto/rebase-from-internal-branch.html | 4 ++-- howto/rebuild-from-update-hook.html | 4 ++-- howto/recover-corrupted-blob-object.html | 4 ++-- howto/recover-corrupted-object-harder.html | 4 ++-- howto/revert-a-faulty-merge.html | 4 ++-- howto/revert-branch-rebase.html | 4 ++-- howto/separating-topic-branches.html | 4 ++-- howto/setup-git-server-over-http.html | 4 ++-- howto/update-hook-example.html | 4 ++-- howto/use-git-daemon.html | 4 ++-- howto/using-merge-subtree.html | 4 ++-- howto/using-signed-tag-in-pull-request.html | 4 ++-- technical/api-error-handling.html | 2 +- technical/api-index.html | 2 +- technical/api-merge.html | 2 +- technical/api-parse-options.html | 2 +- technical/api-simple-ipc.html | 2 +- technical/api-trace2.html | 2 +- technical/bitmap-format.html | 2 +- technical/bundle-uri.html | 2 +- technical/hash-function-transition.html | 2 +- technical/long-running-process-protocol.html | 2 +- technical/multi-pack-index.html | 2 +- technical/pack-heuristics.html | 2 +- technical/parallel-checkout.html | 2 +- technical/partial-clone.html | 2 +- technical/racy-git.html | 2 +- technical/scalar.html | 2 +- technical/send-pack-pipeline.html | 2 +- technical/shallow.html | 2 +- technical/trivial-merge.html | 2 +- technical/unit-tests.html | 2 +- user-manual.html | 2 +- 63 files changed, 175 insertions(+), 161 deletions(-) diff --git a/MyFirstContribution.html b/MyFirstContribution.html index aa192e4af..333be6104 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index bfd7ea49d..07838aacd 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/RelNotes/2.45.0.txt b/RelNotes/2.45.0.txt index e75e5ca36..321da04dd 100644 --- a/RelNotes/2.45.0.txt +++ b/RelNotes/2.45.0.txt @@ -15,6 +15,8 @@ UI, Workflows & Features * Variants of vimdiff learned to honor mergetool..layout settings. + * "git reflog" learned a "list" subcommand that enumerates known reflogs. + Performance, Internal Implementation, Development Support etc. @@ -27,6 +29,10 @@ Performance, Internal Implementation, Development Support etc. * Some parts of command line completion script (in contrib/) have been micro-optimized. + * The way placeholders are to be marked-up in documentation have been + specified; use "__" to typeset the word inside a pair + of emphasized. + Fixes since v2.44 ----------------- @@ -55,7 +61,16 @@ Fixes since v2.44 to handle an empty password correctly. (merge 8f1f2023b7 mh/libsecret-empty-password-fix later to maint). + * "git difftool --dir-diff" learned to honor the "--trust-exit-code" + option; it used to always exit with 0 and signalled success. + (merge eb84c8b6ce ps/difftool-dir-diff-exit-code later to maint). + * Other code cleanup, docfix, build fix, etc. (merge f0e578c69c rs/use-xstrncmpz later to maint). (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint). (merge 64562d784d jb/doc-interactive-singlekey-do-not-need-perl later to maint). + (merge c431a235e2 cp/t9146-use-test-path-helpers later to maint). + (merge 82d75402d5 ds/doc-send-email-capitalization later to maint). + (merge 41bff66e35 jc/doc-add-placeholder-fix later to maint). + (merge 6835f0efe9 jw/remote-doc-typofix later to maint). + (merge 244001aa20 hs/rebase-not-in-progress later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index d08eb4b8c..232d3fb22 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 597aa96c3..4134bb005 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/ToolsForGit.html b/ToolsForGit.html index 110049b2e..3c6d2c151 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/everyday.html b/everyday.html index 57b1672cf..14be44729 100644 --- a/everyday.html +++ b/everyday.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/git-add.html b/git-add.html index 293aef4ae..153588488 100644 --- a/git-add.html +++ b/git-add.html @@ -809,7 +809,7 @@ commit.

to ignore removed files; use --no-all option if you want to add modified or new files but ignore removed ones.

-

For more details about the <pathspec> syntax, see the pathspec entry +

For more details about the <pathspec> syntax, see the pathspec entry in gitglossary(7).

@@ -916,10 +916,10 @@ apply to the index. See EDITING PATCHES below.

Update the index just where it already has an entry matching - <pathspec>. This removes as well as modifies index entries to + <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files.

-

If no <pathspec> is given when -u option is used, all +

If no <pathspec> is given when -u option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories).

@@ -936,11 +936,11 @@ subdirectories).

Update the index not only where the working tree has a file - matching <pathspec> but also where the index already has an + matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree.

-

If no <pathspec> is given when -A option is used, all +

If no <pathspec> is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories).

@@ -956,11 +956,11 @@ subdirectories).

Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This - option is a no-op when no <pathspec> is used. + option is a no-op when no <pathspec> is used.

This option is primarily to help users who are used to older -versions of Git, whose "git add <pathspec>…" was a synonym -for "git add --no-all <pathspec>…", i.e. ignored removed files.

+versions of Git, whose "git add <pathspec>…" was a synonym +for "git add --no-all <pathspec>…", i.e. ignored removed files.

-N @@ -1050,8 +1050,8 @@ for "git add --no-all <pathspec>…", i.e. ignored removed files.

<

- Pathspec is passed in <file> instead of commandline args. If - <file> is exactly - then standard input is used. Pathspec + Pathspec is passed in <file> instead of commandline args. If + <file> is exactly - then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable core.quotePath (see git-config(1)). See also --pathspec-file-nul and @@ -1425,7 +1425,7 @@ add.interactive.useBuiltin

diff --git a/git-add.txt b/git-add.txt index 3d2e67071..14a371fff 100644 --- a/git-add.txt +++ b/git-add.txt @@ -63,7 +63,7 @@ OPTIONS to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones. + -For more details about the syntax, see the 'pathspec' entry +For more details about the __ syntax, see the 'pathspec' entry in linkgit:gitglossary[7]. -n:: @@ -119,10 +119,10 @@ apply to the index. See EDITING PATCHES below. -u:: --update:: Update the index just where it already has an entry matching - . This removes as well as modifies index entries to + __. This removes as well as modifies index entries to match the working tree, but adds no new files. + -If no is given when `-u` option is used, all +If no __ is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories). @@ -131,11 +131,11 @@ subdirectories). --all:: --no-ignore-removal:: Update the index not only where the working tree has a file - matching but also where the index already has an + matching __ but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree. + -If no is given when `-A` option is used, all +If no __ is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories). @@ -145,11 +145,11 @@ subdirectories). Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This - option is a no-op when no is used. + option is a no-op when no __ is used. + This option is primarily to help users who are used to older -versions of Git, whose "git add ..." was a synonym -for "git add --no-all ...", i.e. ignored removed files. +versions of Git, whose "git add __..." was a synonym +for "git add --no-all __...", i.e. ignored removed files. -N:: --intent-to-add:: @@ -198,8 +198,8 @@ for "git add --no-all ...", i.e. ignored removed files. unchanged. --pathspec-from-file=:: - Pathspec is passed in `` instead of commandline args. If - `` is exactly `-` then standard input is used. Pathspec + Pathspec is passed in __ instead of commandline args. If + __ is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and diff --git a/git-clone.html b/git-clone.html index 7571b443d..6e42518f8 100644 --- a/git-clone.html +++ b/git-clone.html @@ -1213,7 +1213,7 @@ or --mirror is given)

---ref-format=<ref-format +--ref-format=<ref-format>

@@ -1534,7 +1534,7 @@ clone.filterSubmodules

diff --git a/git-clone.txt b/git-clone.txt index 6e43eb9c2..0c07720c6 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -311,7 +311,7 @@ or `--mirror` is given) The result is Git repository can be separated from working tree. ---ref-format=:: Specify the given ref storage format for the repository. The valid values are: + diff --git a/git-config.html b/git-config.html index adfb8b18d..5a700404f 100644 --- a/git-config.html +++ b/git-config.html @@ -5309,8 +5309,8 @@ diff.colorMovedWS

When moved lines are colored using e.g. the diff.colorMoved setting, - this option controls the <mode> how spaces are treated - for details of valid modes see --color-moved-ws in git-diff(1). + this option controls the <mode> how spaces are treated. + For details of valid modes see --color-moved-ws in git-diff(1).

@@ -9058,14 +9058,10 @@ pack.allowPackReuse reachability bitmap is available, pack-objects will try to send parts of all packs in the MIDX.

-
-
-
If only a single pack bitmap is available, and
-`pack.allowPackReuse` is set to "multi", reuse parts of just the
-bitmapped packfile. This can reduce memory and CPU usage to
-serve fetches, but might result in sending a slightly larger
-pack. Defaults to true.
-
+

If only a single pack bitmap is available, and pack.allowPackReuse +is set to "multi", reuse parts of just the bitmapped packfile. This +can reduce memory and CPU usage to serve fetches, but might result in +sending a slightly larger pack. Defaults to true.

pack.island @@ -10470,7 +10466,7 @@ sendemail.smtpEncryption

-sendemail.smtpsslcertpath +sendemail.smtpSSLCertPath

@@ -10594,13 +10590,13 @@ sendemail.from sendemail.headerCmd

-sendemail.signedoffbycc +sendemail.signedOffByCc
sendemail.smtpPass
-sendemail.suppresscc +sendemail.suppressCc
sendemail.suppressFrom @@ -10609,7 +10605,7 @@ sendemail.suppressFrom sendemail.to
-sendemail.tocmd +sendemail.toCmd
sendemail.smtpDomain @@ -10646,11 +10642,11 @@ sendemail.xmailer

-sendemail.signedoffcc (deprecated) +sendemail.signedOffCc (deprecated)

- Deprecated alias for sendemail.signedoffbycc. + Deprecated alias for sendemail.signedOffByCc.

diff --git a/git-diff.html b/git-diff.html index 88a3616fa..ead5a8cea 100644 --- a/git-diff.html +++ b/git-diff.html @@ -3649,8 +3649,8 @@ diff.colorMovedWS

When moved lines are colored using e.g. the diff.colorMoved setting, - this option controls the <mode> how spaces are treated - for details of valid modes see --color-moved-ws in git-diff(1). + this option controls the <mode> how spaces are treated. + For details of valid modes see --color-moved-ws in git-diff(1).

diff --git a/git-difftool.html b/git-difftool.html index b2e108736..364d59308 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -912,7 +912,6 @@ instead. --no-symlinks is the default on Windows.

- git-difftool invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use --trust-exit-code to make git-difftool exit when an invoked diff tool returns a non-zero exit code. @@ -1055,7 +1054,7 @@ difftool.guiDefault

diff --git a/git-difftool.txt b/git-difftool.txt index c05f97aca..a616f8b2e 100644 --- a/git-difftool.txt +++ b/git-difftool.txt @@ -105,7 +105,6 @@ instead. `--no-symlinks` is the default on Windows. `merge.tool` until a tool is found. --[no-]trust-exit-code:: - 'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code. diff --git a/git-fast-export.html b/git-fast-export.html index fa7da2179..f5af0f46f 100644 --- a/git-fast-export.html +++ b/git-fast-export.html @@ -807,7 +807,7 @@ warning.

when encountering such a tag. With drop it will omit such tags from the output. With rewrite, if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see -git-rev-list(1))

+git-rev-list(1)).

-M @@ -1120,7 +1120,7 @@ a tag referencing a tree instead of a commit.

diff --git a/git-fast-export.txt b/git-fast-export.txt index 4643ddbe6..752e4b9b0 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt @@ -48,7 +48,7 @@ When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see -linkgit:git-rev-list[1]) +linkgit:git-rev-list[1]). -M:: -C:: diff --git a/git-reflog.html b/git-reflog.html index a6265b239..fa50398eb 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -750,6 +750,7 @@ git-reflog(1) Manual Page 
git reflog [show] [<log-options>] [<ref>]
+git reflog list
 git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
         [--rewrite] [--updateref] [--stale-fix]
         [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>…]
@@ -779,6 +780,7 @@ command-line (or HEAD, by default). The reflog covers all recent
 actions, and in addition the HEAD reflog records branch switching.
 git reflog show is an alias for git log -g --abbrev-commit
 --pretty=oneline; see git-log(1) for more information.
+

The "list" subcommand lists all refs which have a corresponding reflog.

The "expire" subcommand prunes older reflog entries. Entries older than expire time, or entries older than expire-unreachable time and not reachable from the current tip, are removed from the reflog. @@ -925,7 +927,7 @@ used with expire.

diff --git a/git-reflog.txt b/git-reflog.txt index ec64cbff4..a929c5298 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -10,6 +10,7 @@ SYNOPSIS -------- [verse] 'git reflog' [show] [] [] +'git reflog list' 'git reflog expire' [--expire=
---glob=pattern +--glob=<pattern>

@@ -1064,7 +1064,7 @@ or --all. If a trailing /* is intended, it must be giv explicitly.

---exclude-hidden=[fetch|receive|uploadpack] +--exclude-hidden=(fetch|receive|uploadpack)

@@ -1284,10 +1284,10 @@ print a message to stderr and exit with nonzero status.

Other Options

---since=datestring +--since=<datestring>
---after=datestring +--after=<datestring>

@@ -1296,10 +1296,10 @@ print a message to stderr and exit with nonzero status.

---until=datestring +--until=<datestring>
---before=datestring +--before=<datestring>

@@ -1308,7 +1308,7 @@ print a message to stderr and exit with nonzero status.

-<args>… +<arg>…

@@ -2159,7 +2159,7 @@ Similar to above:

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 546faf901..5d83dd36d 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -9,7 +9,7 @@ git-rev-parse - Pick out and massage parameters SYNOPSIS -------- [verse] -'git rev-parse' [] ... +'git rev-parse' [] ... DESCRIPTION ----------- @@ -130,7 +130,7 @@ for another option. 'git diff-{asterisk}'). In contrast to the `--sq-quote` option, the command input is still interpreted as usual. ---short[=length]:: +--short[=]:: Same as `--verify` but shortens the object name to a unique prefix with at least `length` characters. The minimum length is 4, the default is the effective value of the `core.abbrev` @@ -165,9 +165,9 @@ Options for Objects --all:: Show all refs found in `refs/`. ---branches[=pattern]:: ---tags[=pattern]:: ---remotes[=pattern]:: +--branches[=]:: +--tags[=]:: +--remotes[=]:: Show all branches, tags, or remote-tracking branches, respectively (i.e., refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively). @@ -176,7 +176,7 @@ If a `pattern` is given, only refs matching the given shell glob are shown. If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`. ---glob=pattern:: +--glob=:: Show all refs matching the shell glob pattern `pattern`. If the pattern does not start with `refs/`, this is automatically prepended. If the pattern does not contain a globbing @@ -197,7 +197,7 @@ respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly. ---exclude-hidden=[fetch|receive|uploadpack]:: +--exclude-hidden=(fetch|receive|uploadpack):: Do not include refs that would be hidden by `git-fetch`, `git-receive-pack` or `git-upload-pack` by consulting the appropriate `fetch.hideRefs`, `receive.hideRefs` or `uploadpack.hideRefs` @@ -314,17 +314,17 @@ The following options are unaffected by `--path-format`: Other Options ~~~~~~~~~~~~~ ---since=datestring:: ---after=datestring:: +--since=:: +--after=:: Parse the date string, and output the corresponding --max-age= parameter for 'git rev-list'. ---until=datestring:: ---before=datestring:: +--until=:: +--before=:: Parse the date string, and output the corresponding --min-age= parameter for 'git rev-list'. -...:: +...:: Flags and parameters to be parsed. diff --git a/git-send-email.html b/git-send-email.html index 53c5d23bd..92b917a0b 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -932,7 +932,7 @@ is not set, this will be prompted for.

Specify encoding of compose message. Default is the value of the - sendemail.composeencoding; if that is unspecified, UTF-8 is assumed. + sendemail.composeEncoding; if that is unspecified, UTF-8 is assumed.

@@ -991,7 +991,7 @@ value; if that is unspecified, default to auto.

Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the -i option. The command will be executed in the shell if necessary. Default - is the value of sendemail.sendmailcmd. If unspecified, and if + is the value of sendemail.sendmailCmd. If unspecified, and if --smtp-server is also unspecified, git-send-email will search for sendmail in /usr/sbin, /usr/lib and $PATH.

@@ -1132,7 +1132,7 @@ must be used for each option.

certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the - sendemail.smtpsslcertpath configuration variable, if set, or the + sendemail.smtpSSLCertPath configuration variable, if set, or the backing SSL library’s compiled-in default otherwise (which should be the best choice on most platforms).

@@ -1213,7 +1213,7 @@ must be used for each option.

Specify a command to execute once per patch file which should generate patch file specific "To:" entries. Output of this command must be single email address per line. - Default is the value of sendemail.tocmd configuration value. + Default is the value of sendemail.toCmd configuration value.

@@ -1278,7 +1278,7 @@ must be used for each option.

If this is set, add emails found in the Signed-off-by trailer or Cc: lines to the - cc list. Default is the value of sendemail.signedoffbycc configuration + cc list. Default is the value of sendemail.signedOffByCc configuration value; if that is unspecified, default to --signed-off-by-cc.

@@ -1289,7 +1289,7 @@ must be used for each option.

If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list - for each email set. Default is the value of sendemail.cccover + for each email set. Default is the value of sendemail.ccCover configuration value; if that is unspecified, default to --no-cc-cover.

@@ -1300,7 +1300,7 @@ must be used for each option.

If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list - for each email set. Default is the value of sendemail.tocover + for each email set. Default is the value of sendemail.toCover configuration value; if that is unspecified, default to --no-to-cover.

@@ -1367,7 +1367,7 @@ must be used for each option.

-

Default is the value of sendemail.suppresscc configuration value; if +

Default is the value of sendemail.suppressCc configuration value; if that is unspecified, default to self if --suppress-from is specified, as well as body if --no-signed-off-cc is specified.

@@ -1528,7 +1528,7 @@ default to --validate.

Instead of the normal operation, dump the shorthand alias names from 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. + See sendemail.aliasesFile for more information about aliases.

@@ -1563,7 +1563,7 @@ sendemail.smtpEncryption

-sendemail.smtpsslcertpath +sendemail.smtpSSLCertPath

@@ -1687,13 +1687,13 @@ sendemail.from sendemail.headerCmd

-sendemail.signedoffbycc +sendemail.signedOffByCc
sendemail.smtpPass
-sendemail.suppresscc +sendemail.suppressCc
sendemail.suppressFrom @@ -1702,7 +1702,7 @@ sendemail.suppressFrom sendemail.to
-sendemail.tocmd +sendemail.toCmd
sendemail.smtpDomain @@ -1739,11 +1739,11 @@ sendemail.xmailer

-sendemail.signedoffcc (deprecated) +sendemail.signedOffCc (deprecated)

- Deprecated alias for sendemail.signedoffbycc. + Deprecated alias for sendemail.signedOffByCc.

@@ -1834,7 +1834,7 @@ Authen::SASL and Mail::Address.

diff --git a/git-send-email.txt b/git-send-email.txt index d1ef6a204..8264f8738 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -138,7 +138,7 @@ Note that no attempts whatsoever are made to validate the encoding. --compose-encoding=:: Specify encoding of compose message. Default is the value of the - 'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed. + 'sendemail.composeEncoding'; if that is unspecified, UTF-8 is assumed. --transfer-encoding=(7bit|8bit|quoted-printable|base64|auto):: Specify the transfer encoding to be used to send the message over SMTP. @@ -174,7 +174,7 @@ Sending Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option. The command will be executed in the shell if necessary. Default - is the value of `sendemail.sendmailcmd`. If unspecified, and if + is the value of `sendemail.sendmailCmd`. If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH. @@ -269,7 +269,7 @@ must be used for each option. certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the - `sendemail.smtpsslcertpath` configuration variable, if set, or the + `sendemail.smtpSSLCertPath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms). @@ -313,7 +313,7 @@ Automating Specify a command to execute once per patch file which should generate patch file specific "To:" entries. Output of this command must be single email address per line. - Default is the value of 'sendemail.tocmd' configuration value. + Default is the value of 'sendemail.toCmd' configuration value. --cc-cmd=:: Specify a command to execute once per patch file which @@ -348,19 +348,19 @@ Automating --[no-]signed-off-by-cc:: If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the - cc list. Default is the value of `sendemail.signedoffbycc` configuration + cc list. Default is the value of `sendemail.signedOffByCc` configuration value; if that is unspecified, default to --signed-off-by-cc. --[no-]cc-cover:: If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list - for each email set. Default is the value of 'sendemail.cccover' + for each email set. Default is the value of 'sendemail.ccCover' configuration value; if that is unspecified, default to --no-cc-cover. --[no-]to-cover:: If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list - for each email set. Default is the value of 'sendemail.tocover' + for each email set. Default is the value of 'sendemail.toCover' configuration value; if that is unspecified, default to --no-to-cover. --suppress-cc=:: @@ -384,7 +384,7 @@ Automating - 'all' will suppress all auto cc values. -- + -Default is the value of `sendemail.suppresscc` configuration value; if +Default is the value of `sendemail.suppressCc` configuration value; if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'body' if --no-signed-off-cc is specified. @@ -471,7 +471,7 @@ Information Instead of the normal operation, dump the shorthand alias names from 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. + See 'sendemail.aliasesFile' for more information about aliases. CONFIGURATION diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 2320699bd..7d50a0d3c 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 050df3321..1c32bd493 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -939,7 +939,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index a8688656d..2fad00f87 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1479,7 +1479,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index ff73a5aba..01b790c4a 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -864,7 +864,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index e3f2d5f36..6ed1db2ed 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -896,7 +896,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 2b66b69fe..6997cd746 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -848,7 +848,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index a78a46389..e0e30e27c 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -881,7 +881,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index a938fcdc0..c39ae0648 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1190,7 +1190,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 8dd77cab0..964f10d4f 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1026,7 +1026,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 7e5652ae3..cdaffa0ab 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -908,7 +908,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index f5c384cbb..bc2cc2386 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -842,7 +842,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 975a1ddf3..23c40b6b7 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1072,7 +1072,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 00700a95f..e621e6c2f 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -931,7 +931,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 527b3de34..c585613ae 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -792,7 +792,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 3a7d98674..33bd54082 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -849,7 +849,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index f29995ea5..d6d04972e 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();
@@ -953,7 +953,7 @@ as part of the merge commit.

diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index e0a004915..9df6934c4 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-index.html b/technical/api-index.html index 1c9396e08..a7baa3096 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-merge.html b/technical/api-merge.html index c00064926..21dcdb360 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 65906a82d..1a81d936b 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index a63ff7822..5ecd90900 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 8a7feda42..9aa2d31d2 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 7a085dc8a..1d5f83bf7 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 12ddd23bb..354ffdc79 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 5dedab208..e0b40d57f 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 6d458ff7c..e4779b886 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 7e155cc7e..a5866445c 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index e73bdd90f..9a564a475 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 863b9653b..d937ff9ff 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 3fa1d0c42..6e4dc67e0 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/racy-git.html b/technical/racy-git.html index 985e6ed6f..589061f2a 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/scalar.html b/technical/scalar.html index 3e7aa0d8c..6e4ea9afa 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index a81b60603..b7a1b4766 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/shallow.html b/technical/shallow.html index f8d833e3a..96fe65bd7 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 4c5df1725..d2ca3b4d9 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/technical/unit-tests.html b/technical/unit-tests.html index 09f611811..261fc2f55 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/user-manual.html b/user-manual.html index ed4ddaa4d..7c5932a42 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

Git User Manual

Revision History
2024-02-27

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-03-01

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 -- cgit 1.2.3-korg