From 2ae7e33e0ac3dc2e3f395fc4d0c3fa13bdd65f77 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 26 Jan 2016 16:56:53 +0100 Subject: [PATCH] fixup! Handle the branch..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 --- Documentation/config.txt | 1 - 1 file changed, 1 deletion(-) 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