From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.bugs Subject: bug#28408: 26.0.50; support git rebase in vc-dir Date: Sat, 21 May 2022 13:44:51 -0600 Message-ID: <87mtfaeklo.fsf@tromey.com> References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@gnus.org> <87k0ajlrtv.fsf@tromey.com> <8735h7f6q7.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23835"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) Cc: 28408@debbugs.gnu.org, Tom Tromey To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 21 21:46:35 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsV3a-0005yN-P0 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 21 May 2022 21:46:34 +0200 Original-Received: from localhost ([::1]:55834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsV3Z-0001DK-A4 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 21 May 2022 15:46:33 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsV34-0001CS-8X for bug-gnu-emacs@gnu.org; Sat, 21 May 2022 15:46:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsV33-0008Pu-Vw for bug-gnu-emacs@gnu.org; Sat, 21 May 2022 15:46:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nsV33-0003Z8-Ry for bug-gnu-emacs@gnu.org; Sat, 21 May 2022 15:46:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 May 2022 19:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28408 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 28408-submit@debbugs.gnu.org id=B28408.165316230213623 (code B ref 28408); Sat, 21 May 2022 19:46:01 +0000 Original-Received: (at 28408) by debbugs.gnu.org; 21 May 2022 19:45:02 +0000 Original-Received: from localhost ([127.0.0.1]:42998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsV25-0003XR-La for submit@debbugs.gnu.org; Sat, 21 May 2022 15:45:01 -0400 Original-Received: from gproxy2-pub.mail.unifiedlayer.com ([69.89.18.3]:52583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsV23-0003Wt-SP for 28408@debbugs.gnu.org; Sat, 21 May 2022 15:45:00 -0400 Original-Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id F00B310047BB5 for <28408@debbugs.gnu.org>; Sat, 21 May 2022 19:44:53 +0000 (UTC) Original-Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id sV1xnDKsej8kTsV1xnGQMC; Sat, 21 May 2022 19:44:53 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=MbSpB7zf c=1 sm=1 tr=0 ts=62894135 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=oZkIemNP1mAA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=qeAcK1_oliyaqKTjSoUA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:References :Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=CdIrvYdJG7NvU9zzfdFAUiU87GOHBgrM7rnnWH4D3lU=; b=BRBWV2TyDHvYMVnKHNJAxTfaUW OsOZqogBYjav3QGFqawGLLi3IiyQt8w4P6yVtIeJvU0yuRuio6uuIycMkyyO6+F8q+4occcftrgRY zvcv76exe63Fz+iwHVigyFk64; Original-Received: from 71-211-158-194.hlrn.qwest.net ([71.211.158.194]:34934 helo=prentzel) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nsV1x-002kIU-5C; Sat, 21 May 2022 13:44:53 -0600 X-Attribution: Tom In-Reply-To: <8735h7f6q7.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 18 May 2022 12:57:52 +0200") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.158.194 X-Source-L: No X-Exim-ID: 1nsV1x-002kIU-5C X-Source-Sender: 71-211-158-194.hlrn.qwest.net (prentzel) [71.211.158.194]:34934 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:232850 Archived-At: 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