From 3583c5c3e0e0265a7a2e48b2be5e756b53c42dca Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Feb 2023 15:31:59 -0800 Subject: Autogenerated HTML docs for v2.39.2-542-g06dd2 --- RelNotes/2.40.0.txt | 69 +++++++++++++++-------------- git-add.html | 15 ++++--- git-add.txt | 6 +-- git-config.html | 51 +++++++++++++++++++-- git-fetch.html | 36 ++++++++++++++- git-hook.html | 14 +++++- git-hook.txt | 7 ++- git-ls-remote.html | 21 ++++++--- git-ls-remote.txt | 19 +++++--- git-pull.html | 4 +- git-push.html | 4 +- howto-index.html | 4 +- howto-index.txt | 2 +- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 2 +- howto/new-command.html | 4 +- howto/new-command.txt | 4 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- technical/bundle-uri.html | 10 ++--- technical/bundle-uri.txt | 8 ++-- urls-remotes.txt | 4 +- 33 files changed, 215 insertions(+), 97 deletions(-) diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt index edbbe7d04..4232ad804 100644 --- a/RelNotes/2.40.0.txt +++ b/RelNotes/2.40.0.txt @@ -49,6 +49,11 @@ UI, Workflows & Features * "scalar" warns but continues when its periodic maintenance feature cannot be enabled. + * The bundle-URI subsystem adds support for creation-token heuristics + to help incremental fetches. + + * Userdiff regexp update for Java language. + Performance, Internal Implementation, Development Support etc. @@ -69,12 +74,10 @@ Performance, Internal Implementation, Development Support etc. the submodule--helper. * Stop running win+VS build by default. - (merge a0da6deeec js/ci-disable-cmake-by-default later to maint). * CI updates. We probably want a clean-up to move the long shell script embedded in yaml file into a separate file, but that can come later. - (merge 4542582e59 cw/ci-whitespace later to maint). * Use `git diff --no-index` as a test_cmp on Windows. @@ -84,14 +87,21 @@ Performance, Internal Implementation, Development Support etc. * Avoid unnecessary builds in CI, with settings configured in ci-config. - (merge eb5b03a9c0 tb/ci-concurrency later to maint). + + * Plug leaks in sequencer subsystem and its users. + + * In-tree .gitattributes update to match the way we recommend our + users to mark a file as text. + (merge 1f34e0cd3d po/attributes-text later to maint). + + * Finally retire the scripted "git add -p/-i" implementation and have + everybody use the one reimplemented in C. Fixes since v2.39 ----------------- * Various leak fixes. - (merge ac95f5d36a ab/various-leak-fixes later to maint). * Fix a bug where `pack-objects` would not respect multiple `--filter` arguments when invoked directly. @@ -106,8 +116,6 @@ Fixes since v2.39 * Redefining system functions for a few functions did not follow our usual "implement git_foo() and #define foo(args) git_foo(args)" pattern, which has broken build for some folks. - (merge e1a95b78d8 jk/avoid-redef-system-functions-2.30 later to maint). - (merge 395bec6b39 jk/avoid-redef-system-functions later to maint). * The way the diff machinery prepares the options array for the parse_options API has been refactored to avoid resource leaks. @@ -137,36 +145,27 @@ Fixes since v2.39 * When given a pattern that matches an empty string at the end of a line, the code to parse the "git diff" line-ranges fell into an infinite loop, which has been corrected. - (merge 4e57c88e02 lk/line-range-parsing-fix later to maint). * Fix the sequence to fsync $GIT_DIR/packed-refs file that forgot to flush its output to the disk.. - (merge ce54672f9b ps/fsync-refs-fix later to maint). * Fix to a small regression in 2.38 days. - (merge 6d5e9e53aa ab/bundle-wo-args later to maint). * "git diff --relative" did not mix well with "git diff --ext-diff", which has been corrected. - (merge f034bb1cad jk/ext-diff-with-relative later to maint). * The logic to see if we are using the "cone" mode by checking the sparsity patterns has been tightened to avoid mistaking a pattern that names a single file as specifying a cone. - (merge 5842710dc2 ws/single-file-cone later to maint). * Deal with a few deprecation warning from cURL library. - (merge 6c065f72b8 jk/curl-avoid-deprecated-api later to maint). * Doc update for environment variables set when hooks are invoked. - (merge 772f8ff826 es/hooks-and-local-env later to maint). * Document ORIG_HEAD a bit more. - (merge f1c9243fc5 pb/doc-orig-head later to maint). * "git ls-tree --format='%(path) %(path)' $tree $path" showed the path three times, which has been corrected. - (merge c388fcda99 rs/ls-tree-path-expansion-fix later to maint). * Remove "git env--helper" and demote it to a test-tool subcommand. (merge 4a1baacd46 ab/test-env-helper later to maint). @@ -175,7 +174,6 @@ Fixes since v2.39 where '\(A\|B\)' works as alternation, unless explicitly asked with the REG_ENHANCED flag. "git grep" now can be compiled to do so, to retain the old behaviour. - (merge 54463d32ef rs/use-enhanced-bre-on-macos later to maint). * Pthread emulation on Win32 leaked thread handle when a thread is joined. @@ -188,7 +186,6 @@ Fixes since v2.39 * Document that "branch -f " disables only the safety to avoid recreating an existing branch. - (merge bf08abac56 jc/doc-branch-update-checked-out-branch later to maint). * "git fetch ", when "" of remotes lists the same remote twice, unnecessarily failed when parallel fetching was @@ -197,7 +194,6 @@ Fixes since v2.39 * Clarify how "checkout -b/-B" and "git branch [-f]" are similar but different in the documentation. - (merge fedb8ea2df jc/doc-checkout-b later to maint). * "git hash-object" now checks that the resulting object is well formed with the same code as "git fsck". @@ -222,22 +218,24 @@ Fixes since v2.39 it is done using it, saving peak heap memory usage. (merge 647982bb71 ew/free-island-marks later to maint). + * In an environment where dynamically generated code is prohibited to + run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall + back to interpreted execution in such a case. + (merge 50b6ad55b0 cb/grep-fallback-failing-jit later to maint). + + * "git name-rev" heuristics update. + (merge b2182a8730 en/name-rev-make-taggerdate-much-less-important later to maint). + + * Remove more remaining uses of macros that relies on the_index + singleton instance without explicitly spelling it out. + + * Remove unnecessary explicit sizing of strbuf. + (merge 93ea118bed rs/cache-tree-strbuf-growth-fix later to maint). + + * Doc update. + (merge d9ec3b0dc0 jk/doc-ls-remote-matching later to maint). + * Other code cleanup, docfix, build fix, etc. - (merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint). - (merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint). - (merge 243caa8982 ab/t5314-avoid-losing-exit-status later to maint). - (merge 4d81ce1b99 ab/t7600-avoid-losing-exit-status-of-git later to maint). - (merge 5f3bfdc4f3 ab/t4023-avoid-losing-exit-status-of-diff later to maint). - (merge 500317ae03 js/t3920-shell-and-or-fix later to maint). - (merge 86325d36e6 rs/t3920-crlf-eating-grep-fix later to maint). - (merge cfbd173ccb rj/branch-copy-and-rename later to maint). - (merge c25d9e529d jk/unused-post-2.39 later to maint). - (merge a31cfe3283 jk/server-supports-v2-cleanup later to maint). - (merge a658e881c1 rs/am-parse-options-cleanup later to maint). - (merge 4cb39fcf19 rs/clear-commit-marks-cleanup later to maint). - (merge b07a819c05 rs/reflog-expiry-cleanup later to maint). - (merge d422d06167 rs/clarify-error-in-write-loose-object later to maint). - (merge 92cb135855 sk/remove-duplicate-includes later to maint). (merge 4eb1ccecd4 dh/mingw-ownership-check-typofix later to maint). (merge f95526419b ar/typofix-gitattributes-doc later to maint). (merge 27875aeec9 km/doc-branch-start-point later to maint). @@ -258,3 +256,8 @@ Fixes since v2.39 (merge 4f542975d1 mh/doc-credential-cache-only-in-core later to maint). (merge 3a2ebaebc7 gc/index-format-doc later to maint). (merge b08edf709d jk/httpd-test-updates later to maint). + (merge d85e9448dd wl/new-command-doc later to maint). + (merge d912a603ed kf/t5000-modernise later to maint). + (merge e65b868d07 rs/size-t-fixes later to maint). + (merge 3eb1e1ca9a ab/config-h-remove-unused later to maint). + (merge d390e08076 cw/doc-pushurl-vs-url later to maint). diff --git a/git-add.html b/git-add.html index 2e57f689e..1514e39e9 100644 --- a/git-add.html +++ b/git-add.html @@ -1149,14 +1149,14 @@ status 
              staged     unstaged path
      1:       binary      nothing foo.png
