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
[cs] typo in chapter 1
Merge branch 'master' of https://github.com/progit/progit.git
[cs] Chapter 2 manually revised up to 2.3 including
[cs] translation revision of Chapter 2
Merge branch 'master' of https://github.com/progit/progit.git
[cs] fixing the markup; minor translation enhancements
[cs] revision of Chapter 3 finished
[cs] minor formulation correction in chapter 2
Merge pull request #837 from pepr/master

[cs] revision of chapters 2 and 3 finished
Merge pull request #836 from Onizuka89/master

no-NB chapter 1 translated