From: Tom Tromey <tom@tromey.com>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 28408@debbugs.gnu.org, Tom Tromey <tom@tromey.com>
Subject: bug#28408: 26.0.50; support git rebase in vc-dir
Date: Sat, 21 May 2022 13:44:51 -0600 [thread overview]
Message-ID: <87mtfaeklo.fsf@tromey.com> (raw)
In-Reply-To: <8735h7f6q7.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 18 May 2022 12:57:52 +0200")
Lars> Doesn't the normal vc flow take care of that without the user having to
Lars> know about anything? Admittedly, I seldom see any conflicts while
Lars> rebasing, so I may be misremembering, but I think Emacs just lets you
Lars> fix the merge errors, commit, and then everything's fine?
"rebase -i" is a mode that lets you reorder commits, squash commits, or
stop in the middle and edit or add new commits mid-rebase... it's not
really about conflicts or pull. It's the typical git thing where the
same command may mean wildly different things depending on the
arguments.
Tom
next prev parent reply other threads:[~2022-05-21 19:44 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 [this message]
2022-05-22 11:15 ` Lars Ingebrigtsen
2022-05-18 13:23 ` Filipp Gunbin
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=87mtfaeklo.fsf@tromey.com \
--to=tom@tromey.com \
--cc=28408@debbugs.gnu.org \
--cc=larsi@gnus.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.