Set dummy merge driver merge ours .gitattributes.
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

Few mispelled word
Merge pull request #805 from alecthegeek/svn-info

Svn info and BFG
Merge pull request #751 from cirosantilli/attributes-merge-ours-config-driver

Set dummy merge driver merge ours .gitattributes.