From: Phillip Wood <phillip.wood123@gmail.com>
To: git@vger.kernel.org, Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Cc: "Felipe Contreras" <felipe.contreras@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [RFC PATCH] rebase: implement --rewind
Date: Tue, 11 Apr 2023 11:06:04 +0100 [thread overview]
Message-ID: <390e6a25-72db-8a9e-97af-7b9d803cfb2d@gmail.com> (raw)
In-Reply-To: <ZC+/nYp2RRF9Gjrd@ugly>
On 07/04/2023 08:00, Oswald Buddenhagen wrote:
> at this point i'm actually thinking in the opposite direction: introduce
> commands that let me move by a few commits without even opening the todo
> editor (where have i seen that already? jj?).
When I'm working on a patch series I use this approach a lot with a "git
rewrite" script I have. To amend a commit I run "git rewrite amend
<commit>" and it will start a rebase or rewind the current one. It will
also take a file, line number pair and use "git diff" to map that line
onto HEAD and then "git blame" to work out which commit to amend so you
can run it from your editor and say "amend the commit that added this
line" which is a great time saver. I'd love to a command like that
upstream in git but I don't think it covers all the cases that "rebase
--rewind" does such as dscho rebasing git-for-windows.
Best Wishes
Phillip
next prev parent reply other threads:[~2023-04-11 10:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [RFC PATCH] rebase: implement --rewind Oswald Buddenhagen
2023-03-28 14:53 ` Johannes Schindelin
2023-03-28 16:11 ` Oswald Buddenhagen
2023-04-05 12:07 ` Johannes Schindelin
2023-04-05 15:15 ` Oswald Buddenhagen
2023-04-06 10:45 ` Ævar Arnfjörð Bjarmason
2023-04-06 14:49 ` Oswald Buddenhagen
2023-04-07 0:21 ` Felipe Contreras
2023-04-07 7:00 ` Oswald Buddenhagen
2023-04-11 10:06 ` Phillip Wood [this message]
2023-04-06 10:01 ` Phillip Wood
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=390e6a25-72db-8a9e-97af-7b9d803cfb2d@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=oswald.buddenhagen@gmx.de \
--cc=phillip.wood@dunelm.org.uk \
/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).