public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Sergey Organov <sorganov@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: Johannes Altmanninger <aclopte@gmail•com>,
	git@vger•kernel.org, sandals@crustytoothpaste•net,
	solly.ucko@gmail•com
Subject: Re: rebase -i: quick/inline reword
Date: Sun, 16 Aug 2020 15:24:10 +0300	[thread overview]
Message-ID: <87imdipymt.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqq364n5f0b.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Sat, 15 Aug 2020 22:36:04 -0700")

Junio C Hamano <gitster@pobox•com> writes:

> 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

  reply	other threads:[~2020-08-16 12:24 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-07  4:27 rebase -i: quick/inline reword Solomon Ucko
2020-05-07  4:52 ` Junio C Hamano
2020-05-07 11:46   ` Jeff King
2020-05-07 12:17     ` Sergey Organov
2020-05-07 14:01   ` Solomon Ucko
2020-05-07 10:49 ` Sergey Organov
2020-05-08  0:05   ` brian m. carlson
2020-05-08 21:14     ` Sergey Organov
2020-08-16  0:14       ` Johannes Altmanninger
2020-08-16  5:36         ` Junio C Hamano
2020-08-16 12:24           ` Sergey Organov [this message]
2020-08-16 16:55             ` Junio C Hamano
2020-08-16 12:21         ` Sergey Organov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87imdipymt.fsf@osv.gnss.ru \
    --to=sorganov@gmail$(echo .)com \
    --cc=aclopte@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=sandals@crustytoothpaste$(echo .)net \
    --cc=solly.ucko@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox