Merge branch 'js/pull-rebase-i'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 07f7a3b771266d488f986cd803e3fd7809533e21..0f710ca3c2fcdfa552c15d346af6995b599b0af4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -870,6 +870,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase'
 so that locally committed merge commits will not be flattened
 by running 'git pull'.
 +
+When the value is `interactive`, the rebase is run in interactive mode.
++
 *NOTE*: this is a possibly dangerous operation; do *not* use
 it unless you understand the implications (see linkgit:git-rebase[1]
 for details).
@@ -2157,6 +2159,8 @@ When preserve, also pass `--preserve-merges` along to 'git rebase'
 so that locally committed merge commits will not be flattened
 by running 'git pull'.
 +
+When the value is `interactive`, the rebase is run in interactive mode.
++
 *NOTE*: this is a possibly dangerous operation; do *not* use
 it unless you understand the implications (see linkgit:git-rebase[1]
 for details).