Closed mdaxtman closed 8 years ago
@boygirl all changes should be addressed from your comments. Please review as needed.
closes #31
I think this is ready to be reviewed @coopy @paulathevalley @boygirl
This is a branch with a long history and a pretty simple implementation in the end. Let's squash all those commits down. See https://gist.github.com/coopy/377ab74e850c782c8404#2-squashing-commits-no-rebase-required
@coopy I think I accomplished this? I only see one commit now, but github still has the history of them all?
There are still many commits on the branch:
~/dev/formidable/ecology (master)$ git log --oneline -5
9abb427 1.5.2
4a267d5 Changelog 1.5.2
d8e2715 Merge pull request #43 from FormidableLabs/task/fix-templating
5bd22e1 fix linting
48dd276 use regular strings instead of templates
~/dev/formidable/ecology (master)$ git co feature-exportToGist
Branch feature-exportToGist set up to track remote branch feature-exportToGist from origin by rebasing.
Switched to a new branch 'feature-exportToGist'
~/dev/formidable/ecology (feature-exportToGist)$ git log --oneline -5
ff008cf Merge branch 'feature-exportToGist' of https://github.com/FormidableLabs/ecology into feature-exportToGist
de735c1 Add export to gist functionality
81c2705 use fat arrow to narrow scope
b611348 use non-plural global
b138457 define default props
You can always make a new branch to test squashing:
# from feature-exportToGist:
$ git checkout -b feature-exportToGist-squashed
$ git reset HEAD~26
$ git log --one-line -1
# => Should show `9abb427 1.5.2`
$ git status
# => Should show all changes as local changes
@coopy ready for re-review
Review compete; let me know if you have any questions!
@coopy thanks! everything should be fixed now
LGTM! 🚀
@boygirl let me know if you would like me to change the formatting and/or filetype of the gist export. This is obviously a prototype.