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: Sun, 22 May 2022 13:15:16 +0200 Message-ID: <87mtf9x1h7.fsf@gnus.org> References: <874lsa8l4r.fsf@bapiya> <874k1ohrex.fsf@gnus.org> <87k0ajlrtv.fsf@tromey.com> <8735h7f6q7.fsf@gnus.org> <87mtfaeklo.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="27413"; 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 Sun May 22 13:16:49 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 1nsjZp-0006xO-4S for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 22 May 2022 13:16:49 +0200 Original-Received: from localhost ([::1]:54918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsjZn-000215-BM for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 22 May 2022 07:16:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsjZ4-0001zc-PO for bug-gnu-emacs@gnu.org; Sun, 22 May 2022 07:16:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsjZ4-0000Ny-DR for bug-gnu-emacs@gnu.org; Sun, 22 May 2022 07:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nsjZ4-0006xV-96 for bug-gnu-emacs@gnu.org; Sun, 22 May 2022 07:16:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 May 2022 11:16:02 +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.165321812826698 (code B ref 28408); Sun, 22 May 2022 11:16:02 +0000 Original-Received: (at 28408) by debbugs.gnu.org; 22 May 2022 11:15:28 +0000 Original-Received: from localhost ([127.0.0.1]:43747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsjYV-0006wY-SA for submit@debbugs.gnu.org; Sun, 22 May 2022 07:15:28 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:39168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsjYU-0006wN-Tv for 28408@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=; 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 1nsjYL-0005WZ-Md; Sun, 22 May 2022 13:15:19 +0200 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" In-Reply-To: <87mtfaeklo.fsf@tromey.com> (Tom Tromey's message of "Sat, 21 May 2022 13:44:51 -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:232883 Archived-At: Tom Tromey 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