From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Filipp Gunbin Newsgroups: gmane.emacs.bugs Subject: bug#28408: 26.0.50; support git rebase in vc-dir Date: Wed, 18 May 2022 16:23:15 +0300 Message-ID: References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@gnus.org> <87k0ajlrtv.fsf@tromey.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19741"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (darwin) Cc: 28408@debbugs.gnu.org, Lars Ingebrigtsen To: Tom Tromey Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 18 15:24: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 1nrJfG-0004vC-6s for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 May 2022 15:24:35 +0200 Original-Received: from localhost ([::1]:42374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrJfE-0004k9-Mq for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 May 2022 09:24:32 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrJek-0004iJ-6L for bug-gnu-emacs@gnu.org; Wed, 18 May 2022 09:24:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrJej-000182-Qa for bug-gnu-emacs@gnu.org; Wed, 18 May 2022 09:24:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrJej-00046j-N4 for bug-gnu-emacs@gnu.org; Wed, 18 May 2022 09:24:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Filipp Gunbin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 May 2022 13:24: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.165288020515739 (code B ref 28408); Wed, 18 May 2022 13:24:01 +0000 Original-Received: (at 28408) by debbugs.gnu.org; 18 May 2022 13:23:25 +0000 Original-Received: from localhost ([127.0.0.1]:59425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJe9-00045n-IZ for submit@debbugs.gnu.org; Wed, 18 May 2022 09:23:25 -0400 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrJe7-00045a-MW for 28408@debbugs.gnu.org; Wed, 18 May 2022 09:23:24 -0400 Original-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) Original-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: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrheelgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufgjfhgffffkgggtsehttdertddtredtnecuhfhrohhmpefhihhlihhp phcuifhunhgsihhnuceofhhguhhnsghinhesfhgrshhtmhgrihhlrdhfmheqnecuggftrf grthhtvghrnhepfffhjeevieeiiedutefgheffleeiveeffeeftdekleehledufeeuuedu heevieffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epfhhguhhnsghinhesfhgrshhtmhgrihhlrdhfmh X-ME-Proxy: Feedback-ID: id48c41f1:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 18 May 2022 09:23:17 -0400 (EDT) In-Reply-To: <87k0ajlrtv.fsf@tromey.com> (Tom Tromey's message of "Tue, 17 May 2022 16:25:32 -0600") 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:232563 Archived-At: 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