From nobody Sat Aug 13 16:07:46 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lnJ6cbzz4ZFtv for ; Sat, 13 Aug 2022 16:07:48 +0000 (UTC) (envelope-from mandree@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 4M4lnJ65VLz3Lfl for ; Sat, 13 Aug 2022 16:07:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4avsdRjBJFi/3eAPIJJEyTnVNI9hwCRul7p6BrEYjrU=; b=KUpp2s/OhbOfuPOmWNwTzz3J/QM8+jGKbKUP/ms5moHzyPetoiiHjD+Ort1aLkjpkqZOEW DndVvjtnCilIsm0aDr7lRLgJjbbIeTcWqZyvC8c9sAmNiB66e9HWV6csZbj/PoI0YE7LsT T/qswyRIKhslTV1k1m8sJOM1M7wuQoYQLK0cWCitGp+JNP1Dudv9l2EN2d98Z8hY4ufeM5 p+UnObKUTJhpR8/uLHBthhXa5wiFlzSylf6SNFBmnosd1Utbe8fkFHcNG+XE2uFdBrraiM v2bqkOo0+yhKXDFRETpPpOumZy6ahMQJdVm3wakoxXTpQXIZZJmbTMheFDfhFQ== Received: from mandree.no-ip.org (p4fe52769.dip0.t-ipconnect.de [79.229.39.105]) (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 did not present a certificate) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lnJ4Mxrzmpc for ; Sat, 13 Aug 2022 16:07:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id 2A4DE814C81 for ; Sat, 13 Aug 2022 18:07:47 +0200 (CEST) Message-ID: <231aa2e6-5a07-0227-e673-2c766dc0f5c8@FreeBSD.org> Date: Sat, 13 Aug 2022 18:07:46 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 From: Matthias Andree Subject: Re: git wants to commit more files than expected ? To: freebsd-git@freebsd.org References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4avsdRjBJFi/3eAPIJJEyTnVNI9hwCRul7p6BrEYjrU=; b=cLbXuV5nV7bVclkSZC/XA5RXBIQ1bUhkN9UzWvu4ovBY9V7AGQB82ccE8nI9anqsxlMETy 4OeVAa6k1o//JtrSpA6Zw7orthxoT0GfK1r1uW8XOqZ3Xk0u0ImCW95J9vPGFVq351kHNI G05xzzJHW+xCXrNqvAzMZ4UgE7v9Oz/iiJHuN6dYtLwqjSAZWNLq4qZ5lhWCI0D6neDus1 Av3RwBhKPOY9E6HVGbqS5vuQ1mbGAANxNVxgumI+IVqDENdt5P5vu0CB+DniCtozdic523 uOmJCpnY0NEFfpAEIf3WLA6d/SZmdhYRattAYs3kslSRKhTwCPw+/GUEz4g0XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660406868; a=rsa-sha256; cv=none; b=Mx5bikR/BaXvrWhfEtOucVM2bw+L73WvLCVZ9pTQoqjBaIMqg/ghqv9/S876aRJguj+2Sv IYmV7hjxYvaQa8voX5mGIV4pndb7kDiA5f+i/w/gaaWRaYvgCJV23PL78fZ6PckGHQPjiJ J32IgaNE2Tw08pMdlrKkwffW2i5Wq0Mva8z28R8eebSmSkhvhMrtimAXNFWsyeQ8wCp7QM yiJu456JZ/91vf/gA9TsohBEC79m5qtrqSB+YLWJ5PhtMt9B2Qscqc27Ngu05zXcO6f7fl uABrFKqrQfU9goRwNzdAnXWRjixNoM86dbszIcLYWNHC4AWEJ0RwqyFEKq0BnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Am 13.08.22 um 17:45 schrieb Nuno Teixeira: > Hi, > > I always forgot to use `git commit --amend` when commit needed some > correction/change. I usually do a `git reset --hard ^HEAD` and then > commit from scratch :) > > Next commit I do I will use amend and see if I got similar problem > like yours. --amend means "tack what is currently marked for commit onto the previous commit, rewriting it and changing its hash".