From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Uberti Newsgroups: gmane.emacs.devel Subject: vc-git: interactive rebasing Date: Fri, 3 Dec 2021 11:13:38 +0100 Message-ID: <38be4a33-d755-a317-b7fd-ceb0f88c4416@inventati.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19467"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Dec 03 11:14:43 2021 Return-path: Envelope-to: ged-emacs-devel@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 1mt5aV-0004pt-K7 for ged-emacs-devel@m.gmane-mx.org; Fri, 03 Dec 2021 11:14:43 +0100 Original-Received: from localhost ([::1]:53872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mt5aT-0003WU-SZ for ged-emacs-devel@m.gmane-mx.org; Fri, 03 Dec 2021 05:14:41 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mt5Zb-0002p6-6p for emacs-devel@gnu.org; Fri, 03 Dec 2021 05:13:47 -0500 Original-Received: from devianza.investici.org ([198.167.222.108]:25961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mt5ZY-0003KP-4b for emacs-devel@gnu.org; Fri, 03 Dec 2021 05:13:46 -0500 Original-Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4J57vR6FTrz6vJk for ; Fri, 3 Dec 2021 10:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1638526419; bh=Bq8FXXJTZIeoCNccRvmyZmrF1XnyYqRYfQmBusMMi28=; h=From:To:Subject:Date:From; b=chV/Nx0NM6aZdIUV87RjxIzX97hEOmDxDklb+wOXuO833ZWNPD6jF8I3eIDxxGcCH TaCc+/q00bz5EaJJISXCzK8x6VU4I+Yt3Nm2XRNOUQOrpuWRbOARZNThl5OJlrhz5F wfBBx3X0QOjeoDOR46UelLRbKbRkUusa20/5CO5Q= Original-Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: manuel.uberti@inventati.org) by localhost (Postfix) with ESMTPSA id 4J57vR5NVxz6v62 for ; Fri, 3 Dec 2021 10:13:39 +0000 (UTC) Content-Language: en-GB Received-SPF: pass client-ip=198.167.222.108; envelope-from=manuel.uberti@inventati.org; helo=devianza.investici.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:280817 Archived-At: Hello everyone, as my recent bug report[1] and some writings on my blog[2] witness, I've been using and actually really liking the built-in VC. Beside thanking everyone involved with this feature, I'd like to know how one can approach an interactive rebase with it. Let me try to provide an example. Usually, 'M-! git rebase master' is enough when I work on my projects, but sometimes I need to squash commits before pushing. Is it possible to rely on VC for this? If it is not a problem, could you describe how you would do it? Note that relying on 'M-!' or 'shell-mode' is good too for me. As long as everything can be done from Emacs, I am not asking to extend VC just for this specific workflow. BTW, before anyone suggests it: I know this is all doable from Magit, I was using Magit before (and I still have it installed). I am just trying to understand a different approach in order to decide which one suits me best. [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52158 [2] https://www.manueluberti.eu/emacs/2021/11/27/vc/ -- Manuel Uberti www.manueluberti.eu