From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: Amending commits Date: Sun, 25 Sep 2022 10:50:30 +0000 Message-ID: <877d1ru3rd.fsf@posteo.net> References: <87h70vbw2f.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17631"; mail-complaints-to="usenet@ciao.gmane.io" Cc: "Emacs-devel@gnu.org" To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 25 12:53:20 2022 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 1ocPGC-0004Qm-72 for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 12:53:20 +0200 Original-Received: from localhost ([::1]:46440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocPGA-0003IT-MU for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 06:53:18 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocPDa-0001Hr-JV for Emacs-devel@gnu.org; Sun, 25 Sep 2022 06:50:39 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:45881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocPDW-0000CU-Tp for Emacs-devel@gnu.org; Sun, 25 Sep 2022 06:50:38 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D69FF240028 for ; Sun, 25 Sep 2022 12:50:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1664103032; bh=9LfLW80vOvoc4bQ8rzXlQKCDXkAMLVAJMbhdIZgQR0w=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=QCeLkV9s54A8unLOXqNezGsrMTqZF30Y3lWMEMuH+AJf8s8yagvxh5xe4wlQl7dWF /kxUNGoWGOVMw0phLw8idsXf4aONXD5fmvtA6m5ajnp2g5rESP2QISjMSKQeJkunpF dhj7IiQ25xy7MJ47Js9ovUiKeClGGlnKVte71qS4/rp0DX82dUb4WUN+wFx5s63Y3S BrEsGBPC1e9KhjOzfhXyQUbW5qN4aCB/a/5YvH/DN9QZFNwfrVOxjc4ZPnXoModUb3 IAlVP/IcKKc7Bq/ndhnzFuhumJr8oOhiciXA9Ri3Z+9v/yfM+jSgOKXQUVFdVMV0VF vw8bPv2qaRnwA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Mb2jM1pPvz6tm4; Sun, 25 Sep 2022 12:50:30 +0200 (CEST) In-Reply-To: <87h70vbw2f.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 25 Sep 2022 12:14:00 +0200") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_NONE=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:296212 Archived-At: Lars Ingebrigtsen writes: > I vaguely remembered that commands for amending commits had been added, > but I have no idea how those are supposed to be used. I searched for > "amend" in maintaining.texi and found nothing. I found > `vc-git-log-edit-toggle-amend', but... how is that supposed to be used? I think that command assumed you have changes that you wish to add to the last commit (so you couldn't just use it to reword a commit). You start preparing a new commit using `vc-next-action', then when the buffer appears you M-x vc-git-log-edit-toggle-amend to indicate that this commit will be amending the previous one. So the commit message gets replaced by that of the previous message. The rest just involves finishing up like any other commit. > There should be a command in `vc-dir-mode' that allows you to amend the > last commit, I think. That would be good, because it would also allow easier to reword a commit that doesn't require any code changes.