add options to git diff
Merge branch 'diff_options'
can now parse raw diff format
Merge branch 'diff_parse_raw'