Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 28408) by debbugs.gnu.org; 22 May 2022 11:15:28 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 22 07:15:28 2022 Received: from localhost ([127.0.0.1]:43747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nsjYV-0006wY-SA for submit <at> debbugs.gnu.org; Sun, 22 May 2022 07:15:28 -0400 Received: from quimby.gnus.org ([95.216.78.240]:39168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1nsjYU-0006wN-Tv for 28408 <at> debbugs.gnu.org; Sun, 22 May 2022 07:15:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; 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=O1DV8Fv/eQBWKRv31yFljCtQ9iYjaXyGcSgrLG94uGk=; b=BRtmecG/A0R+owR206w+jFvbPK pIyH7EJYyh9nX0CJ4cQ4k2ZDClWbjW/f8X5+vhp2IajEreJeugWG5Z57dM2BZVAIUatRdFAS7zCt6 ++hPNiiGDpSs3rRLgWzNjQ2qFo5cRU+Tyn9iQxs1242Q4ZVgNxfBx0nVlKhynYuKB1fY=; Received: from [84.212.220.105] (helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1nsjYL-0005WZ-Md; Sun, 22 May 2022 13:15:19 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Tom Tromey <tom@HIDDEN> Subject: Re: bug#28408: 26.0.50; support git rebase in vc-dir References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@HIDDEN> <87k0ajlrtv.fsf@HIDDEN> <8735h7f6q7.fsf@HIDDEN> <87mtfaeklo.fsf@HIDDEN> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEXy8OxRPUIpFyOk c0v////6Lr75AAAAAWJLR0QEj2jZUQAAAAd0SU1FB+YFFgsMNUcIscIAAAGxSURBVDjLvVNRjuUw CGOUCwxwAsgFyuP+d1ubNKOR9ne1UdOmdcCxoSL/Yah+KwcWaqahF/DwA3j1Wfz70d0L09Vxl64i j5dKZqiF5Qyv1LNKAGq+DTBfy7ANTwWA1e5Z8xahXIQBCPUvrjlJYJOdHL3WBcIgfxglLeSReoGc AF6SutfzLLCXFgLUJuEA5QTyedrSgRLI0VHfstr2Kp6rNMgiEbsJSFvXyZPkkUikgjPwBjv4VSk2 kGq3ynrWcnNYxu3USEtQRPoIZuZXHVegA5GbBACaxC9A85h4G3dAeNApAhEIqhi5qm3jLpSP3eFh YwU02akNuqTSNgTPK7nfQkXAodg1wJBcoGdMhPHFT6g4Gu0HwGyeGYGIGKCo47QDMgOU9JMLPk2K HovVByD29OUf+hBjpxUmdtkpPc03YULE1GmPAWIA+ITv5jiI6vQEvcBvEp9AChv3GbXHot2it13Z Ptp5iLzl429H8wEzR45CR8Xb3kd3fj5M6yWoWd7jpNXb3ADYYTcmf1Zxftb8Naag2CH4bfTW4HcU 2qeiLf9ChKcp/f1NL8DKXS3vsXH9AVnHcuwud4Y2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIyLTA1 LTIyVDExOjEyOjUzKzAwOjAwszC0mwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0wNS0yMlQxMTox Mjo1MyswMDowMMJtDCcAAAAASUVORK5CYII= X-Now-Playing: The Names's _Swimming_: "Floating World" Date: Sun, 22 May 2022 13:15:16 +0200 In-Reply-To: <87mtfaeklo.fsf@HIDDEN> (Tom Tromey's message of "Sat, 21 May 2022 13:44:51 -0600") Message-ID: <87mtf9x1h7.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Tom Tromey <tom@HIDDEN> writes: > "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 [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28408 Cc: 28408 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Tom Tromey <tom@HIDDEN> writes: > "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. Ah, OK -- I've never used "rebase -i" myself. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.Received: (at 28408) by debbugs.gnu.org; 21 May 2022 19:45:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 21 15:45:02 2022 Received: from localhost ([127.0.0.1]:42998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nsV25-0003XR-La for submit <at> debbugs.gnu.org; Sat, 21 May 2022 15:45:01 -0400 Received: from gproxy2-pub.mail.unifiedlayer.com ([69.89.18.3]:52583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <tom@HIDDEN>) id 1nsV23-0003Wt-SP for 28408 <at> debbugs.gnu.org; Sat, 21 May 2022 15:45:00 -0400 Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id F00B310047BB5 for <28408 <at> debbugs.gnu.org>; Sat, 21 May 2022 19:44:53 +0000 (UTC) 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; 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 <tom@HIDDEN>) id 1nsV1x-002kIU-5C; Sat, 21 May 2022 13:44:53 -0600 From: Tom Tromey <tom@HIDDEN> To: Lars Ingebrigtsen <larsi@HIDDEN> Subject: Re: bug#28408: 26.0.50; support git rebase in vc-dir References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@HIDDEN> <87k0ajlrtv.fsf@HIDDEN> <8735h7f6q7.fsf@HIDDEN> X-Attribution: Tom Date: Sat, 21 May 2022 13:44:51 -0600 In-Reply-To: <8735h7f6q7.fsf@HIDDEN> (Lars Ingebrigtsen's message of "Wed, 18 May 2022 12:57:52 +0200") Message-ID: <87mtfaeklo.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: X-Source-Args: X-Source-Dir: 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28408 Cc: 28408 <at> debbugs.gnu.org, Tom Tromey <tom@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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
bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.Received: (at 28408) by debbugs.gnu.org; 18 May 2022 13:23:25 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 18 09:23:25 2022 Received: from localhost ([127.0.0.1]:59425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nrJe9-00045n-IZ for submit <at> debbugs.gnu.org; Wed, 18 May 2022 09:23:25 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <fgunbin@HIDDEN>) id 1nrJe7-00045a-MW for 28408 <at> debbugs.gnu.org; Wed, 18 May 2022 09:23:24 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 41DDA5C008C; Wed, 18 May 2022 09:23:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 18 May 2022 09:23:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.fm; h= cc:cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1652880198; x=1652966598; bh=50K6hGFLn9 Zdjvv1V8eRp9oy/6vR4oz53bKXVbmQoZ4=; b=cSvwHCVch6br+RYJO+ZRuoZrE/ gRMRxPEB8qLLvT5lfHTxHizP923FHGNFpx+JKDM8JDCFZDBA6aINQXgAagUb/nFn 4ucAw2SV2Tt4HthxG3NoekL3ba+6iN7aUlqHR7fEpgt/lVXKun8xE9W/6t36k821 T1l0oCN0o1uYxLekJTekFX9EWqKnchZnt1er1NwV+lN8P1OPD/EVhU9IeYYH6c7D 9aSS/YGEHrOl71+H/ogS/kH6aEpibSQJy/HR3OddWeT8E+ZlOwkz2of/3/YHZULp EqpzsoAXfzG4/WJptKYZA5YI4yOtaBYYuvzyr0/O14gpNEQHBIFYiLYD0uiQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1652880198; x=1652966598; bh=50K6hGFLn9Zdjvv1V8eRp9oy/6vR 4oz53bKXVbmQoZ4=; b=E6dk2w6qEkFED87d7TQ0JfJGFbVgAEO+cNmLD32S1Mq3 AuhR5ccC5761O/gitl7EWiApYeIkprBvXyGSCIXU/LMfNeBjaGm46EiPq+eWiVBn Fd6cwMW7I3VUG0l3k0+QlQnSobYBZNN7f78Y5mGQchFcye3TLAwZqkD8ieVxBaMD W5Twj7PpFPXsLtowbUByiqR8o4cG7AeLncWXDeKRPmB7DiaTsI9VkWCIItCLeK7R hTS9BuJ0SOhx9Rgi6ub3yrce46IaxMeJ4BHrXQ+P0ZOxiTW74j56d5xfcyste7da //sRVjXAeX/ZXu8Trl/WFc8sb4sZHwSUCw/o4K+HLg== X-ME-Sender: <xms:RvOEYkv48ZZUZT7656UKO1XNnDVIDHyqyVsjc6zmn3j8Q5DysaHIXQ> <xme:RvOEYhc2NOEYZKJq5klyvJZ6RhYtaVa0Gnyd9jpwegvjHMz5wYz1O_bfiO2EuOL0Z pomnCett3KW6iOu> X-ME-Received: <xmr:RvOEYvwJaJJNzFbiktbTZ-h0qwoeZjSQ3cktFSd2i_YNy6RMMfa60reem7t8eAE> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrheelgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufgjfhgffffkgggtsehttdertddtredtnecuhfhrohhmpefhihhlihhp phcuifhunhgsihhnuceofhhguhhnsghinhesfhgrshhtmhgrihhlrdhfmheqnecuggftrf grthhtvghrnhepfffhjeevieeiiedutefgheffleeiveeffeeftdekleehledufeeuuedu heevieffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epfhhguhhnsghinhesfhgrshhtmhgrihhlrdhfmh X-ME-Proxy: <xmx:RvOEYnMUeNDwsjc-a0krgVhTNkYncCw4bfb-zaj3qcavYyNZ9uunOw> <xmx:RvOEYk_Lx3Ww1H0Cx11YAGKTtk7UbJLSisIKcs2LUYBU-3lhmkruHA> <xmx:RvOEYvUmdRYk_fSKgOCaQQLgZ51cAUcv4JA1GMDN5OCtD1ejGoW2SA> <xmx:RvOEYikbJPHzTSPi5DAwwP43crlnnro4s-Hl1fy16Ixvq1RByugDjw> Feedback-ID: id48c41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 18 May 2022 09:23:17 -0400 (EDT) From: Filipp Gunbin <fgunbin@HIDDEN> To: Tom Tromey <tom@HIDDEN> Subject: Re: bug#28408: 26.0.50; support git rebase in vc-dir In-Reply-To: <87k0ajlrtv.fsf@HIDDEN> (Tom Tromey's message of "Tue, 17 May 2022 16:25:32 -0600") References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@HIDDEN> <87k0ajlrtv.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (darwin) Date: Wed, 18 May 2022 16:23:15 +0300 Message-ID: <m21qwrvut8.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 28408 Cc: 28408 <at> debbugs.gnu.org, Lars Ingebrigtsen <larsi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) 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
bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.Received: (at 28408) by debbugs.gnu.org; 18 May 2022 10:58:09 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 18 06:58:09 2022 Received: from localhost ([127.0.0.1]:59106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nrHNZ-0001oI-6W for submit <at> debbugs.gnu.org; Wed, 18 May 2022 06:58:09 -0400 Received: from quimby.gnus.org ([95.216.78.240]:37406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1nrHNW-0001nk-SE for 28408 <at> debbugs.gnu.org; Wed, 18 May 2022 06:58:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; 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=VirpOitYT4m3Aqgr+as6o+nM9tZzOm+3HcmwL2BvY0o=; b=T4mvP1yFGT9Am+PbBM42Nm1fGX b8lk1MncL0Dzta0NmItqJnsc6/11MaM2cZYcUzxFqv+nygtt4wajHCdg7y7gh1dq2kjY2/dbb+qDj cvyMUfTow+0/NypOJMoEv4NZgOgJyZFpomxHtS5doleghbL3FnnCvxU1OoD6H2jPCVvY=; Received: from [84.212.220.105] (helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1nrHNN-0006OV-5R; Wed, 18 May 2022 12:57:59 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Tom Tromey <tom@HIDDEN> Subject: Re: bug#28408: 26.0.50; support git rebase in vc-dir References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@HIDDEN> <87k0ajlrtv.fsf@HIDDEN> X-Now-Playing: William Basinski's _The Disintegration Loops_: "DLP 1.1" Date: Wed, 18 May 2022 12:57:52 +0200 In-Reply-To: <87k0ajlrtv.fsf@HIDDEN> (Tom Tromey's message of "Tue, 17 May 2022 16:25:32 -0600") Message-ID: <8735h7f6q7.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Tom Tromey <tom@HIDDEN> writes: > 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 > equiv [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28408 Cc: 28408 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Tom Tromey <tom@HIDDEN> writes: > 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. Doesn't the normal vc flow take care of that without the user having to know about anything? Admittedly, I seldom see any conflicts while rebasing, so I may be misremembering, but I think Emacs just lets you fix the merge errors, commit, and then everything's fine? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.Received: (at 28408) by debbugs.gnu.org; 17 May 2022 22:25:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 17 18:25:53 2022 Received: from localhost ([127.0.0.1]:58287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nr5dZ-0005RD-Bv for submit <at> debbugs.gnu.org; Tue, 17 May 2022 18:25:53 -0400 Received: from outbound-ss-820.bluehost.com ([69.89.24.241]:33652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <tom@HIDDEN>) id 1nr5dX-0005Qz-5u for 28408 <at> debbugs.gnu.org; Tue, 17 May 2022 18:25:52 -0400 Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 40C1D10046B55 for <28408 <at> debbugs.gnu.org>; Tue, 17 May 2022 22:25:34 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id r5dFnOrqqwPf0r5dFnzdQS; Tue, 17 May 2022 22:25:34 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=VLgYI/DX c=1 sm=1 tr=0 ts=628420de 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=e8MawYx5wDF6CDVU16AA: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=rHnb/iHPI8HYJjiqAsr1SeP8sl0KmyJra+PL/SVi4fM=; b=SRayITlSqRb2N2/xp8f14xLvKG WB+MEtv0ROhI8JfxjN00z1wtHOJDCSITXni6WKCVEUkIHNhxdC9O+iFOK7dqSHIEDqWiZuumDnUBB u+Jg4YQGHoPF4dPGSZcRXigre; Received: from [161.98.8.3] (port=52320 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 <tom@HIDDEN>) id 1nr5dF-003Amv-Du; Tue, 17 May 2022 16:25:33 -0600 From: Tom Tromey <tom@HIDDEN> To: Lars Ingebrigtsen <larsi@HIDDEN> Subject: Re: bug#28408: 26.0.50; support git rebase in vc-dir References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@HIDDEN> X-Attribution: Tom Date: Tue, 17 May 2022 16:25:32 -0600 In-Reply-To: <874k1ohrex.fsf@HIDDEN> (Lars Ingebrigtsen's message of "Tue, 17 May 2022 21:48:06 +0200") Message-ID: <87k0ajlrtv.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: 161.98.8.3 X-Source-L: No X-Exim-ID: 1nr5dF-003Amv-Du X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (prentzel) [161.98.8.3]:52320 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28408 Cc: 28408 <at> debbugs.gnu.org, Tom Tromey <tom@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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. thanks, Tom
bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 28408) by debbugs.gnu.org; 17 May 2022 19:48:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 17 15:48:18 2022 Received: from localhost ([127.0.0.1]:58082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1nr3B4-0003En-11 for submit <at> debbugs.gnu.org; Tue, 17 May 2022 15:48:18 -0400 Received: from quimby.gnus.org ([95.216.78.240]:57320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1nr3B2-0003EW-VZ for 28408 <at> debbugs.gnu.org; Tue, 17 May 2022 15:48:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; 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=d+GuPgoKE8xQokgkyqz/B7gU55Vkvy8DI9MsaZI4ofU=; b=XVfO4p8AZyyg7XecTQMCN2jR+x ruyT2uoa6+MP6JVGDbSuPN+5JHXFr3/gNo3kgN2nO2nTkr9NwWM3OxN3z22HTusfoXxghbbo/P/SR ayufsyPXxxqU5E9SgJgz8Lgic2SvAyo1jqcpFLVXr4rVc+hbv+xmuwVR9JJEgc7TVGcI=; Received: from [84.212.220.105] (helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1nr3As-0006qG-Ri; Tue, 17 May 2022 21:48:09 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Tom Tromey <tom@HIDDEN> Subject: Re: bug#28408: 26.0.50; support git rebase in vc-dir References: <874lsa8l4r.fsf@bapiya> X-Now-Playing: Crosby, Stills, Nash & Young's _So Far_: "Deja Vu" Date: Tue, 17 May 2022 21:48:06 +0200 In-Reply-To: <874lsa8l4r.fsf@bapiya> (Tom Tromey's message of "Sun, 10 Sep 2017 12:27:16 -0600") Message-ID: <874k1ohrex.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Tom Tromey <tom@HIDDEN> writes: > I've noticed that one of the few reasons I leave Emacs for the shell is > to run "git rebase". It would be nice if vc-dir had rebase support. > (I realize magit exists, but I generally prefer vc-dir [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28408 Cc: 28408 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Tom Tromey <tom@HIDDEN> writes: > I've noticed that one of the few reasons I leave Emacs for the shell is > to run "git rebase". It would be nice if vc-dir had rebase support. > (I realize magit exists, but I generally prefer vc-dir.) > > Some ideas: > > * vc-git already notices that a rebase is in progress. It could have a > command to "git rebase --continue". > > * Initiating a rebase in Emacs could let one edit the rebase to-do list, > like "git rebase -i". Then when the rebase stops at some point, Emacs > could auto-revert all the affected buffers. > > * It would be very nice if I could rebase local changes to some other > branch using "git rebase --onto". Currently I always need to look up > the syntax when doing this; but Emacs could walk through it more > easily. (I'm going through old bug reports that unfortunately weren't resolved at the time.) I have [pull] rebase = true in ~/.gitconfig, and that makes all this work automatically in vc-dir, I think? That, is I don't think it would be necessary to add anything further in this area. Does anybody else have an opinion here? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.Received: (at submit) by debbugs.gnu.org; 10 Sep 2017 18:27:42 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 14:27:41 2017 Received: from localhost ([127.0.0.1]:59623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1dr6xJ-00063N-HF for submit <at> debbugs.gnu.org; Sun, 10 Sep 2017 14:27:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <tom@HIDDEN>) id 1dr6xH-000638-Jy for submit <at> debbugs.gnu.org; Sun, 10 Sep 2017 14:27:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <tom@HIDDEN>) id 1dr6xA-00023r-NH for submit <at> debbugs.gnu.org; Sun, 10 Sep 2017 14:27:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_50,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:59594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <tom@HIDDEN>) id 1dr6xA-00023T-Kf for submit <at> debbugs.gnu.org; Sun, 10 Sep 2017 14:27:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <tom@HIDDEN>) id 1dr6x8-0004zc-FD for bug-gnu-emacs@HIDDEN; Sun, 10 Sep 2017 14:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <tom@HIDDEN>) id 1dr6x5-0001yM-8i for bug-gnu-emacs@HIDDEN; Sun, 10 Sep 2017 14:27:30 -0400 Received: from gproxy8-pub.mail.unifiedlayer.com ([67.222.33.93]:35272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <tom@HIDDEN>) id 1dr6x4-0001xd-S0 for bug-gnu-emacs@HIDDEN; Sun, 10 Sep 2017 14:27:27 -0400 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy8.mail.unifiedlayer.com (Postfix) with ESMTP id D263D1AB7A6 for <bug-gnu-emacs@HIDDEN>; Sun, 10 Sep 2017 12:27:23 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id 7uTH1w01T2f2jeq01uTLzy; Sun, 10 Sep 2017 12:27:23 -0600 X-Authority-Analysis: v=2.2 cv=OZLoNlbY c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=sTktBo_3Wd7w4qPAnjkA:9 a=3iq2f6CACV_tQ1mc:21 a=WQQPb8qfF8tkiAIy:21 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:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=o8udZBna2n4ukysRzLORYr1ZPYNLqo/9idpBwFXhKqI=; b=HxeQBu7+25rL8stscFZoY3PSr/ CvZ+v3YtnmUEALx4DSJI4DDJxkA0t73ZEq1N8w0lTJ1UmzwJpWY6Eth2EPpq8Gqr2KT+L8evJDBps 3dqu5lLoRvatyC/4D2w2VnUEt; Received: from 75-166-76-94.hlrn.qwest.net ([75.166.76.94]:46636 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from <tom@HIDDEN>) id 1dr6wv-0004jZ-Jb; Sun, 10 Sep 2017 12:27:17 -0600 From: Tom Tromey <tom@HIDDEN> To: bug-gnu-emacs@HIDDEN Subject: 26.0.50; support git rebase in vc-dir X-Attribution: Tom Date: Sun, 10 Sep 2017 12:27:16 -0600 Message-ID: <874lsa8l4r.fsf@bapiya> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - 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: 75.166.76.94 X-Exim-ID: 1dr6wv-0004jZ-Jb X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-76-94.hlrn.qwest.net (bapiya) [75.166.76.94]:46636 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.5 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -4.5 (----) I've noticed that one of the few reasons I leave Emacs for the shell is to run "git rebase". It would be nice if vc-dir had rebase support. (I realize magit exists, but I generally prefer vc-dir.) Some ideas: * vc-git already notices that a rebase is in progress. It could have a command to "git rebase --continue". * Initiating a rebase in Emacs could let one edit the rebase to-do list, like "git rebase -i". Then when the rebase stops at some point, Emacs could auto-revert all the affected buffers. * It would be very nice if I could rebase local changes to some other branch using "git rebase --onto". Currently I always need to look up the syntax when doing this; but Emacs could walk through it more easily. Tom In GNU Emacs 26.0.50 (build 18, x86_64-pc-linux-gnu, GTK+ Version 3.22.17) of 2017-09-09 built on bapiya Repository revision: 4131f9785e30f2a31745125c714e922892113c62 Windowing system distributor 'Fedora Project', version 11.0.11903000 System Description: Fedora release 25 (Twenty Five) Recent messages: Mark set Mark saved where search started [2 times] Saving file /home/tromey/DotEmacs/.emacs... Wrote /home/tromey/DotEmacs/.emacs Save file /home/tromey/DotEmacs/.gnus.el? (y, n, !, ., q, C-r, d or C-h) Save file /home/tromey/DotEmacs/.gnus.el? (y, n, !, ., q, C-r, d or C-h) y Saving file /home/tromey/DotEmacs/.gnus.el... Wrote /home/tromey/DotEmacs/.gnus.el Save file /home/tromey/Mail/drafts/*message*-20170910-121845? (y, n, !, ., q, C-r, d or C-h) Save file /home/tromey/Mail/drafts/*message*-20170910-121845? (y, n, !, ., q, C-r, d or C-h) n Quit Configured using: 'configure --prefix=/home/tromey/Emacs/install' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11 Important settings: value of $LANG: en_US.utf8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Change Log Minor modes in effect: shell-dirtrack-mode: t bug-reference-mode: t diff-auto-refine-mode: t flyspell-mode: t which-function-mode: t erc-services-mode: t erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-networks-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-match-mode: t erc-netsplit-mode: t erc-hl-nicks-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t savehist-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t auto-fill-function: do-auto-fill transient-mark-mode: t Load-path shadows: /home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/26.0.50/lisp/play/bubbles Features: (cus-edit gnus-fun follow org-bullets org-rmail org-mhe org-irc org-info org-gnus org-docview doc-view image-mode org-bibtex bibtex org-bbdb org-w3m org-element avl-tree generator org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint ob-core ob-eval org-compat org-macs org-loaddefs shadow emacsbug make-mode cc-awk texinfo log-edit cl-print debug nndoc gnus-dup debbugs-gnu debbugs soap-client url-http url-auth url-gw rng-xsd rng-dt rng-util xsd-regexp smerge-mode whitespace gnus-html url-queue help-fns radix-tree url-cache mm-url url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf goto-addr log-view pcvs-util term/xterm xterm shell find-file copyright pulse etags xref project vc-mtn vc-hg vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs jka-compr shr-color url-util shr svg xml dom browse-url find-dired add-log misearch multi-isearch bug-reference vc-git diff-mode map cc-mode cc-fonts cc-guess cc-menus cc-cmds dabbrev supercite easy-mmode regi mail-hist nnir flow-fill mm-archive mailalias sort smiley gnus-cite gnus-async gnus-bcklg mail-extr gnus-ml disp-table gnus-topic nndraft nnmh nnfolder utf-7 network-stream nsm starttls gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp gnus-cache gnus-registry registry ebdb-gnus gnus-art mm-uu mml2015 mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo smtpmail gnus-start gnus-cloud nnimap nnmail mail-source tls gnutls utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range gnus-win gnus nnheader elec-pair flyspell ispell diminish edmacro kmacro projectile grep compile ibuf-ext ibuffer ibuffer-loaddefs dash appt diary-lib diary-loaddefs which-func imenu minimap autorevert filenotify cus-start cus-load status erc-services erc-list erc-menu erc-join erc-ring erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit erc-hl-nicks color erc-button erc-fill erc-stamp wid-edit erc-goodies erc erc-backend erc-compat thingatpt pp warnings advice vc-dir ewoc vc vc-dispatcher cc-styles cc-align cc-engine cc-vars cc-defs ebdb-complete ebdb-message sendmail message puny dired dired-loaddefs format-spec rfc822 mml mml-sec epa derived epg gnus-util rmail rmail-loaddefs mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 mm-util ietf-drums mail-prsvr mail-utils gmm-utils mailheader ebdb-mua ebdb-com crm mailabbrev ebdb-format qp ebdb cl-extra help-mode eieio-opt speedbar sb-image ezimage dframe find-func eieio-base pcase subr-x cal-menu calendar cal-loaddefs timezone ange-ftp comint ansi-color ring server savehist finder-inf dwarf-mode-autoloads gdb-shell-autoloads lisppaste-autoloads pydoc-info-autoloads info-look cl weblogger-autoloads info package easymenu epg-config url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache url-vars seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote dbusbind inotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 2470737 547891) (symbols 48 64391 49) (miscs 40 17553 8059) (strings 32 637391 150226) (string-bytes 1 16765213) (vectors 16 260426) (vector-slots 8 4036842 135793) (floats 8 6540 3198) (intervals 56 170892 2451) (buffers 992 220))
Tom Tromey <tom@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#28408; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.