Date: Sun, 27 Aug 2023 20:50:56 +0100 From: Graham Perrin <grahamperrin@gmail.com> To: questions@freebsd.org Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Message-ID: <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> In-Reply-To: <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> References: <e49bc6e0-1380-0dc9-40ab-8865ae546a74@gmail.com> <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <ee842be3-5458-872d-b3b1-f4dc64fcacd4@gmail.com> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 27/08/2023 19:13, Steve O'Hara-Smith wrote: > On Sun, 27 Aug 2023 18:42:20 +0100 > Graham Perrin <grahamperrin@gmail.com> wrote: > >> I did use 'git rebase -i' with success four days ago, for a PR in >> someone else's repo (not a fork of a FreeBSD tree). Successful then, >> however I have used the command so rarely – like, only a handful of >> occasions over the past year or so – that my mind goes blank. Entirely >> blank, and using a search engine will make things far worse for me. >> >> What should I do first, for the PR above? > I would go with git rebase -i - it pretty much tells you what to do > if you know what you want - but in this case it boils down to changing the > pick in front of the commits to a sequence like > > edit <first commit> > squash <second commit> > squash <third commit> > ... > > Then tidying up the commit message. 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. Right now I can't repeat the routine, to get more detail, because I'm using my local copy of the main branch to update the OS. I might take another look tomorrow. Thanks
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55dc4697-dafe-19fe-0017-20a6effbac2b>