add git rebase/revert/reset file
Merge branch 'dev'