summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-07-31 22:02:10 +0200
committerJunio C Hamano <gitster@pobox.com>2024-07-31 22:34:21 +0200
commit891ee3b9db5cbd35a9759896f347546c5edb7929 (patch)
tree75d545d152f00a97130fa6789aa513134e5386c5
parentMerge branch 'jc/how-to-maintain-updates' (diff)
downloadgit-891ee3b9db5cbd35a9759896f347546c5edb7929.tar.xz
git-891ee3b9db5cbd35a9759896f347546c5edb7929.zip
Start the 2.47 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.47.0.txt42
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 44 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt
new file mode 100644
index 0000000000..94f217c856
--- /dev/null
+++ b/Documentation/RelNotes/2.47.0.txt
@@ -0,0 +1,42 @@
+Git v2.47 Release Notes
+=======================
+
+UI, Workflows & Features
+------------------------
+
+ * Many Porcelain commands that internally use the merge machinery
+ were taught to consistently honor the diff.algorithm configuration.
+
+
+Performance, Internal Implementation, Development Support etc.
+--------------------------------------------------------------
+
+ * A build tweak knob has been simplified by not setting the value
+ that is already the default; another unused one has been removed.
+
+ * A CI job that use clang-format to check coding style issues in new
+ code has been added.
+
+
+Fixes since v2.46
+-----------------
+
+ * "git add -p" by users with diff.suppressBlankEmpty set to true
+ failed to parse the patch that represents an unmodified empty line
+ with an empty line (not a line with a single space on it), which
+ has been corrected.
+ (merge 60cf761ed1 pw/add-patch-with-suppress-blank-empty later to maint).
+
+ * "git checkout --ours" (no other arguments) complained that the
+ option is incompatible with branch switching, which is technically
+ correct, but found confusing by some users. It now says that the
+ user needs to give pathspec to specify what paths to checkout.
+ (merge d1e6c61272 jc/checkout-no-op-switch-errors later to maint).
+
+ * It has been documented that we avoid "VAR=VAL shell_func" and why.
+ (merge 728a1962cd jc/doc-one-shot-export-with-shell-func later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge 8db8786fc2 jt/doc-post-receive-hook-update later to maint).
+ (merge 1c473dd6af tn/doc-commit-fix later to maint).
+ (merge bb0498b1bb jc/how-to-maintain-updates later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7b81915e52..ee71e9d8aa 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.46.0
+DEF_VER=v2.46.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index cc696fc869..0104513a31 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.46.0.txt \ No newline at end of file
+Documentation/RelNotes/2.47.0.txt \ No newline at end of file