-     2:     +403/-35        +1/-1 git-add--interactive.perl
+ 2: +403/-35 +1/-1 add-interactive.c

It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, binary would have been shown in place of nothing). The -other file, git-add--interactive.perl, has 403 lines added +other file, add-interactive.c, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion).

@@ -1180,7 +1180,7 @@ like this:

           staged     unstaged path
   1:       binary      nothing foo.png
-* 2:     +403/-35        +1/-1 git-add--interactive.perl
+* 2: +403/-35 +1/-1 add-interactive.c

To remove selection, prefix the input with - like this:

@@ -1394,9 +1394,10 @@ add.interactive.useBuiltin

- Set to false to fall back to the original Perl implementation of - the interactive version of git-add(1) instead of the built-in - version. Is true by default. + Unused configuration variable. Used in Git versions v2.25.0 to + v2.36.0 to enable the built-in version of git-add(1)'s + interactive mode, which then became the default in Git + versions v2.37.0 to v2.39.0.

@@ -1424,7 +1425,7 @@ add.interactive.useBuiltin diff --git a/git-add.txt b/git-add.txt index a030d33c6..ed44c1cb3 100644 --- a/git-add.txt +++ b/git-add.txt @@ -274,7 +274,7 @@ status:: ------------ staged unstaged path 1: binary nothing foo.png - 2: +403/-35 +1/-1 git-add--interactive.perl + 2: +403/-35 +1/-1 add-interactive.c ------------ + It shows that foo.png has differences from HEAD (but that is @@ -282,7 +282,7 @@ binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The -other file, git-add{litdd}interactive.perl, has 403 lines added +other file, add-interactive.c, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion). @@ -303,7 +303,7 @@ like this: ------------ staged unstaged path 1: binary nothing foo.png -* 2: +403/-35 +1/-1 git-add--interactive.perl +* 2: +403/-35 +1/-1 add-interactive.c ------------ + To remove selection, prefix the input with `-` diff --git a/git-config.html b/git-config.html index f20daa6e4..8b5a2dc8a 100644 --- a/git-config.html +++ b/git-config.html @@ -3442,9 +3442,10 @@ add.interactive.useBuiltin

