rebase -i --root: let the sequencer handle even the initial part

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ce9102cea83766be0ae8d2ed2867fd4c587d7a95..d6bcb5dcb6753dff0d4c170009f1ae986cecb1d1 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1058,6 +1058,10 @@ branch.<name>.rebase::
        "git pull" is run. See "pull.rebase" for doing this in a non
        branch-specific manner.
 +
+When `merges`, pass the `--rebase-merges` option to 'git rebase'
+so that the local merge commits are included in the rebase (see
+linkgit:git-rebase[1] for details).
++
 When preserve, also pass `--preserve-merges` along to 'git rebase'
 so that locally committed merge commits will not be flattened
 by running 'git pull'.
@@ -1957,6 +1961,7 @@ http.sslVersion::
        - tlsv1.0
        - tlsv1.1
        - tlsv1.2
+       - tlsv1.3
 
 +
 Can be overridden by the `GIT_SSL_VERSION` environment variable.
@@ -2616,6 +2621,10 @@ pull.rebase::
        pull" is run. See "branch.<name>.rebase" for setting this on a
        per-branch basis.
 +
+When `merges`, pass the `--rebase-merges` option to 'git rebase'
+so that the local merge commits are included in the rebase (see
+linkgit:git-rebase[1] for details).
++
 When preserve, also pass `--preserve-merges` along to 'git rebase'
 so that locally committed merge commits will not be flattened
 by running 'git pull'.
@@ -3364,7 +3373,7 @@ uploadpack.packObjectsHook::
        stdout.
 
 uploadpack.allowFilter::
-       If this option is set, `upload-pack` will advertise partial
+       If this option is set, `upload-pack` will support partial
        clone and partial fetch object filtering.
 +
 Note that this configuration variable is ignored if it is seen in the