Hi Dscho,
On Wed, Jan 13, 2016 at 2:57 PM, Johannes Schindelin
<johannes.schindelin@xxxxxx> wrote:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 07f7a3b..e5897e9 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -865,6 +865,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
I think this change needs to be repeated for the section on
"pull.rebase" as well.
> [...]
> --
> 2.6.3.windows.1.300.g1c25e49
Other than that, builtin/pull.c has the following option definition
that needs to be updated:
{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase, "false|true|preserve",
N_("incorporate changes by rebasing rather than merging"),
The "false|true|preserve" needs to be updated to
"false|true|preserve|interactive", I think.
Regards,
Paul
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html