Fifth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Nov 11, 2020 at 13:16 UTC e31aba42fb12bdeb0f850829e008e1e3f43af500
1 file changed +22
Documentation/RelNotes/2.30.0.txt
+22
@@ -167,6 +167,21 @@ Fixes since v2.29
167 * A recent oid->hash conversion missed one spot, breaking "git svn".
168 (merge 03bb366de4 bc/svn-hash-oid-fix later to maint).
169
170 + * The documentation on the "--abbrev=<n>" option did not say the
171 + output may be longer than "<n>" hexdigits, which has been
172 + clarified.
173 + (merge cda34e0d0c jc/abbrev-doc later to maint).
174 +
175 + * "git p4" now honors init.defaultBranch configuration.
176 + (merge 1b09d1917f js/p4-default-branch later to maint).
177 +
178 + * Recently the format of an internal state file "rebase -i" uses has
179 + been tightened up for consistency, which would hurt those who start
180 + "rebase -i" with old git and then continue with new git. Loosen
181 + the reader side a bit (which we may want to tighten again in a year
182 + or so).
183 + (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint).
184 +
185 * Other code cleanup, docfix, build fix, etc.
186 (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint).
187 (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint).
@@ -177,3 +192,10 @@ Fixes since v2.29
192 (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint).
193 (merge 4e1bee9a99 js/t7006-cleanup later to maint).
194 (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint).
195 + (merge 714d491af0 so/format-patch-doc-on-default-diff-format later to maint).
196 + (merge 0795df4b9b rs/clear-commit-marks-in-repo later to maint).
197 + (merge 9542d56379 sd/prompt-local-variable later to maint).
198 + (merge 06d43fad18 rs/pack-write-hashwrite-simplify later to maint).
199 + (merge b7e20b4373 mc/typofix later to maint).
200 + (merge f6bcd9a8a4 js/test-whitespace-fixes later to maint).
201 + (merge 53b67a801b js/test-file-size later to maint).