From owner-freebsd-git@freebsd.org Sat Mar 13 19:30:56 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8FAE85A8695 for ; Sat, 13 Mar 2021 19:30:56 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DyXpm3jrkz3HVC for ; Sat, 13 Mar 2021 19:30:56 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7F9995A8694; Sat, 13 Mar 2021 19:30:56 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F6205A8708 for ; Sat, 13 Mar 2021 19:30:56 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DyXpm3Kfgz3HZg for ; Sat, 13 Mar 2021 19:30:56 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p200300d5d740b96020afcfec3802e2f2.dip0.t-ipconnect.de [IPv6:2003:d5:d740:b960:20af:cfec:3802:e2f2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 0E37C69D0 for ; Sat, 13 Mar 2021 19:30:55 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Sat, 13 Mar 2021 20:30:54 +0100 From: Gordon Bergling To: git@freebsd.org Subject: Correction of a commit message Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Url: X-Operating-System: FreeBSD 12.2-STABLE amd64 X-Host-Uptime: 8:23PM up 4 days, 45 mins, 4 users, load averages: 0.34, 0.35, 0.29 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Mar 2021 19:30:56 -0000 Hi, I made a small mistake while commiting a change for the ls(1) man pagei [1]. I used 'git commit --amend' and corrected the commit-message, but I wasn't be able to push that commit, because git reported, that my local tree was outdated, which is simply not correct. Is the '--amend' option intended to work in that situation, or did I miss something? --Gordon [1] https://cgit.freebsd.org/src/commit/?id=a9275d996c229a30879baa42a6d02d24663ac43b --