Merge branch 'en/merge-options-ff-and-friends'

diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
index b76a45de627d13282c33ed21554261fa774f006c..aa99d4b3cef0f92ea5fc314ea8f77be5b665cb3e 100644 (file)
--- a/Documentation/RelNotes/2.13.0.txt
+++ b/Documentation/RelNotes/2.13.0.txt
@@ -579,6 +579,13 @@ notes for details).
  * Many stale HTTP(s) links have been updated in our documentation.
    (merge 613416f0be jk/update-links-in-docs later to maint).
 
+ * "git-shell" rejects a request to serve a repository whose name
+   begins with a dash, which makes it no longer possible to get it
+   confused into spawning service programs like "git-upload-pack" with
+   an option like "--help", which in turn would spawn an interactive
+   pager, instead of working with the repository user asked to access
+   (i.e. the one whose name is "--help").
+
  * Other minor doc, test and build updates and code cleanups.
    (merge df2a6e38b7 jk/pager-in-use later to maint).
    (merge 75ec4a6cb0 ab/branch-list-doc later to maint).
@@ -606,3 +613,6 @@ notes for details).
    (merge 8d3047cd5b ss/submodule-shallow-doc later to maint).
    (merge 1f9e18b772 jk/prio-queue-avoid-swap-with-self later to maint).
    (merge 627fde1025 jk/submodule-init-segv-fix later to maint).
+   (merge d395745d81 rg/doc-pull-typofix later to maint).
+   (merge 01e60a9a22 rg/doc-submittingpatches-wordfix later to maint).
+   (merge 501d3cd7b8 sr/hooks-cwd-doc later to maint).