apache/mahout — pull request #24 by andrewpalumbo (2014-06-26 23:31:09+00:00)
Title: MAHOUT-1587: test pull request for review of squashed commit history-- not to be commited  

I'm going through the steps on the pull request page. I did two trivial commits to a branch from my master (changing a letter to capitol and back in a comment):

`git commit -a -m "trivial edit should not appear in commit to apache"
git commit -a -m "second trivial edit should not appear in commit to apace"`

ending with:

`git checkout master
git pull apache master
git pull --squash https://github.com/andrewpalubo/mahout MAHOUT-1536`

added two lines to the CHANGELOG

`git commit -a -m "MAHOUT-1536: Update Creating vectors from text page (apalumbo)"`

I then pushed back up to my origin master to double check all that everything was properly squashed out. before pushing to apache. Both trivial commits are squashed out but my merge history and some old commits seem to remain. I'm not sure why the commit from May 23 is in there. Any thoughts?