From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#28408: 26.0.50; support git rebase in vc-dir Date: Wed, 18 May 2022 12:57:52 +0200 Message-ID: <8735h7f6q7.fsf@gnus.org> 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="20894"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 28408@debbugs.gnu.org To: Tom Tromey Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 18 12:59:50 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 1nrHPC-0005H0-ES for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 May 2022 12:59:50 +0200 Original-Received: from localhost ([::1]:37504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrHPA-0000XA-V7 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 May 2022 06:59:49 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrHOW-0000Wr-Hu for bug-gnu-emacs@gnu.org; Wed, 18 May 2022 06:59:10 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrHOQ-0005Ep-1X for bug-gnu-emacs@gnu.org; Wed, 18 May 2022 06:59:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrHOP-0001pQ-R1 for bug-gnu-emacs@gnu.org; Wed, 18 May 2022 06:59:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 May 2022 10:59: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.16528714896966 (code B ref 28408); Wed, 18 May 2022 10:59:01 +0000 Original-Received: (at 28408) by debbugs.gnu.org; 18 May 2022 10:58:09 +0000 Original-Received: from localhost ([127.0.0.1]:59106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrHNZ-0001oI-6W for submit@debbugs.gnu.org; Wed, 18 May 2022 06:58:09 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:37406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrHNW-0001nk-SE for 28408@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=; Original-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 ) id 1nrHNN-0006OV-5R; Wed, 18 May 2022 12:57:59 +0200 X-Now-Playing: William Basinski's _The Disintegration Loops_: "DLP 1.1" 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:232536 Archived-At: Tom Tromey 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