$ git add forgotten_file
$ git checkout branch1
$ git commit –amend :overwrite the previous commit
$ git commit -m ‘initial commit’
$ git rebase master #git merge master branch1
1.one branch is the ancester of another -> fast-forward
2.two branch has commom ancester -> recursive strategy