From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.devel Subject: Re: Amending commits Date: Sun, 25 Sep 2022 20:15:10 +0000 Message-ID: <7a1185d7c7cd09d9c277@heytings.org> References: <87h70vbw2f.fsf@gnus.org> <877d1ru3rd.fsf@posteo.net> <87zgenr812.fsf@gmail.com> <7a1185d7c76d3e55bc78@heytings.org> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6899"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Visuwesh , Philip Kaludercic , Lars Ingebrigtsen , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 25 22:18:27 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 1ocY55-0001UM-6i for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 22:18:27 +0200 Original-Received: from localhost ([::1]:41932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocY54-0007CX-77 for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 16:18:26 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocY20-0006B9-HI for emacs-devel@gnu.org; Sun, 25 Sep 2022 16:15:16 -0400 Original-Received: from heytings.org ([95.142.160.155]:56436) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocY1y-0005Jo-9p for emacs-devel@gnu.org; Sun, 25 Sep 2022 16:15:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1664136911; bh=KAA7nZ41U6ghzBT/0tIK+UV9l9rktHYv7czDTtBOK20=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=Z6ZJMKVv2ZFbAuoJ2LE/iSS5wntPEHPA1/+F2ggNRJ8cG+xczabDd+5/LABPF+tBi PCUMfkwd95WVcpP7U5UYZGTx7LCXSREn8NXMqIC17FvxWQ9KkEcbZv/5lmvLn3qVN+ Vu5VcpuR61aMurNd7V8blJrywh3q6qUi1jz9JXyrOYiTOSduJ0ZkKIi3DeoVtH/904 z+XigmceMFs12z3tMnAlUMIPonSouX7kf7XtP5xxb/HWt2hVU9YWic+pa21ps6IZOr HKbnFloEqtYAJkJ+ksnCkgc842T7wbeRsi0IAg7HiPFEN1vFkvcMRlnbzdcLCQWZT9 0cOGLyH+3SvhQ== In-Reply-To: Received-SPF: pass client-ip=95.142.160.155; envelope-from=gregory@heytings.org; helo=heytings.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, 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:296232 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"). > Hmm... no, AFAIU, it means that (by default) you cannot replace the commit history of a public repository with commits which do not have the HEAD of the public repository as their parent. E.g. if your public repository is A - B - C - D ^ HEAD you cannot change it into B - C - D / A - E - F - G ^ HEAD