git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 1/3] pull: allow interactive rebase with --rebase=interactive

From
Paul Tan <pyokagan@gmail.com>
Date
Jan 13, 2016, 10:33 UTC
Message-ID
<CACRoPnS_CcAuu_jBo9zcjycSN4kvSQhCONNYnY1XRnarRF9Zmw@mail.gmail.com>
In-Reply-To
<2ebf99214ba600b63a39c58bcb9abb7941a7619d.1452668201.git.johannes.schindelin@gmx.de>
Hi Dscho,

On Wed, Jan 13, 2016 at 2:57 PM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

Show 12 quoted lines
> 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

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 16 of 27 in “Support `git pull --rebase=interactive`”
  1. 0/3 Support `git pull --rebase=interactive`Johannes Schindelin, Jan 12, 2016
  2. 1/3 Teach 'git pull' to handle --rebase=interactiveJohannes Schindelin, Jan 12, 2016
  3. Junio C HamanoJan 12, 2016
  4. Johannes SchindelinJan 13, 2016
  5. 2/3 Teach 'git remote' that the config var branch.*.rebase can be 'interactive'Johannes Schindelin, Jan 12, 2016
  6. Junio C HamanoJan 12, 2016
  7. Johannes SchindelinJan 13, 2016
  8. Matthieu MoyJan 13, 2016
  9. Johannes SchindelinJan 13, 2016
  10. Matthieu MoyJan 13, 2016
  11. Johannes SchindelinJan 13, 2016
  12. 3/3 completion: add missing branch.*.rebase valuesJohannes Schindelin, Jan 12, 2016
  13. Junio C HamanoJan 12, 2016
  14. 0/3 Support `git pull --rebase=interactive`Johannes Schindelin, Jan 13, 2016
  15. 1/3 pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin, Jan 13, 2016
  16. Paul TanJan 13, 2016
  17. Johannes SchindelinJan 13, 2016
  18. Junio C HamanoJan 13, 2016
  19. Johannes SchindelinJan 13, 2016
  20. Junio C HamanoJan 13, 2016
  21. 2/3 remote: handle the config setting branch.*.rebase=interactiveJohannes Schindelin, Jan 13, 2016
  22. 3/3 completion: add missing branch.*.rebase valuesJohannes Schindelin, Jan 13, 2016
  23. 0/3 Support `git pull --rebase=interactive`Johannes Schindelin, Jan 13, 2016
  24. 1/3 pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin, Jan 13, 2016
  25. 2/3 remote: handle the config setting branch.*.rebase=interactiveJohannes Schindelin, Jan 13, 2016
  26. 3/3 completion: add missing branch.*.rebase valuesJohannes Schindelin, Jan 13, 2016
  27. Junio C HamanoJan 13, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.