- Set to false to fall back to the original Perl implementation of - the interactive version of git-add(1) instead of the built-in - version. Is true by default. + Unused configuration variable. Used in Git versions v2.25.0 to + v2.36.0 to enable the built-in version of git-add(1)'s + interactive mode, which then became the default in Git + versions v2.37.0 to v2.39.0.

@@ -3802,6 +3803,18 @@ bundle.mode

+bundle.heuristic +
+
+

+ If this string-valued key exists, then the bundle list is designed to + work well with incremental git fetch commands. The heuristic signals + that there are additional keys available for each bundle that help + determine which subset of bundles the client should download. The + only value currently understood is creationToken. +

+
+
bundle.<id>.*
@@ -5599,6 +5612,38 @@ fetch.writeCommitGraph

+fetch.bundleURI +
+
+

+ This value stores a URI for downloading Git object data from a bundle + URI before performing an incremental fetch from the origin Git server. + This is similar to how the --bundle-uri option behaves in + git-clone(1). git clone --bundle-uri will set the + fetch.bundleURI value if the supplied bundle URI contains a bundle + list that is organized for incremental fetches. +

+

If you modify this value and your repository has a fetch.bundleCreationToken +value, then remove that fetch.bundleCreationToken value before fetching from +the new bundle URI.

+
+
+fetch.bundleCreationToken +
+
+

+ When using fetch.bundleURI to fetch incrementally from a bundle + list that uses the "creationToken" heuristic, this config value + stores the maximum creationToken value of the downloaded bundles. + This value is used to prevent downloading bundles in the future + if the advertised creationToken is not strictly larger than this + value. +

+

The creation token values are chosen by the provider serving the specific +bundle URI. If you modify the URI at fetch.bundleURI, then be sure to +remove the value for the fetch.bundleCreationToken value before fetching.

