From owner-freebsd-git@freebsd.org Sat Mar 13 19:45:52 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 D5FE45A8D43 for ; Sat, 13 Mar 2021 19:45:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DyY803vkZz3JSL for ; Sat, 13 Mar 2021 19:45:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 8413C5A8F22; Sat, 13 Mar 2021 19:45:52 +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 83CC15A8CC1 for ; Sat, 13 Mar 2021 19:45:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DyY803C33z3Jbk for ; Sat, 13 Mar 2021 19:45:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id g185so27937109qkf.6 for ; Sat, 13 Mar 2021 11:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qFQTsyKN12Phg+b1VF5jaWFyfu55h3pqrxk389Ys5A4=; b=YpTZXe+5WGohm0IFGMIoUJG4SbGYkCNmVDZjjgN9mnSXpBWWnoTMFHROLnhDdH5Mwq L5Ih/rlTvoKwV6HJxaQQC5mckxMWlHuzacf6PGx9HwzULGVn1S7cF4hfXhJHMRy9aIAW cgkCy8/WUvPB606/U16BGz96uHZPeLGu5WsRPgEZSmcv4e3Vv1kBBzWfMUf3ZCob/F9X NdLoflcrvoVIcgxLbhZJIOm2Q7J86OXH1R+DydiLIHafSOtaGEON7kld+FxBYSoWqv/O EZU5LENKUFe5Dgt5k15X8JsC2PY1N34Ib0hWu6isyHIsxsepbdOx5qDDdQeoMDdeHpMm KzCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qFQTsyKN12Phg+b1VF5jaWFyfu55h3pqrxk389Ys5A4=; b=nza1J+MTx2QMzU4w9T8umQVaj2MPoqxLpXWigdejwN0I5dzvJu7MP96NtHmVfya01T 10ynFibX9qXODXX72wJhRkyVtdywNTk23JdFk2YfrO8pDqxro8I0HJubM+LOA7vP+Lwg q7FLXaBqUIhruAMNLW7APDqPFPazU8s5ExE1DndIRkae50FaKQJGGc7SwWJkuLysErCm qWisLYvPCwWSEkVYtHvYLpELAP4zQgQMM1jRNidPh0twhMoghgrQZ34BnEndqbPbmfaM kzapdQbhn2PuTGChaAMzhZzbe/HkHQrHEG8Kqum7vOAS+eSPUovdGLyVaWCjlVCP1RP4 es0w== X-Gm-Message-State: AOAM531zcHhCYfeYFBu1hgP9JQs38dI9s09GbB+TORSOMqEdDtr8pDzU 1jxTcfjPsfSrLh1/+2SKIosjBVo4QGLFFaV7lwRPCw== X-Google-Smtp-Source: ABdhPJyNvnZTv/bOqTFi3M+zUqOBbIudiny0LTaoOYCxgTzKcbSTxXgw2Qii21vSWBnRekHWeqCK205MaoLzAj1AtUQ= X-Received: by 2002:ae9:e010:: with SMTP id m16mr1617889qkk.44.1615664751293; Sat, 13 Mar 2021 11:45:51 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 13 Mar 2021 12:45:38 -0700 Message-ID: Subject: Re: Correction of a commit message To: Gordon Bergling Cc: git@freebsd.org X-Rspamd-Queue-Id: 4DyY803C33z3Jbk X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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:45:52 -0000 On Sat, Mar 13, 2021, 12:30 PM Gordon Bergling wrote: > 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? > You can use that before you push, but not after. We've been recommending 'git show' for each commit prior to pushing... After the push, it's not possible to change. Warner --Gordon > > [1] > https://cgit.freebsd.org/src/commit/?id=a9275d996c229a30879baa42a6d02d24663ac43b > -- > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >