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

dscho · dscho · commit 0b7d80dbcf4a · 2015-03-20T14:11:38.000+01:00
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -805,6 +805,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
`@@ -805,6 +805,7 @@ branch.<name>.rebase::`
`805`	`805`	`instead of merging the default branch from the default remote when`
`806`	`806`	`"git pull" is run. See "pull.rebase" for doing this in a non`
`807`	`807`	`branch-specific manner.`
	`808`	+ When the value is `interactive`, the rebase is run in interactive mode.
`808`	`809`	`+`
`809`	`810`	When preserve, also pass `--preserve-merges` along to 'git rebase'
`810`	`811`	`so that locally committed merge commits will not be flattened`