unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Manuel Uberti <manuel.uberti@inventati.org>
To: emacs-devel <emacs-devel@gnu.org>
Subject: vc-git: interactive rebasing
Date: Fri, 3 Dec 2021 11:13:38 +0100	[thread overview]
Message-ID: <38be4a33-d755-a317-b7fd-ceb0f88c4416@inventati.org> (raw)

Hello everyone,

as my recent bug report[1] and some writings on my blog[2] witness, I've been 
using and actually really liking the built-in VC. Beside thanking everyone 
involved with this feature, I'd like to know how one can approach an interactive 
rebase with it.

Let me try to provide an example. Usually, 'M-! git rebase master' is enough 
when I work on my projects, but sometimes I need to squash commits before 
pushing. Is it possible to rely on VC for this? If it is not a problem, could 
you describe how you would do it?

Note that relying on 'M-!' or 'shell-mode' is good too for me. As long as 
everything can be done from Emacs, I am not asking to extend VC just for this 
specific workflow.

BTW, before anyone suggests it: I know this is all doable from Magit, I was 
using Magit before (and I still have it installed). I am just trying to 
understand a different approach in order to decide which one suits me best.



[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52158
[2] https://www.manueluberti.eu/emacs/2021/11/27/vc/

-- 
Manuel Uberti
www.manueluberti.eu



             reply	other threads:[~2021-12-03 10:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03 10:13 Manuel Uberti [this message]
2021-12-03 12:40 ` vc-git: interactive rebasing Dmitry Gutov
2021-12-03 13:16   ` Manuel Uberti
2021-12-03 13:26     ` Dmitry Gutov
2021-12-03 14:23       ` Manuel Uberti
2021-12-03 13:20 ` Stefan Monnier
2021-12-03 18:46 ` Thierry Volpiatto
2021-12-04  8:18   ` Manuel Uberti

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=38be4a33-d755-a317-b7fd-ceb0f88c4416@inventati.org \
    --to=manuel.uberti@inventati.org \
    --cc=emacs-devel@gnu.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://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).