From: Filipp Gunbin <fgunbin@fastmail.fm>
To: Tom Tromey <tom@tromey.com>
Cc: 28408@debbugs.gnu.org, Lars Ingebrigtsen <larsi@gnus.org>
Subject: bug#28408: 26.0.50; support git rebase in vc-dir
Date: Wed, 18 May 2022 16:23:15 +0300 [thread overview]
Message-ID: <m21qwrvut8.fsf@fastmail.fm> (raw)
In-Reply-To: <87k0ajlrtv.fsf@tromey.com> (Tom Tromey's message of "Tue, 17 May 2022 16:25:32 -0600")
On 17/05/2022 16:25 -0600, Tom Tromey wrote:
> Lars> in ~/.gitconfig, and that makes all this work automatically in vc-dir, I
> Lars> think? That, is I don't think it would be necessary to add anything
> Lars> further in this area. Does anybody else have an opinion here?
>
> This is a different thing. It might be nice to have the option of
> rebase on pull from Emacs, rather than merge on pull...
>
> But what I was really asking for here was being able to do the
> equivalent of typical "rebase -i" operations from inside emacs / vc-dir.
Yes, this would be great, I support this request. The interactive
rebase conveniently allows to specify multiple operations, by editing a
file. It could be integrated neatly into vc (which I also prefer over
magit).
For me the most frequent scenario is squashing commits. Currently I
just make a temporary branch, then merge there with --squash, and
force-rename it back to original branch name. This is more natural done
with interactive rebase.
Filipp
prev parent reply other threads:[~2022-05-18 13:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-10 18:27 bug#28408: 26.0.50; support git rebase in vc-dir Tom Tromey
2022-05-17 19:48 ` Lars Ingebrigtsen
2022-05-17 22:25 ` Tom Tromey
2022-05-18 10:57 ` Lars Ingebrigtsen
2022-05-21 19:44 ` Tom Tromey
2022-05-22 11:15 ` Lars Ingebrigtsen
2022-05-18 13:23 ` Filipp Gunbin [this message]
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m21qwrvut8.fsf@fastmail.fm \
--to=fgunbin@fastmail.fm \
--cc=28408@debbugs.gnu.org \
--cc=larsi@gnus.org \
--cc=tom@tromey.com \
/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://git.savannah.gnu.org/cgit/emacs.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).