diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-12-03 09:30:16 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-03 09:30:16 -0800 |
commit | 40a1d614a81ab6c17429d569ed75bb6bb6351612 (patch) | |
tree | 0c01c8271fdff94f1d4845e4bcf8f10f523600ad | |
parent | 8524398ff42cc7af50dc0629cc1d8b2f5f5134c2 (diff) | |
download | git-htmldocs-40a1d614a81ab6c17429d569ed75bb6bb6351612.tar.gz |
Autogenerated HTML docs for v2.29.2-456-g3a0b88
-rw-r--r-- | RelNotes/2.30.0.txt | 21 | ||||
-rw-r--r-- | cmds-synchelpers.txt | 3 | ||||
-rw-r--r-- | git-parse-remote.txt | 23 | ||||
-rw-r--r-- | git.html | 8 | ||||
-rw-r--r-- | howto/keep-canonical-history-correct.html | 2 | ||||
-rw-r--r-- | howto/maintain-git.html | 2 | ||||
-rw-r--r-- | howto/new-command.html | 2 | ||||
-rw-r--r-- | howto/rebase-from-internal-branch.html | 2 | ||||
-rw-r--r-- | howto/rebuild-from-update-hook.html | 2 | ||||
-rw-r--r-- | howto/recover-corrupted-blob-object.html | 2 | ||||
-rw-r--r-- | howto/recover-corrupted-object-harder.html | 2 | ||||
-rw-r--r-- | howto/revert-a-faulty-merge.html | 2 | ||||
-rw-r--r-- | howto/revert-branch-rebase.html | 2 | ||||
-rw-r--r-- | howto/separating-topic-branches.html | 2 | ||||
-rw-r--r-- | howto/setup-git-server-over-http.html | 2 | ||||
-rw-r--r-- | howto/update-hook-example.html | 2 | ||||
-rw-r--r-- | howto/use-git-daemon.html | 2 | ||||
-rw-r--r-- | howto/using-merge-subtree.html | 2 | ||||
-rw-r--r-- | howto/using-signed-tag-in-pull-request.html | 2 |
19 files changed, 31 insertions, 54 deletions
diff --git a/RelNotes/2.30.0.txt b/RelNotes/2.30.0.txt index c0892759e..cb4d65f9f 100644 --- a/RelNotes/2.30.0.txt +++ b/RelNotes/2.30.0.txt @@ -136,6 +136,8 @@ Performance, Internal Implementation, Development Support etc. file, causing everybody else but one to fail---reattempt locking with some timeout to reduce the rate of the failure. + * "git-parse-remote" shell script library outlived its usefulness. + Fixes since v2.29 ----------------- @@ -263,11 +265,6 @@ Fixes since v2.29 larger than 4GB. (merge 81c4c5cf2e jk/4gb-idx later to maint). - * "git fetch" did not work correctly with nested submodules where the - innermost submodule that is not of interest got updated in the - upstream, which has been corrected. - (merge 1b7ac4e6d4 pk/subsub-fetch-fix later to maint). - * Since jgit does not yet work with SHA-256 repositories, mark the tests that uses it not to run unless we are testing with ShA-1 repositories. @@ -283,6 +280,20 @@ Fixes since v2.29 * Error message fix. (merge eaf5341538 km/stash-error-message-fix later to maint). + * "git pull --rebase --recurse-submodules" checked for local changes + in a wrong range and failed to run correctly when it should. + (merge 5176f20ffe pb/pull-rebase-recurse-submodules later to maint). + + * "git push" that is killed may leave a pack-objects process behind, + still computing to find a good compression, wasting cycles. This + has been corrected. + (merge 8b59935114 jk/stop-pack-objects-when-push-is-killed later to maint). + + * "git fetch" that is killed may leave a pack-objects process behind, + still computing to find a good compression, wasting cycles. This + has been corrected. + (merge 309a4028e7 jk/stop-pack-objects-when-fetch-is-killed later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint). (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint). diff --git a/cmds-synchelpers.txt b/cmds-synchelpers.txt index 6ff96cea1..253c5d352 100644 --- a/cmds-synchelpers.txt +++ b/cmds-synchelpers.txt @@ -4,9 +4,6 @@ linkgit:git-http-fetch[1]:: linkgit:git-http-push[1]:: Push objects over HTTP/DAV to another repository. -linkgit:git-parse-remote[1]:: - Routines to help parsing remote repository access parameters. - linkgit:git-receive-pack[1]:: Receive what is pushed into the repository. diff --git a/git-parse-remote.txt b/git-parse-remote.txt deleted file mode 100644 index a45ea1ece..000000000 --- a/git-parse-remote.txt +++ /dev/null @@ -1,23 +0,0 @@ -git-parse-remote(1) -=================== - -NAME ----- -git-parse-remote - Routines to help parsing remote repository access parameters - - -SYNOPSIS --------- -[verse] -'. "$(git --exec-path)/git-parse-remote"' - -DESCRIPTION ------------ -This script is included in various scripts to supply -routines to parse files under $GIT_DIR/remotes/ and -$GIT_DIR/branches/ and configuration variables that are related -to fetching, pulling and pushing. - -GIT ---- -Part of the linkgit:git[1] suite @@ -2159,14 +2159,6 @@ typically do not use them directly.</p></div> </p>
</dd>
<dt class="hdlist1">
-<a href="git-parse-remote.html">git-parse-remote(1)</a>
-</dt>
-<dd>
-<p>
- Routines to help parsing remote repository access parameters.
-</p>
-</dd>
-<dt class="hdlist1">
<a href="git-receive-pack.html">git-receive-pack(1)</a>
</dt>
<dd>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 008512d0b..e19f23028 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:24 PST
+ 2020-12-03 09:28:25 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 94992175b..fd9b0f8ef 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:24 PST
+ 2020-12-03 09:28:25 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index 19386e085..57ff1cfd6 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:20 PST
+ 2020-12-03 09:28:22 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index bbae50c00..8f37c391b 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:24 PST
+ 2020-12-03 09:28:25 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 2b647231b..36f128e24 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 <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:24 PST
+ 2020-12-03 09:28:25 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index c7bf2d511..bd3a46670 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:23 PST
+ 2020-12-03 09:28:24 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 2c74877a1..464f33575 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) <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:24 PST
+ 2020-12-03 09:28:25 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 68c0cdcfa..726cccac6 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 <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:23 PST
+ 2020-12-03 09:28:24 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 71ce186f5..812e47ee9 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:20 PST
+ 2020-12-03 09:28:22 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 27449cf17..f00aee7b6 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master"</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:23 PST
+ 2020-12-03 09:28:24 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 880fb59e3..5887c50bf 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.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:22 PST
+ 2020-12-03 09:28:23 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 6a6a8d29c..87a6c424e 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.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:22 PST
+ 2020-12-03 09:28:23 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 6ad25e539..fb9fbbde0 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.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:21 PST
+ 2020-12-03 09:28:23 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index beb2e0701..e5a6b14d2 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 <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:21 PST
+ 2020-12-03 09:28:22 PST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 12dbb78f2..3f58272ea 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.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-30 20:45:21 PST
+ 2020-12-03 09:28:23 PST
</div>
</div>
</body>
|