diff --git a/Documentation/config.txt b/Documentation/config.txt index 3eb1eddf49..e086b332ec 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -886,7 +886,6 @@ branch..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