Merge branch 'tk/typofix-connect-unknown-proto-error' into maint

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index a67138a022f1ba2e621601fda4852a6026d23f6f..bbbade4f5112645c13bde24b4dcbb929a4f8c4b3 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -197,7 +197,9 @@ start-point is either a local or remote-tracking branch.
 
 --edit-description::
        Open an editor and edit the text to explain what the branch is
-       for, to be used by various other commands (e.g. `request-pull`).
+       for, to be used by various other commands (e.g. `format-patch`,
+       `request-pull`, and `merge` (if enabled)). Multi-line explanations
+       may be used.
 
 --contains [<commit>]::
        Only list branches which contain the specified commit (HEAD