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
Junio C Hamano <gitster@pobox.com>
Date
Jan 13, 2016, 17:36 UTC
Message-ID
<xmqqd1t5pej1.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<2ebf99214ba600b63a39c58bcb9abb7941a7619d.1452668201.git.johannes.schindelin@gmx.de>
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
Show 5 quoted lines
> The way builtin pull works, this change also supports the value
> 'interactive' for the 'branch.<name>.rebase' config variable, which
> is a neat thing because users can now configure given branches for
> interactively-rebasing pulls without having to type out the complete
> `--rebase=interactive` option every time they pull.

Surely this is a better description about the "config also works and it is a good thing" part. What I was alluding to was actually this you wrote in 0/3:

    A couple of years ago, I found the need to collaborate on topic
    branches that were rebased all the time, and I really needed to
    see what I was rebasing when pulling, so I introduced an
    interactively-rebasing pull.

that justifies why allowing 'pull' to invoke interactive rebase is a good thing, which should go before all of the above five lines.

I see you have v3 already (and I read Paul's "you missed these"), which I haven't read yet, but I expect the actual changes are good and no longer need rerolling, so I may just insert these four lines at the beginning of the log message while queuing, or something.

Thanks, both.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 18 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.