spj-wildcard-refactor

[Edward Z. Yang]

IMO, reset is a fine way to do this if you don't care about any of this
history.  But Simon, you should use 'git reset --soft master' so that
you don't have to re-add any new files (if you have any!).

Edward

Excerpts from Alan & Kim Zimmerman's message of 2015-11-20 09:42:26 -0800:
> I would imagine
> 
> git pull # Get master up to date
> git checkout wip/spj-wildcard-refactor
> git rebase -i master
> 
> The -i will let you flatten commits
> 
> See
> https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history
> 
> Alan
> 
> On Fri, Nov 20, 2015 at 7:14 PM, Simon Peyton Jones <simonpj at microsoft.com>
> wrote:
> 
> > Status on my spj-wildcard-refactor patch
> >
> > ·         I’m down to one test failure a modest perf regression on T3064.
> >   This is really a test of type family reduction which is nothing to do
> > with my changes, so I have no idea what’s happening there.  I’m waiting
> > till I can build a profiled compiler to test.
> >
> >
> >
> > What’s the best workflow for to take my branch with tons of wibble-ish
> > patches, and commit to HEAD with a small number of sensible patches.
> >
> >
> >
> > I was thinking:
> >
> > ·         Git checkout wip/spj-wildcard-refactor
> >
> > ·         Git merge master
> >
> > ·         Git reset master   (leaves working files alone)
> >
> > ·         Now commit patches
> >
> > Is that right?
> >
> >
> >
> > Simon
> >