mirror of
https://github.com/git/git.git
synced 2026-02-03 14:31:45 +00:00
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user