From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: Alejandro Colomar <alx@kernel.org>, git@vger.kernel.org
Subject: Re: git-rebase-walk
Date: Thu, 01 Oct 2026 10:31:32 -0700 [thread overview]
Message-ID: <xmqqmrsx5nuz.fsf@gitster.g> (raw)
In-Reply-To: <ar5eereSq91xldo-@pks.im> (Patrick Steinhardt's message of "Thu, 1 Oct 2026 15:22:02 +0200")
Patrick Steinhardt <ps@pks.im> writes:
> Maybe that tool is interesting to you. But it's certainly fallen a bit
> out of date, as it hasn't received any updates for more than 6 years by
> now. Chances are it stll works alright though.
>
> [1]: https://github.com/mhagger/git-imerge
;-)
imerge is one of the best things since sliced bread, and what I
still occasinally fall back on when I encounter a really difficult
merges and rebases.
next prev parent reply other threads:[~2026-10-01 17:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 11:58 git-rebase-walk Alejandro Colomar
2026-10-01 13:22 ` git-rebase-walk Patrick Steinhardt
2026-10-01 15:51 ` git-rebase-walk Alejandro Colomar
2026-10-02 6:46 ` git-rebase-walk Patrick Steinhardt
2026-10-02 7:19 ` git-rebase-walk Alejandro Colomar
2026-10-03 19:37 ` git-rebase-walk Nico Williams
2026-10-04 10:03 ` git-rebase-walk Phillip Wood
2026-10-05 13:28 ` git-rebase-walk Alejandro Colomar
2026-10-05 13:37 ` git-rebase-walk Alejandro Colomar
2026-10-06 14:01 ` git-rebase-walk Phillip Wood
2026-10-06 14:58 ` git-rebase-walk Nico Williams
2026-10-06 16:45 ` git-rebase-walk Alejandro Colomar
2026-10-08 22:05 ` git-rebase-walk Alejandro Colomar
2026-10-08 22:07 ` git-rebase-walk Alejandro Colomar
2026-10-01 17:31 ` Junio C Hamano [this message]
2026-10-01 16:10 ` git-rebase-walk Nico Williams
2026-10-01 16:50 ` git-rebase-walk Alejandro Colomar
2026-10-01 17:40 ` git-rebase-walk Nico Williams
2026-10-01 20:29 ` git-rebase-walk Alejandro Colomar
2026-10-01 21:01 ` git-rebase-walk Nico Williams
2026-10-01 21:35 ` git-rebase-walk Nico Williams
2026-10-02 2:49 ` git-rebase-walk Simon Richter
2026-10-02 3:19 ` git-rebase-walk Nico Williams
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=xmqqmrsx5nuz.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alx@kernel.org \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox