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

dscho · kblees · commit e46c4d26e045 · 2014-08-16T02:59:55.000+02:00
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -776,6 +776,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
`@@ -776,6 +776,7 @@ branch.<name>.rebase::`
`776`	`776`	`instead of merging the default branch from the default remote when`
`777`	`777`	`"git pull" is run. See "pull.rebase" for doing this in a non`
`778`	`778`	`branch-specific manner.`
	`779`	+ When the value is `interactive`, the rebase is run in interactive mode.
`779`	`780`	`+`
`780`	`781`	When preserve, also pass `--preserve-merges` along to 'git rebase'
`781`	`782`	`so that locally committed merge commits will not be flattened`