Merge pull request progit#1104 from evanderiel/master

Clarify explanatory text for .gitignore

Merge pull request progit#1056 from duncandean/master

Change repo to repo.rb, update reset-squash-r3.png

Merge pull request progit#1102 from snehalshekatkar/master

Fixed the author name

Merge pull request progit#1101 from rahrah/master

Explain -o option in ssh-keygen

Merge pull request progit#1099 from peterwwillis/master

Update ssh-keygen with secure password encryption

Merge pull request progit#1098 from aollier/trailing_spaces

removed trailing spaces

Merge pull request progit#1096 from bzz/embedding-git-small-fixup

Remove quotes from index entries

Merge pull request progit#1094 from edenhochbaum/patch-1

Tree objects don't nec. point to trees

Merge pull request progit#999 from bzz/embedding/add-dulwich

Add Dulwich to Appendinx B: embedding

Merge pull request progit#1088 from tirkarthi/master

Fix minor typos