Date: Thu, 14 Sep 2023 21:15:12 -0400 From: "Kevin P. Neal" <kpn@neutralgood.org> To: Graham Perrin <grahamperrin@gmail.com> Cc: "Steve O'Hara-Smith" <steve@sohara.org>, FreeBSD questions <freebsd-questions@freebsd.org> Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Message-ID: <ZQOwIJmGtfLZn41N@neutralgood.org> In-Reply-To: <be9d4518-99e4-4650-ed40-55f623faf4c8@gmail.com> References: <e49bc6e0-1380-0dc9-40ab-8865ae546a74@gmail.com> <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <ee842be3-5458-872d-b3b1-f4dc64fcacd4@gmail.com> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> <20230827213415.27b35f49feaf6b6959f9df7c@sohara.org> <be9d4518-99e4-4650-ed40-55f623faf4c8@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <grahamperrin@gmail.com> 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~<number of commits to go back> > > Success. Thanks, Steve. Result: > > % git -C /usr/src log -n 1 > commit 9de94bcad3dab199829e2755e816a1b30e23054c (HEAD -> bhyve, > origin/bhyve) > Author: Graham Perrin <grahamperrin@gmail.com> > 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 <grahamperrin@gmail.com> > % > > -- "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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZQOwIJmGtfLZn41N>