Skip to content

Commit d1d37cf

Browse files
committed
Autogenerated HTML docs for v2.51.0-68-g954d33
1 parent 56cee71 commit d1d37cf

File tree

5 files changed

+211
-111
lines changed

5 files changed

+211
-111
lines changed

RelNotes/2.52.0.adoc

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
Git v2.52 Release Notes
2+
=======================
3+
4+
UI, Workflows & Features
5+
------------------------
6+
7+
8+
Performance, Internal Implementation, Development Support etc.
9+
--------------------------------------------------------------
10+
11+
* string_list_split*() family of functions have been extended to
12+
simplify common use cases.
13+
14+
* Arrays of strbuf is often a wrong data structure to use, and
15+
strbuf_split*() family of functions that create them often have
16+
better alternatives. Update several code paths and replace
17+
strbuf_split*().
18+
19+
* Revision traversal limited with pathspec, like "git log dir/*",
20+
used to ignore changed-paths Bloom filter when the pathspec
21+
contained wildcards; now they take advantage of the filter when
22+
they can.
23+
24+
Fixes since v2.51
25+
-----------------
26+
27+
Unless otherwise noted, all the changes in 2.51.X maintenance track,
28+
including security updates, are included in this release.
29+
30+
* During interactive rebase, using 'drop' on a merge commit lead to
31+
an error, which was incorrect.
32+
(merge 4d491ade8f js/rebase-i-allow-drop-on-a-merge later to maint).
33+
34+
* "git refs migrate" to migrate the reflog entries from a refs
35+
backend to another had a handful of bugs squashed.
36+
(merge 465eff81de ps/reflog-migrate-fixes later to maint).
37+
38+
* "git remote rename origin upstream" failed to move origin/HEAD to
39+
upstream/HEAD when origin/HEAD is unborn and performed other
40+
renames extremely inefficiently, which has been corrected.
41+
(merge 16c4fa26b9 ps/remote-rename-fix later to maint).
42+
43+
* "git describe" has been optimized by using better data structure.
44+
(merge 08bb69d70f rs/describe-with-prio-queue later to maint).
45+
46+
* "git push" had a code path that led to BUG() but it should have
47+
been a die(), as it is a response to a usual but invalid end-user
48+
action to attempt pushing an object that does not exist.
49+
(merge dfbfc2221b dl/push-missing-object-error later to maint).
50+
51+
* Various bugs about rename handling in "ort" merge strategy have
52+
been fixed.
53+
(merge f6ecb603ff en/ort-rename-fixes later to maint).
54+
55+
* Other code cleanup, docfix, build fix, etc.
56+
(merge 823d537fa7 kh/doc-git-log-markup-fix later to maint).
57+
(merge cf7efa4f33 rj/t6137-cygwin-fix later to maint).
58+
(merge 529a60a885 ua/t1517-short-help-tests later to maint).

git-config.html

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6520,14 +6520,27 @@ <h3 id="_variables">Variables</h3>
65206520
<dd>
65216521
<p>Print out the ref names of any commits that are shown by the log
65226522
command. Possible values are:</p>
6523-
<div class="listingblock">
6523+
<div class="openblock">
65246524
<div class="content">
6525-
<pre>`short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
6526-
`refs/remotes/` are not printed.
6527-
`full`;; the full ref name (including prefix) are printed.
6528-
`auto`;; if the output is going to a terminal,
6529-
the ref names are shown as if `short` were given, otherwise no ref
6530-
names are shown.</pre>
6525+
<div class="dlist">
6526+
<dl>
6527+
<dt class="hdlist1"><code>short</code></dt>
6528+
<dd>
6529+
<p>the ref name prefixes <code>refs/heads/</code>, <code>refs/tags/</code> and
6530+
<code>refs/remotes/</code> are not printed.</p>
6531+
</dd>
6532+
<dt class="hdlist1"><code>full</code></dt>
6533+
<dd>
6534+
<p>the full ref name (including prefix) are printed.</p>
6535+
</dd>
6536+
<dt class="hdlist1"><code>auto</code></dt>
6537+
<dd>
6538+
<p>if the output is going to a terminal,
6539+
the ref names are shown as if <code>short</code> were given, otherwise no ref
6540+
names are shown.</p>
6541+
</dd>
6542+
</dl>
6543+
</div>
65316544
</div>
65326545
</div>
65336546
<div class="paragraph">

git-log.html

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4279,14 +4279,27 @@ <h2 id="_configuration">CONFIGURATION</h2>
42794279
<dd>
42804280
<p>Print out the ref names of any commits that are shown by the log
42814281
command. Possible values are:</p>
4282-
<div class="listingblock">
4282+
<div class="openblock">
42834283
<div class="content">
4284-
<pre>`short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
4285-
`refs/remotes/` are not printed.
4286-
`full`;; the full ref name (including prefix) are printed.
4287-
`auto`;; if the output is going to a terminal,
4288-
the ref names are shown as if `short` were given, otherwise no ref
4289-
names are shown.</pre>
4284+
<div class="dlist">
4285+
<dl>
4286+
<dt class="hdlist1"><code>short</code></dt>
4287+
<dd>
4288+
<p>the ref name prefixes <code>refs/heads/</code>, <code>refs/tags/</code> and
4289+
<code>refs/remotes/</code> are not printed.</p>
4290+
</dd>
4291+
<dt class="hdlist1"><code>full</code></dt>
4292+
<dd>
4293+
<p>the full ref name (including prefix) are printed.</p>
4294+
</dd>
4295+
<dt class="hdlist1"><code>auto</code></dt>
4296+
<dd>
4297+
<p>if the output is going to a terminal,
4298+
the ref names are shown as if <code>short</code> were given, otherwise no ref
4299+
names are shown.</p>
4300+
</dd>
4301+
</dl>
4302+
</div>
42904303
</div>
42914304
</div>
42924305
<div class="paragraph">

git-reflog.adoc

Lines changed: 52 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ git-reflog - Manage reflog information
88

