diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-11-12 15:42:03 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-12 15:42:03 -0800 |
commit | e8fdbbb076c350daf2cd9921918f90610074189e (patch) | |
tree | c0330cd09393d2ed08a84e3f1f92b4bbf9fa7132 | |
parent | 9eaac010dcd8105e97533c860aede97f455be35f (diff) | |
download | git-htmldocs-e8fdbbb076c350daf2cd9921918f90610074189e.tar.gz |
Autogenerated HTML docs for v2.34.0-rc2-16-g5a73c
-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 | ||||
-rw-r--r-- | technical/api-trace2.html | 6 | ||||
-rw-r--r-- | technical/api-trace2.txt | 4 |
21 files changed, 24 insertions, 52 deletions
diff --git a/git-log.html b/git-log.html index f1c87ffd0..1cbab34b4 100644 --- a/git-log.html +++ b/git-log.html @@ -2061,16 +2061,6 @@ 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>
@@ -2081,8 +2071,7 @@ 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>--unsorted-input</code> if <code>sorted</code> or no argument was given.
+ Cannot be combined with <code>--graph</code>.
</p>
</dd>
<dt class="hdlist1">
diff --git a/git-rev-list.html b/git-rev-list.html index f63c76ec6..496fb895d 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -2178,16 +2178,6 @@ 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>
@@ -2198,8 +2188,7 @@ 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>--unsorted-input</code> if <code>sorted</code> or no argument was given.
+ Cannot be combined with <code>--graph</code>.
</p>
</dd>
<dt class="hdlist1">
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 9f923bbf1..7ed1fafff 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-11-10 16:06:20 PST
+ 2021-11-12 15:40:45 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 6d96b3d10..e097b761f 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-11-10 16:06:19 PST
+ 2021-11-12 15:40:44 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index a54d665bc..5eff91033 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-11-10 16:06:20 PST
+ 2021-11-12 15:40:45 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index fe6b4aa57..bcc56779a 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-11-10 16:06:17 PST
+ 2021-11-12 15:40:42 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 1da8a73f0..29cf2cbbf 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-11-10 16:06:19 PST
+ 2021-11-12 15:40:44 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 0ad584164..2f97f9a00 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-11-10 16:06:19 PST
+ 2021-11-12 15:40:44 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 11f110f52..3b6bc5a55 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-11-10 16:06:19 PST
+ 2021-11-12 15:40:44 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 5abfa8023..553691c78 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-11-10 16:06:19 PST
+ 2021-11-12 15:40:44 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 6c8a743a6..6b5beeb34 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-11-10 16:06:19 PST
+ 2021-11-12 15:40:44 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index b0d547548..17ca646ae 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-11-10 16:06:17 PST
+ 2021-11-12 15:40:42 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 9b4cf92da..3d07cde6e 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-11-10 16:06:18 PST
+ 2021-11-12 15:40:43 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index edff7a0cf..cacb88462 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-11-10 16:06:18 PST
+ 2021-11-12 15:40:43 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 8c135a029..527c66505 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-11-10 16:06:18 PST
+ 2021-11-12 15:40:43 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 2624f580a..9ed01e679 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-11-10 16:06:18 PST
+ 2021-11-12 15:40:43 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 242b48a18..ce27ad1fa 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-11-10 16:06:17 PST
+ 2021-11-12 15:40:42 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 094d1c443..07c9dfd78 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-11-10 16:06:17 PST
+ 2021-11-12 15:40:42 PST
</div>
</div>
</body>
diff --git a/rev-list-options.txt b/rev-list-options.txt index b7bd27e17..24569b06d 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -968,11 +968,6 @@ 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 @@ -980,8 +975,7 @@ 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 - `--unsorted-input` if `sorted` or no argument was given. + Cannot be combined with `--graph`. --do-walk:: Overrides a previous `--no-walk`. diff --git a/technical/api-trace2.html b/technical/api-trace2.html index a74c8ebaa..6e4ec0e20 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -854,7 +854,7 @@ git version 2.20.1.155.g426c96fcdb</code></pre> <div class="listingblock">
<div class="content">
<pre><code>$ cat ~/log.event
-{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"3","exe":"2.20.1.155.g426c96fcdb"}
{"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
{"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
{"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
@@ -1235,7 +1235,7 @@ only present on the "start" and "atexit" events.</p></div> <pre><code>{
"event":"version",
...
- "evt":"2", # EVENT format version
+ "evt":"3", # EVENT format version
"exe":"2.20.1.155.g426c96fcdb" # git version
}</code></pre>
</div></div>
@@ -2216,7 +2216,7 @@ Trace2 targets (and convert <key> to a "category"). <div id="footer">
<div id="footer-text">
Last updated
- 2021-10-14 10:10:01 PDT
+ 2021-11-12 15:40:07 PST
</div>
</div>
</body>
diff --git a/technical/api-trace2.txt b/technical/api-trace2.txt index ef7fe02a8..bb13ca3db 100644 --- a/technical/api-trace2.txt +++ b/technical/api-trace2.txt @@ -128,7 +128,7 @@ yields ------------ $ cat ~/log.event -{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"} +{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"3","exe":"2.20.1.155.g426c96fcdb"} {"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]} {"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"} {"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0} @@ -391,7 +391,7 @@ only present on the "start" and "atexit" events. { "event":"version", ... - "evt":"2", # EVENT format version + "evt":"3", # EVENT format version "exe":"2.20.1.155.g426c96fcdb" # git version } ------------ |