From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Amending commits Date: Sun, 25 Sep 2022 23:37:01 +0300 Message-ID: References: <87h70vbw2f.fsf@gnus.org> <877d1ru3rd.fsf@posteo.net> <87zgenr812.fsf@gmail.com> <7a1185d7c76d3e55bc78@heytings.org> <7a1185d7c7cd09d9c277@heytings.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="23428"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Cc: Visuwesh , Philip Kaludercic , Lars Ingebrigtsen , emacs-devel@gnu.org To: Gregory Heytings , Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 25 22:39:13 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 1ocYPA-0005wT-9c for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 22:39:12 +0200 Original-Received: from localhost ([::1]:39266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocYP9-0007gz-8n for ged-emacs-devel@m.gmane-mx.org; Sun, 25 Sep 2022 16:39:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocYNI-0006YL-Kw for emacs-devel@gnu.org; Sun, 25 Sep 2022 16:37:16 -0400 Original-Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:56254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocYNG-000853-Nf for emacs-devel@gnu.org; Sun, 25 Sep 2022 16:37:16 -0400 Original-Received: by mail-wm1-x32a.google.com with SMTP id t4so3268606wmj.5 for ; Sun, 25 Sep 2022 13:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date; bh=XZtymRpRl3MiRmO+BGhgsiRm50fK2NKUekBs7hAPtjQ=; b=aqyk8rNYAku5n5bEXq9HTawvNBByymSRFbcUmpFgLzbEA1E5Ok266xwvbUt5rNZ7kH 4jkN91Av4nP9EzZHhjeJSJYAdvRsgAkblFvOjsy17RiBr+2AVYN17mm43OCovsUKBN0H ITHSNrRn6aghG75nlBthbseJkDIxvAjNqc5HbyraV4G395YtyjP6Sl8i0z7uyW6wXDRY 4q+BXax7qJnNXg2T1pSGjhzcre/HRLBJZC+IRpnHEU2r4CSo3dib5ao1wRl7B6pnXPVF yE+ai2Hf0e4hSohMrIDq0B989aalurWqE9DQInBo74+XU/NqutQ2Oep6UjIJ4eldK6w4 Nc3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date; bh=XZtymRpRl3MiRmO+BGhgsiRm50fK2NKUekBs7hAPtjQ=; b=jdvW77XQaTPHdyPIwkjtyF5oIvNqQ1jLeIhsCh681BlQUiQsq1SjCKdxjyh91ZoN/F pBpIrcIjQeOWbmILdYid+CgZ59e3+HLoM/fM4ftv+QpWghunjSRk9Iv1OOkDYCzqE9c5 aBspoSKNPIry1Ev4I8nt1b/QrY9H8W5gwgP23H3q/9JeuZoSRiQ4ToFebOqwrtEylQDh b9zutNnU68WjXzMewbqrtre5HaNnjjxn42oT4XTUB1I1PvcdjdEKt2Hzrsx8tY/5Yx+0 gsNySnbaQjxe00aRYPFzmIH8bFxxgtS2AwMzXXmICCS8AmoHUaIEOJnLxVqyxM1oToTp JtVw== X-Gm-Message-State: ACrzQf2MHNLv/dN6iCiWXscal9D/wk34ShxdkYPVkc3GxX43I67NQF3p OvCnfsj5o4zsdAEZXUHNaY4= X-Google-Smtp-Source: AMsMyM5j70IcB91X82t0uTt2Z7kOrh25e5nQuKh1p3H1S3f4ZehP3Fd1hhWk/9QCvudAkXCs8Ip6UA== X-Received: by 2002:a05:600c:474c:b0:3b4:cbca:5677 with SMTP id w12-20020a05600c474c00b003b4cbca5677mr12538391wmo.76.1664138224866; Sun, 25 Sep 2022 13:37:04 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id m10-20020a05600c3b0a00b003b47b913901sm21984137wms.1.2022.09.25.13.37.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 25 Sep 2022 13:37:04 -0700 (PDT) Content-Language: en-US In-Reply-To: <7a1185d7c7cd09d9c277@heytings.org> Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=raaahh@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -52 X-Spam_score: -5.3 X-Spam_bar: ----- X-Spam_report: (-5.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-3.766, RCVD_IN_DNSWL_NONE=-0.0001, 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:296235 Archived-At: On 25.09.2022 23:15, Gregory Heytings wrote: > >>>> 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 You can even do that (if 'force pushes' are not disabled in the repository's settings). It's just usually a bad idea. So you can rewrite history, but commits are "immutable".