From nobody Fri Sep 15 01:15:12 2023 X-Original-To: freebsd-questions@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 4Rmx7t1C3vz4sgy7 for ; Fri, 15 Sep 2023 01:15:22 +0000 (UTC) (envelope-from kpn@neutralgood.org) Received: from gunsight1.neutralgood.org (gunsight1.neutralgood.org [IPv6:2607:f758:2280:1:d6be:d9ff:feac:a1e9]) (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 (2048 bits) client-digest SHA256) (Client CN "gunsight1.neutralgood.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rmx7s3cXRz4Mxw for ; Fri, 15 Sep 2023 01:15:21 +0000 (UTC) (envelope-from kpn@neutralgood.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of kpn@neutralgood.org designates 2607:f758:2280:1:d6be:d9ff:feac:a1e9 as permitted sender) smtp.mailfrom=kpn@neutralgood.org; dmarc=none Received: from gunsight1.NeutralGood.ORG (localhost [127.0.0.1]) by gunsight1.neutralgood.org (8.17.1/8.17.1) with ESMTPS id 38F1FDix028151 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 14 Sep 2023 21:15:13 -0400 (EDT) (envelope-from kpn@gunsight1.NeutralGood.ORG) Received: (from kpn@localhost) by gunsight1.NeutralGood.ORG (8.17.1/8.17.1/Submit) id 38F1FCra028148; Thu, 14 Sep 2023 21:15:12 -0400 (EDT) (envelope-from kpn) Date: Thu, 14 Sep 2023 21:15:12 -0400 From: "Kevin P. Neal" To: Graham Perrin Cc: "Steve O'Hara-Smith" , FreeBSD questions Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Message-ID: References: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> <20230827213415.27b35f49feaf6b6959f9df7c@sohara.org> List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-No-archive: Yes X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.30 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-questions@freebsd.org]; ASN(0.00)[asn:13649, ipnet:2607:f758::/32, country:US]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; TO_DN_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[neutralgood.org]; RCPT_COUNT_THREE(0.00)[3]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Rmx7s3cXRz4Mxw On Thu, Sep 07, 2023 at 09:18:35PM +0100, Graham Perrin wrote: > On 27/08/2023 21:34, Steve O'Hara-Smith wrote: > > > On Sun, 27 Aug 2023 20:50:56 +0100 > > Graham Perrin wrote: > > > > > I did try 'git rebase -i' before my previous post, there was nothing to > > > pick (or drop), which is partly why my mind went blank. > > Ah try git rebase -i HEAD~ > > Success. Thanks, Steve. Result: > > % git -C /usr/src log -n 1 > commit 9de94bcad3dab199829e2755e816a1b30e23054c (HEAD -> bhyve, > origin/bhyve) > Author: Graham Perrin > Date:   Sat Aug 19 08:41:09 2023 +0100 Is that the right date? When I squash a branch I never get the right timestamp. I think it reuses the timestamp from first commit that is "pick" instead of "squash". But I think "git commit --amend --date=now" is good enough for me. Or something like that... I don't have my notes handy. >     lowercase b for bhyve in five files > >     MFC after:      3 days >     Pull-request: https://github.com/grahamperrin/freebsd-src/pull/3 >     Closes: https://github.com/grahamperrin/freebsd-src/pull/3 >     Pull-request: https://github.com/freebsd/freebsd-src/pull/838 >     Closes: https://github.com/freebsd/freebsd-src/pull/838 >     Signed-off-by:  Graham Perrin > % > > -- "A method for inducing cats to exercise consists of directing a beam of invisible light produced by a hand-held laser apparatus onto the floor ... in the vicinity of the cat, then moving the laser ... in an irregular way fascinating to cats,..." -- US patent 5443036, "Method of exercising a cat"