Set dummy merge driver merge ours .gitattributes.
Add a chmod on the ~/.ssh on server

As remarked in #709, setting up a key-based server may need to set up
restricted rights.
Added some brief details on BFG http://rtyley.github.io/bfg-repo-cleaner/
A note about using 'git svn info' in build scripts

Also fixed a small typo
Added some brief details on BFG http://rtyley.github.io/bfg-repo-cleaner/
Added reference to BFG
A note about using 'git svn info' in build scripts

Also fixed a small typo
Merge branch 'master' of github.com:alecthegeek/progit into svn-info
Merge remote-tracking branch 'origin/svn-info' into svn-info

Conflicts:
	en/06-git-tools/01-chapter6.markdown
Updated after feedback on 548a15f
[fa] chapter 1 complete

translation of chapter 1 completed but it needs another lookup for
spelling correction and some minor modifications.
Merge pull request #827 from mxamin/master

[fa] chapter 1 complete
Merge pull request #828 from daftano/master

[it] Update URL used in cURL to fetch from Grit library
Phrase fix in line 35

Updated the 'or' clause for the correct in portuguese is 'ou'
Merge pull request #829 from kiide/master

Phrase fix in line 35
translated 3 sections
added no-nb to makeebooks script
'no-NB' translated 2 sub-sections chapter 1
no-NB translated 2 sections in Chapther 1

"Git has Integrity"
"Git generally only add data"
[fa] Update Chapter 1

Some minor modification on chapter 1.
Added some notes for better translation.
Updated README file.