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

Added livecode english book and italian guide #1762

Merged
merged 6 commits into from Feb 13, 2016

Conversation

Projects
None yet
2 participants
@angerangel
Copy link
Contributor

commented Dec 29, 2015

No description provided.

@vhf

This comment has been minimized.

Copy link
Member

commented Dec 29, 2015

Thanks! Could you please remove the spaces between ] and (?

angerangel added some commits Jan 19, 2016

@angerangel

This comment has been minimized.

Copy link
Contributor Author

commented Jan 19, 2016

Wow, now it's all ok.

@vhf

This comment has been minimized.

Copy link
Member

commented Jan 19, 2016

Yep. And it's not so magical, it's all described in the CONTRIBUTING.md shown when you open a PR. ;)

Could you please squash these before I merge?

@angerangel

This comment has been minimized.

Copy link
Contributor Author

commented Jan 20, 2016

What do you mean for squash?

@vhf

This comment has been minimized.

Copy link
Member

commented Jan 20, 2016

You got 6 commits here. "Merging" them into one single commit is known as "squashing commits".

Here's one way to do it:

  1. In your git repo, do git rebase -i HEAD~6 (because we would like to rebase 6 commits starting at the latest one, which is the current HEAD)
  2. It will open an editor. Each line starting with pick describes a commit. On the first line, you will see the first commit of this PR, this is the commit we would like to keep, so we will not modify this line. For all the following lines, replace pick with fixup.
  3. Close the editor. Git will start rewriting history.
  4. git push --force

:)

@angerangel

This comment has been minimized.

Copy link
Contributor Author

commented Jan 20, 2016

Sorry, but I use git only on the github website.
How can I do with the website?

@vhf

This comment has been minimized.

Copy link
Member

commented Jan 20, 2016

You cannot do it from the website. I'll do it for you before merging, no worries.

@angerangel

This comment has been minimized.

Copy link
Contributor Author

commented Jan 20, 2016

Thank you!

vhf added a commit that referenced this pull request Feb 13, 2016

Merge pull request #1762 from angerangel/master
Added livecode english book and italian guide

@vhf vhf merged commit 6fe580d into EbookFoundation:master Feb 13, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.