+
+
format.attach
diff --git a/git-fetch.html b/git-fetch.html index 5764582e4..6becff88b 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -1595,7 +1595,9 @@ config file would appear like this:

fetch = <refspec>

The <pushurl> is used for pushes only. It is optional and defaults -to <URL>.

+to <URL>. Pushing to a remote affects all defined pushurls or to all +defined urls if no pushurls are defined. Fetch, however, will only +fetch from the first defined url if muliple urls are defined.

Named file in $GIT_DIR/remotes

@@ -2155,6 +2157,38 @@ fetch.writeCommitGraph git push -f, and git log --graph. Defaults to false.

+
+fetch.bundleURI +
+
+

+ This value stores a URI for downloading Git object data from a bundle + URI before performing an incremental fetch from the origin Git server. + This is similar to how the --bundle-uri option behaves in + git-clone(1). git clone --bundle-uri will set the + fetch.bundleURI value if the supplied bundle URI contains a bundle + list that is organized for incremental fetches. +

+

If you modify this value and your repository has a fetch.bundleCreationToken +value, then remove that fetch.bundleCreationToken value before fetching from +the new bundle URI.

+
+
+fetch.bundleCreationToken +
+
+

+ When using fetch.bundleURI to fetch incrementally from a bundle + list that uses the "creationToken" heuristic, this config value + stores the maximum creationToken value of the downloaded bundles. + This value is used to prevent downloading bundles in the future + if the advertised creationToken is not strictly larger than this + value. +

+

The creation token values are chosen by the provider serving the specific +bundle URI. If you modify the URI at fetch.bundleURI, then be sure to +remove the value for the fetch.bundleCreationToken value before fetching.

+
diff --git a/git-hook.html b/git-hook.html index 8b1bf6e0e..45a6e23d4 100644 --- a/git-hook.html +++ b/git-hook.html @@ -749,7 +749,7 @@ git-hook(1) Manual Page

SYNOPSIS

-
git hook run [--ignore-missing] <hook-name> [-- <hook-args>]
+
git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
@@ -785,6 +785,16 @@ mandatory -- (or --end-of-options, see
+--to-stdin +
+
+

+ For "run"; Specify a file which will be streamed into the + hook’s stdin. The hook will receive the entire file from + beginning to EOF. +

+
+
--ignore-missing
@@ -814,7 +824,7 @@ mandatory -- (or --end-of-options, see
Last updated - 2022-02-16 17:29:08 PST + 2023-02-22 15:29:29 PST
diff --git a/git-hook.txt b/git-hook.txt index 77c3a8ad9..3407f3c2c 100644 --- a/git-hook.txt +++ b/git-hook.txt @@ -8,7 +8,7 @@ git-hook - Run git hooks SYNOPSIS -------- [verse] -'git hook' run [--ignore-missing] [-- ] +'git hook' run [--ignore-missing] [--to-stdin=] [-- ] DESCRIPTION ----------- @@ -31,6 +31,11 @@ linkgit:githooks[5] for arguments hooks might expect (if any). OPTIONS ------- +--to-stdin:: + For "run"; Specify a file which will be streamed into the + hook's stdin. The hook will receive the entire file from + beginning to EOF. + --ignore-missing:: Ignore any missing hook by quietly returning zero. Used for tools that want to do a blind one-shot run of a hook that may diff --git a/git-ls-remote.html b/git-ls-remote.html index 028cbc00f..1502a7ca2 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -751,7 +751,7 @@ git-ls-remote(1) Manual Page 
git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]
               [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]
-              [--symref] [<repository> [<refs>…]]
+ [--symref] [<repository> [<patterns>…]]
@@ -892,14 +892,19 @@ commit IDs.

-<refs>… +<patterns>…

When unspecified, all references, after filtering done - with --heads and --tags, are shown. When <refs>… are - specified, only references matching the given patterns - are displayed. + with --heads and --tags, are shown. When <patterns>… are + specified, only references matching one or more of the given + patterns are displayed. Each pattern is interpreted as a glob + (see glob in gitglossary(7)) which is matched against + the "tail" of a ref, starting either from the start of the ref + (so a full name like refs/heads/foo matches) or from a slash + separator (so bar matches refs/heads/bar but not + refs/heads/foobar).

@@ -910,15 +915,17 @@ commit IDs.

-
$ git ls-remote --tags ./.
+
$ git ls-remote --tags .
 d6602ec5194c87b0fc87103ca4d67251c76f233a        refs/tags/v0.99
 f25a265a342aed6041ab0cc484224d9ca54b6f41        refs/tags/v0.99.1
 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e        refs/tags/v0.99.3
 c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 0918385dbd9656cab0d1d81ba7453d49bbc16250        refs/tags/junio-gpg-pub
+
 $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
 5fe978a5381f1fbad26a80e682ddd2a401966740        refs/heads/master
 c781a84b5204fb294c9ccc79f8b3baceeb32c061        refs/heads/seen
+
 $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
 $ git ls-remote --tags korg v\*
 d6602ec5194c87b0fc87103ca4d67251c76f233a        refs/tags/v0.99
@@ -945,7 +952,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 
 
diff --git a/git-ls-remote.txt b/git-ls-remote.txt
index 492e57385..ff3da547d 100644
--- a/git-ls-remote.txt
+++ b/git-ls-remote.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=]
 	      [-q | --quiet] [--exit-code] [--get-url] [--sort=]
-	      [--symref] [ [...]]
+	      [--symref] [ [...]]
 
 DESCRIPTION
 -----------
@@ -85,25 +85,32 @@ OPTIONS
 	either a URL or the name of a remote (see the GIT URLS and
 	REMOTES sections of linkgit:git-fetch[1]).
 
-...::
+...::
 	When unspecified, all references, after filtering done
-	with --heads and --tags, are shown.  When ... are
-	specified, only references matching the given patterns
-	are displayed.
+	with --heads and --tags, are shown.  When ... are
+	specified, only references matching one or more of the given
+	patterns are displayed. Each pattern is interpreted as a glob
+	(see `glob` in linkgit:gitglossary[7]) which is matched against
+	the "tail" of a ref, starting either from the start of the ref
+	(so a full name like `refs/heads/foo` matches) or from a slash
+	separator (so `bar` matches `refs/heads/bar` but not
+	`refs/heads/foobar`).
 
 EXAMPLES
 --------
 
 ----
-$ git ls-remote --tags ./.
+$ git ls-remote --tags .
 d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
 f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
 c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
 0918385dbd9656cab0d1d81ba7453d49bbc16250	refs/tags/junio-gpg-pub
+
 $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
 5fe978a5381f1fbad26a80e682ddd2a401966740	refs/heads/master
 c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/seen
+
 $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
 $ git ls-remote --tags korg v\*
 d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
diff --git a/git-pull.html b/git-pull.html
index dc4948811..289872f64 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1823,7 +1823,9 @@ config file would appear like this:
fetch = <refspec>

The <pushurl> is used for pushes only. It is optional and defaults -to <URL>.

+to <URL>. Pushing to a remote affects all defined pushurls or to all +defined urls if no pushurls are defined. Fetch, however, will only +fetch from the first defined url if muliple urls are defined.

Named file in $GIT_DIR/remotes

diff --git a/git-push.html b/git-push.html index a3421facc..381406b8c 100644 --- a/git-push.html +++ b/git-push.html @@ -1498,7 +1498,9 @@ config file would appear like this:

fetch = <refspec>

The <pushurl> is used for pushes only. It is optional and defaults -to <URL>.

+to <URL>. Pushing to a remote affects all defined pushurls or to all +defined urls if no pushurls are defined. Fetch, however, will only +fetch from the first defined url if muliple urls are defined.

Named file in $GIT_DIR/remotes

diff --git a/howto-index.html b/howto-index.html index e092a06be..142f34162 100644 --- a/howto-index.html +++ b/howto-index.html @@ -779,7 +779,7 @@ step up as the new maintainer. This howto will show you "how to" do it.

This is how-to documentation for people who want to add extension -commands to Git. It should be read alongside api-builtin.txt.

+commands to Git. It should be read alongside builtin.h.

  • @@ -895,7 +895,7 @@ later validate it.

