Date: Sun, 27 Aug 2023 19:13:24 +0100 From: Steve O'Hara-Smith <steve@sohara.org> To: questions@freebsd.org Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Message-ID: <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> In-Reply-To: <ee842be3-5458-872d-b3b1-f4dc64fcacd4@gmail.com> References: <e49bc6e0-1380-0dc9-40ab-8865ae546a74@gmail.com> <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <ee842be3-5458-872d-b3b1-f4dc64fcacd4@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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. -- Steve O'Hara-Smith <steve@sohara.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230827191324.eb8e546fdfb61469dd14bc5a>