git rebase -i is great and very well documented, with tons of blogs post about it all over the web.
if you pick `s` as a memonic it will squash and let you edit the merged commit message. If the base commit message is already good, use `f` and it will “fixup” it which is a squash where the original commit message is kept and the other one discarded. -Pierre > On Dec 17, 2015, at 2:07 AM, James Campbell via swift-corelibs-dev > <swift-corelibs-dev@swift.org> wrote: > > Help on rebasing would be great. I use git all the time but I still struggle > to squash my commits as I usually don't do it. > > On Thu, Dec 17, 2015 at 9:25 AM, Tom Jowett via swift-corelibs-dev > <swift-corelibs-dev@swift.org <mailto:swift-corelibs-dev@swift.org>> wrote: > Hi everyone, > > I'm wondering if there's a way I can help to keep the commit structure of the > repo a bit tidier? I can see the guideline being provided on CONTRIBUTING.md > however the current commit history could be a little easier to follow for the > average viewer (eb06d19 and b4f6e2b were duplicate commits, e.g) and it seems > the rebase before PR element of that guideline could be better followed. > > Perhaps a link in CONTRIBUTING.md to a walkthrough on how to squash and > rebase commits (including adding tests appropriately for bisect) could be > helpful? Happy to put one together in the context of this project if you > think so. Also interested in any other suggestions you might have for how > this could be remedied. > > Cheers, > Tom > > > > _______________________________________________ > swift-corelibs-dev mailing list > swift-corelibs-dev@swift.org <mailto:swift-corelibs-dev@swift.org> > https://lists.swift.org/mailman/listinfo/swift-corelibs-dev > <https://lists.swift.org/mailman/listinfo/swift-corelibs-dev> > > > > > -- > Wizard > ja...@supmenow.com <mailto:ja...@supmenow.com> > +44 7523 279 698 > _______________________________________________ > swift-corelibs-dev mailing list > swift-corelibs-dev@swift.org > https://lists.swift.org/mailman/listinfo/swift-corelibs-dev
_______________________________________________ swift-corelibs-dev mailing list swift-corelibs-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-corelibs-dev
