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
Update 01-chapter1.markdown

Translation of the brief history / Traduko de la mallonga historio
[fa] ch1 update
Merge pull request #825 from mxamin/master

[fa] ch1 update
Merge pull request #824 from mjwalter/patch-1

Update 01-chapter1.markdown
[fa] chapter 1 update
Merge pull request #826 from mxamin/master

[fa] chapter 1 update
[fa] chapter 1 complete

translation of chapter 1 completed but it needs another lookup for
spelling correction and some minor modifications.
[it] Update URL used in cURL to fetch from Grit library

Add -L flag to cURL command to follow any redirects

cURL by default will not follow redirects, leading
to blank file unless the `-L` flag is included since
all resources once hosted on raw.github.com are now
on the raw.githubusercontent.com domain.

Fixes issue mentioned at https://github.com/git/git-scm.com/issues/422
See also PR #811
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