Handle the branch.<name>.rebase value 'interactive'

dscho · kasal · commit e797040bba46 · 2014-05-29T10:41:27.000+02:00
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -768,6 +768,7 @@ 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

Original file line number	Diff line number	Diff line change
`@@ -768,6 +768,7 @@ branch.<name>.rebase::`
`768`	`768`	`instead of merging the default branch from the default remote when`
`769`	`769`	`"git pull" is run. See "pull.rebase" for doing this in a non`
`770`	`770`	`branch-specific manner.`
	`771`	+ When the value is `interactive`, the rebase is run in interactive mode.
`771`	`772`	`+`
`772`	`773`	When preserve, also pass `--preserve-merges` along to 'git rebase'
`773`	`774`	`so that locally committed merge commits will not be flattened`