Skip to content

Added squashing docs - #253

Merged
joshsmith merged 2 commits into
developfrom
rt-add-squashing-docs
Sep 25, 2016
Merged

joshsmith merged 2 commits into
developfrom
rt-add-squashing-docs

Conversation

@rileytaylor

@rileytaylor rileytaylor commented Sep 24, 2016 •

Copy link
Copy Markdown
Contributor

What's in this PR?

This adds squashing.md to the API docs folder. It is copied over from the ember repository with the addition of instructions for working from a fork since that varies slightly.

References

Fixes #243

@joshsmith joshsmith left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is there an easy way here to find out the number of commits added on your branch?

@rileytaylor

Copy link
Copy Markdown
Contributor Author

@joshsmith Yes. git log functions like a summarized git diff. So you can do git log develop..your-branch-here for local copies on a feature branch, or git log origin/develop..develop for a fork. You might need to do upstream/develop depending on how it was set up but I haven't tested that yet.

@joshsmith
joshsmith merged commit 048200b into develop Sep 25, 2016
@joshsmith
joshsmith deleted the rt-add-squashing-docs branch September 25, 2016 19:09
@joshsmith

Copy link
Copy Markdown
Contributor

🎈

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants