Update recording-changes.asc

Added note about git diff --staged and git diff --cached being synonyms
Merge pull request #128 from mrlucmorin/master

Update recording-changes.asc
Merge branch 'ch02' of github.com:harupong/progit2 into ch02

Conflicts:
	book/02-git-basics/sections/recording-changes.asc
		conflict fixed using upstream changes