diff --git a/Documentation/config.txt b/Documentation/config.txt index f61788668e..af7b693793 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -865,6 +865,7 @@ 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