diff --git a/howto-index.txt b/howto-index.txt index 9c57cd80c..083dfaa27 100644 --- a/howto-index.txt +++ b/howto-index.txt @@ -28,7 +28,7 @@ step up as the new maintainer. This howto will show you "how to" do it. * link:howto/new-command.html[new-command] by Eric S. Raymond This is how-to documentation for people who want to add extension -commands to Git. It should be read alongside api-builtin.txt. +commands to Git. It should be read alongside builtin.h. * link:howto/rebase-from-internal-branch.html[rebase-from-internal-branch] by Junio C Hamano diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index e7eb00201..c1ba79be3 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 15ef04ab1..9c76aa63c 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index dddf5e3fb..38e74865e 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index ba34cf363..b908302a6 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -740,7 +740,7 @@ asciidoc.install();

This is how-to documentation for people who want to add extension -commands to Git. It should be read alongside api-builtin.txt.

+commands to Git. It should be read alongside builtin.h.

@@ -863,7 +863,7 @@ letter [PATCH 0/n]. diff --git a/howto/new-command.txt b/howto/new-command.txt index 15a4c8031..880c51112 100644 --- a/howto/new-command.txt +++ b/howto/new-command.txt @@ -1,13 +1,13 @@ From: Eric S. Raymond Abstract: This is how-to documentation for people who want to add extension - commands to Git. It should be read alongside api-builtin.txt. + commands to Git. It should be read alongside builtin.h. Content-type: text/asciidoc How to integrate new subcommands ================================ This is how-to documentation for people who want to add extension -commands to Git. It should be read alongside api-builtin.txt. +commands to Git. It should be read alongside builtin.h. Runtime environment ------------------- diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 86005de2c..738b00c46 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index bfe5a4a57..fcb27a756 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index d700666b0..afb25f3dc 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 6baa0f941..7c9774aa0 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 3b89f0558..64270e5ba 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index a3b178496..f8edee34b 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 612738685..d77443156 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index d3b1946e2..7f5ceb379 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index ef5b0f6e8..dca3ec216 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 3b643b931..7d20ffda3 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 07765f4fa..594d5ecaa 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 4aba90c50..7eae6124b 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.

diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 10ee76499..98054b12c 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -1351,17 +1351,17 @@ Create the bundle-uri protocol v2 command so Git servers can advert

  • -Allow the client to understand the bundle.flag=forFetch configuration +Allow the client to understand the bundle.heuristic configuration key and the bundle.<id>.creationToken heuristic. When git clone - discovers a bundle URI with bundle.flag=forFetch, it configures the - client repository to check that bundle URI during later git fetch <remote> + discovers a bundle URI with bundle.heuristic, it configures the client + repository to check that bundle URI during later git fetch <remote> commands.

  • Allow clients to discover bundle URIs during git fetch and configure - a bundle URI for later fetches if bundle.flag=forFetch. + a bundle URI for later fetches if bundle.heuristic is set.

  • @@ -1463,7 +1463,7 @@ would cause these on-demand downloads to be too aggressive.

    diff --git a/technical/bundle-uri.txt b/technical/bundle-uri.txt index b78d01d9a..91d3a13e3 100644 --- a/technical/bundle-uri.txt +++ b/technical/bundle-uri.txt @@ -479,14 +479,14 @@ outline for submitting these features: (This choice is an opt-in via a config option and a command-line option.) -4. Allow the client to understand the `bundle.flag=forFetch` configuration +4. Allow the client to understand the `bundle.heuristic` configuration key and the `bundle..creationToken` heuristic. When `git clone` - discovers a bundle URI with `bundle.flag=forFetch`, it configures the - client repository to check that bundle URI during later `git fetch ` + discovers a bundle URI with `bundle.heuristic`, it configures the client + repository to check that bundle URI during later `git fetch ` commands. 5. Allow clients to discover bundle URIs during `git fetch` and configure - a bundle URI for later fetches if `bundle.flag=forFetch`. + a bundle URI for later fetches if `bundle.heuristic` is set. 6. Implement the "inspect headers" heuristic to reduce data downloads when the `bundle..creationToken` heuristic is not available. diff --git a/urls-remotes.txt b/urls-remotes.txt index 86d0008f9..e410912fe 100644 --- a/urls-remotes.txt +++ b/urls-remotes.txt @@ -33,7 +33,9 @@ config file would appear like this: ------------ The `` is used for pushes only. It is optional and defaults -to ``. +to ``. Pushing to a remote affects all defined pushurls or to all +defined urls if no pushurls are defined. Fetch, however, will only +fetch from the first defined url if muliple urls are defined. Named file in `$GIT_DIR/remotes` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit 1.2.3-korg