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

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