Skip to content

Conversation

rpjday
Copy link

@rpjday rpjday commented Nov 24, 2018

Among other things:

  • remove unnecessary hyphenation
  • font changes for emphasis

Signed-off-by: Robert P. J. Day rpjday@crashcourse.ca

Among other things:

  - remove unnecessary hyphenation
  - font changes for emphasis

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
@aollier
Copy link
Contributor

aollier commented Nov 25, 2018

@rpjday you should update your master branch which is currently 45 commits behing progit:master.
You are going to merge changes from an old commit, this is not very clean. 😬

@rpjday
Copy link
Author

rpjday commented Nov 25, 2018

You're right, I erred in my updating of my master branch, but the patch appears to apply cleanly, anyway.

@aollier
Copy link
Contributor

aollier commented Nov 26, 2018

To update correctly and simply your master branch, do the following:

$ git checkout master
$ git pull https://github.com/progit/progit2.git
$ git push origin master

@ben
Copy link
Member

ben commented Nov 26, 2018

I actually don't mind if it's based on an older commit. We're not super strict about DAG shape here.

These are good changes, thanks!

@ben ben merged commit 52e813f into progit:master Nov 26, 2018
@rpjday rpjday deleted the ch1 branch November 27, 2018 10:22
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.

4 participants