Git fork

Start the 2.47 cycle

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

+44 -2
+42
Documentation/RelNotes/2.47.0.txt
··· 1 + Git v2.47 Release Notes 2 + ======================= 3 + 4 + UI, Workflows & Features 5 + ------------------------ 6 + 7 + * Many Porcelain commands that internally use the merge machinery 8 + were taught to consistently honor the diff.algorithm configuration. 9 + 10 + 11 + Performance, Internal Implementation, Development Support etc. 12 + -------------------------------------------------------------- 13 + 14 + * A build tweak knob has been simplified by not setting the value 15 + that is already the default; another unused one has been removed. 16 + 17 + * A CI job that use clang-format to check coding style issues in new 18 + code has been added. 19 + 20 + 21 + Fixes since v2.46 22 + ----------------- 23 + 24 + * "git add -p" by users with diff.suppressBlankEmpty set to true 25 + failed to parse the patch that represents an unmodified empty line 26 + with an empty line (not a line with a single space on it), which 27 + has been corrected. 28 + (merge 60cf761ed1 pw/add-patch-with-suppress-blank-empty later to maint). 29 + 30 + * "git checkout --ours" (no other arguments) complained that the 31 + option is incompatible with branch switching, which is technically 32 + correct, but found confusing by some users. It now says that the 33 + user needs to give pathspec to specify what paths to checkout. 34 + (merge d1e6c61272 jc/checkout-no-op-switch-errors later to maint). 35 + 36 + * It has been documented that we avoid "VAR=VAL shell_func" and why. 37 + (merge 728a1962cd jc/doc-one-shot-export-with-shell-func later to maint). 38 + 39 + * Other code cleanup, docfix, build fix, etc. 40 + (merge 8db8786fc2 jt/doc-post-receive-hook-update later to maint). 41 + (merge 1c473dd6af tn/doc-commit-fix later to maint). 42 + (merge bb0498b1bb jc/how-to-maintain-updates later to maint).
+1 -1
GIT-VERSION-GEN
··· 1 1 #!/bin/sh 2 2 3 3 GVF=GIT-VERSION-FILE 4 - DEF_VER=v2.46.0 4 + DEF_VER=v2.46.GIT 5 5 6 6 LF=' 7 7 '
+1 -1
RelNotes
··· 1 - Documentation/RelNotes/2.46.0.txt 1 + Documentation/RelNotes/2.47.0.txt