fixup! Handle the branch.<name>.rebase value 'interactive'

This commit became obsolete when 'pull' became a builtin, and was
redone in a patch series to teach the builtin pull about
--rebase=interactive that has landed in upstream Git already.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-01-26 16:56:53 +01:00
parent 692cbd4758
commit 2ae7e33e0a

View File

@@ -886,7 +886,6 @@ branch.<name>.rebase::
instead of merging the default branch from the default remote when
"git pull" is run. See "pull.rebase" for doing this in a non
branch-specific manner.
When the value is `interactive`, the rebase is run in interactive mode.
+
When preserve, also pass `--preserve-merges` along to 'git rebase'
so that locally committed merge commits will not be flattened