git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: ydirson@free.fr
To: git <git@vger.kernel.org>
Subject: [RFC] git-rebase-rewind, nested rebases, remembering stgit
Date: Sat, 13 Mar 2021 17:37:21 +0100 (CET)	[thread overview]
Message-ID: <139173043.431119331.1615653441685.JavaMail.root@zimbra39-e7> (raw)
In-Reply-To: <1641138664.431077840.1615652537045.JavaMail.root@zimbra39-e7>

[-- Attachment #1: Type: text/plain, Size: 1037 bytes --]

Hello there,

I often find myself doing iterative refactorings, which can lead to
long branches, and while rebasing to edit HEAD~10 realize that I first
need to edit HEAD~20 or to add more commits below that stack.

If you've used stgit when it was a thing, you probably see how it
helped doing that.  While git-rebase has grown to do much more than
stgit in most areas, this is still one area where with a pain point
for me.

Here is a small git-rebase-rewind script I've been using for a few weeks,
starting with my most common use-case: automate worklow "edit git-rebase-todo
to prepend 'pick' commands for the N previous commits, then reset --hard HEAD~N".

As you will see from the new needs revealed by using this script (see in the
script header), I believe it would be valuable to integrate such a mechanism
directly into git-rebase.  Notably, "git rebase -i" itself can be seen as a
form of rewind, and this rewind feature would benefit from all the interactive
rebase work.

Does that sound like reasonable premises ?
-- 
Yann

[-- Attachment #2: git-rebase-rewind --]
[-- Type: application/x-shellscript, Size: 2465 bytes --]

       reply	other threads:[~2021-03-13 16:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1641138664.431077840.1615652537045.JavaMail.root@zimbra39-e7>
2021-03-13 16:37 ` ydirson [this message]
2021-03-22  8:49   ` [RFC] git-rebase-rewind, nested rebases, remembering stgit Christian Couder
2021-03-22  9:33     ` ydirson

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=139173043.431119331.1615653441685.JavaMail.root@zimbra39-e7 \
    --to=ydirson@free.fr \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).