Set dummy merge driver merge ours .gitattributes.
[fr] Update chapter on diffing
[fr] sync with 90c92ceb
[fr] sync with 21e84add
[fr] sync with 2a0a8371
[fr] apply 15f2bf1b
[fr] apply bdef6f76 and 1ca5ef16
fix  chap 4.
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
[fr] update with bdef6f76
[fr] sync with c418e2ea
[fr] Sync with ceba7dfb
[fr] Sync with 60e26189