99
SYNOPSIS
1010
--------
11-
[verse]
12-
'git reflog' [show] [<log-options>] [<ref>]
13-
'git reflog list'
14-
'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
11+
[synopsis]
12+
git reflog [show] [<log-options>] [<ref>]
13+
git reflog list
14+
git reflog exists <ref>
15+
git reflog write <ref> <old-oid> <new-oid> <message>
16+
git reflog delete [--rewrite] [--updateref]
17+
[--dry-run | -n] [--verbose] <ref>@{<specifier>}...
18+
git reflog drop [--all [--single-worktree] | <refs>...]
19+
git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
1520
[--rewrite] [--updateref] [--stale-fix]
1621
[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
17-
'git reflog delete' [--rewrite] [--updateref]
18-
[--dry-run | -n] [--verbose] <ref>@{<specifier>}...
19-
'git reflog drop' [--all [--single-worktree] | <refs>...]
20-
'git reflog exists' <ref>
2122

2223
DESCRIPTION
2324
-----------
@@ -43,11 +44,15 @@ actions, and in addition the `HEAD` reflog records branch switching.
4344

4445
The "list" subcommand lists all refs which have a corresponding reflog.
4546

46-
The "expire" subcommand prunes older reflog entries. Entries older
47-
than `expire` time, or entries older than `expire-unreachable` time
48-
and not reachable from the current tip, are removed from the reflog.
49-
This is typically not used directly by end users -- instead, see
50-
linkgit:git-gc[1].
47+
The "exists" subcommand checks whether a ref has a reflog. It exits
48+
with zero status if the reflog exists, and non-zero status if it does
49+
not.
50+
51+
The "write" subcommand writes a single entry to the reflog of a given
52+
reference. This new entry is appended to the reflog and will thus become
53+
the most recent entry. The reference name must be fully qualified. Both the old
54+
and new object IDs must not be abbreviated and must point to existing objects.
55+
The reflog message gets normalized.
5156

5257
The "delete" subcommand deletes single entries from the reflog, but
5358
not the reflog itself. Its argument must be an _exact_ entry (e.g. "`git
@@ -58,9 +63,11 @@ The "drop" subcommand completely removes the reflog for the specified
5863
references. This is in contrast to "expire" and "delete", both of which
5964
can be used to delete reflog entries, but not the reflog itself.
6065

61-
The "exists" subcommand checks whether a ref has a reflog. It exits
62-
with zero status if the reflog exists, and non-zero status if it does
63-
not.
66+
The "expire" subcommand prunes older reflog entries. Entries older
67+
than `expire` time, or entries older than `expire-unreachable` time
68+
and not reachable from the current tip, are removed from the reflog.
69+
This is typically not used directly by end users -- instead, see
70+
linkgit:git-gc[1].
6471

6572
OPTIONS
6673
-------
@@ -71,26 +78,45 @@ Options for `show`
7178
`git reflog show` accepts any of the options accepted by `git log`.
7279

7380

81+
Options for `delete`
82+
~~~~~~~~~~~~~~~~~~~~
83+
84+
`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`,
85+
`--dry-run`, and `--verbose`, with the same meanings as when they are
86+
used with `expire`.
87+
88+
Options for `drop`
89+
~~~~~~~~~~~~~~~~~~
90+
91+
`--all`::
92+
Drop the reflogs of all references from all worktrees.
93+
94+
`--single-worktree`::
95+
By default when `--all` is specified, reflogs from all working
96+
trees are dropped. This option limits the processing to reflogs
97+
from the current working tree only.
98+
99+
74100
Options for `expire`
75101
~~~~~~~~~~~~~~~~~~~~
76102

77-
--all::
103+
`--all`::
78104
Process the reflogs of all references.
79105

80-
--single-worktree::
106+
`--single-worktree`::
81107
By default when `--all` is specified, reflogs from all working
82108
trees are processed. This option limits the processing to reflogs
83109
from the current working tree only.
84110

85-
--expire=<time>::
111+
`--expire=<time>`::
86112
Prune entries older than the specified time. If this option is
87113
not specified, the expiration time is taken from the
88114
configuration setting `gc.reflogExpire`, which in turn
89115
defaults to 90 days. `--expire=all` prunes entries regardless
90116
of their age; `--expire=never` turns off pruning of reachable
91117
entries (but see `--expire-unreachable`).
92118

93-
--expire-unreachable=<time>::
119+
`--expire-unreachable=<time>`::
94120
Prune entries older than `<time>` that are not reachable from
95121
the current tip of the branch. If this option is not
96122
specified, the expiration time is taken from the configuration
@@ -100,17 +126,17 @@ Options for `expire`
100126
turns off early pruning of unreachable entries (but see
101127
`--expire`).
102128

103-
--updateref::
129+
`--updateref`::
104130
Update the reference to the value of the top reflog entry (i.e.
105131
<ref>@\{0\}) if the previous top entry was pruned. (This
106132
option is ignored for symbolic references.)
107133

108-
--rewrite::
134+
`--rewrite`::
109135
If a reflog entry's predecessor is pruned, adjust its "old"
110136
SHA-1 to be equal to the "new" SHA-1 field of the entry that
111137
now precedes it.
112138

113-
--stale-fix::
139+
`--stale-fix`::
114140
Prune any reflog entries that point to "broken commits". A
115141
broken commit is a commit that is not reachable from any of
116142
the reference tips and that refers, directly or indirectly, to
@@ -121,33 +147,15 @@ has the same cost as 'git prune'. It is primarily intended to fix
121147
corruption caused by garbage collecting using older versions of Git,
122148
which didn't protect objects referred to by reflogs.
123149

124-
-n::
125-
--dry-run::
150+
`-n`::
151+
`--dry-run`::
126152
Do not actually prune any entries; just show what would have
127153
been pruned.
128154

129-
--verbose::
155+
`--verbose`::
130156
Print extra information on screen.
131157

132158

133-
Options for `delete`
134-
~~~~~~~~~~~~~~~~~~~~
135-
136-
`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`,
137-
`--dry-run`, and `--verbose`, with the same meanings as when they are
138-
used with `expire`.
139-
140-
Options for `drop`
141-
~~~~~~~~~~~~~~~~~~
142-
143-
--all::
144-
Drop the reflogs of all references from all worktrees.
145-
146-
--single-worktree::
147-
By default when `--all` is specified, reflogs from all working
148-
trees are dropped. This option limits the processing to reflogs
149-
from the current working tree only.
150-
151159
GIT
152160
---
153161
Part of the linkgit:git[1] suite

0 commit comments

Comments
 (0)