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
[NL] resynchronized with 4cefec
[zh] Fix a missing word in 01-chapter6

"All the changes from your Rack project are merged in and ready to be committed locally." 
The word "and" is missed in the translation.
Merge pull request #809 from Cpt-xx/nl_merges_with_4cefec

[NL] resynchronized with 4cefec
Merge pull request #810 from zhukangyi/patch-1

[zh] Fix a missing word in 01-chapter6
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
[JP]Fix typo in chapter2

Change to "時点" from "地点"
Merge pull request #812 from takasuka/fix_typo_chapter2

[JP]Fix typo in chapter2
Merge pull request #811 from randomecho/chap-9-git-internals

Update URL used in cURL to fetch from Grit library
Added some brief details on BFG http://rtyley.github.io/bfg-repo-cleaner/