From 5168fca6deb6771123ade4733b3a0836115f942a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 21 Oct 2011 23:27:37 -0500 Subject: [PATCH] Handle the branch..rebase value 'interactive' Signed-off-by: Johannes Schindelin --- Documentation/config.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index a65cdd43c2..52364da208 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -857,6 +857,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