From 2b1164dcb4d39a0163d4ac1a7ba350140d59ce15 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 29 Sep 2023 09:43:29 -0700 Subject: Autogenerated HTML docs for v2.42.0-296-g493f46 --- MyFirstContribution.html | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/2.43.0.txt | 27 ++++++++++++++++++++----- ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- diff-options.txt | 17 ++++++++-------- everyday.html | 2 +- git-config.html | 9 +++++++++ git-diff-files.html | 17 ++++++++-------- git-diff-index.html | 17 ++++++++-------- git-diff-tree.html | 26 ++++++++++++++++-------- git-diff.html | 26 ++++++++++++++++-------- git-format-patch.html | 17 ++++++++-------- git-log.html | 26 ++++++++++++++++-------- git-remote-helpers.html | 2 +- git-show.html | 30 ++++++++++++++++++---------- git-show.txt | 2 +- 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 ++-- pretty-options.txt | 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 +- user-manual.html | 2 +- 55 files changed, 204 insertions(+), 130 deletions(-) diff --git a/MyFirstContribution.html b/MyFirstContribution.html index f334e102d..bb4866332 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 6602ee4a3..533637058 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/RelNotes/2.43.0.txt b/RelNotes/2.43.0.txt index f5b426a9d..a8f946116 100644 --- a/RelNotes/2.43.0.txt +++ b/RelNotes/2.43.0.txt @@ -57,10 +57,21 @@ UI, Workflows & Features * The command-line complation support (in contrib/) learned to complete "git commit --trailer=" for possible trailer keys. - * "git update-index" learns "--show-index-version" to inspect the index format version used by the on-disk index file. + * "git diff" learned diff.statNameWidth configuration variable, to + give the default width for the name part in the "--stat" output. + + * "git range-diff --notes=foo" compared "log --notes=foo --notes" of + the two ranges, instead of using just the specified notes tree. + + * The command line completion script (in contrib/) can be told to + complete aliases by including ": git ;" in the alias to tell + it that the alias should be completed similar to how "git " is + completed. The parsing code for the alias as been loosened to + allow ';' without an extra space before it. + Performance, Internal Implementation, Development Support etc. @@ -74,12 +85,12 @@ Performance, Internal Implementation, Development Support etc. * Tests that are known to pass with LSan are now marked as such. (merge 5fafe8c95f tb/mark-more-tests-as-leak-free later to maint). - * Flakey "git p4" tests, as well as "git svn" tests, are now skipped + * Flaky "git p4" tests, as well as "git svn" tests, are now skipped in the (rather expensive) sanitizer CI job. (merge 6ba913629f js/ci-san-skip-p4-and-svn-tests later to maint). * Tests with LSan from time to time seem to emit harmless message - that makes our tests unnecessarily flakey; we work it around by + that makes our tests unnecessarily flaky; we work it around by filtering the uninteresting output. (merge 370ef7e40d jk/test-lsan-denoise-output later to maint). @@ -134,7 +145,7 @@ Fixes since v2.42 pathnames recorded in tree objects. (merge 4d5693ba05 jk/tree-name-and-depth-limit later to maint). - * Various fixes to the behaviour of "rebase -i" when the command got + * Various fixes to the behavior of "rebase -i" when the command got interrupted by conflicting changes. (merge 203573b024 pw/rebase-i-after-failure later to maint). @@ -155,7 +166,7 @@ Fixes since v2.42 which has been corrected. (merge 48944f214c pw/diff-no-index-from-named-pipes later to maint). - * Update "git maintainance" timers' implementation based on systemd + * Update "git maintenance" timers' implementation based on systemd timers to work with WSL. (merge 5e8515e8e8 js/systemd-timers-wsl-fix later to maint). @@ -178,6 +189,10 @@ Fixes since v2.42 address did not give correct information, which has been corrected. (merge 12288cc44e tb/send-email-extract-valid-address-error-message-fix later to maint). + * UBSan options were not propagated through the test framework to git + run via the httpd, unlike ASan options, which has been corrected. + (merge 252d693797 jk/test-pass-ubsan-options-to-http-test later to maint). + * Other code cleanup, docfix, build fix, etc. (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint). (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint). @@ -196,3 +211,5 @@ Fixes since v2.42 (merge 8aae489756 ob/t3404-typofix later to maint). (merge 58be11432e eg/config-type-path-docfix later to maint). (merge 563f339d98 ch/clean-docfix later to maint). + (merge 4fbe83fcd9 hy/doc-show-is-like-log-not-diff-tree later to maint). + (merge 43abaaf008 ob/am-msgfix later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 63983cfa8..f8a3ef016 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index e60e772fe..718a14db5 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/ToolsForGit.html b/ToolsForGit.html index 9810efc2e..f37365808 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/diff-options.txt b/diff-options.txt index c07488b12..35fae7c87 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -204,14 +204,15 @@ have to use `--diff-algorithm=default` option. part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by ``. The width of the filename part can be limited by - giving another width `` after a comma. The width - of the graph part can be limited by using - `--stat-graph-width=` (affects all commands generating - a stat graph) or by setting `diff.statGraphWidth=` - (does not affect `git format-patch`). - By giving a third parameter ``, you can limit the - output to the first `` lines, followed by `...` if - there are more. + giving another width `` after a comma or by setting + `diff.statNameWidth=`. The width of the graph part can be + limited by using `--stat-graph-width=` or by setting + `diff.statGraphWidth=`. Using `--stat` or + `--stat-graph-width` affects all commands generating a stat graph, + while setting `diff.statNameWidth` or `diff.statGraphWidth` + does not affect `git format-patch`. + By giving a third parameter ``, you can limit the output to + the first `` lines, followed by `...` if there are more. + These parameters can also be set individually with `--stat-width=`, `--stat-name-width=` and `--stat-count=`. diff --git a/everyday.html b/everyday.html index 80f96f6f7..dd3e169d8 100644 --- a/everyday.html +++ b/everyday.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/git-config.html b/git-config.html index 9ee2a07fe..239e8f074 100644 --- a/git-config.html +++ b/git-config.html @@ -4738,6 +4738,15 @@ and accumulating child directory counts in the parent directories: files,10,cumulative.

+diff.statNameWidth +
+
+

+ Limit the width of the filename part in --stat output. If set, applies + to all commands generating --stat output except format-patch. +

+
+
diff.statGraphWidth
diff --git a/git-diff-files.html b/git-diff-files.html index b4de7d6fa..827314312 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -964,14 +964,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

diff --git a/git-diff-index.html b/git-diff-index.html index a3d6910e9..689d7fda4 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -965,14 +965,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

diff --git a/git-diff-tree.html b/git-diff-tree.html index 3178ede31..d2f41be8a 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -966,14 +966,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

@@ -2286,6 +2287,15 @@ being displayed. Examples: "--notes=foo" will show only notes from

+--show-notes-by-default +
+
+

+ Show the default notes unless options for displaying specific + notes are given. +

+
+
--show-notes[=<ref>]
diff --git a/git-diff.html b/git-diff.html index 9b747eb58..cd2783008 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1101,14 +1101,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

@@ -3100,6 +3101,15 @@ and accumulating child directory counts in the parent directories: files,10,cumulative.

+diff.statNameWidth +
+
+

+ Limit the width of the filename part in --stat output. If set, applies + to all commands generating --stat output except format-patch. +

+
+
diff.statGraphWidth
diff --git a/git-format-patch.html b/git-format-patch.html index 4cbeb5420..151102612 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -1022,14 +1022,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

diff --git a/git-log.html b/git-log.html index 66de3d04d..6aa260e5b 100644 --- a/git-log.html +++ b/git-log.html @@ -2286,6 +2286,15 @@ being displayed. Examples: "--notes=foo" will show only notes from

+--show-notes-by-default +
+
+

+ Show the default notes unless options for displaying specific + notes are given. +

+
+
--show-notes[=<ref>]
@@ -3872,14 +3881,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 96d0940b5..68f5829da 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/git-show.html b/git-show.html index 68521ec4e..bf6fb1a78 100644 --- a/git-show.html +++ b/git-show.html @@ -765,7 +765,7 @@ presents the merge commit in a special format as produced by

For trees, it shows the names (equivalent to git ls-tree with --name-only).

For plain blobs, it shows the plain contents.

-

The command takes options applicable to the git diff-tree command to +

Some options that git log command understands can be used to control how the changes the commit introduces are shown.

This manual page describes only the most frequently used options.

@@ -911,6 +911,15 @@ being displayed. Examples: "--notes=foo" will show only notes from

+--show-notes-by-default +
+
+

+ Show the default notes unless options for displaying specific + notes are given. +

+
+
--show-notes[=<ref>]
@@ -2333,14 +2342,15 @@ have to use --diff-algorithm=default option.

part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by - giving another width <name-width> after a comma. The width - of the graph part can be limited by using - --stat-graph-width=<width> (affects all commands generating - a stat graph) or by setting diff.statGraphWidth=<width> - (does not affect git format-patch). - By giving a third parameter <count>, you can limit the - output to the first <count> lines, followed by ... if - there are more. + giving another width <name-width> after a comma or by setting + diff.statNameWidth=<width>. The width of the graph part can be + limited by using --stat-graph-width=<width> or by setting + diff.statGraphWidth=<width>. Using --stat or + --stat-graph-width affects all commands generating a stat graph, + while setting diff.statNameWidth or diff.statGraphWidth + does not affect git format-patch. + By giving a third parameter <count>, you can limit the output to + the first <count> lines, followed by ... if there are more.

These parameters can also be set individually with --stat-width=<width>, --stat-name-width=<name-width> and --stat-count=<count>.

@@ -3798,7 +3808,7 @@ reversible operation.

diff --git a/git-show.txt b/git-show.txt index 2b1bc7288..03c063451 100644 --- a/git-show.txt +++ b/git-show.txt @@ -26,7 +26,7 @@ with --name-only). For plain blobs, it shows the plain contents. -The command takes options applicable to the 'git diff-tree' command to +Some options that 'git log' command understands can be used to control how the changes the commit introduces are shown. This manual page describes only the most frequently used options. diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 7aaadb0f7..280a58efe 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 684d6af56..62d1ad2ac 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 25585e74d..7e4cb2c8e 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 4acb4be0c..af28b58a7 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 09185f712..06b3709b8 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 1f89783ae..f72855753 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 adfe417e9..7f25e8717 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 188046274..27a05c07e 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 9dc0e53f1..d19a22c21 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 ab2bf5ec3..56bc29dcd 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 c80db199f..e88ecf367 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 f130668e7..b8bbd8392 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 ff697407c..afa2afb48 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 b3ebc0528..bb7f13a75 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 7c7d1b87d..367d06edd 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 0f9b6333a..0f81cf559 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/pretty-options.txt b/pretty-options.txt index dc685be36..335395b72 100644 --- a/pretty-options.txt +++ b/pretty-options.txt @@ -87,6 +87,10 @@ being displayed. Examples: "--notes=foo" will show only notes from "--notes --notes=foo --no-notes --notes=bar" will only show notes from "refs/notes/bar". +--show-notes-by-default:: + Show the default notes unless options for displaying specific + notes are given. + --show-notes[=]:: --[no-]standard-notes:: These options are deprecated. Use the above --notes/--no-notes diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 184a92d1f..59023c758 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 d13d0ddf7..7b419fa45 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 155b76d37..c57f07b7c 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 cd83adc58..eba65ab91 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 191c9db3b..aea36f6d4 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 12bdbde5a..88d4505b9 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 2c5348108..0c20ad764 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 f736d9835..1bba1e598 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 bb9dc4135..1625940cf 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 1d9509fd6..c906e2058 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 0369b9dd4..77068fcc2 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 01cb382ca..97721ba85 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 626f5f564..16d4cfe05 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 00274452d..8ccf57df9 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 2bbce2f94..70b5d87a6 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 56d29b1dd..aa67f11d7 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 54b7196bd..1f11dfd79 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 5a78445ea..7aa1d2c73 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 6945d2104..3ff67a7b3 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
diff --git a/user-manual.html b/user-manual.html index 06a6f0250..9193b54cc 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

Git User Manual

Revision History
2023-09-22

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
2023-09-29

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