Re: [swift-corelibs-dev] Git history

2015-12-17 Thread Tom Jowett via swift-corelibs-dev
Completely agree re: not wishing to be pedantic and I know this represents such a tiny part of the overall scope of the project (ie it's much more important that we have a full library vs a perfect commit history). I'll try and put together a couple of scenarios based on the current history and ho

Re: [swift-corelibs-dev] Git history

2015-12-17 Thread Tony Parker via swift-corelibs-dev
Hi Tom, I’ve actually been thinking about this a lot over the past few days, but haven’t come to any real conclusion yet. The way I’ve traditionally worked on Foundation is that each commit has more content, and each commit is (almost) always associated with a bug. This is basically the proces

Re: [swift-corelibs-dev] Git history

2015-12-17 Thread Pierre Habouzit via swift-corelibs-dev
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 orig

Re: [swift-corelibs-dev] Git history

2015-12-17 Thread James Campbell via swift-corelibs-dev
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> wrote: > Hi everyone, > > I'm wondering if there's a way I can help to kee

[swift-corelibs-dev] Git history

2015-12-17 Thread Tom Jowett via swift-corelibs-dev
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