diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-09-08 14:24:58 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 14:24:58 -0700 |
commit | 810dc8f1583cea4aa8bebdfbbc5da4b72f4b0b20 (patch) | |
tree | 3f156e3646a6885c2b825f13cc1670447fe86eb2 | |
parent | 7a031e5c8c444cac4c199ecf6538eb89f8862071 (diff) | |
download | git-htmldocs-810dc8f1583cea4aa8bebdfbbc5da4b72f4b0b20.tar.gz |
Autogenerated HTML docs for v2.33.0-180-g8463be
-rw-r--r-- | RelNotes/2.34.0.txt | 58 | ||||
-rw-r--r-- | git-branch.html | 5 | ||||
-rw-r--r-- | git-branch.txt | 3 | ||||
-rw-r--r-- | git-column.html | 4 | ||||
-rw-r--r-- | git-column.txt | 2 | ||||
-rw-r--r-- | git-log.html | 13 | ||||
-rw-r--r-- | git-rev-list.html | 13 | ||||
-rw-r--r-- | howto/coordinate-embargoed-releases.html | 2 | ||||
-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 | ||||
-rw-r--r-- | rev-list-options.txt | 8 |
24 files changed, 113 insertions, 25 deletions
diff --git a/RelNotes/2.34.0.txt b/RelNotes/2.34.0.txt index e378a9941..4cb0b8f4c 100644 --- a/RelNotes/2.34.0.txt +++ b/RelNotes/2.34.0.txt @@ -44,6 +44,10 @@ Performance, Internal Implementation, Development Support etc. that checking for the lack of a prerequisite would not work. Avoid the use of "if ! test_have_prereq X" in a test script. + * The revision traversal API has been optimized by taking advantage + of the commit-graph, when available, to determine if a commit is + reachable from any of the existing refs. + Fixes since v2.33 ----------------- @@ -69,9 +73,63 @@ Fixes since v2.33 * "git range-diff" code clean-up. (merge c4d5907324 jk/range-diff-fixes later to maint). + * "git commit --fixup" now works with "--edit" again, after it was + broken in v2.32. + (merge 8ef6aad664 jk/commit-edit-fixup-fix later to maint). + + * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the + new version has a blocker bug for that architecture. + (merge 3cf9bb36bf cb/ci-use-upload-artifacts-v1 later to maint). + + * Checking out all the paths from HEAD during the last conflicted + step in "git rebase" and continuing would cause the step to be + skipped (which is expected), but leaves MERGE_MSG file behind in + $GIT_DIR and confuses the next "git commit", which has been + corrected. + (merge e5ee33e855 pw/rebase-skip-final-fix later to maint). + + * Various bugs in "git rebase -r" have been fixed. + (merge f2563c9ef3 pw/rebase-r-fixes later to maint). + + * mmap() imitation used to call xmalloc() that dies upon malloc() + failure, which has been corrected to just return an error to the + caller to be handled. + (merge 95b4ff3931 rs/git-mmap-uses-malloc later to maint). + + * "git diff --relative" segfaulted and/or produced incorrect result + when there are unmerged paths. + (merge 8174627b3d dd/diff-files-unmerged-fix later to maint). + + * The delayed checkout code path in "git checkout" etc. were chatty + even when --quiet and/or --no-progress options were given. + (merge 7a132c628e mt/quiet-with-delayed-checkout later to maint). + + * "git branch -D <branch>" used to refuse to remove a broken branch + ref that points at a missing commit, which has been corrected. + (merge 597a977489 rs/branch-allow-deleting-dangling later to maint). + + * Build update for Apple clang. + (merge f32c5d3716 cb/makefile-apple-clang later to maint). + + * The parser for the "--nl" option of "git column" has been + corrected. + (merge c93ca46cf5 sg/column-nl later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 1d9c8daef8 ab/bundle-doc later to maint). (merge 81483fe613 en/merge-strategy-docs later to maint). (merge 626beebdf8 js/log-protocol-version later to maint). (merge 00e302da76 cb/builtin-merge-format-string-fix later to maint). (merge ad51ae4dc0 cb/ci-freebsd-update later to maint). + (merge be6444d1ca fc/completion-updates later to maint). + (merge ff7b83f562 ti/tcsh-completion-regression-fix later to maint). + (merge 325b06deda sg/make-fix-ar-invocation later to maint). + (merge bd72824c60 me/t5582-cleanup later to maint). + (merge f6a5af0f62 ga/send-email-sendmail-cmd later to maint). + (merge f58c7468cd ab/ls-remote-packet-trace later to maint). + (merge 0160f7e725 ab/rebase-fatal-fatal-fix later to maint). + (merge a16eb6b1ff js/maintenance-launchctl-fix later to maint). + (merge c21b2511c2 jk/t5323-no-pack-test-fix later to maint). + (merge 5146c2f148 mh/credential-leakfix later to maint). + (merge 1549577338 dd/t6300-wo-gpg-fix later to maint). + (merge 66e905b7dd rs/xopen-reports-open-failures later to maint). diff --git a/git-branch.html b/git-branch.html index 455198c69..7a7d763b3 100644 --- a/git-branch.html +++ b/git-branch.html @@ -877,7 +877,8 @@ way to clean up all obsolete remote-tracking branches.</p></div> Reset <branchname> to <startpoint>, even if <branchname> exists
already. Without <code>-f</code>, <em>git branch</em> refuses to change an existing branch.
In combination with <code>-d</code> (or <code>--delete</code>), allow deleting the
- branch irrespective of its merged status. In combination with
+ branch irrespective of its merged status, or whether it even
+ points to a valid commit. In combination with
<code>-m</code> (or <code>--move</code>), allow renaming the branch even if the new
branch name already exists, the same applies for <code>-c</code> (or <code>--copy</code>).
</p>
@@ -1397,7 +1398,7 @@ a branch?”</a> in the Git User’s Manual.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-02-25 17:29:29 PST
+ 2021-09-08 14:15:40 PDT
</div>
</div>
</body>
diff --git a/git-branch.txt b/git-branch.txt index 94dc9a54f..544976712 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -118,7 +118,8 @@ OPTIONS Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the - branch irrespective of its merged status. In combination with + branch irrespective of its merged status, or whether it even + points to a valid commit. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`). diff --git a/git-column.html b/git-column.html index b36d79d10..b43ff272f 100644 --- a/git-column.html +++ b/git-column.html @@ -813,7 +813,7 @@ columns.</p></div> </p>
</dd>
<dt class="hdlist1">
---nl=<N>
+--nl=<string>
</dt>
<dd>
<p>
@@ -873,7 +873,7 @@ v2.4.8 v2.4.9</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2021-09-08 14:15:40 PDT
</div>
</div>
</body>
diff --git a/git-column.txt b/git-column.txt index f58e9c43e..6cea9ab46 100644 --- a/git-column.txt +++ b/git-column.txt @@ -39,7 +39,7 @@ OPTIONS --indent=<string>:: String to be printed at the beginning of each line. ---nl=<N>:: +--nl=<string>:: String to be printed at the end of each line, including newline character. diff --git a/git-log.html b/git-log.html index 2590e067f..fdafa1404 100644 --- a/git-log.html +++ b/git-log.html @@ -2061,6 +2061,16 @@ together.</p></div> <div class="paragraph"><p>These options are mostly targeted for packing of Git repositories.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
+--unsorted-input
+</dt>
+<dd>
+<p>
+ Show commits in the order they were given on the command line instead
+ of sorting them in reverse chronological order by commit time. Cannot
+ be combined with <code>--no-walk</code> or <code>--no-walk=sorted</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--no-walk[=(sorted|unsorted)]
</dt>
<dd>
@@ -2071,7 +2081,8 @@ together.</p></div> given on the command line. Otherwise (if <code>sorted</code> or no argument
was given), the commits are shown in reverse chronological order
by commit time.
- Cannot be combined with <code>--graph</code>.
+ Cannot be combined with <code>--graph</code>. Cannot be combined with
+ <code>--unsorted-input</code> if <code>sorted</code> or no argument was given.
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-rev-list.html b/git-rev-list.html index de7c73ddf..c378f7cf2 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -2178,6 +2178,16 @@ list of the missing objects. Object IDs are prefixed with a “?” cha </p>
</dd>
<dt class="hdlist1">
+--unsorted-input
+</dt>
+<dd>
+<p>
+ Show commits in the order they were given on the command line instead
+ of sorting them in reverse chronological order by commit time. Cannot
+ be combined with <code>--no-walk</code> or <code>--no-walk=sorted</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--no-walk[=(sorted|unsorted)]
</dt>
<dd>
@@ -2188,7 +2198,8 @@ list of the missing objects. Object IDs are prefixed with a “?” cha given on the command line. Otherwise (if <code>sorted</code> or no argument
was given), the commits are shown in reverse chronological order
by commit time.
- Cannot be combined with <code>--graph</code>.
+ Cannot be combined with <code>--graph</code>. Cannot be combined with
+ <code>--unsorted-input</code> if <code>sorted</code> or no argument was given.
</p>
</dd>
<dt class="hdlist1">
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 801e6867f..e716c8c56 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, <div id="footer">
<div id="footer-text">
Last updated
- 2021-08-30 16:51:19 PDT
+ 2021-09-08 14:21:56 PDT
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index b33efef54..ab7107f37 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
- 2021-08-30 16:51:19 PDT
+ 2021-09-08 14:21:56 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 828d0b8c0..e2a81b955 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
- 2021-08-30 16:51:19 PDT
+ 2021-09-08 14:21:56 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index dd7abac18..99ac5fa50 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
- 2021-08-30 16:51:12 PDT
+ 2021-09-08 14:21:50 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index dafb0dd14..d840082d9 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
- 2021-08-30 16:51:18 PDT
+ 2021-09-08 14:21:55 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 483e2acda..1cf354a2f 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
- 2021-08-30 16:51:18 PDT
+ 2021-09-08 14:21:55 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 324716f85..1b3bacf07 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
- 2021-08-30 16:51:17 PDT
+ 2021-09-08 14:21:54 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 54f7e5f80..ba0206114 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
- 2021-08-30 16:51:18 PDT
+ 2021-09-08 14:21:55 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 46ff06dd9..64a404445 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
- 2021-08-30 16:51:16 PDT
+ 2021-09-08 14:21:53 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 3960cc5a8..1e549ceff 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
- 2021-08-30 16:51:13 PDT
+ 2021-09-08 14:21:50 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 741cce305..7f47a663c 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
- 2021-08-30 16:51:16 PDT
+ 2021-09-08 14:21:53 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 63f3679c3..8dc311b78 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
- 2021-08-30 16:51:15 PDT
+ 2021-09-08 14:21:52 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index cc08163ae..13c7ba78f 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
- 2021-08-30 16:51:15 PDT
+ 2021-09-08 14:21:52 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index ddf367a62..dd5d26cf8 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
- 2021-08-30 16:51:14 PDT
+ 2021-09-08 14:21:51 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index e2c5ff10f..809616e11 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
- 2021-08-30 16:51:13 PDT
+ 2021-09-08 14:21:51 PDT
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 436f5e4ad..24aba4648 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
- 2021-08-30 16:51:14 PDT
+ 2021-09-08 14:21:51 PDT
</div>
</div>
</body>
diff --git a/rev-list-options.txt b/rev-list-options.txt index 24569b06d..b7bd27e17 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -968,6 +968,11 @@ list of the missing objects. Object IDs are prefixed with a ``?'' character. objects. endif::git-rev-list[] +--unsorted-input:: + Show commits in the order they were given on the command line instead + of sorting them in reverse chronological order by commit time. Cannot + be combined with `--no-walk` or `--no-walk=sorted`. + --no-walk[=(sorted|unsorted)]:: Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument @@ -975,7 +980,8 @@ endif::git-rev-list[] given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. - Cannot be combined with `--graph`. + Cannot be combined with `--graph`. Cannot be combined with + `--unsorted-input` if `sorted` or no argument was given. --do-walk:: Overrides a previous `--no-walk`. |