Add first file: file1
add file2, update file1
update file1
update file2
renamed file2
Merge branch 'master' of https://github.com/teho/learn