The second batch

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

diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt
index 94f217c856a79d6ca10b14f63c1d75720c8bfdb5..fc713b46965190af70d0973d19df94db8c40af38 100644 (file)
--- a/Documentation/RelNotes/2.47.0.txt
+++ b/Documentation/RelNotes/2.47.0.txt
@@ -7,6 +7,8 @@ UI, Workflows & Features
  * Many Porcelain commands that internally use the merge machinery
    were taught to consistently honor the diff.algorithm configuration.
 
+ * A few descriptions in "git show-ref -h" have been clarified.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -17,6 +19,9 @@ Performance, Internal Implementation, Development Support etc.
  * A CI job that use clang-format to check coding style issues in new
    code has been added.
 
+ * The reviewing guidelines document now explicitly encourages people
+   to give positive reviews and how.
+
 
 Fixes since v2.46
 -----------------
@@ -36,6 +41,11 @@ Fixes since v2.46
  * 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).
 
+ * "git rebase --help" referred to "offset" (the difference between
+   the location a change was taken from and the change gets replaced)
+   incorrectly and called it "fuzz", which has been corrected.
+   (merge 70058db385 jc/doc-rebase-fuzz-vs-offset-fix 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).