use rebase to modify history commit
file2.txt add line1
modfify file2.txt
add test2.txt
merge origin/master