Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce diff to haskell/master #131

Merged
merged 5 commits into from
May 15, 2020
Merged

Reduce diff to haskell/master #131

merged 5 commits into from
May 15, 2020

Conversation

curiousleo
Copy link
Collaborator

@curiousleo curiousleo commented May 15, 2020

This just reduces the diff in haskell#61 by removing some commented out configuration and code and checking out some files to be the same or similar to what is on haskell/master.

Before

❯ git diff --stat haskell/master..idontgetoutmuch/v1.2-proposal
[...]
 42 files changed, 4010 insertions(+), 1609 deletions(-)

After

❯ git diff --stat haskell/master..idontgetoutmuch/reduce-diff
[...]
 41 files changed, 3704 insertions(+), 1586 deletions(-)

@curiousleo curiousleo marked this pull request as ready for review May 15, 2020 09:08
Copy link
Collaborator

@lehins lehins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

License must stay the same

@lehins lehins self-requested a review May 15, 2020 13:49
Copy link
Collaborator

@lehins lehins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome ;)

@curiousleo curiousleo merged commit 85b6043 into v1.2-proposal May 15, 2020
@curiousleo curiousleo deleted the reduce-diff branch May 15, 2020 14:15
curiousleo added a commit that referenced this pull request May 19, 2020
* Reduce .gitignore diff

* Remove unused configurations from .travis.yml

* Remove default comments from stack-old.yaml

* Remove default comments from stack.yaml

* Remove commented out Spec code
curiousleo added a commit that referenced this pull request May 20, 2020
* Reduce .gitignore diff

* Remove unused configurations from .travis.yml

* Remove default comments from stack-old.yaml

* Remove default comments from stack.yaml

* Remove commented out Spec code
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants