From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Amending commits Date: Sun, 25 Sep 2022 15:26:39 -0400 Message-ID: References: <87h70vbw2f.fsf@gnus.org> <877d1ru3rd.fsf@posteo.net> <87zgenr812.fsf@gmail.com> <7a1185d7c76d3e55bc78@heytings.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="8230"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Visuwesh , Philip Kaludercic , Lars Ingebrigtsen , emacs-devel@gnu.org To: Gregory Heytings Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 25 21:27:46 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 1ocXI1-00021C-9r for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 21:27:45 +0200 Original-Received: from localhost ([::1]:39444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocXHz-00076e-NN for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 15:27:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocXH6-0006RX-FU for emacs-devel@gnu.org; Sun, 25 Sep 2022 15:26:49 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:19696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocXH2-00071M-Te for emacs-devel@gnu.org; Sun, 25 Sep 2022 15:26:46 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id CB04D80664; Sun, 25 Sep 2022 15:26:42 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 5D67880263; Sun, 25 Sep 2022 15:26:41 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1664134001; bh=PlKQ/qFI7TeCesVfPiR+d3X+3dqgi0g9xP2lprRHM4Q=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=dkiW9rYjR9P0xP4TAQwURaxGOZRTvWtd+vYtHhL+jzWTSD37RI5ykK1Mj4dUYR85g 8rwtxOGlxP2Ypz42R/Uq48NiR8YV0Q33JaXmzDeIKCpKpF+A2VSRUgk6nE3c7Oygzk hksFwKWp4/wQhGTR1GpFEKt8arLYrRbCKDiAFd4qtODdKZJpjfHFNWclH82H+PjMbe CWnKwkedwEcJFkAgjDOipu1zd8W/EY6IRIo95V4sXjEdZiMGtF7h8wloT4VnwKpAca 4Tm7HbOYlpwS44ZMoSER2SW6RAgnC9NU4yjvuf8RulmF2tPZTPilq4t6R1rVMq2ryI S4pw4nDXJsXBw== Original-Received: from pastel (65-110-220-202.cpe.pppoe.ca [65.110.220.202]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 1E0F6120346; Sun, 25 Sep 2022 15:26:41 -0400 (EDT) In-Reply-To: <7a1185d7c76d3e55bc78@heytings.org> (Gregory Heytings's message of "Sun, 25 Sep 2022 18:04:18 +0000") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-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:296230 Archived-At: >> As someone who does not really understand Git, does this mean we are >> rewriting the log message without also committing a change? I thought >> that was not allowed by Git. > git commit --amend is mainly used to change a commit before pushing > it. Rewriting history (i.e. changing an already public commit) is (by > default) not possible. When people say that in Git you cannot rewrite history, what it means is that you can't change anything about a given *commit id* (aka "revision"). Of course, you can create a new revision (i.e. a different commit id) with any content you like. Things like `rebase` and `filter-repo` are more general version of `commit --amend` and work in the same way, by writing a whole new history. Stefan