first commit
this commit without add
delete README.md file
a.md file renamed
just commit
merge b.md
Merge branch 'master' of https://github.com/josoblue/grit
pull after local modification
conflicted after pulling
c.md josoblue