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

Re: rebase -i: quick/inline reword

From
Sergey Organov <sorganov@gmail.com>
Date
Aug 16, 2020, 12:24 UTC
Message-ID
<87imdipymt.fsf@osv.gnss.ru>
In-Reply-To
<xmqq364n5f0b.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 22 quoted lines
> Johannes Altmanninger <aclopte@gmail.com> writes:
>
>>> >   !f() { GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash "$@"; };f
>>> 
>>> These are very good and useful features indeed, and they are examples of
>>> batch processing that is very handy for automation, but lacks
>>> interactivity. What I rather have in mind is being able to put all the
>>> messages /simultaneously/ into my favorite text editor and edit them
>>> more or less freely till I'm satisfied, then "commit" the overall result
>>> by passing it back to git. Essentially "git rebase -i" on steroids.
>>
>> git-revise is a third-party tool that can do this
>>
>> https://git-revise.readthedocs.io/en/latest/
>>
>> For example, "git revise -ie" allows you to edit all commit messages in
>> @{u}..HEAD in a single buffer.
>
> I only looked at its description but the UI the tool does it with
> looks quite obvious and intuitive.  From its source, the "merge"
> operation does not seem to handle merging a side branch that renamed
> files, but that should be OK most of the time, I presume.
From the docs:

No merge commits may occur between the target commit and HEAD, as rewriting them is not supported.

>
> Nice.
Yeah, it is!
-- Sergey
Previous: Junio C HamanoNext: Junio C Hamano
Message 11 of 13 in “rebase -i: quick/inline reword”
  1. Solomon UckoMay 7, 2020
  2. Junio C HamanoMay 7, 2020
  3. Jeff KingMay 7, 2020
  4. Sergey OrganovMay 7, 2020
  5. Solomon UckoMay 7, 2020
  6. Sergey OrganovMay 7, 2020
  7. brian m. carlsonMay 8, 2020
  8. Sergey OrganovMay 8, 2020
  9. Johannes AltmanningerAug 16, 2020
  10. Junio C HamanoAug 16, 2020
  11. Sergey OrganovAug 16, 2020
  12. Junio C HamanoAug 16, 2020
  13. Sergey OrganovAug 16, 2020

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.